gentoo resync : 02.05.2018

6 files changed, 34 insertions, 48 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 21cfd038f53c..ca451748df7e 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/crimson/Manifest b/games-strategy/crimson/Manifest
index a586911aaf47..5b018af99190 100644
--- a/games-strategy/crimson/Manifest
+++ b/games-strategy/crimson/Manifest
@@ -1,3 +1,3 @@
 DIST crimson-0.5.3.tar.bz2 882366 BLAKE2B 6faece818105d29dd2d141b925b332cfd5214dd918f5c07cacd2f6cdfcd6a58c86e6ab1cc2fce396fbf24839f5dded619e92a786f03663e78068926a8d0e6be3 SHA512 9632317c4b258ed5e501ad1d058706ed654fc621b07099f65d93e29fe92e53fc8f6bbffa13c70fc2129f30695d3f10e85174234dc96cc171631b3465d2b7cffc
-EBUILD crimson-0.5.3.ebuild 1300 BLAKE2B 013141743128418025dba2f3de5d322b8be7eb75a17a2a59fd01f6222b798c0d5d394321000e5aa9ba331a7e4a14319e7239bdd8e8115bc2ca344efe130e7a19 SHA512 d4e4bb3ad9841cc16388b7a0cf91ea523868e2e18c8373ec344aa6d2587d014dbbce2163f799642e5dfdfa8876900e37351e463ef7d140610c5428009ff87b16
+EBUILD crimson-0.5.3-r1.ebuild 939 BLAKE2B edc3f30e9e491dd3fe94acd0ef3bafaa153021dd465ca4b63dd4ec8b0b5ee0c25abde13e47b09326eb10f0c0beaad0f019df2744331f02badadadd78e4e1721a SHA512 fe6a679dc47f6297fec3864f2f2f9f6b4abb0bf7a2a2250a4df6b7994fd99dbf2d3838c6e4844f105732950ea4981cd6743675036be7aed675baa047dc0d1e4c
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/crimson/crimson-0.5.3.ebuild b/games-strategy/crimson/crimson-0.5.3-r1.ebuild
index 0cec24d6a050..ad228438eb35 100644
--- a/games-strategy/crimson/crimson-0.5.3.ebuild
+++ b/games-strategy/crimson/crimson-0.5.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit desktop
 
 DESCRIPTION="Tactical war game in the tradition of Battle Isle"
 HOMEPAGE="http://crimson.seul.org/"
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test zlib"
 
-RDEPEND="media-libs/libsdl[sound,video]
+RDEPEND="
+	media-libs/libsdl[sound,video]
 	media-libs/sdl-mixer
 	media-libs/sdl-ttf
 	media-libs/sdl-net
@@ -21,12 +22,13 @@ RDEPEND="media-libs/libsdl[sound,video]
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	test? (
-		=app-text/docbook-xml-dtd-4.2*
+		app-text/docbook-xml-dtd:4.2
 		dev-libs/libxml2
-	)"
+	)
+"
 
 src_configure() {
-	egamesconf \
+	econf \
 		--enable-sound \
 		--enable-network \
 		$(use_with zlib) \
@@ -41,18 +43,7 @@ src_install() {
 		DESTDIR="${D}" \
 		pixmapsdir="/usr/share/pixmaps" \
 		install
-	dodoc NEWS README* THANKS TODO
-	rm -rf "${D}/${GAMES_DATADIR}/applications"
+	einstalldocs
+	rm -rf "${ED}/usr/share/applications"
 	make_desktop_entry crimson "Crimson Fields"
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	ewarn "Crimson Fields ${PV} is not necessarily save-game compatible with previous versions."
-	echo
-	elog "If you have older save files and you wish to continue those games,"
-	elog "you'll need to remerge the version with which you started"
-	elog "those save-games."
 }
diff --git a/games-strategy/dopewars/Manifest b/games-strategy/dopewars/Manifest
index fe63f679caf7..c469820a201b 100644
--- a/games-strategy/dopewars/Manifest
+++ b/games-strategy/dopewars/Manifest
@@ -1,4 +1,4 @@
-AUX dopewars-1.5.12-CVE-2009-3591.patch 714 BLAKE2B 8f644e1a93445637216325d72e1c0892a64adc2737ec158dcee848b0cfe9c38649cbf8fa57fb1fc7fa5a164ae55980786efec837c89817b5b3ad49fb828bdfc9 SHA512 3175d69c55843bc21f619d1df045796f39413f8d0cf27274464d68779518867576bd880b45b8760f2ee13e33a77f84dc97dd1308fa82d4e77a43890384f4d78e
+AUX dopewars-1.5.12-CVE-2009-3591.patch 696 BLAKE2B a627b4b714af717942f310411154a069b5ee9a9e98454f325e085354bf1d534528048404cf8c0f78150d5f6af9ca1f8e9aac2d95c90d864e3bea5de51546086d SHA512 3f9476db27f1de31363470688f8a5ec97fa51fda4eb6025da513a1ad1640e5faa802ee7202e0698970eb3bbcb0edadfd304d839f2a3643a64d50e7354c8a049e
 DIST dopewars-1.5.12.tar.gz 1419725 BLAKE2B 930a0406bbf36f874d3bb00c7883c7d47136022e0209ec3993302cd75979d9f80033c973e23d60c4db70a335bfd3b8ff99075af470cb382ded59fc9289ee0edc SHA512 cfabaf9326c847aed6210a852ace64c697df5845a66b3179b8dc8dea7b99a11e1f91358d4ee54929a56c70d5f3a76f9f7bb4079fdef765601f165b4cd06cba5a
-EBUILD dopewars-1.5.12-r2.ebuild 1556 BLAKE2B b95166fc2a6105d8009867e3bd77fdffc4d2660aa2008ec59ba592adee0b4b4f26595d6c9e59e8c6dddb89b80a1d11efcb682521da3cd374c3525a110385365b SHA512 97f15fd18bda68527adb13db5e0248f6f7a358d9b1adb24d931139ef032e960f3030a1833b979540c211277cfd080b9e0530b63da07cd4ab260a43f7f6a294f4
+EBUILD dopewars-1.5.12-r3.ebuild 1403 BLAKE2B a213900d842e325726df7df70fc7f54b959c15fde83349bd342e9c6cedf441f168eaeb19b02e60cb4cd38729bdae8c7c8e8a2462558c125e98ca1a642e666cd1 SHA512 6892d2e0feb45c180e9430e2718571cfb01c2caa9274c9f1b7f8de1355f8745988aea987604770ec960c523d91141a8c0398beab66eba9f47d08f07c68ef4eb9
 MISC metadata.xml 331 BLAKE2B af8487e0de1082dcc36415bf1216b7fcfdf35a3caf93fe3e5a0f40de32978b442eac43dfc7283a82a5403e5abfc73ff2b48ee6fce3b489a6fbc88529c4db28ab SHA512 26259f05b18c933c638d693805a106d26288c96ba220a719d8ec12d65b28c9abdb1d120694d31c07194282081e92dd83522e936771ab71e2ce86ea12d629d5b4
diff --git a/games-strategy/dopewars/dopewars-1.5.12-r2.ebuild b/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild
index ca73bb9543a7..4d1c38437619 100644
--- a/games-strategy/dopewars/dopewars-1.5.12-r2.ebuild
+++ b/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit desktop
 
 DESCRIPTION="Re-Write of the game Drug Wars"
 HOMEPAGE="http://dopewars.sourceforge.net/"
@@ -13,22 +13,26 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls ncurses gtk gnome sdl"
 
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.2:0 )
+RDEPEND="
+	ncurses? ( >=sys-libs/ncurses-5.2:0= )
 	gtk? ( x11-libs/gtk+:2 )
 	dev-libs/glib:2
 	nls? ( virtual/libintl )
 	sdl? (
 		media-libs/libsdl
 		media-libs/sdl-mixer
-	)"
+	)
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-CVE-2009-3591.patch
+	default
+	eapply "${FILESDIR}"/${P}-CVE-2009-3591.patch
 	sed -i \
