gentoo resync : 19.03.2019

2 files changed, 31 insertions, 18 deletions

diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 6657fba2f409..d0e25809f0ce 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -8,6 +8,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_20190123-7318.tar.xz 14728924 BLAKE2B 3b6bddd12675029c3a92d1de58421ee48ac5537104bf990d9e3e10c8e3e22264eb433a61ab79ed472c85304f59904fb5fe2a2c3df765106f96734432e41daf74 SHA512 c6b275a8a0b611f6c42f3fa63959e9b717a25b45a86bb8f385873d6d6d1833893c0a2e16993c955d73c3e44887845c192d1f93b5649bd78ce07760f801e48914
-EBUILD eduke32-20190123.7318.ebuild 5920 BLAKE2B 00a79d1be248ea9a576e167dd645d04bd9c739e41734e1b8e836d29cc1bc3f8020900d6279db73ef0ff27ec9b37be834a922febba1b77158f76ea292af1dcf54 SHA512 785b4cdd06fac0c79e0c1d82ad06b40f5cc5da878e62aedf3e41ff0d5cacadfae0bc56340401b7baab0534da6f5a7178991e2b0ac86faea2b03279c1cf9950c6
+DIST eduke32_src_20190304-7392.tar.xz 14730992 BLAKE2B f10702e820e72d03a6f909e3f908cc705877908fc5455aa2060deaed3ff485e26b8fef56fde89e30d066af4663e8eb7ccfa42e71c99a15d99326199c24edd04a SHA512 e63d31e406f2a62559ad6c88c3c54d64397319bf701e6fba0df31574ff124d8378239fc849d10af91544fcdcb437ab853b83222d0f753017fa8e94d4620d7dbf
+EBUILD eduke32-20190304.7392.ebuild 5914 BLAKE2B 0fc6329d7677e0dd658ecb70e4b373f298c39326c179eb05a5d9cde3fc88b96297c1603bcbb32268e15614e28960930f0decc0831f9fcf55e70c686a1b721779 SHA512 1b1e918f7dcffbfae470f1eed6e7e404ee6cedb18004d183099b3d60282900d4d6ddce29edaaacaa1cf467e0ae062620977b392bc03eb3a442f355cf4493a938
 MISC metadata.xml 1727 BLAKE2B 3448f8633a915311ffb9ccc6d53bf8a94928df2625eaba9e21952dab0c6eb6ec1d5da514c8ad6f810a94005571e69d1d00d1d4ecc2e2afc6ea99ee5aa9de73f5 SHA512 8aeb500968ff3b161f244cc0374f9d6b2261ad11104f92f496ab501675cc50e68981a28f0482b06845a2e058ac63464db92c0250373d2036c249739e2954063a
diff --git a/games-fps/eduke32/eduke32-20190123.7318.ebuild b/games-fps/eduke32/eduke32-20190304.7392.ebuild
index 70135dd19c0d..b4a97498c3e4 100644
--- a/games-fps/eduke32/eduke32-20190123.7318.ebuild
+++ b/games-fps/eduke32/eduke32-20190304.7392.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit desktop eapi7-ver gnome2-utils toolchain-funcs
+inherit desktop toolchain-funcs xdg-utils
 
 MY_BUILD="$(ver_cut 2)"
 MY_DATE="$(ver_cut 1)"
@@ -17,20 +17,23 @@ 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
+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
 	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 )
 	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 )"
+	voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-${MY_PV_VOXELS}.zip )
+"
 
-KEYWORDS="~amd64 ~hppa ~x86"
 LICENSE="BUILDLIC GPL-2 HRP"
 SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis voxels vpx xmp"
-REQUIRED_USE="cdinstall? ( !demo )
+REQUIRED_USE="
+	cdinstall? ( !demo )
 	demo? ( !cdinstall )
 	hrp? ( ^^ ( demo cdinstall )
 		!voxels )
@@ -41,11 +44,13 @@ REQUIRED_USE="cdinstall? ( !demo )
 	sc-55? ( ^^ ( demo cdinstall )
 		!opl )
 	voxels? ( !hrp )
-	vpx? ( opengl )"
+	vpx? ( opengl )
+"
 
 S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}"
 
-MY_DEPEND_RDEPEND="media-libs/libsdl2[joystick,opengl?,sound,video,X]
+MY_DEPEND_RDEPEND="
+	media-libs/libsdl2[joystick,opengl?,sound,video]
 	media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?]
 	sys-libs/zlib:=
 	flac? ( media-libs/flac )
@@ -57,17 +62,25 @@ MY_DEPEND_RDEPEND="media-libs/libsdl2[joystick,opengl?,sound,video,X]
 	vpx? ( media-libs/libvpx:= )
 	vorbis? ( media-libs/libogg
 		media-libs/libvorbis )
-	xmp? ( media-libs/exempi:= )"
+	xmp? ( media-libs/exempi:= )
+"
 
-RDEPEND="${MY_DEPEND_RDEPEND}
+RDEPEND="
+	${MY_DEPEND_RDEPEND}
 	cdinstall? ( games-fps/duke3d-data )
-	demo? ( games-fps/duke3d-demodata )"
+	demo? ( games-fps/duke3d-demodata )
+"
 
-DEPEND="${MY_DEPEND_RDEPEND}
+DEPEND="
+	${MY_DEPEND_RDEPEND}
 	app-arch/unzip
-	x86? ( dev-lang/nasm )"
+	x86? ( dev-lang/nasm )
+"
 
-PATCHES=( "${FILESDIR}/log-to-tmpdir.patch" "${FILESDIR}/search-duke3d-path.patch" )
+PATCHES=(
+	"${FILESDIR}/log-to-tmpdir.patch"
+	"${FILESDIR}/search-duke3d-path.patch"
+)
 
 src_unpack() {
 	# Extract only the eduke32 archive
@@ -225,9 +238,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }