old

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 6 insertions, 179 deletions

diff --git a/games-puzzle/amoebax/ChangeLog b/games-puzzle/amoebax/ChangeLog
index 08db8d7ef041..e3d54dc0b777 100644
--- a/games-puzzle/amoebax/ChangeLog
+++ b/games-puzzle/amoebax/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-puzzle/amoebax
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/amoebax/ChangeLog,v 1.12 2015/02/25 15:48:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/amoebax/ChangeLog,v 1.13 2015/03/12 19:25:00 mr_bones_ Exp $
+
+  12 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org> -amoebax-0.2.0.ebuild,
+  -files/amoebax-0.2.0-aclocal.patch, -files/amoebax-0.2.0-gcc43.patch,
+  -files/amoebax-0.2.0-glibc2.10.patch:
+  old
 
   25 Feb 2015; Agostino Sarubbo <ago@gentoo.org> amoebax-0.2.1.ebuild:
   Stable for x86, wrt bug #539718
diff --git a/games-puzzle/amoebax/amoebax-0.2.0.ebuild b/games-puzzle/amoebax/amoebax-0.2.0.ebuild
deleted file mode 100644
index 5d5be4296dcd..000000000000
--- a/games-puzzle/amoebax/amoebax-0.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/amoebax/amoebax-0.2.0.ebuild,v 1.9 2014/05/15 16:48:41 ulm Exp $
-
-EAPI=2
-inherit autotools eutils games
-
-DESCRIPTION="a cute and addictive action-puzzle game, similar to tetris"
-HOMEPAGE="http://www.emma-soft.com/games/amoebax/"
-SRC_URI="http://www.emma-soft.com/games/amoebax/download/${P}.tar.bz2"
-
-LICENSE="FreeArt GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,joystick,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[vorbis]"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-glibc2.10.patch \
-		"${FILESDIR}"/${P}-aclocal.patch
-	sed -i \
-		-e "/^SUBDIRS/s:doc ::" \
-		Makefile.am || die
-	sed -i \
-		-e "/^iconsdir/s:=.*:=/usr/share/pixmaps:" \
-		-e "/^desktopdir/s:=.*:=/usr/share/applications:" \
-		data/Makefile.am || die
-	sed -i \
-		-e '/Encoding/d' \
-		-e '/Icon/s/.svg//' \
-		data/amoebax.desktop || die
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS NEWS README TODO
-	prepgamesdirs
-}
diff --git a/games-puzzle/amoebax/files/amoebax-0.2.0-aclocal.patch b/games-puzzle/amoebax/files/amoebax-0.2.0-aclocal.patch
deleted file mode 100644
index 4cafc8d44de8..000000000000
--- a/games-puzzle/amoebax/files/amoebax-0.2.0-aclocal.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- m4/objc.m4.old
-+++ m4/objc.m4
-@@ -448,32 +448,32 @@
- 
- # AC_LANG_SOURCE(Objective C)(BODY)
- # ---------------------------------
--m4_copy([AC_LANG_SOURCE(C)], [AC_LANG_SOURCE(Objective C)])
-+m4_copy_force([AC_LANG_SOURCE(C)], [AC_LANG_SOURCE(Objective C)])
- 
- 
- # AC_LANG_PROGRAM(Objective C)([PROLOGUE], [BODY])
- # ------------------------------------------------
--m4_copy([AC_LANG_PROGRAM(C)], [AC_LANG_PROGRAM(Objective C)])
-+m4_copy_force([AC_LANG_PROGRAM(C)], [AC_LANG_PROGRAM(Objective C)])
- 
- 
- # AC_LANG_CALL(Objective C)(PROLOGUE, FUNCTION)
- # ---------------------------------------------
--m4_copy([AC_LANG_CALL(C)], [AC_LANG_CALL(Objective C)])
-+m4_copy_force([AC_LANG_CALL(C)], [AC_LANG_CALL(Objective C)])
- 
- 
- # AC_LANG_FUNC_LINK_TRY(Objective C)(FUNCTION)
- # --------------------------------------------
--m4_copy([AC_LANG_FUNC_LINK_TRY(C)], [AC_LANG_FUNC_LINK_TRY(Objective C)])
-+m4_copy_force([AC_LANG_FUNC_LINK_TRY(C)], [AC_LANG_FUNC_LINK_TRY(Objective C)])
- 
- 
- # AC_LANG_BOOL_COMPILE_TRY(Objective C)(PROLOGUE, EXPRESSION)
- # -----------------------------------------------------------
--m4_copy([AC_LANG_BOOL_COMPILE_TRY(C)], [AC_LANG_BOOL_COMPILE_TRY(Objective C)])
-+m4_copy_force([AC_LANG_BOOL_COMPILE_TRY(C)], [AC_LANG_BOOL_COMPILE_TRY(Objective C)])
- 
- 
- # AC_LANG_INT_SAVE(Objective C)(PROLOGUE, EXPRESSION)
- # ---------------------------------------------------
--m4_copy([AC_LANG_INT_SAVE(C)], [AC_LANG_INT_SAVE(Objective C)])
-+m4_copy_force([AC_LANG_INT_SAVE(C)], [AC_LANG_INT_SAVE(Objective C)])
- 
- 
- 
diff --git a/games-puzzle/amoebax/files/amoebax-0.2.0-gcc43.patch b/games-puzzle/amoebax/files/amoebax-0.2.0-gcc43.patch
deleted file mode 100644
index 2ee119d5c6c0..000000000000
--- a/games-puzzle/amoebax/files/amoebax-0.2.0-gcc43.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- src/ControlSetupState.cxx
-+++ src/ControlSetupState.cxx
-@@ -20,6 +20,7 @@
- #include <config.h>
- #endif // !HAVE_CONFIG_H
- #include <sstream>
-+#include <cstdlib>
- #include "ControlSetupState.h"
- #include "File.h"
- #include "Joystick.h"
---- src/Font.cxx
-+++ src/Font.cxx
-@@ -23,6 +23,7 @@
- #include <config.h>
- #endif // HAVE_CONFIG_H
- #include <numeric>
-+#include <algorithm>
- #include <SDL.h>
- #include "Font.h"
- 
---- src/Joystick.cxx
-+++ src/Joystick.cxx
-@@ -19,6 +19,7 @@
- #if defined (HAVE_CONFIG_H)
- #include <config.h>
- #endif // !HAVE_CONFIG_H
-+#include <cstdlib>
- #include "Joystick.h"
- 
- using namespace Amoebax;
---- src/MainMenuState.cxx
-+++ src/MainMenuState.cxx
-@@ -19,6 +19,7 @@
- #if defined (HAVE_CONFIG_H)
- #include <config.h>
- #endif // HAVE_CONFIG_H
-+#include <algorithm>
- #include <SDL.h>
- #include "AdvancedAIPlayer.h"
- #include "AnticipatoryAIPlayer.h"
---- src/OptionsMenuState.cxx
-+++ src/OptionsMenuState.cxx
-@@ -20,6 +20,7 @@
- #include <config.h>
- #endif // HAVE_CONFIG_H
- #include <SDL.h>
-+#include <algorithm>
- #include <sstream>
- #include "ControlSetupState.h"
- #include "File.h"
---- src/Sound.h
-+++ src/Sound.h
-@@ -19,6 +19,7 @@
- #if !defined (AMOEBAX_SOUND_H)
- #define AMOEBAX_SOUND_H
- 
-+#include <string>
- #include <SDL_mixer.h>
- 
- namespace Amoebax
---- src/System.cxx
-+++ src/System.cxx
-@@ -19,7 +19,8 @@
- #if defined (HAVE_CONFIG_H)
- #include <config.h>
- #endif // HAVE_CONFIG_H
--#include <assert.h>
-+#include <algorithm>
-+#include <cassert>
- #include <cstdlib>
- #include <iostream>
- #include <limits>
---- src/TwoPlayersState.cxx
-+++ src/TwoPlayersState.cxx
-@@ -19,6 +19,7 @@
- #if defined (HAVE_CONFIG_H)
- #include <config.h>
- #endif // HAVE_CONFIG_H
-+#include <algorithm>
- #include <cassert>
- #include <SDL.h>
- #include <sstream>
diff --git a/games-puzzle/amoebax/files/amoebax-0.2.0-glibc2.10.patch b/games-puzzle/amoebax/files/amoebax-0.2.0-glibc2.10.patch
deleted file mode 100644
index 4dae207f418c..000000000000
--- a/games-puzzle/amoebax/files/amoebax-0.2.0-glibc2.10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/binreloc.cxx
-+++ src/binreloc.cxx
-@@ -744,7 +744,7 @@
- 	if (path == (const char *) NULL)
- 		return (char *) NULL;
- 
--	end = strrchr (path, '/');
-+	end = strrchr ((char *)path, '/');
- 	if (end == (const char *) NULL)
- 		return strdup (".");
-