-		-e "/priv_hiscore/ s:DPDATADIR:\"${GAMES_STATEDIR}\":" \
+		-e "/priv_hiscore/ s:DPDATADIR:\"/var/lib\":" \
 		-e "/\/doc\// s:DPDATADIR:\"/usr/share\":" \
 		-e 's:index.html:html/index.html:' \
 		src/dopewars.c || die
@@ -41,8 +45,7 @@ src_configure() {
 		myservconf="--disable-gui-client --disable-gui-server --disable-glibtest --disable-gtktest"
 	fi
 
-	egamesconf \
-		--disable-dependency-tracking \
+	econf \
 		$(use_enable ncurses curses-client) \
 		$(use_enable nls) \
 		$(use_with sdl) \
@@ -53,17 +56,9 @@ src_configure() {
 }
 
 src_install() {
-	default
-
-	dodir /usr/share
-	if use gnome ; then
-		mv "${D}/${GAMES_DATADIR}"/gnome "${D}/usr/share" || die
-	else
-		rm -r "${D}/${GAMES_DATADIR}"/gnome || die
-	fi
-	mv "${D}/${GAMES_DATADIR}"/pixmaps "${D}/usr/share" || die
-	dohtml -r "${D}/${GAMES_DATADIR}"/doc/*/*
-	rm -r "${D}/${GAMES_DATADIR}"/doc || die
-
-	prepgamesdirs
+	emake DESTDIR="${D}" install
+	rm -r "${ED}"/usr/share/gnome || die
+	rm -rf "${ED}"/usr/share/doc
+	make_desktop_entry "${PN}" "Dopewars" /usr/share/pixmaps/dopewars-weed.png
+	HTML_DOCS="doc/*html" einstalldocs
 }
diff --git a/games-strategy/dopewars/files/dopewars-1.5.12-CVE-2009-3591.patch b/games-strategy/dopewars/files/dopewars-1.5.12-CVE-2009-3591.patch
index d657bf8744f1..3b8b066a81cd 100644
--- a/games-strategy/dopewars/files/dopewars-1.5.12-CVE-2009-3591.patch
+++ b/games-strategy/dopewars/files/dopewars-1.5.12-CVE-2009-3591.patch
@@ -3,8 +3,8 @@ Patch for CVE-2009-3591 -- bug 288295.
 Fetched from upstream SVN:
 http://dopewars.svn.sourceforge.net/viewvc/dopewars/dopewars/trunk/src/serverside.c?r1=1033&r2=1032&pathrev=1033
 
---- dopewars/trunk/src/serverside.c	2009/03/10 07:18:49	1032
-+++ dopewars/trunk/src/serverside.c	2009/10/05 04:11:32	1033
+--- trunk/src/serverside.c	2009/03/10 07:18:49	1032
++++ trunk/src/serverside.c	2009/10/05 04:11:32	1033
 @@ -504,6 +504,12 @@
      break;
    case C_REQUESTJET: