gentoo resync : 20.11.2017

3 files changed, 24 insertions, 30 deletions

diff --git a/games-arcade/opensonic/Manifest b/games-arcade/opensonic/Manifest
index 73de90e3ae18..6c31648f386b 100644
--- a/games-arcade/opensonic/Manifest
+++ b/games-arcade/opensonic/Manifest
@@ -1,6 +1,6 @@
-AUX opensonic-0.1.4-r1-cmake.patch 4654 SHA256 b327a5f4d34aab12b9eb42b8baf675b9434a0890786ce5e5a97c038a3c3181d4 SHA512 092c2dce7d0251bd44ac58b8a49339d3046cebde8ea8434b1cd61dcd5ca8c61ec45b4bef52b91235741c4a56253b0bee36cc6513ccaf430826ebab7c073653be WHIRLPOOL de522d68983e1b54ea123970289283fac50c98cdcfa8be17278a5f1b3e140df11c577daa43db8c843afe6f7e4016f1071f9df648c88bf63457fea6d195f2d85b
+AUX opensonic-0.1.4-r1-cmake.patch 4658 SHA256 f097849a7a12944dd0dcd953b077820c10eb95011b16d45752f0271a5e0ff5e7 SHA512 4764d967664c2c775696a4ccbfb17cf8d3051b1b96cc1f2c6314b8054059334374fca5d39153ec565f22b5716f34c4d0ff45f4c7b00500e2590437025f10fd06 WHIRLPOOL 759fb8803129a4ddd4b35baba217a6f2e47e8204c91a096045602fcf275422b8438d9f274320f1cbb26218496b4ed61bc48973d3d9fd7e61476b3f1559e1ba83
 DIST opensnc-src-0.1.4.tar.gz 10525059 SHA256 3a4c3fa9538ee27c04b5ea848c9ad0a83f335471936d4617a18d3648c42588e9 SHA512 239c7b4c7f9663e4d46c54d8bdaefed8d12274b71feaf9c637feb04f3567465f265c50bf3419f4c881ae3fa48a62ab339fe8a0b005c2b080b53d54ebf1e2f29d WHIRLPOOL dd65be3d6403936cf4defe30360b2b86fd77f49de88b118ac873201917f263d3494797f964b295ee6370e0959784af77b8ff3b777559856009abfc0f80ebc598
-EBUILD opensonic-0.1.4-r1.ebuild 1208 SHA256 9f4ef0d4cd19e0f4fabcacdc9727090847146e7b7a7b5d982f8f8b1747be4de9 SHA512 42c895d669661ae4081321052befae1afe3fd3d6c738500cfb154eba50f3dc2316ec18f7d897683697a6fe59547e4723de5a1dd47aa88fda0a0ecfae8d00cc4b WHIRLPOOL 51a455fd68ef3aca841c1c467b07a9f102d5d2eadf1e7a35fb4f74adbc4a94543b74d1daeac1da9bbc25741db753cab075b8a96259b0e0b322d36ecec85a913a
+EBUILD opensonic-0.1.4-r2.ebuild 1219 SHA256 a2a6afecc5619887ad81b456578383c93f8ab31c7bf6880e84ac2804950f4430 SHA512 50c39b104eb0fc2cee336263ceb8ae8c7ff8029b19e4660afde6f6dfc2f1b50c0e14b4ff5882040a4a8ce7271892149a53565f0c207f7a16c168036a66a3247c WHIRLPOOL 0f4e1967e673b773c8c5994f2c7410f678a36b53e0f3aff17dd935be3936328b437d3ff26d8e09d170be49d6cf2ee482fc87478f4259d1946d5b718249cdf3ac
 MISC ChangeLog 3174 SHA256 3777f0875120f64d5612beb82a5b85f958eb3c07e3fe57db4c2598c17104c100 SHA512 f50161a5f8a4cb06b1cbe3b089323370e8fa72c51d8b40b0246b6bb128d5f91295491b97bdc21fd06d8103e22315f98872ad75f9dcf081d985e0e1d715286f25 WHIRLPOOL aa0ba1d2e95bb94d601bc55dae631362be544703f8351a558372c46b3a9820daf66f5ce5be4c3fef88496b7102c854023bc43e6a7cc56dd2b2cd57c6ab4da124
 MISC ChangeLog-2015 1431 SHA256 cc899dba7d3c9de97646c77e1988901bb68d2741bfc98abb86af9381c5858b7f SHA512 b849a45f50e0973ac5e5e68a4e2b7964e76fd0aedcf7f716fb9e02ca44d6c526e6063dc1af29bed0d302c2c3487489201cc62af1ab1b961b72a751855a032995 WHIRLPOOL 96bb288fd28404084fd7e1e519f7dcbbc8dad9f49177b5b849858287f6d907697c86795db9ee8db5865e5de41393ed49d83a1dbcb7e6091caacfeff3743f3f2d
 MISC metadata.xml 330 SHA256 7c99b8bde42724a10e58e76229efd0ba521dda8e1f73a1f78411f1b1ba9efa2e SHA512 5ac408fe48351e3db869e0cf5af951fd441690505d16d826c4010d2d575fde0b7de6f9f9ef2594cd2006692e0682b2e62f8cb5726db5c80bc7974f942b7cd79c WHIRLPOOL ff4add7133d3a64f2ffd0a309a768acaa78821620d8abd3128aec0304a411befcafd6e831a47fb81483ee7ee6129df2ff4b0bde499bf0113c7e1962559c15214
