gentoo resync : 28.04.2018

4 files changed, 67 insertions, 82 deletions

diff --git a/games-arcade/supertransball2/Manifest b/games-arcade/supertransball2/Manifest
index 43343eb96b6e..dfc7559f0a85 100644
--- a/games-arcade/supertransball2/Manifest
+++ b/games-arcade/supertransball2/Manifest
@@ -1,5 +1,4 @@
-AUX supertransball2-1.5-ldflags.patch 397 BLAKE2B d639cb954fb1c7e309f3d47791e112c883c058536f7242e30b854c8cc9ffe3854abf74384e7bf7e96ae0f092b0c764a97f55325189392ef93f255f594b3b7b33 SHA512 a16655c44cd13cbcd1f9fa2b96104d42914c5a26cedff7abea65552610e95c6e71934a6f3b1d32d687993bcfe27b119b53d17c3881460bc0729d9267dd7998e4
 DIST stransball2-v15-linux.zip 302212 BLAKE2B 8b45e32f37c805e75ba0d19ef004d75baea689fe87e946d50301cef01230492fd531b4100bc6200a261c24463443b2811faea8d200d15b15af0c884dbc285d2a SHA512 e87655dfca039c0c8553372b4da139f1d8fa420aad1909b422318dc049a9f7972c8d2398b83fde677b3eaf21d2d70fad73d7ec0c4b7bcbeacbf3544e6e575f6a
-DIST supertransball2_1.5-3.diff.gz 6592 BLAKE2B 29ed5609bffb8093422d74a5b2889bb4c7a5c4728cab40bc3e95fef35a1ddc9f60945e15366e07b47efb1a3a15e51bb4bc85b51bb3e854778e8ec07700861fc6 SHA512 d8f0682633d8b20661a98d037430590c0f509205857644b28a7b56fc80011df8cd5dbbacf1142514b18dd471e6f79e515d981c025cb19a2288cd7bf46c0d1ba4
-EBUILD supertransball2-1.5.ebuild 1429 BLAKE2B 402ed52aa235419a59d7c0642643ccf34ee34eba2560013a8c6371dbd4d49473780b6424fcac121bfd5608fbaa2c12bdc0cef8d6cacd1ea846ab07b1158fb49e SHA512 05a2f53ce4fa057f1d7dba31f278f22a2bbd5c5a134231ac1938ac86bc0ba11cbceb667a7153a332c0a0c3055e0a1365cd67d31a3f3107846b7b74d7dfa5a52a
+DIST supertransball2_1.5-8.debian.tar.xz 26148 BLAKE2B 50ada1b6976da9686aa5cabd5e3a04222e30f9c69565018eebe51271842842dab88829c0672d7375995e3835c3be4983c8990e736278177d7d10596ed2453a0c SHA512 efbb8517b73d4413755663f96aa01eb679b43876091920a6d9a9fc0a31d001828aa536ac59e74172fa519d14b1dff117c150c022fb8f3898efbee2901a418a53
+EBUILD supertransball2-1.5-r1.ebuild 1346 BLAKE2B 5614b4f90e27a8da89bafa0562b8fc5414aeb9fefb9f7b76e37baf2bd5b295fcdd0feff5cb9b57875737d6f8561a9aca8844fbce40549ca58e20da9f81706e45 SHA512 eb13c56975274f9b2f88cfe4abe7221422e4206ba272848d6b2a912af0f73a5315f413b033b0109a40561ccab86e7811e319a8fd364a7f592e0794341f9d117f
 MISC metadata.xml 732 BLAKE2B 02a55b153806bf73c5f777a196d4bcaa79f3bf4155eda30b792b56ba1289df14c5d8597e38b1a2b122d7b53c4792e589a01b57bf31fafbae99333b3dead5e9f8 SHA512 ff6eef56c6c80e08bac6a0d2ce6f848d22e90c1326a2a3e0927c04fdabe38cd0736b8f3555cd8f0743d1ba6cc5094946488cb0b9cf1c1db4ee4176f3bde79e8d
