gentoo resync : 15.12.2019

3 files changed, 24 insertions, 58 deletions

diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 487384f6313c..bbca309963d9 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -9,6 +9,6 @@ DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c
 DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
-DIST eduke32_src_20190919-8133.tar.xz 15940944 BLAKE2B 8c00579694d068c8a433a4d124dfd84249671ad71fa3fc23ef64fb5a9a63c2f7abb662fd017a1c72bd9a62171e93aea57dbdbd257970c9a96f436e090c2eb18c SHA512 4e4cd724d2852335b205be970f17a60062f3eeffc76923bed362a685357082b4f328a76f8a7d2a7b98e039f25f32bc5b0a1178ceb84c7d52206384bf1a06c976
-EBUILD eduke32-20190919.8133-r1.ebuild 5991 BLAKE2B 4f4a68f1615c3aae8368d0acbdb4b4667804367ee7dc198a9e3430449b2a80ac2b8a90925570b5928795993061b38ad7aacf18c11af237390633b1d6ef95a0f3 SHA512 016e9ef5f6d0616b745a657b708c49169aee53dcbd4bbb39ed159bee63a8a6347f958280f420312acf13a0acd84374d3a26f73dd889734342373c58fb2a21d08
-MISC metadata.xml 1727 BLAKE2B 3448f8633a915311ffb9ccc6d53bf8a94928df2625eaba9e21952dab0c6eb6ec1d5da514c8ad6f810a94005571e69d1d00d1d4ecc2e2afc6ea99ee5aa9de73f5 SHA512 8aeb500968ff3b161f244cc0374f9d6b2261ad11104f92f496ab501675cc50e68981a28f0482b06845a2e058ac63464db92c0250373d2036c249739e2954063a
+DIST eduke32_src_20191204-8360.tar.xz 15945040 BLAKE2B d9f422d97609f4999c6601e050a900f9042f23c7e0bdfb31d3426c7ede4daa6ba5bac2cb0cd63b0f3b4ed956167ab267ca750ced1f25914938e2aea6bea0ffb3 SHA512 b7d0c6522571f59fcc057af2680b3a7536bd6176aa946e72cc5a58763fb79c3ca718868fc7e3658b319901e09078e1b4e79d9e7fa94aca81aa616b943c644dc6
+EBUILD eduke32-20191204.8360.ebuild 5831 BLAKE2B 4bb3e61b032caf1cb9b87ad195edc2858e422591a34f04722d9f5990f8d54d040ed0752c9fffa2bafc3b0c6d098a38ebbab8cb806a4fff57a78adf3ddc773135 SHA512 27d1dfc13d12282dd75f752be9a8e474b8fa784cc885d97c9898239b8fce24629ae281e5228e2cfc44ca12212dfe809db0c37d322d9f3760ceaf37eab3a51514
+MISC metadata.xml 1608 BLAKE2B 73414a3516a4a690254e70ad071f160688ac11e8fe0634b0218565fc32e01d1e4b8ed0ce830ecd995e715552f23fd50f8c7cb0b0af95f6cdb07a35940639e779 SHA512 2392e18cc53663943341397d3a92f07b3dbbb04497b584739095bef5e9b2f60376115a2952e0d2eba524b3a678e7c205ad3e66a78709a2f4d36b3ea76d8b8c09
diff --git a/games-fps/eduke32/eduke32-20190919.8133-r1.ebuild b/games-fps/eduke32/eduke32-20191204.8360.ebuild
index bfa718b76ccc..58283d8826c5 100644
--- a/games-fps/eduke32/eduke32-20190919.8133-r1.ebuild
+++ b/games-fps/eduke32/eduke32-20191204.8360.ebuild
@@ -7,7 +7,6 @@ inherit desktop toolchain-funcs xdg-utils
 
 MY_BUILD="$(ver_cut 2)"
 MY_DATE="$(ver_cut 1)"
-
 MY_PV_HRP="5.4"
 MY_PV_OFFENSIVE_XXX="1.33"
 MY_PV_OPL="2.01"
@@ -18,11 +17,11 @@ MY_PV_VOXELS="1.21"
 DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D"
 HOMEPAGE="http://www.eduke32.com/"
 SRC_URI="
