gentoo resync : 04.05.2018

2 files changed, 23 insertions, 19 deletions

diff --git a/games-strategy/uqm/Manifest b/games-strategy/uqm/Manifest
index 01ba594bcaf3..9617b8304bd2 100644
--- a/games-strategy/uqm/Manifest
+++ b/games-strategy/uqm/Manifest
@@ -8,5 +8,5 @@ DIST uqm-remix-disc1.uqm 50188876 BLAKE2B 02bf183aa9ef5460831d4bbcfa90ce4745814d
 DIST uqm-remix-disc2.uqm 60282662 BLAKE2B c556a99adfb11c8b90cf1de272ce5d42aaf7ec16d246572286646328ddd24b0928f013c8de7806e6545b436c2fa152e0cfd7f4851769992848d6aecb0379a433 SHA512 3053693417facef6d01cdb366a15c1bd2a6272961df5870c4151a928845dd76e4ac5fc59f232da5034d56fd9476d3074840a2e9f16d63dba341aeffd92827c4e
 DIST uqm-remix-disc3.uqm 39924875 BLAKE2B f5f495f2c3aca9d6a9a95df51379398a823cb795d85d0ccaa719676d54d7b1dbe9d1b41724eb13fabf62359d6aa72d90615de1f437e2ffde7066436fdebeb13b SHA512 2337752e3a2447ab048cc6782153bbb120d2d6b890c5bfae9cbef60a46d12abf716917863286b0196bf6f5e8ef301b5f84338237520880b10cbf75e450076951
 DIST uqm-remix-disc4.uqm 86545760 BLAKE2B d644e537ccf234ff846525d70ebe9bd910f68db78f9c7e8dc72b768f24acd98e8db587592352d575bb919561ef5c7dcf09a7e414d31d519475915c65cf65f9b7 SHA512 07f0fbe0b9889602eab43f376577c8e0a19c6db50bbb3f01f57836c7caab1eb18813e94d8d9f2d3098a6b6c9dc336290b7f5262c586f2fb41ffab0e2b0ba7f65
-EBUILD uqm-0.7.0-r3.ebuild 2948 BLAKE2B 0a1e059808315f5e838b3886c58fde77b26d89eba25b252661dbe057c249bd20d65ab82c6f3c43105cdbbc3ee2bc3584f1859231643cb2ac3c3d6cc18fcb6117 SHA512 e7344fcb4c306e69317e898ca86f5c43079a9378538a1216d2e2a694d7993a5a3ad1bf1d27d03daa3a23163085fb31fa1d3efe9bd96ad9852dd34226baed2285
+EBUILD uqm-0.7.0-r4.ebuild 2887 BLAKE2B b9bcdc61a47019fefe86f46453e7413efe252a7e7169d9fed3b4d93c00b045228bd0a3956b0d8013388128eb16b30ab2aab1010b8ebce093bd29f70dbd3a9b20 SHA512 2c551fcce44049917d348d04d011c095ed0e92ba2ba7ca38f0430c2ad83e5e13c1c96951b0be0e03a23a49cb044aee4a281815d5dd9c3de7e80b9febd176f58f
 MISC metadata.xml 572 BLAKE2B 154cfbc9c11b74fb658a2e8b494e394f1924291e2273e0fef3346471c9059adf42e819dbf795aad3fdf4296a272e149cf46a8502a195b6bb97287c7b0c548409 SHA512 cd21d5260e39857374bcd1795f2cb2c158104ce865cd9c091202bab404f8133b547d0ba8e7a2580a0177ee1b97de31bdf1b0658f0b20860d70585ecb85bd49b1
diff --git a/games-strategy/uqm/uqm-0.7.0-r3.ebuild b/games-strategy/uqm/uqm-0.7.0-r4.ebuild
index 0d0264e8f7a6..f04136716330 100644
--- a/games-strategy/uqm/uqm-0.7.0-r3.ebuild
+++ b/games-strategy/uqm/uqm-0.7.0-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils multilib toolchain-funcs games
+EAPI=6
+inherit desktop toolchain-funcs
 
 DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2"
 HOMEPAGE="http://sc2.sourceforge.net/"
