gentoo resync : 24.07.2021

4 files changed, 57 insertions, 131 deletions

diff --git a/games-arcade/whichwayisup/Manifest b/games-arcade/whichwayisup/Manifest
index 11f7035f8c62..99e43df31d3e 100644
--- a/games-arcade/whichwayisup/Manifest
+++ b/games-arcade/whichwayisup/Manifest
@@ -1,7 +1,7 @@
 AUX whichwayisup-0.7.9-check_for_joystick_axes_not_null.patch 582 BLAKE2B 6d5c35fe35fe08df884c69b54c8a0ca18bfa2f22706274cf7a8589391fc0f25d77ae7619c8ec44fe075e31020af19b0350bbac7f9e2866838629e24df6e7468f SHA512 506560bb48348b37034a6f7851e1d4ff4e56374df7fed9cc5ac405aadfd4e63cf947fdfa837f45b51eaa08f5bd0f5deeb805a02afb67eae9a03c8b24aff53c74
 AUX whichwayisup-0.7.9-initialize_only_required_pygame_modules.patch 631 BLAKE2B 09c7b64e45ec239905043b1d1a8abf965d92a54405f98ee5db4f3c6e494dc509ca99ee00f42c2c125320975e8e8e7bd17436a05b1066218b70ba27c16af65643 SHA512 2fb39740ed5ee4814f496e799d27f4d9377771861799e907bab5d3454aca2b3d6d25616d254977f7bf3504b4874774bc9984ddcfca58660fd63cb5bc6938663d
 AUX whichwayisup-0.7.9-python3.patch 18559 BLAKE2B 96cb66f5092e1a0ee29e82b12ec5c6cdde3f92cdc3cb6a0db5b768e0eb51e6a8eaf5e4ca85889966d5155f9197fff8431408ac5a3a63b58cb65d38db15e04c64 SHA512 cefabb3deee25bf6fb008d648257dfd5fbe30a87e7aa9fc3cb0d80ce544db6e7c52193a3aad68761a8d7258b9474066eba6c5723b7da3ad1ac5c27f579184f28
-AUX whichwayisup-32.xpm 1694 BLAKE2B 079e9f6e3dde54c1d2bb7f576330663fa886bc112f3e20398c3e50521c19ccc4c68647b37e9d3ed4dc88a7f2c2ac60d11c171e3350e7ec84fee0b193e4eeb830 SHA512 e0329876d45aa575abe07024d7f154ff743f1899c4dbb58b8e317ae9173c2aadd63a511924e99115a9f56f42411507f542225e4980d9588e09f7765cf41bf95c
+DIST whichwayisup.png 6720 BLAKE2B 26514e025341ce7d5145d69295a24477ea3575afcfb0a11bbbddb1dd716feadef9a030ec9dc4171b75842fafc78670ed1fc7656dac8dbd6695b9592b73bb1383 SHA512 469b847955a745177c7629dd13f1975191766863bfe263e3818105356d71aaaeb66cbe34846d0bd908bf494e2d7d42b7f33499868da2fa346f96f8080bccc0b2
 DIST whichwayisup_b079.zip 1001890 BLAKE2B bfc8f15376ae7c93cc3921a7c0537d44bca44cbfd5e19533912c56151b8811a40e96271e0f3b8634a6fc4625bd32c9668fc3c321f1d2ea0306517067f3d31e24 SHA512 49ac6b8224f3cf7b0711b297c9dd96ff2a0969f7c16fa1da500bef1ea5d793bd900be124a9b9874239c98db6fd2db92917b8ce2ee09b685e184cfd87bf519809
