From 8aebb228036d5e2863b7eaa6e319ab41c1669269 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 16 Apr 2018 16:47:37 +0100
Subject: gentoo resync : 16.04.2018

---
 games-puzzle/amoebax/Manifest                      |  6 +--
 games-puzzle/amoebax/amoebax-0.2.1-r1.ebuild       | 40 ++++++++++++++++++++
 games-puzzle/amoebax/amoebax-0.2.1.ebuild          | 43 ----------------------
 .../amoebax/files/amoebax-0.2.1-aclocal.patch      |  4 +-
 .../amoebax/files/amoebax-0.2.1-compile.patch      |  4 +-
 5 files changed, 47 insertions(+), 50 deletions(-)
 create mode 100644 games-puzzle/amoebax/amoebax-0.2.1-r1.ebuild
 delete mode 100644 games-puzzle/amoebax/amoebax-0.2.1.ebuild

(limited to 'games-puzzle/amoebax')

diff --git a/games-puzzle/amoebax/Manifest b/games-puzzle/amoebax/Manifest
index 8527a6fada6e..88c3507409a8 100644
--- a/games-puzzle/amoebax/Manifest
+++ b/games-puzzle/amoebax/Manifest
@@ -1,5 +1,5 @@
-AUX amoebax-0.2.1-aclocal.patch 1532 BLAKE2B 3444d44488291d196015149e48f31e79eca0d6457fb878149215fbdb22175eda6e7d61c603537c063d8d97773dc4a937a3077c82a0564e390e8e245de8a214cc SHA512 d2bf1de8c773074eb7b69c188b3a8e242bc03bd6d80d770a1db8cd4fd5ac2cdd5bc96e807713211b19efd839df0344c8318f259cc2f95be3abd55a1523bb54f5
-AUX amoebax-0.2.1-compile.patch 223 BLAKE2B 092506bf019fe27799f6d144bf29097e2f040246a7f470885c0ebc24eefbbe20c8125dd326b099c8a46b346177ae1dadfb96415cc428c1e3de54acf41c957ae1 SHA512 90fccf04bf3567c5f5773870c447e331b15a0d275a95eddca3c911fffbd7fe580aa1441a009bf0667fb2279e56e9d2c425c3070c24692dc4acc7f719ab052c72
+AUX amoebax-0.2.1-aclocal.patch 1536 BLAKE2B bb83bfc7e254ca1f649a735121ba8f9bc71abe35c7c935083d50682ee7cbd77b6eeb5f87ac35b5235f46d5abf8b0a995796548401ed2b943b3acf374bd6e18d9 SHA512 f5f501b0bbe76902c65d404e7aebf830d84c329cf8d84ee5c769660bb4a30cbfbae9a0e16eb2697bd693de77ef38811ac52e68fe799add00b97292c2e79a2d27
+AUX amoebax-0.2.1-compile.patch 227 BLAKE2B de56259f5d58fd3509b2fe2b6d51e7ecd3bdebee4196d03ca3529a24e10123f005529b6e0e9fb434a45c7a8caaaf8197ce9e730276bd3631ad5e3c1b47df2ffc SHA512 fe6b2b3b7d61f5548fc9959dce491e25cdf51313bc46141615e3ea5e96edff34084ac8294b0b8ddace6dc6a374a02cd173e3a4308cb9d56018535f62dfa6defe
 DIST amoebax-0.2.1.tar.bz2 10645579 BLAKE2B 0e8f5d5bb92dd20444bfcb735fdc28142bc359676e057471089b94a6df8a8b45cdecdb1462022909f025310fbc9da1946a50a4d716aa75e34ffc71b4fbc8cfbe SHA512 f8cd20cb35e2456487f55ebc89411ebd47b25cf549d35c36041a27e1d96ef30702151f303dbb457afbf8583f67c53143c30becdea00a26fddad20555e0c7d181
-EBUILD amoebax-0.2.1.ebuild 983 BLAKE2B cc743065a7864fb1c15b1a0e553583253680c18ecef32ff66f2321c4fc28d4440c324763ddb68f03b80d2df486155ac37b0472c44fff0e1a3eb21372a6e724a5 SHA512 468fabe4342c3550545aec163b4de716777dbbb5e353cb79beb06d3287c65d16772edfc29465589961c4c846941aa55f1a422442507155fd6280b93bb7b16a45
+EBUILD amoebax-0.2.1-r1.ebuild 937 BLAKE2B 796983bbdbe49edcb964bc15095e2a049599ec0f523223277f124c42d3310369d176738ec99ab0834a063585b4e34134aed72cd005d96ab4b7da06a43fe27bdb SHA512 5f7de2cdf5fe0f91b32f012f61f8d3cd8a589e88dcf70d44b4139372e6e0df4541188c71e4bb3c1d4ec90fd1ee427ac91129802514587c9f95e7533c9c7c9ea3
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/amoebax/amoebax-0.2.1-r1.ebuild b/games-puzzle/amoebax/amoebax-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..316d438bcddd
--- /dev/null
+++ b/games-puzzle/amoebax/amoebax-0.2.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+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]"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	default
+
+	eapply \
+		"${FILESDIR}"/${P}-aclocal.patch \
+		"${FILESDIR}"/${P}-compile.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
+}
diff --git a/games-puzzle/amoebax/amoebax-0.2.1.ebuild b/games-puzzle/amoebax/amoebax-0.2.1.ebuild
deleted file mode 100644
index 687f1d8f9057..000000000000
--- a/games-puzzle/amoebax/amoebax-0.2.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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]"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-aclocal.patch \
-		"${FILESDIR}"/${P}-compile.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() {
-	default
-	prepgamesdirs
-}
diff --git a/games-puzzle/amoebax/files/amoebax-0.2.1-aclocal.patch b/games-puzzle/amoebax/files/amoebax-0.2.1-aclocal.patch
index 4cafc8d44de8..11d903516c19 100644
--- a/games-puzzle/amoebax/files/amoebax-0.2.1-aclocal.patch
+++ b/games-puzzle/amoebax/files/amoebax-0.2.1-aclocal.patch
@@ -1,5 +1,5 @@
---- m4/objc.m4.old
-+++ m4/objc.m4
+--- a/m4/objc.m4.old
++++ b/m4/objc.m4
 @@ -448,32 +448,32 @@
  
  # AC_LANG_SOURCE(Objective C)(BODY)
diff --git a/games-puzzle/amoebax/files/amoebax-0.2.1-compile.patch b/games-puzzle/amoebax/files/amoebax-0.2.1-compile.patch
index 79c66a8c95b8..6be301674149 100644
--- a/games-puzzle/amoebax/files/amoebax-0.2.1-compile.patch
+++ b/games-puzzle/amoebax/files/amoebax-0.2.1-compile.patch
@@ -1,5 +1,5 @@
---- src/binreloc.cxx
-+++ src/binreloc.cxx
+--- a/src/binreloc.cxx
++++ b/src/binreloc.cxx
 @@ -739,7 +739,8 @@
  char *
  br_dirname (const char *path)
-- 
cgit v1.2.3