gentoo resync : 27.03.2018

2 files changed, 13 insertions, 17 deletions

diff --git a/games-rpg/eternal-lands-data/Manifest b/games-rpg/eternal-lands-data/Manifest
index 00d86a1c0760..0576dca4f609 100644
--- a/games-rpg/eternal-lands-data/Manifest
+++ b/games-rpg/eternal-lands-data/Manifest
@@ -1,5 +1,5 @@
 DIST EL_sound_191.zip 43002046 BLAKE2B 450fd0fbff0fefbbffb1154ecb3e1e97ec8eb447d961e1442900af629c612c5a6f14f673a0c2820f7403b79ae0b4920a17f1e2a1b3457a5cc47daca0deb54bca SHA512 cc4103d6cdafffcf3926f0e90ca2555b09b22d9e00947f9e1790cfa5b7c945cff16f935ede886b498ac86028b77e8f1ead6eecab2d59848100233eed373c1310
 DIST el_linux_193.zip 67104165 BLAKE2B 8e83cc00ef766f829793880952cf852adc7081a095ee3cee4f483c6fff7f9c0a293556483506fe4d09b5681ea7b7c5796e876a92e06f739d92b5fba1e7129f51 SHA512 95de984998bfc27525b7986895d1154a74c6e4dbffb9bf115c1284213acf56a470967b55e0507ed6aacd67f972bce4689aa7cffb9acd16d92bf448f195dc4f0c
 DIST el_music_full-20060803.zip 65511882 BLAKE2B 618fe476473f00371f50f9249a11aaa7b9da28caae41e072f6cf6a5d74d640b58182586f92a770bef45c80f19c1b46408b6ac2625972ba804d4c1967f01546c6 SHA512 dbd24cb20331d3640b3a5891faaf88aa0e71ba0564dfde347f2ea0fcb7e0f2700f1324ee8e988c551efb943183bbc823d4ee0373ed2b1f6d0300df76e25a524c
-EBUILD eternal-lands-data-1.9.3-r1.ebuild 3226 BLAKE2B a5e309fb5cc5828cba841b47eb4fb58890bb20e9ab9b915353f23c3d50bdfab32c8a5196af67ea9c1d9d214599338e60429d967e87f55e5a62beaefb8e921296 SHA512 34ccbd924c6c11fc12a24755773d7ccc75a0e02ccc91cf64fdc8dcce9fec77c682184e4e419c043405d26317a9b0eb594436202f8a9343423d43712947d77744
+EBUILD eternal-lands-data-1.9.3-r1.ebuild 3170 BLAKE2B 0868cf1594d2acf6f0cb853674c9de2de381a09f777cffd798a14f1f7d9d0ee13697fa927a4c5e978bf61c0270a9eaa5bdf73af9e1f76b70819500a270352d6e SHA512 98ed0c7cfa0ef77b571195fce7ac9ddc1d1e749fe12c935101405222800efe5f3b0226f16d4e100b8d21e80acb6ab4290ad7d52bd8919b0debe52b08575d877c
 MISC metadata.xml 707 BLAKE2B 27ac7d1be17ce87ec9f76b8b6613a995a315f775b22b04adc7bfce8af873196145fa32f76557e8b03da3215f1aa8e847072ed7f355aee288820810cbbd515dae SHA512 1128694f4485b282c424ab67e933779dc10265f051078d62fdab077a13c7d95888b55d048402474501a4483dd1d52189295d3c08ef8e298640153d3fbd3261cd
diff --git a/games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild b/games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild
index 5a4e5d454bcb..cdcd0ac6284b 100644
--- a/games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild
+++ b/games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-
-inherit games
+EAPI=6
 
 MUSIC_DATE="20060803"
 
@@ -24,10 +22,10 @@ SRC_URI="http://www.eternal-lands.com/el_linux_193.zip
 LICENSE="eternal_lands"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="music sound bloodsuckermaps"
+IUSE="bloodsuckermaps music sound"
 
 DEPEND="app-arch/unzip
-		!bloodsuckermaps? ( !games-rpg/eternal-lands-bloodsucker )"
+	!bloodsuckermaps? ( !games-rpg/eternal-lands-bloodsucker )"
 
 PDEPEND="bloodsuckermaps? ( >=games-rpg/eternal-lands-bloodsucker-3.0_p20110618 )"
 
@@ -37,13 +35,14 @@ S="${WORKDIR}/el_linux"
 src_prepare() {
 	# Move our music files to the correct directory
 	if use music ; then
-		mkdir music
+		mkdir music || die
 		mv ../*.ogg ../*.pll music || die
 	fi
 
 	# Fix assertion error with >=libxml2-2.9 (see bug #449352)
 	xmllint --noent actor_defs/actor_defs.xml > actor_defs.xml || die "Failed parsing actor_defs.xml"
-	mv actor_defs.xml actor_defs
+	mv actor_defs.xml actor_defs || die
+	eapply_user
 }
 
 src_install() {
@@ -72,32 +71,29 @@ src_install() {
 	fi
 
 	insopts -m 0660
-	insinto "${GAMES_DATADIR}/${MY_PN}"
+	insinto /usr/share/games/eternal-lands
 	doins -r 2dobjects 3dobjects actor_defs animations maps meshes \
 		particles skeletons shaders textures languages shaders skybox \
 		*.lst 3dobjects.txt *.xml \
 		|| die "doins failed"
 
 	if use music ; then
-		doins -r music || die "doins music failed"
+		doins -r music
 	fi
 
 	# Removed sound from above - need to handle sound support
 
 	cd "${WORKDIR}"
 	if use sound ; then
-	   doins -r sound || die "doins sound failed"
+	   doins -r sound
 	fi
-
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	# Ensure that the files are writable by the game group for auto
 	# updating.
-	chmod -R g+rw "${ROOT}/${GAMES_DATADIR}/${MY_PN}"
+	chmod -R g+rw "${EROOT}"usr/share/games/eternal-lands || die
 
 	# Make sure new files stay in games group
-	find "${ROOT}/${GAMES_DATADIR}/${MY_PN}" -type d -exec chmod g+sx {} \;
+	find "${EROOT}"usr/share/games/eternal-lands -type d -exec chmod g+sx {} \; || die
 }