-EBUILD whichwayisup-0.7.9-r3.ebuild 1370 BLAKE2B 351e7169dfd7edccced27db3f5f3193b08555017a66f5803cd7271a0670b7a92d2ed2646a8f76c96ebcce1b65f1038fd79750470118cc9ca1a43d7b7118e81ed SHA512 dc95b2776b8c533e7468afd9db8e4054052d78542833d8f64fe15d822faee0b5cbfc87cfa141998b06f931927e34e2357816c3da2dd17b7318dba75bd5fdc3f9
+EBUILD whichwayisup-0.7.9-r4.ebuild 1308 BLAKE2B 836ee81070c329f198af378100a0dfa628af0c44c1265dbb2dec45b160bccf0596ea941232a79cfdb2969b1ccf43c844f59161174ccc897d510a87e848370ad6 SHA512 1ac00033d22e0f3e51c785336c9b4898f01d38e55960d51f6ca27c3ece458722606e33c48139efa1bab0f79d8ed76003a510e7d936a112e391bc540985e34013
 MISC metadata.xml 491 BLAKE2B 7c632e2660757b2796dc732506e95b040890bc30941d152f4b650a2aad266e9aa3c013ce8054d02979c64610559ace6b4ac4b6d8ed9b5277a0dd9c92d9414b4c SHA512 a53511b1c0d5b69a34c5dfb0c302505cda98b9a54edb6b4f74868a48ee7870b1ec83dfedff7833e2997a97160182fb35f610a2f97c3577ca4b4cc297c98eeb1b