-	http://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}/${PN}_src_${MY_DATE}-${MY_BUILD}.tar.xz
-	http://www.eduke32.com/images/eduke32_classic.png
+	https://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}/${PN}_src_${MY_DATE}-${MY_BUILD}.tar.xz
+	https://www.eduke32.com/images/eduke32_classic.png
 	hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-${MY_PV_HRP}.zip )
 	offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip )
-	opl? ( http://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-${MY_PV_OPL}.zip )
+	opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-${MY_PV_OPL}.zip )
 	psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-${MY_PV_PSX}.zip )
 	sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-${MY_PV_SC55}.zip )
 	voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-${MY_PV_VOXELS}.zip )
@@ -47,14 +46,16 @@ REQUIRED_USE="
 	vpx? ( opengl )
 "
 
-RESTRICT="bindist"
+# There are no tests,
+# instead it tries to build a test game, which does not compile
+RESTRICT="bindist test"
 
 S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}"
 
 RDEPEND="
 	media-libs/libsdl2[joystick,opengl?,sound,video]
 	media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?]
-	sys-libs/zlib:=
+	sys-libs/zlib
 	flac? ( media-libs/flac )
 	gtk? ( x11-libs/gtk+:2 )
 	opengl? (
@@ -67,7 +68,7 @@ RDEPEND="
 		media-libs/libogg
 		media-libs/libvorbis
 	)
-	xmp? ( media-libs/exempi:= )
+	xmp? ( media-libs/exempi:2= )
 "
 
 DEPEND="
@@ -162,12 +163,6 @@ src_compile() {
 	fi
 }
 
-src_test() {
-	# There are no tests
-	# Instead it tries to build a test game, which does not compile
-	:;
-}
-
 src_install() {
 	dobin eduke32 mapster32 "${FILESDIR}"/eduke32-bin
 
@@ -198,27 +193,13 @@ src_install() {
 	keepdir /usr/share/games/eduke32
 	insinto /usr/share/games/eduke32
 
-	if use hrp; then
-		doins "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip
-	fi
-	if use offensive; then
-		doins "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip
-	fi
-	if use opl; then
-		doins "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip
-	fi
-	if use psx; then
-		doins "${DISTDIR}"/duke3d_psx-${MY_PV_PSX}.zip
-	fi
-	if use sc-55; then
-		doins "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip
-	fi
-	if use sdk; then
-		doins -r package/sdk
-	fi
-	if use voxels; then
-		doins "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip
-	fi
+	use hrp && doins "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip
+	use offensive && doins "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip
+	use opl && doins "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip
+	use psx && doins "${DISTDIR}"/duke3d_psx-${MY_PV_PSX}.zip
+	use sc-55 && doins "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip
+	use sdk && doins -r package/sdk
+	use voxels && doins "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip
 
 	newicon "${DISTDIR}"/eduke32_classic.png eduke32.png
 
@@ -226,22 +207,11 @@ src_install() {
 	make_desktop_entry mapster32 Mapster32 eduke32 Game
 
 	local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt source/duke3d/src/lunatic/doc/*.txt )
-
-	if use hrp; then
-		DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt )
-	fi
-	if use offensive; then
-		DOCS+=( "${WORKDIR}"/xxx_readme.txt )
-	fi
-	if use opl; then
-		DOCS+=( "${WORKDIR}"/opl_readme.txt )
-	fi
-	if use sc-55; then
-		DOCS+=( "${WORKDIR}"/readme/music_readme.txt )
-	fi
-	if use voxels; then
-		DOCS+=( "${WORKDIR}"/voxelpack_readme.txt )
-	fi
+	use hrp && DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt )
+	use offensive && DOCS+=( "${WORKDIR}"/xxx_readme.txt )
+	use opl && DOCS+=( "${WORKDIR}"/opl_readme.txt )
+	use sc-55 && DOCS+=( "${WORKDIR}"/readme/music_readme.txt )
+	use voxels && DOCS+=( "${WORKDIR}"/voxelpack_readme.txt )
 
 	einstalldocs
 }
diff --git a/games-fps/eduke32/metadata.xml b/games-fps/eduke32/metadata.xml
index 15de77d47f59..0ce346f0721f 100644
--- a/games-fps/eduke32/metadata.xml
+++ b/games-fps/eduke32/metadata.xml
@@ -2,17 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		EDuke32 is an awesome, free homebrew game engine and source port
 		of the classic PC first person shooter Duke Nukem 3D - Duke3D