diff --git a/games-arcade/supertransball2/files/supertransball2-1.5-ldflags.patch b/games-arcade/supertransball2/files/supertransball2-1.5-ldflags.patch
deleted file mode 100644
index daee9f6b17fd..000000000000
--- a/games-arcade/supertransball2/files/supertransball2-1.5-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.old	2010-10-16 21:34:09.000000000 +0200
-+++ Makefile	2010-10-16 21:34:24.000000000 +0200
-@@ -17,7 +17,7 @@
- 
- # dynamically linked binary:
- $(TARGET): $(OBJS)
--	$(CXX) $^ -o $@ `sdl-config --libs` -lSDL_image -lSDL_mixer -lSDL_sound -lSDL_sound -lSGE
-+	$(CXX) $(LDFLAGS) $^ -o $@ `sdl-config --libs` -lSDL_image -lSDL_mixer -lSDL_sound -lSDL_sound -lSGE
- 	mv ./$(TARGET) ..
- 
- clean:
diff --git a/games-arcade/supertransball2/supertransball2-1.5-r1.ebuild b/games-arcade/supertransball2/supertransball2-1.5-r1.ebuild
new file mode 100644
index 000000000000..96768ec7e1cd
--- /dev/null
+++ b/games-arcade/supertransball2/supertransball2-1.5-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit epatch desktop versionator
+
+MY_PV="$(delete_all_version_separators)"
+MY_P="stransball2-v${MY_PV}"
+FILE="${MY_P}-linux"
+
+DESCRIPTION="Thrust clone"
+HOMEPAGE="http://www.braingames.getput.com/stransball2/"
+SRC_URI="http://braingames.bugreport.nl/stransball2/${FILE}.zip
+	mirror://debian/pool/main/s/${PN}/${PN}_${PV}-8.debian.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image
+	media-libs/sdl-mixer
+	media-libs/sdl-sound
+	media-libs/sge
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+"
+
+S="${WORKDIR}/${P}/sources"
+
+src_unpack() {
+	unpack ${A}
+	mv -f "${FILE}" ${P}
+}
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:/usr/share/games:/usr/share:" \
+		"${WORKDIR}"/debian/patches/0001-Fix-unix-paths-and-Makefile.patch || die
+
+	epatch "${WORKDIR}"/debian/patches/*.patch
+
+	sed -i \
+		-e "s: -I/usr/local/include/SDL::" \
+		-e "s:-g3 -O3:\$(CXXFLAGS):" \
+		-e "s:c++:\$(CXX):" \
+		Makefile || die "sed Makefile failed"
+}
+
+src_install() {
+	cd ..
+	dobin ${PN}
+
+	doicon ../debian/${PN}.png
+	make_desktop_entry ${PN} "Super Transball 2"
+	dodoc readme.txt
+	doman ../debian/supertransball2.6
+
+	insinto "/usr/share/${PN}"
+	doins -r demos graphics maps sound
+}
diff --git a/games-arcade/supertransball2/supertransball2-1.5.ebuild b/games-arcade/supertransball2/supertransball2-1.5.ebuild
deleted file mode 100644
index 3ceb2f40f728..000000000000
--- a/games-arcade/supertransball2/supertransball2-1.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils versionator games
-
-MY_PV=$(delete_all_version_separators)
-MY_P=stransball2-v${MY_PV}
-FILE=${MY_P}-linux
-DEBIAN_PATCH="${PN}_${PV}-3.diff"
-
-DESCRIPTION="Thrust clone"
-HOMEPAGE="http://www.braingames.getput.com/stransball2/"
-SRC_URI="http://braingames.bugreport.nl/stransball2/${FILE}.zip
-	mirror://debian/pool/main/s/${PN}/${DEBIAN_PATCH}.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-image
-	media-libs/sdl-mixer
-	media-libs/sdl-sound
-	media-libs/sge"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${P}/sources
-
-src_unpack() {
-	unpack ${A}
-	mv -f "${FILE}" ${P}
-}
-
-src_prepare() {
-	cd "${WORKDIR}"
-	sed -i \
-		-e "s:/usr/share/games:${GAMES_DATADIR}:" \
-		"${DEBIAN_PATCH}" || die
-
-	epatch "${DEBIAN_PATCH}"
-
-	local deb_dir=${P}/debian/patches
-	rm -f "${deb_dir}"/00list
-	epatch "${deb_dir}"/*
-
-	cd "${S}"
-	sed -i \
-		-e "s: -I/usr/local/include/SDL::" \
-		-e "s:-g3 -O3:\$(CXXFLAGS):" \
-		-e "s:c++:\$(CXX):" \
-		Makefile || die "sed Makefile failed"
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-}
-
-src_install() {
-	cd ..
-	dogamesbin ${PN}
-	make_desktop_entry ${PN} "Super Transball 2"
-	dodoc readme.txt
-	doman debian/supertransball2.6
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r demos graphics maps sound
-
-	prepgamesdirs
-}