diff --git a/games-arcade/whichwayisup/files/whichwayisup-32.xpm b/games-arcade/whichwayisup/files/whichwayisup-32.xpm
deleted file mode 100644
index f5a6ff33c0dc..000000000000
--- a/games-arcade/whichwayisup/files/whichwayisup-32.xpm
+++ /dev/null
@@ -1,67 +0,0 @@
-/* XPM */
-static char * whichwayisup_32_xpm[] = {
-"32 32 32 1",
-" 	c None",
-".	c #03151B",
-"+	c #016C87",
-"@	c #225361",
-"#	c #363636",
-"$	c #387D9A",
-"%	c #0A2B35",
-"&	c #4E4F50",
-"*	c #ECEBEB",
-"=	c #9D866F",
-"-	c #E3D9D3",
-";	c #A8947C",
-">	c #CDCDCD",
-",	c #C5BDA7",
-"'	c #B2A38C",
-")	c #D0C9B4",
-"!	c #AEACAB",
-"~	c #FDFDFD",
-"{	c #020202",
-"]	c #856B5D",
-"^	c #262524",
-"/	c #6E6E6E",
-"(	c #888987",
-"_	c #121111",
-":	c #9E9D9D",
-"<	c #4F6871",
-"[	c #BCBDBD",
-"}	c #023B4A",
-"|	c #6E4C3B",
-"1	c #7D5945",
-"2	c #4F2C21",
-"3	c #401D14",
-"             .+@@#              ",
-"             ++++$              ",
-"           #%&@&@@@.            ",
-"           *=-;>,'-             ",
-"             )*=!~              ",
-"           {{#]]]#{{            ",
-"        {{^^%+@/(%_/#_          ",
-"      {{&:*>@+<&<<%[~[&{        ",
-"     _#:~~~~<+@/@&&(-~~/_       ",
-"    _#>~~[<^{}%%@{_&{<>~:{      ",
-"   _#-~>&{{  }}.+{   {^:~({     ",
-"   ^>~>_^(;>,:((((--,) {(~&     ",
-"  {(~*#{ ,),))))))),,;  _>[{    ",
-" #^*~({  ;',,,,,),,,=|  {&*#    ",
-" _/~~&{  ;;',)),)),=1]   ^*/{   ",
-" _(~*^_  =;;'),,))=|11   {>[_   ",
-" _!~*_{  ====',,,=|1|2   {:-^   ",
-" _:~*^{  ;;;';')=|]1##   {:*^   ",
-" {(~*^{  ;=;=;=]||12&2   {:~^   ",
-" _&~~&{  ==;==|321^:/^   {[~^   ",
-"  _>~/{  =';;13222&~#3  {#~>_   ",
-"  {/~!{  =;=|3333_[~^#  {:~(^   ",
-"  ^_>~^{ ''|3222_#~*^| {#~*^    ",
-"   {#~:{&'123232{/~*^^{_>~/{    ",
-"    {&*&^|323333{(~*&{#>~:{     ",
-"     {&!#       {(~~[!*~:{{     ",
-"      {^#_      {/~*~~~:{{      ",
-"        __{{    {#~~~~~:^{      ",
-"                 _>~~~~~-/_{    ",
-"                 {#([*~~~~[&_{  ",
-"                   {{^&(:[**!&{ ",
-"                        {{_^&&#{"};
diff --git a/games-arcade/whichwayisup/whichwayisup-0.7.9-r3.ebuild b/games-arcade/whichwayisup/whichwayisup-0.7.9-r3.ebuild
deleted file mode 100644
index 8c6d76376e9e..000000000000
--- a/games-arcade/whichwayisup/whichwayisup-0.7.9-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit desktop python-r1
-
-MY_PV="${PV//./}"
-MY_P="${PN}_b${MY_PV}"
-
-DESCRIPTION="A traditional and challenging 2D platformer game with a slight rotational twist"
-HOMEPAGE="http://hectigo.net/puskutraktori/whichwayisup/"
-SRC_URI="http://hectigo.net/puskutraktori/whichwayisup/${MY_P}.zip"
-
-LICENSE="GPL-2 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygame[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
-	# Fixes from Fedora
-	"${FILESDIR}"/${P}-check_for_joystick_axes_not_null.patch
-	"${FILESDIR}"/${P}-initialize_only_required_pygame_modules.patch
-	"${FILESDIR}"/${P}-python3.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:libdir\ =\ .*:libdir\ =\ \"/usr/$(get_libdir)/${PN}\":" \
-		run_game.py || die
-	sed -i \
-		-e "s:data_dir\ =\ .*:data_dir\ =\ \"/usr/share/${PN}\":" \
-		lib/data.py || die
-	rm data/pictures/Thumbs.db || die
-}
-
-src_install() {
-	newbin run_game.py ${PN}
-
-	insinto "/usr/$(get_libdir)/${PN}"
-	doins lib/*.py
-
-	einstalldocs
-
-	insinto "/usr/share/${PN}"
-	doins -r data/*
-
-	newicon "${FILESDIR}"/${PN}-32.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Which Way Is Up?"
-}
diff --git a/games-arcade/whichwayisup/whichwayisup-0.7.9-r4.ebuild b/games-arcade/whichwayisup/whichwayisup-0.7.9-r4.ebuild
new file mode 100644
index 000000000000..f37eff3578bc
--- /dev/null
+++ b/games-arcade/whichwayisup/whichwayisup-0.7.9-r4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit desktop python-single-r1
+
+DESCRIPTION="Traditional and challenging 2D platformer game with a slight rotational twist"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="
+	mirror://gentoo/${PN}_b$(ver_rs 1- '').zip
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+S="${WORKDIR}/${PN}"
+
+LICENSE="BitstreamVera CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/pygame[${PYTHON_USEDEP}]')
+	media-libs/sdl2-image[png]
+	media-libs/sdl2-mixer[vorbis]"
+BDEPEND="
+	${PYTHON_DEPS}
+	app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-check_for_joystick_axes_not_null.patch
+	"${FILESDIR}"/${P}-initialize_only_required_pygame_modules.patch
+	"${FILESDIR}"/${P}-python3.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i "/libdir =/s|= .*|= \"${EPREFIX}/usr/share/${PN}/lib\"|" run_game.py || die
+	python_fix_shebang run_game.py
+
+	rm data/pictures/Thumbs.db || die
+}
+
+src_install() {
+	newbin run_game.py ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r data lib
+
+	dodoc README.txt changelog.txt
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} "Which Way Is Up?"
+}