diff --git a/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch b/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch
index b4db7644bc9d..53d76faafae2 100644
--- a/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch
+++ b/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch
@@ -8,8 +8,8 @@ make paths modifiable
 add rules for icon, desktop-file and game-wrapper
 fix compilation for as-needed
 
---- CMakeLists.txt
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -35,16 +35,14 @@
  MESSAGE("Using CFLAGS='${CFLAGS}'")
  
diff --git a/games-arcade/opensonic/opensonic-0.1.4-r1.ebuild b/games-arcade/opensonic/opensonic-0.1.4-r2.ebuild
index 95eb7ebac18a..3e0e1b0c35a2 100644
--- a/games-arcade/opensonic/opensonic-0.1.4-r1.ebuild
+++ b/games-arcade/opensonic/opensonic-0.1.4-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit cmake-utils eutils games
+EAPI=6
+
+inherit cmake-utils
 
 MY_PN=opensnc
 MY_P=${MY_PN}-src-${PV}
@@ -17,40 +18,33 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror" # unsure about legality of graphics
 
-DEPEND="media-libs/allegro:0[X,jpeg,png,vorbis]
-	media-libs/libogg
-	media-libs/libpng:0
-	media-libs/libvorbis
-	sys-libs/zlib
+DEPEND="
+	media-libs/allegro:0=[X,jpeg,png,vorbis]
+	media-libs/libogg:=
+	media-libs/libpng:0=
+	media-libs/libvorbis:=
+	sys-libs/zlib:=
 	virtual/jpeg:0"
 RDEPEND=${DEPEND}
 
 S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PF}-cmake.patch
-}
+PATCHES=( "${FILESDIR}"/${PN}-0.1.4-r1-cmake.patch )
 
 src_configure() {
 	local mycmakeargs=(
-		-DGAME_INSTALL_DIR="${GAMES_DATADIR}"/${PN}
-		-DGAME_FINAL_DIR="${GAMES_BINDIR}"
-		-DGAME_LIBDIR="$(games_get_libdir)/${PN}"
+		-DGAME_INSTALL_DIR="${EPREFIX}"/usr/share/${PN}
+		-DGAME_FINAL_DIR="${EPREFIX}"/usr/bin
+		-DGAME_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/${PN}
 	)
-
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
 	cmake-utils_src_install
-	local i
-	for i in $(ls "${D}${GAMES_DATADIR}/${PN}") ; do
-		dosym "${GAMES_DATADIR}/${PN}/${i}" \
-			"$(games_get_libdir)/${PN}/${i}"
-	done
-	prepgamesdirs
+
+	local f
+	while IFS="" read -d $'\0' -r f; do
+		dosym ../../share/${PN}/${f##*/} \
+			/usr/$(get_libdir)/${PN}/${f##*/}
+	done < <(find "${ED%/}"/usr/share/${PN}/ -mindepth 1 -maxdepth 1 -type d -print0)
 }