gentoo resync : 30.04.2018

2 files changed, 27 insertions, 21 deletions

diff --git a/games-fps/darkplaces/Manifest b/games-fps/darkplaces/Manifest
index 2f35c62ced01..5124a874f822 100644
--- a/games-fps/darkplaces/Manifest
+++ b/games-fps/darkplaces/Manifest
@@ -1,5 +1,5 @@
 DIST darkplacesengine20140513.zip 28113487 BLAKE2B 9e3ffa759921fd61d1308f7c08cc1253a5a3d32c57e8dd8c2a05771aa0b5019fac7932ad337e4be95545bf093f4a2f20d221328ae0bfa45c2b00a7f5700fc04a SHA512 45864b590057c6de0ea978b3cc967feb879b87b2d376f3b4d8525e037b10ca1fc68599c152506494bb06669c6c2304e0aa0ee1b28f7a0d589d10c23f7285052c
 DIST fuhquake-lits.rar 8388829 BLAKE2B fb9c4db151deb43424de9331641154f412394ae6346864bc62a210c7d8d12c6ed6c8647cb4cd83fa853155c5f562f7e9b8d3c779fe74c1bb3f05bb6f627b1d5e SHA512 6e59f5e08a6c401b329b86b0cd677a04b1a5aee11f24973c77c9e7ea50cab9dedf4fc15c4f3d6b73bdc87bacdc9612a3c244d0a4ceceef943abb6e256ac23925
 DIST id1.pk3 350470 BLAKE2B 76426667de5f42633f608b75286671344d439398aa9b819e9ba3979ca317a93930b1077de7efb4b1bad670a6341c7536d572cfc2590a5812c71dd0c4e8def784 SHA512 d4d7233bc1e5049e89d09448818219b0ce7941fecde5381cd95933e4c96ebc9b4e34ff7eae5eb5d0d1e3cc2ceb4f5254f4d600aded7dda373713149817621331
-EBUILD darkplaces-20140513.ebuild 4443 BLAKE2B 8c97b6b3b45cfe94093f409067cc5559b6b98c8be3c63583713ba9167338c11c339fb6d220bf44d31933181b98e17551947dca07e492665e38993b499aacda5f SHA512 86f0c103972d42ad24f8213cbb73c5237a32f58e06c75bd966822d6ef2aeb1a41d6a9b6c83369b9e340d16041ecd8b8415836c1ced37b2c0ac1620cb1c52e4b2
+EBUILD darkplaces-20140513-r1.ebuild 4419 BLAKE2B 9169f50bd1048a9351158acf76a9baf906b81dfe5ca33e525c4bce678d9204438b354bd17d3bf951a6b566a292f3b6b9b8021cb83d8c639cbc8b3a0984c8c658 SHA512 a767f3c87fc336acabcf660968540528d031514300145f6b33a64215ab5e2e368cba7861c537e1e2c29eb634aed47dda654eeb4346512abbee6c73da00a43e7f
 MISC metadata.xml 567 BLAKE2B 46fb34c2aab597b51dd9e8d5effb76af828734a9a7826c503de0a843d12ddeb275d31d846f419635450a3ce1880eb31a1942e684cdc82d1aad83d1aa1cc97d17 SHA512 719f0053b4390b1dccb63e70bddb518f9aad79c8b240dd37ed16b1680a1053a51e309632893c87c51d6057e2602bc6a3fbe8c7d11330da76d5646b3c8c542bbd
diff --git a/games-fps/darkplaces/darkplaces-20140513.ebuild b/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
index 1e154b7074f7..303d09082be6 100644
--- a/games-fps/darkplaces/darkplaces-20140513.ebuild
+++ b/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit unpacker eutils flag-o-matic games
+EAPI=6
+inherit eutils flag-o-matic unpacker
 
 # Latest versions are in http://icculus.org/twilight/darkplaces/files/
-MY_PV=${PV/_beta/beta}
+MY_PV="${PV/_beta/beta}"
 MY_ENGINE="${PN}engine${MY_PV}.zip"
 
 # Different Quake 1 engines expect the lights in different directories
@@ -24,7 +24,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="alsa cdinstall cdsound debug dedicated demo lights opengl oss sdl textures"
 
-UIRDEPEND="virtual/jpeg:0
+UIRDEPEND="
+	virtual/jpeg:0
 	media-libs/libogg
 	media-libs/libvorbis
 	virtual/opengl
@@ -33,18 +34,23 @@ UIRDEPEND="virtual/jpeg:0
 	x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm"
-UIDEPEND="x11-proto/xextproto
+	x11-libs/libXxf86vm
+"
+UIDEPEND="
+	x11-proto/xextproto
 	x11-proto/xf86dgaproto
 	x11-proto/xf86vidmodeproto
-	x11-proto/xproto"
-RDEPEND="net-misc/curl
+	x11-proto/xproto
+"
+RDEPEND="
+	net-misc/curl
 	cdinstall? ( games-fps/quake1-data )
 	demo? ( games-fps/quake1-demodata )
 	textures? ( >=games-fps/quake1-textures-20050820 )
 	opengl? ( ${UIRDEPEND} )
 	!opengl? ( sdl? ( ${UIRDEPEND} ) )
-	!opengl? ( !sdl? ( !dedicated? ( ${UIRDEPEND} ) ) )"
+	!opengl? ( !sdl? ( !dedicated? ( ${UIRDEPEND} ) ) )
+"
 DEPEND="lights? ( || (
 			app-arch/unrar
 			app-arch/rar ) )
@@ -58,10 +64,11 @@ DEPEND="lights? ( || (
 		${UIRDEPEND}
 		${UIDEPEND} ) ) )
 	virtual/pkgconfig
-	app-arch/unzip"
+	app-arch/unzip
+"
 
-S=${WORKDIR}/${PN}
-dir=${GAMES_DATADIR}/quake1
+S="${WORKDIR}/${PN}"
+dir="/usr/share/quake1"
 
 opengl_client() { use opengl || ( ! use dedicated && ! use sdl ) }
 
@@ -77,6 +84,8 @@ src_unpack() {
 }
 
 src_prepare() {
+	default
+
 	rm "${WORKDIR}"/README-SDL.txt
 	cd "${S}"
 	rm mingw_note.txt
@@ -137,12 +146,12 @@ src_install() {
 		use sdl && type=sdl
 
 		# darkplaces executable is needed, even just for demo
-		newgamesbin "${PN}-${type}" ${PN}
+		newbin "${PN}-${type}" ${PN}
 		newicon darkplaces72x72.png ${PN}.png
 
 		if use demo ; then
 			# Install command-line for demo, even if not desktop entry
-			games_make_wrapper ${PN}-demo "${PN} -game demo"
+			make_wrapper ${PN}-demo "${PN} -game demo"
 		fi
 
 		if use demo && ! use cdinstall ; then
@@ -154,7 +163,7 @@ src_install() {
 	fi
 
 	if use dedicated ; then
-		newgamesbin ${PN}-dedicated ${PN}-ded
+		newbin ${PN}-dedicated ${PN}-ded
 	fi
 
 	dodoc *.txt ChangeLog todo "${WORKDIR}"/*.txt
@@ -170,17 +179,14 @@ src_install() {
 			done
 		fi
 	fi
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-
 	if ! use cdinstall && ! use demo ; then
 		elog "Place pak0.pak and pak1.pak in ${dir}/id1"
 	fi
 
-	if use sdl ; then
+	if use sdl && ! use alsa ; then
 		ewarn "Select opengl with alsa, instead of sdl USE flag, for better audio latency."
 	fi
 }