gentoo resync : 22.10.2018

7 files changed, 28 insertions, 50 deletions

diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index c35e4f208d3b..ec081acde405 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 ee19c2b54f9e..121cb633115c 100644
--- a/games-rpg/arx-fatalis-data/Manifest
+++ b/games-rpg/arx-fatalis-data/Manifest
@@ -1,4 +1,4 @@
 DIST ArxFatalis_1.21_MULTILANG.exe 9064611 BLAKE2B 42a81491ff470843a80bd6f801a1d8d5b1295603c3b6ec759f545d6fed9530b64ca684b772735f92187eb4eb613b12f68ce7d0491a157123578476b835bb40eb SHA512 885260c6173ee5f2d6d6072bcfd14d085f11b997a0ce45cbdee9a347612e96da13477ef7d71b9c015fb02f2e47bdfb968a2aa89b0c92e9327abbd75b724e47c2
 DIST setup_arx_fatalis_2.0.0.7.exe 525046992 BLAKE2B 558bffc8f4a0096761a9b1c8003b8127480bf03b1198b943dfe3c0bc8c6b9642275f86f5f4e9c6bbc2211bf48e38bebef634b24196b48d1d5520abf75254033f SHA512 08be7870d02ed6da8cedceb652906ea169eedcb44497a4517ef6a42d9db37403b5146b9e5a3a628a465f23088b0c09d958719e05454dcbb5ac12225c32d35942
-EBUILD arx-fatalis-data-1.21-r4.ebuild 2744 BLAKE2B ae9e493f0c251a118593bf5df93604f108ab221deb91d5eee16bf50b54d5b36968b437a3fbbf4dc6c76bf3a66cf971d8a5f9b80c2f6e7b8ad64c4195fb81d4d0 SHA512 38259961c0613a2e7eb349f5fecaf9fdb609070cd8613506945c6fcd41c7fabe0b687055404ef50183561398c51a50a576873e5046282d8ecfb725fc0715b810
+EBUILD arx-fatalis-data-1.21-r4.ebuild 2741 BLAKE2B 887dbae5a59653a4f3fa421f083c722d60e420859a385557c45cac109a29c4a4f9397f1b6fda348e12e5886a61bf795411a623068ba4bee6ebe184cf3a179be7 SHA512 9da163c8aab09019b77e40549157d9e72de0b446b5302334c57fdcac729988296c84e87a93fb17231294c5b7e44250d87fc176961fe331005cf687f6bb8abc77
 MISC metadata.xml 568 BLAKE2B df7b3692077bfc0e63f920d5bdb61072498ec1de1de6add84d2756ccf384930f2552aa5f5ee50f1732e7030a9d266c6888ee5bf1fe91098e550cef16e50b970d SHA512 a4fd63f6c3ce3eb957694c1a2e61fa13783a09b7072832371c6ac8dd65490d0cc9206467fb88c494a864ae6e1df1d530a52f38b663df9f601feeeba8df5f0555
diff --git a/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r4.ebuild b/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r4.ebuild
index e8f9d5770890..dc78d66cf81a 100644
--- a/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r4.ebuild
+++ b/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r4.ebuild
@@ -8,7 +8,7 @@ inherit eutils cdrom check-reqs
 
 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 )
+SRC_URI="cdinstall? ( https://cdn.bethsoft.com/arxfatalis/patches/1.21/ArxFatalis_1.21_MULTILANG.exe )
 	gog? ( setup_arx_fatalis_2.0.0.7.exe )"
 
 LICENSE="cdinstall? ( ArxFatalis-EULA-JoWooD ) gog? ( GOG-EULA )"
diff --git a/games-rpg/arx-fatalis-demo/Manifest b/games-rpg/arx-fatalis-demo/Manifest
index c39d62a34cdc..d3bc4effa2e7 100644
--- a/games-rpg/arx-fatalis-demo/Manifest
+++ b/games-rpg/arx-fatalis-demo/Manifest
@@ -1,3 +1,3 @@
 DIST arx_demo_english.zip 160545354 BLAKE2B 2693bdd2546c8788eb8c9fc303065f880c3995cfa1d75ca613b8ebb32238a3852dd7eeb20731f7c685521b669c47df45bcf22842772227be5cc3483ec3869c77 SHA512 0cbf0d6da1a373ed29edc49c65ed431117c868ec7bcab04166abd59f5d799460faec506baf191c83fa7c61372888009abb260d8a50e28507a5ec8ab7913a9ad7
