gentoo resync : 02.06.2018

5 files changed, 5 insertions, 103 deletions

diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 8cf19d546bc4..f21112b7a4c9 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/arx-fatalis-data/Manifest b/games-rpg/arx-fatalis-data/Manifest
index 70e7c6e60f3b..ee19c2b54f9e 100644
--- a/games-rpg/arx-fatalis-data/Manifest
+++ b/games-rpg/arx-fatalis-data/Manifest
@@ -1,6 +1,4 @@
 DIST ArxFatalis_1.21_MULTILANG.exe 9064611 BLAKE2B 42a81491ff470843a80bd6f801a1d8d5b1295603c3b6ec759f545d6fed9530b64ca684b772735f92187eb4eb613b12f68ce7d0491a157123578476b835bb40eb SHA512 885260c6173ee5f2d6d6072bcfd14d085f11b997a0ce45cbdee9a347612e96da13477ef7d71b9c015fb02f2e47bdfb968a2aa89b0c92e9327abbd75b724e47c2
-DIST setup_arx_fatalis.exe 547521812 BLAKE2B 8089773df88cff78ac933ffcd71b6db8d0757ce0a6eb9c92a8993ca4ed8bfad4497cd437c313de3fe677e1146b66d89887c2c0bca01ccd32213aff1c128e0bc6 SHA512 4f2021657bd1c5b89d40a29fca0f77a7755e191b8b3e297bb614e557b18ad943a76eb6670f66fb7f0ae1ad92353f1988c0f3bd0c27e220a35fa38a9cdffe0970
 DIST setup_arx_fatalis_2.0.0.7.exe 525046992 BLAKE2B 558bffc8f4a0096761a9b1c8003b8127480bf03b1198b943dfe3c0bc8c6b9642275f86f5f4e9c6bbc2211bf48e38bebef634b24196b48d1d5520abf75254033f SHA512 08be7870d02ed6da8cedceb652906ea169eedcb44497a4517ef6a42d9db37403b5146b9e5a3a628a465f23088b0c09d958719e05454dcbb5ac12225c32d35942
-EBUILD arx-fatalis-data-1.21-r2.ebuild 2766 BLAKE2B 2d418e52d21f4cc22143aa21d69ec0e7afe8be3bdabfe39c42b4a027327bec11daf42e1c7f5276938c20b3eb4b46d88083b2135a7bf33b7821bbdb0ca68d255f SHA512 c6c0d82a41f6dbc77e3e80516f79c0a95b1fd1c6f42c34707d96c3cc7bcef99efa710f8b1f178dcc175ccfc693168362882a7172953ba77e59cd665dbbee2acf
-EBUILD arx-fatalis-data-1.21-r3.ebuild 2774 BLAKE2B d39aa66187de654a2ba1cb8c5b6a55ec82d5e32f062193772c6da0293c0bcca7961a849368c88c798b38bd22da85f5e804475146c9f05114cfde70f828d97bc5 SHA512 983c3de8c94496d8bce3c73c321b76aa6d6e7669d734d1bbefb0992c0cf7f89dd7b71b3346295ffb3186c94e470cb9dd94dd3cca6d15469ac99d5f71f4436dc4
+EBUILD arx-fatalis-data-1.21-r4.ebuild 2744 BLAKE2B ae9e493f0c251a118593bf5df93604f108ab221deb91d5eee16bf50b54d5b36968b437a3fbbf4dc6c76bf3a66cf971d8a5f9b80c2f6e7b8ad64c4195fb81d4d0 SHA512 38259961c0613a2e7eb349f5fecaf9fdb609070cd8613506945c6fcd41c7fabe0b687055404ef50183561398c51a50a576873e5046282d8ecfb725fc0715b810
 MISC metadata.xml 568 BLAKE2B df7b3692077bfc0e63f920d5bdb61072498ec1de1de6add84d2756ccf384930f2552aa5f5ee50f1732e7030a9d266c6888ee5bf1fe91098e550cef16e50b970d SHA512 a4fd63f6c3ce3eb957694c1a2e61fa13783a09b7072832371c6ac8dd65490d0cc9206467fb88c494a864ae6e1df1d530a52f38b663df9f601feeeba8df5f0555
