gentoo resync : 15.01.2020

6 files changed, 121 insertions, 148 deletions

diff --git a/games-puzzle/pathological/Manifest b/games-puzzle/pathological/Manifest
index 1d9194351507..f861e94c8792 100644
--- a/games-puzzle/pathological/Manifest
+++ b/games-puzzle/pathological/Manifest
@@ -1,5 +1,5 @@
-AUX pathological-1.1.3-build.patch 527 BLAKE2B eb58b42104ee13d4f438800656ac056e2b404c48615472ad18eda144c6976828e1ea3f58551d4ee9dc8032299bab492fc7c8af12048bbd6807b84af26822357a SHA512 d18b8e55d3f40fa69d0a551749b1242ba055ba8eb5bde517d7df8a46414d81232836bf232b28e77b1dcab8f0d049b3ee46ef666621674ac1be68e343e53f1c34
-AUX pathological-1.1.3-music-py.patch 475 BLAKE2B f73a83c4feba6810a39bca173845dd3b5c24ce752414f03e626879185ee53ee073c249136d9568f4866a337111d22f3aea2d13aeaeaed5b1da22a7cf520d26a5 SHA512 4a96a35d299f10ba90ff979ec77c7b117228d6e593be0b5858233fd44a0c746ad3abd52fe2751496e2ace813afc95ae7ee76c2e3d940678236de973cdae7aa87
+AUX pathological-1.1.3-build-r1.patch 294 BLAKE2B ca608731e0e25134f2ce66d8336e73fceb9a4201199a770857e6a5e8235ef387ab2bd9f7fb27f9434c8042131d09fb49eec39582d59bca3661a4ab489d181159 SHA512 ae7ba9c82cc51232b69fe5756ca5ae17d816c395b091f43c344f86439b3e08bdf2c4bcb9272f2b4e47ab1756432a9455c25c94dfe914ab2d2e5bfde99839483a
 DIST pathological-1.1.3.tar.gz 6995274 BLAKE2B 2fc891f1d0f15f68d2be3a210f04a64b73896cba92882e24fa60df09752b3235e025c4480510b7eebbf214d8ec4885ea556d76757888b85751a48432ea22709f SHA512 a64e0ca9a3bf86ade4a1abdd4f471c341838f690b2471f21c488471b7800da55f89f42c62a51c9be380cb9f265432db904a5de6f6bb3a9a7dde835da94baf566
-EBUILD pathological-1.1.3-r3.ebuild 1965 BLAKE2B 9a1856c81705fd53a79e00b847ae89e510a4f038039fe939cf94269a51ee7674a0d5ff82ca787ed78fde174276e9bea74a4554a24dd8c4a3193b3aac61e12898 SHA512 bc36d2f3f012273c2c3cdc9f74c656bfe40d51c568a3e916fd35b31d45a428717ffa9c7b6fe99de08940d66cd112912781cbaa15cb4967c822be996ccdb9801f
+DIST pathological_1.1.3-16.debian.tar.xz 12992 BLAKE2B 3209f1d6b867f8d7baf83dda22f94829ba880a7aeff2a7587b883cac406e21b5c20d703a55599bc8692caa49553102ed1b4b0f7ac11c490b400ccbca7608d6cf SHA512 3d946a6d3c0daa4f0dac256c6e5fa053942a101aaae229836c8290dffc4556279169f71eff6bf4814d26ee30f466df9d7014b504c259aba139c3919c704db3ee
+EBUILD pathological-1.1.3_p16.ebuild 2213 BLAKE2B 673cdb9598c7a0fc215d90239aeda921619c75c2d78e224952dd530814e3c3a90f3a921a6cfbbeae39c0791e292f69eaf53c744a68151d564fb642749b5bc44d SHA512 be4a4108301c7a9f4001a96c4df78810f3bc24d29a877df6323a93cc620f633a340910080d3e26ffafc7f14463c0854e2852bad5264509bc352dbaec700ce888
 MISC metadata.xml 335 BLAKE2B 775a6a1e8fcce8caa16099edfe9513a7dd1528584f8a54090e5064d9dc7b7c956caa585d90878f1f39148faf224fd941c04a2fe1be4cfdc3f1b1c27cf3a2a6c8 SHA512 d37783b18071c416deb0bbc6702ca086e84653bc7a54bc76283285eb0ece1f82a4f1b1a57ae6572b174c21a4d6d629d77f7edb8d2883cd2401f8cb0943646eaa
diff --git a/games-puzzle/pathological/files/pathological-1.1.3-build-r1.patch b/games-puzzle/pathological/files/pathological-1.1.3-build-r1.patch
new file mode 100644
index 000000000000..48038df00036
--- /dev/null
+++ b/games-puzzle/pathological/files/pathological-1.1.3-build-r1.patch
@@ -0,0 +1,12 @@
+--- a/Makefile.old	2019-12-25 20:55:37.932303932 +0100
++++ b/Makefile	2019-12-25 20:55:58.584530808 +0100
+@@ -4,9 +4,6 @@
+ 
+ all: write-highscores docs
+ 
+-write-highscores: write-highscores.c
+-	gcc -s -o write-highscores write-highscores.c
+-
+ docs: html/wheel.png
+ html/wheel.png:
+ 	./makehtml
diff --git a/games-puzzle/pathological/files/pathological-1.1.3-build.patch b/games-puzzle/pathological/files/pathological-1.1.3-build.patch
deleted file mode 100644
index d8793a6aef6e..000000000000
--- a/games-puzzle/pathological/files/pathological-1.1.3-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Use implicit rules to build write-highscores so we dont have to worry
-about CC/CFLAGS/LDFLAGS/etc...
-
-Include stdlib.h to get exit() prototype
-
---- write-highscores.c
-+++ write-highscores.c
-@@ -25,6 +25,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <stdlib.h>
- 
- #define BUFFER_SIZE 1024
- 
---- Makefile
-+++ Makefile
-@@ -4,9 +4,6 @@
- 
- all: write-highscores html/wheel.png
- 
--write-highscores: write-highscores.c
--	gcc -s -o write-highscores write-highscores.c
--
- html/wheel.png:
- 	./makehtml
- 
diff --git a/games-puzzle/pathological/files/pathological-1.1.3-music-py.patch b/games-puzzle/pathological/files/pathological-1.1.3-music-py.patch
deleted file mode 100644
index 9d67085dd13a..000000000000
--- a/games-puzzle/pathological/files/pathological-1.1.3-music-py.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Make sure music_pending_song is defined before we try using it
-
-http://bugs.gentoo.org/109272
-
---- pathological.py
-+++ pathological.py
-@@ -28,6 +28,7 @@
- colorblind = 0
- sound_on = 1
- music_on = 1
-+music_pending_song = 0
- for arg in sys.argv[1:]:
- 	if arg == '-s':
- 		screenshot = 1
-@@ -194,7 +195,7 @@
- 	sound_on = sound_on ^ 1
- 
- def toggle_music():
--	global music_on
-+	global music_pending_song, music_on
- 	music_on = music_on ^ 1
- 	if music_on:
- 		if music_pending_song:
diff --git a/games-puzzle/pathological/pathological-1.1.3-r3.ebuild b/games-puzzle/pathological/pathological-1.1.3-r3.ebuild
deleted file mode 100644
index 88e3d609d04c..000000000000
--- a/games-puzzle/pathological/pathological-1.1.3-r3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1 games
-
-DESCRIPTION="An enriched clone of the game 'Logical' by Rainbow Arts"
-HOMEPAGE="http://pathological.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-shells/bash
-	>=dev-python/pygame-1.5.5[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	doc? ( media-libs/netpbm )"
-
-pkg_setup() {
-	games_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	unpack ./${PN}.6.gz
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-music-py.patch
-
-	if use doc ; then
-		sed -i -e '5,$ s/=/ /g' makehtml || die
-	else
-		echo "#!/bin/sh" > makehtml
-	fi
-
-	sed -i \
-		-e "s:/usr/share/games:${GAMES_DATADIR}:" \
-		-e "s:/var/games:${GAMES_STATEDIR}:" \
-		-e "s:exec:exec ${EPYTHON}:" \
-		${PN} || die
-
-	sed -i \
-		-e 's:\xa9:(C):' \
-		-e "s:/usr/lib/${PN}/bin:$(games_get_libdir)/${PN}:" \
-		${PN}.py || die
-
-	python_fix_shebang ${PN}.py
-}
-
-src_install() {
-	dogamesbin ${PN}
-
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe write-highscores
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r circuits graphics music sounds ${PN}.py
-
-	insinto "${GAMES_STATEDIR}"
-	doins ${PN}_scores
-	fperms 660 "${GAMES_STATEDIR}"/${PN}_scores
-
-	dodoc changelog README TODO
-	doman ${PN}.6
-	use doc && dohtml -r html/*
-
-	doicon ${PN}.xpm
-	make_desktop_entry ${PN} Pathological ${PN}
-
-	# remove some unneeded resource files
-	rm -f "${D}/${GAMES_DATADIR}"/${PN}/graphics/*.xcf
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	if ! has_version "media-libs/sdl-mixer[mod]" ; then
-		echo
-		elog "Since you have turned off the 'mod' use flag for media-libs/sdl-mixer"
-		elog "no background music will be played."
-		echo
-	fi
-
-}
diff --git a/games-puzzle/pathological/pathological-1.1.3_p16.ebuild b/games-puzzle/pathological/pathological-1.1.3_p16.ebuild
new file mode 100644
index 000000000000..f1e7df2a7630
--- /dev/null
+++ b/games-puzzle/pathological/pathological-1.1.3_p16.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit desktop python-single-r1
+
+DESCRIPTION="An enriched clone of the game 'Logical' by Rainbow Arts"
+HOMEPAGE="http://pathological.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P/_p*}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/pygame-1.5.5[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	doc? ( media-libs/netpbm )
+"
+
+S="${WORKDIR}/${P/_p*}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+	unpack ./${PN}.6.gz
+}
+
+src_prepare() {
+	default
+
+	# Debian fixes
+	# We don't face this bug, this way we skip needing to convert the
+	# files at build time
+	sed -i -e '/60_use_ogg_music.patch/d' "${WORKDIR}"/debian/patches/series || die
+
+	for p in $(<"${WORKDIR}"/debian/patches/series) ; do
+		eapply -p1 "${WORKDIR}/debian/patches/${p}"
+	done
+
+	# Fix prestripped files
+	eapply "${FILESDIR}/${PN}-1.1.3-build-r1.patch"
+
+	if use doc ; then
+		sed -i -e '5,$ s/=/ /g' makehtml || die
+	else
+		echo "#!/bin/sh" > makehtml
+	fi
+
+	sed -i \
+		-e "s:/usr/share/games:/usr/share:" \
+		-e "s:exec:exec ${EPYTHON}:" \
+		${PN} || die
+
+	sed -i \
+		-e 's:\xa9:(C):' \
+		-e "s:/usr/lib/${PN}/bin:/usr/$(get_libdir)/${PN}:" \
+		${PN}.py || die
+
+	python_fix_shebang ${PN}.py
+}
+
+src_install() {
+	dobin ${PN}
+
+	exeinto /usr/"$(get_libdir)"/${PN}
+	doexe write-highscores
+
+	insinto /usr/share/${PN}
+	doins -r circuits graphics music sounds ${PN}.py
+
+	insinto /var/games/
+	doins ${PN}_scores
+	fperms 660 /var/games/${PN}_scores
+
+	doman ${PN}.6
+	use doc && local HTML_DOCS=( html/. )
+	einstalldocs
+	dodoc changelog
+
+	doicon ${PN}.xpm
+	make_desktop_entry ${PN} Pathological ${PN}
+
+	# remove some unneeded resource files
+	rm -f "${ED}"/usr/share/${PN}/graphics/*.xcf
+}
+
+pkg_postinst() {
+	if ! has_version "media-libs/sdl-mixer[mod]" ; then
+		echo
+		elog "Since you have turned off the 'mod' use flag for media-libs/sdl-mixer"
+		elog "no background music will be played."
+		echo
+	fi
+
+}