-EBUILD arx-fatalis-demo-0.ebuild 1289 BLAKE2B 0936a3355f2ae853783df034db76246b0a953b6315b1e46b173c9337d00609111eccdf43094ec7741444c9e74b32494f94ad1c9e9edc2182454ae738464af955 SHA512 99a20d0f550aff284c062c5c7da2444ec9b713fd0ee610e406d55f9d8eee7f0b2857ddc16e3515a7143daf0538d69b53045044e1695c2ebc26b5833f676a73c5
+EBUILD arx-fatalis-demo-0-r1.ebuild 1248 BLAKE2B 78cf7170451e9372b9aa2cfec8b637bcba76d611ac2b87b23f37ceb1cab32e1333723dee95bc77cd5f8aab6eecfad57fec081558ef01a23012a8bdd241785d89 SHA512 fdebbecd382e1b869840907fcc07df3d596206f656fd77e5c580fab0e19bced5fe206ebdb62075fff70925a66b94dc55c5174da7034aac913393047355efec5a
 MISC metadata.xml 481 BLAKE2B 3200a8ff8937163cf8132a3387d21516b532df01bddcdd377eaf84b3c43ba54b766f2c8def173b2ef4bc32d660b022282295207918809437d3daa85d28b3bf7a SHA512 25957616a3defb79f4ffe4ea925d7eea8f121995bbef149ad8176735eba4597b05d0467457834387ebab951a7b205ff7a1dfd5b272de36aa2ab783553d649e18
diff --git a/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0.ebuild b/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0-r1.ebuild
index b3c07e2abd36..f249e93678b4 100644
--- a/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0.ebuild
+++ b/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils games
+inherit desktop
 
 DESCRIPTION="Arx Fatalis demo"
 HOMEPAGE="https://www.arkane-studios.com/uk/arx.php"
@@ -16,10 +16,12 @@ IUSE=""
 RESTRICT="fetch"
 
 RDEPEND="games-rpg/arx-libertatis"
-DEPEND="app-arch/cabextract
-	app-arch/unzip"
+DEPEND="
+	app-arch/cabextract
+	app-arch/unzip
+"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 pkg_nofetch() {
 	einfo "Please find and download ${SRC_URI} and put it into ${DISTDIR}."