diff --git a/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r2.ebuild b/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r2.ebuild
deleted file mode 100644
index 41f3d8d12f77..000000000000
--- a/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CDROM_OPTIONAL="yes"
-inherit eutils cdrom check-reqs games
-
-DESCRIPTION="Arx Fatalis data files"
-HOMEPAGE="https://www.arkane-studios.com/uk/arx.php"
-SRC_URI="cdinstall? ( http://download.zenimax.com/arxfatalis/patches/1.21/ArxFatalis_1.21_MULTILANG.exe )
-	gog? ( setup_arx_fatalis.exe )"
-
-LICENSE="cdinstall? ( ArxFatalis-EULA-JoWooD ) gog? ( GOG-EULA )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gog"
-REQUIRED_USE="^^ ( cdinstall gog )"
-RESTRICT="binchecks mirror gog? ( fetch )"
-
-RDEPEND="games-rpg/arx-libertatis"
-DEPEND="app-arch/innoextract
-	cdinstall? ( app-arch/cabextract )"
-
-CHECKREQS_DISK_BUILD="621M"
-CHECKREQS_DISK_USR="617M"
-
-S=${WORKDIR}
-
-detect_language() {
-	speech_checksum=$(find '.' -iname "speech.pak" \
-		-exec md5sum -b '{}' \; | sed "s/ .*//g")
-	if [[ -z $speech_checksum ]] ; then
-		speech_checksum=$(find '.' -iname "speech_default.pak" \
-			-exec md5sum -b '{}' \; | sed "s/ .*//g")
-	fi
-
-	# check if the checksum is of a known localisation and set data_lang to
-	# the language string to be used with the 1.21 patch installer
-	case "$speech_checksum" in
-		'4c3fdb1f702700255924afde49081b6e') data_lang='german' ;;
-		# Bundled version of AF included with NVIDIA card
-		'ab8a93161688d793a7c78fbefd7d133e') data_lang='german' ;;
-		'4e8f962d8204bcfd79ce6f3226d6d6de') data_lang='english' ;;
-		'2f88c67ae1537919e69386d27583125b') data_lang='spanish' ;;
-		'4edf9f8c799190590b4cd52cfa5f91b1') data_lang='french' ;;
-		'81f05dea47c52d43f01c9b44dd8fe962') data_lang='italian' ;;
-		'677163bc319cd1e9aa1b53b5fb3e9402') data_lang='russian' ;;
-		'') eerror "speech*.pak not found"
-			die "speech*.pak not found" ;;
-		*) eerror "unsupported data language - speech*.pak checksum:" \
-		        "$speech_checksum" \
-				"please file a gentoo bug"
-			die "unsupported data language, file a gentoo bug" ;;
-	esac
-}
-
-pkg_nofetch() {
-	einfo "Please download ${A} from your GOG.com account after buying Arx Fatalis"
-	einfo "and put it into ${DISTDIR}."
-}
-
-src_unpack() {
-	local data_lang
-
-	if use cdinstall ; then
-		cdrom_get_cds bin/Arx.ttf
-		find "${CDROM_ROOT}" -iname "setup*.cab" -exec cabextract '{}' \;
-		detect_language
-	else
-		# gog only offers english
-		data_lang="english"
-	fi
-
-	einfo "Data language: $data_lang"
-	innoextract --lowercase --language=${data_lang} \
-		"${DISTDIR}"/${A} || die
-}
-
-src_install() {
-	insinto "${GAMES_DATADIR}"/arx
-	doins -r app/{graph,misc}
-	find . -iname "*.pak" -exec doins '{}' \;
-
-	dodoc app/{manual,map}.pdf
-
-	# convert to lowercase
-	cd "${D}"
-	find . -type f -exec sh -c 'echo "${1}"
-	lower="`echo "${1}" | tr [:upper:] [:lower:]`"
-	[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
-
-	prepgamesdirs
-}
diff --git a/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r3.ebuild b/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r4.ebuild
index dce1853fc98b..e8f9d5770890 100644
--- a/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r3.ebuild
+++ b/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 CDROM_OPTIONAL="yes"
-inherit eutils cdrom check-reqs games
+inherit eutils cdrom check-reqs
 
 DESCRIPTION="Arx Fatalis data files"
 HOMEPAGE="https://www.arkane-studios.com/uk/arx.php"
@@ -78,7 +78,7 @@ src_unpack() {
 }
 
 src_install() {
-	insinto "${GAMES_DATADIR}"/arx
+	insinto /usr/share/arx
 	doins -r app/{graph,misc}
 	find . -iname "*.pak" -exec doins '{}' \;
 
@@ -89,6 +89,4 @@ src_install() {
 	find . -type f -exec sh -c 'echo "${1}"
 	lower="`echo "${1}" | tr [:upper:] [:lower:]`"
 	[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
-
-	prepgamesdirs
 }
diff --git a/games-rpg/wasteland2/Manifest b/games-rpg/wasteland2/Manifest
index f2e23cdde66c..499c27eec031 100644
--- a/games-rpg/wasteland2/Manifest
+++ b/games-rpg/wasteland2/Manifest
@@ -1,3 +1,3 @@
-DIST gog_wasteland_2_1.9.0.13.tar.gz 10959158010 SHA256 0f6bf4f806de3233a11ec1049f96d779f8d013dc38f296d101466701fa931728 SHA512 8b5ed19ffee9505efaf03f7ef3ba55dbdbbeda68b7961e92c22776bbb7e842df8c5e5ee727967e79dec753fd03d39f0a1c98e380e540971834b56066b6a79929 WHIRLPOOL d53f4636606c03a5977b9603495f61aaedc3f1851a1ca2bd8b4b2bda6feff8de0f9ec488fa10b052870fbfbea875673f2fe27fafd92ee0c663b0ae158171c2ee
+DIST gog_wasteland_2_1.9.0.13.tar.gz 10959158010 BLAKE2B 8a82a608b3530fd2000ebe689b337529630da3c81ac4fc9369d9dd210b48b842658770b16ea451f3eedd63fcc682ad0c898fcff895d119ab4395fad32c04e9c4 SHA512 8b5ed19ffee9505efaf03f7ef3ba55dbdbbeda68b7961e92c22776bbb7e842df8c5e5ee727967e79dec753fd03d39f0a1c98e380e540971834b56066b6a79929
 EBUILD wasteland2-1.9.0.13.ebuild 2051 BLAKE2B a8762193eec699034a3bbfef566c23c81b638730d02ec1409565d5c85a7f866df3817a9ba270bdac5b45614ce5825906d7696eabe9588afdb30caf2f170c7ea5 SHA512 158bfcb7eaeb02efbb2fac3a31f25d2f1b1f221de81f62252a00f33b1b7a5569cfe320a9c7622fb72d20987b81c2b1d9a02a16ec8ad4e50bc8588b4e5f6e7166
 MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638