@@ -20,25 +20,30 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="music opengl remix voice"
 
-RDEPEND="media-libs/libmikmod
+RDEPEND="
+	media-libs/libmikmod
 	media-libs/libogg
-	>=media-libs/libpng-1.4:0
+	>=media-libs/libpng-1.4:0=
 	media-libs/libsdl[X,sound,joystick,video]
 	media-libs/libvorbis
 	media-libs/sdl-image[png]
 	sys-libs/zlib
-	opengl? ( virtual/opengl )"
+	opengl? ( virtual/opengl )
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_prepare() {
+	default
+
 	local myopengl
 
 	use opengl \
 		&& myopengl=opengl \
 		|| myopengl=pure
 
-	epatch \
+	eapply \
 		"${FILESDIR}"/${P}-tempdir.patch \
 		"${FILESDIR}"/${P}-warning.patch
 
@@ -47,10 +52,10 @@ src_prepare() {
 	CHOICE_graphics_VALUE='${myopengl}'
 	CHOICE_sound_VALUE='mixsdl'
 	CHOICE_accel_VALUE='plainc'
-	INPUT_install_prefix_VALUE='${GAMES_PREFIX}'
+	INPUT_install_prefix_VALUE='/usr/share'
 	INPUT_install_bindir_VALUE='\$prefix/bin'
 	INPUT_install_libdir_VALUE='\$prefix/lib'
-	INPUT_install_sharedir_VALUE='${GAMES_DATADIR}/'
+	INPUT_install_sharedir_VALUE='/usr/share/'
 	EOF
 
 	# Take out the read so we can be non-interactive.
@@ -62,7 +67,7 @@ src_prepare() {
 		-e "s/-O3//" build/unix/build.config || die
 
 	sed -i \
-		-e "s:@INSTALL_LIBDIR@:$(games_get_libdir)/:g" \
+		-e "s:@INSTALL_LIBDIR@:/usr/$(get_libdir)/:g" \
 		build/unix/uqm-wrapper.in || die
 
 	# respect CC
@@ -79,15 +84,15 @@ src_install() {
 	# Using the included install scripts seems quite painful.
 	# This manual install is totally fragile but maybe they'll
 	# use a sane build system for the next release.
-	newgamesbin uqm-wrapper uqm
-	exeinto "$(games_get_libdir)"/${PN}
+	newbin uqm-wrapper uqm
+	exeinto /usr/"$(get_libdir)"/${PN}
 	doexe uqm
 
-	insinto "${GAMES_DATADIR}"/${PN}/content/packages
+	insinto /usr/share/${PN}/content/packages
 	doins "${DISTDIR}"/${P}-content.uqm
-	echo ${P} > "${D}${GAMES_DATADIR}"/${PN}/content/version || die
+	echo ${P} > "${ED}"/usr/share/${PN}/content/version || die
 
-	insinto "${GAMES_DATADIR}"/${PN}/content/addons
+	insinto /usr/share/${PN}/content/addons
 	if use music; then
 		doins "${DISTDIR}"/${P}-3domusic.uqm
 	fi
@@ -97,7 +102,7 @@ src_install() {
 	fi
 
 	if use remix; then
-		insinto "${GAMES_DATADIR}"/${PN}/content/addons
+		insinto /usr/share/${PN}/content/addons
 		doins "${DISTDIR}"/${PN}-remix-disc{1,2,3,4}.uqm
 	fi
 
@@ -107,5 +112,4 @@ src_install() {
 	docinto devel/netplay
 	dodoc doc/devel/netplay/*
 	make_desktop_entry uqm "The Ur-Quan Masters"
-	prepgamesdirs
 }