@@ -35,9 +37,9 @@ src_unpack() {
 }
 
 src_install() {
-	insinto "${GAMES_DATADIR}/${PN}"
+	insinto /usr/share/${PN}
 	doins -r *.pak bin/*.pak
-	insinto "${GAMES_DATADIR}/${PN}/misc"
+	insinto /usr/share/${PN}/misc
 	doins bin/Logo.bmp bin/Arx.ttf
 
 	# convert to lowercase
@@ -46,8 +48,6 @@ src_install() {
 	lower="`echo "${1}" | tr [:upper:] [:lower:]`"
 	[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
 
-	make_desktop_entry "arx --data-dir=${GAMES_DATADIR}/arx-fatalis-demo" \
+	make_desktop_entry "arx --data-dir=/usr/share/arx-fatalis-demo" \
 		"Arx Fatalis Demo" arx-libertatis
-
-	prepgamesdirs
 }
diff --git a/games-rpg/arx-libertatis/Manifest b/games-rpg/arx-libertatis/Manifest
index bab50e20be0b..3977511f4c9a 100644
--- a/games-rpg/arx-libertatis/Manifest
+++ b/games-rpg/arx-libertatis/Manifest
@@ -1,4 +1,4 @@
 AUX arx-libertatis-1.1.2-cmake-3.5.patch 888 BLAKE2B 4294247d6ee5f24c7619e9b4cdfafa3efa5d5caf89d5c639a7083b4d408debfa985b95985eb0adfa680d4e2dd49f5afce0f295219eb31fe3762eca8487bff223 SHA512 c1da4981c407bc94ce87b520e2b6288fd6bac437a14dc3b54e8c2c7b01cbda0938b6995581938a2381d1f035ace95df58f3d894e8f7c6070986a5bc43f5e54c2
 DIST arx-libertatis-1.1.2.tar.xz 970608 BLAKE2B 1d4cef400db8223a930d1ff7b3bffbdcd46e47836d99f0c4545ad1bfc575b2b0ed972c9962272c043830be75a54be7992a70429d2692e5811865786370c35d6d SHA512 d4cb8187e7f63934408e38a51a44b7da03c8628820d43139507ff97ebd463b9cd7baf6cc4e85a3d4191d6e5f56850d77d07cfffc33d8f5a51378dfb41f719fb8
-EBUILD arx-libertatis-1.1.2-r1.ebuild 2475 BLAKE2B d97ee646fc453258b83ff90305887e429321cb85c41e8b8b3690afe344a85cb22b9d2cf846d36f30e7088073b1422d74af75ee0e952ee9dd988aa88a395b5797 SHA512 5bd56b938de00f8864194a3575bc7a43afe81315e2728f0e138ccbf273d7a2acafd7f035262c1dbec0912f28b34c542b4841014c360e5073e24be565f0ed51dd
+EBUILD arx-libertatis-1.1.2-r2.ebuild 2043 BLAKE2B 356cd8e6a4b0171dae2ccc17a0291f4daa1945030ecedd577e74f1d7f8afca5619a640554e9fdfc892078f17a91f02122cc2f70ccc164edcbaa3e1e0ddadb7f5 SHA512 b6e13fd1547e48ed7769bffefa92f07611e8c4404ff8ed1734baa1c7ad40a7cd6a7bf531ae87140585df016922a84cc506ca9dd88371173e0b3fce2cbef9d726
 MISC metadata.xml 2564 BLAKE2B 13a668c7bbdb5a7184dbc3334a49d7e342c6400c39af01945ec9fb25ce001faa5267ef874237bafdca399acd38e322ea49f0fcf2a1b5c5eb4089a5be2decb2e3 SHA512 c34718413d4e273abffb224a307075529a3845ac3ceeef7bd38157e16ba0b222c77a2d4b7de2508901a6e0c6602462d907e269d8b83f1554639e97e3dc7133cb
diff --git a/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r1.ebuild b/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r2.ebuild
index 6d505c464f01..5d5f2d64dac9 100644
--- a/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r1.ebuild
+++ b/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r2.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 CMAKE_WARN_UNUSED_CLI=yes
-inherit eutils cmake-utils gnome2-utils games
+inherit cmake-utils gnome2-utils
 
 DESCRIPTION="Cross-platform port of Arx Fatalis, a first-person role-playing game"
-HOMEPAGE="http://arx-libertatis.org/"
+HOMEPAGE="https://arx-libertatis.org/"
 SRC_URI="mirror://sourceforge/arx/${P}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="c++0x debug +unity-build crash-reporter static tools"
+IUSE="c++0x crash-reporter debug static tools +unity-build"
 
 COMMON_DEPEND="
 	media-libs/freetype
@@ -27,7 +27,7 @@ COMMON_DEPEND="
 		dev-qt/qtnetwork:5[ssl]
 		dev-qt/qtwidgets:5
 	)
-	!static? ( media-libs/glew )"
+	!static? ( media-libs/glew:= )"
 RDEPEND="${COMMON_DEPEND}
 	crash-reporter? ( sys-devel/gdb )"
 DEPEND="${COMMON_DEPEND}
@@ -39,51 +39,30 @@ DOCS=( README.md AUTHORS CHANGELOG )
 
 PATCHES=( "${FILESDIR}"/${P}-cmake-3.5.patch )
 
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	# editor does not build
 	local mycmakeargs=(
-		$(cmake-utils_use_build crash-reporter CRASHREPORTER)
 		-DBUILD_EDITOR=OFF
-		$(cmake-utils_use_build tools TOOLS)
-		-DCMAKE_INSTALL_DATAROOTDIR="${GAMES_DATADIR_BASE}"
-		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
-		$(cmake-utils_use debug DEBUG)
-		-DGAMESBINDIR="${GAMES_BINDIR}"
+		-DBUILD_TOOLS=$(usex tools)
+		-DDEBUG=$(usex debug)
 		-DICONDIR=/usr/share/icons/hicolor/128x128/apps
 		-DINSTALL_SCRIPTS=ON
 		-DSET_OPTIMIZATION_FLAGS=OFF
 		-DSTRICT_USE=ON
-		$(cmake-utils_use unity-build UNITY_BUILD)
-		$(cmake-utils_use_use c++0x CXX11)
+		-DUNITY_BUILD=$(usex unity-build)
+		-DUSE_CXX11=$(usex c++0x)
 		-DUSE_NATIVE_FS=ON
 		-DUSE_OPENAL=ON
 		-DUSE_OPENGL=ON
 		-DUSE_SDL=ON
+		-DBUILD_CRASHREPORTER=$(usex crash-reporter)
 		$(usex crash-reporter "-DUSE_QT5=ON" "")
-		$(cmake-utils_use_use static STATIC_LIBS)
+		-DUSE_STATIC_LIBS=$(usex static)
 	)
 
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	elog "optional dependencies:"
 	elog "  games-rpg/arx-fatalis-data (from CD or GOG)"
@@ -94,9 +73,8 @@ pkg_postinst() {
 	elog "http://wiki.arx-libertatis.org/Getting_the_game_data"
 	elog
 	elog "If you have already installed the game or use the STEAM version,"
-	elog "run \"${GAMES_BINDIR}/arx-install-data\""
+	elog "run \"/usr/bin/arx-install-data\""
 
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }