gentoo resync : 02.05.2018

3 files changed, 24 insertions, 18 deletions

diff --git a/games-puzzle/xblockout/Manifest b/games-puzzle/xblockout/Manifest
index 466404f69a93..668a714270f9 100644
--- a/games-puzzle/xblockout/Manifest
+++ b/games-puzzle/xblockout/Manifest
@@ -1,4 +1,4 @@
-AUX xblockout-1.1.6-font.patch 1531 BLAKE2B 6ce245f406ddbbf1b1354fd185e34cce0d307ec42db7c19297e0bebd9bc955236b783343e04bbe5d4834161d47cb37989a335c6ddb520ec6f4846a1c85e42d29 SHA512 adfc6ad87048c4c021e8989886011c8dfa8736778ac12fefacbbffc114272f4a5ee60a997f35d817d22bbd9eb348c7e40701bd25bc1cf0d5924add71fc77e450
+AUX xblockout-1.1.6-font.patch 1535 BLAKE2B 5ae0fffb0d04c69123bb0c1098bcbaf2053551530d9f7f6f001ae693d4826148d16f4793009c83b286a7c9df8669e507145e39f2c7aa6bf4638ddc1e97bab15b SHA512 f74245e8d97859fa692c82f69657a77d31e84f249b5d29e23b16f072d596e85a51800f4af4578ba194151a6d0c5b577bad7a40a95d0477f31d2ae8147bec585d
 DIST xbl-1.1.6.tar.gz 136504 BLAKE2B 253c4a950def66abaef3547596b569542ea0dcd180fa5e81a7cb581d9dc23b2038b39c1059ddd36cfc89275ef3fb2a25d174ada71ab1818e408818613559a33e SHA512 96bf0460863698136a61b43260feed0e90e7ca5b6613d54c8ca98f51557a3d235597eeab46141cd6771aa0bf4fe019c5e4291dd826338e186cc905e3837531e0
-EBUILD xblockout-1.1.6.ebuild 1129 BLAKE2B 02366ea6ec6430a7d2072529a3b2d0d415d0e9f7d4bb846a5422573de7ae90a20ab93030c89a9e967eaeabbeefb2e037831129f523331696afad9c0f21dccae3 SHA512 e808fb73d89f1aa8be9e132211bb227db372952c982b63331f65faaf32632fd3a6f792292fb957cd2951b2e4104ea5e8cc1c7eb88fbac743331727ae2ae80ab9
+EBUILD xblockout-1.1.6-r1.ebuild 1216 BLAKE2B 1fbed71ba49c6a5851d9934faec162692cd77250d9bf61e42cb663685b56df055ced6c7f3d0fdc776c7e8ce4595ee396a435b063f6488f1c2c848906bbab36b2 SHA512 ddc6e41fbe580d99d48dbe69407720b5dd50fdaca6ad9fe149b5d8c141373b880654f2a7dac98e1e143adaa15845eddfde52349b87128613b647253048dc7134
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch b/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch
index bb0302963bdc..1e007494e93e 100644
--- a/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch
+++ b/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch
@@ -1,5 +1,5 @@
---- initmenu.c.old	2008-10-27 23:23:43.000000000 +0100
-+++ initmenu.c	2008-10-27 23:22:52.000000000 +0100
+--- a/initmenu.c.old	2008-10-27 23:23:43.000000000 +0100
++++ b/initmenu.c	2008-10-27 23:22:52.000000000 +0100
 @@ -408,19 +408,17 @@
    XCharStruct overall_return ;
  
diff --git a/games-puzzle/xblockout/xblockout-1.1.6.ebuild b/games-puzzle/xblockout/xblockout-1.1.6-r1.ebuild
index bbb076fd9603..71a44a6d8c39 100644
--- a/games-puzzle/xblockout/xblockout-1.1.6.ebuild
+++ b/games-puzzle/xblockout/xblockout-1.1.6-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 autotools flag-o-matic eutils games
+EAPI=6
+inherit autotools desktop flag-o-matic
 
 DESCRIPTION="X Window block dropping game in 3 Dimension"
 HOMEPAGE="http://perso.univ-lyon1.fr/thierry.excoffier/XBL/"
@@ -13,14 +13,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/xbl-${PV}
+S="${WORKDIR}/xbl-${PV}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-font.patch
+	default
+	eapply "${FILESDIR}"/${P}-font.patch
 	sed -i \
 		-e '/^CC/d' \
 		-e 's:-lm:-lm -lX11:' \
@@ -29,26 +32,29 @@ src_prepare() {
 		Makefile.in || die
 	# Don't know about other archs. --slarti
 	use amd64 && filter-flags "-fweb"
+
+	mv configure.in configure.ac || die
 	eautoreconf
 }
 
 src_compile() {
 	emake \
 		USE_SETGID= \
-		SCOREDIR="${GAMES_DATADIR}/${PN}" \
-		RESOURCEDIR="${GAMES_DATADIR}/${PN}" \
+		SCOREDIR="/usr/share/${PN}" \
+		RESOURCEDIR="/usr/share/${PN}" \
 		LDOPTIONS="${LDFLAGS}"
 }
 
 src_install() {
-	newgamesbin bl xbl
+	newbin bl xbl
 
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto /usr/share/${PN}
 	newins Xbl.ad Xbl
 
 	newman xbl.man xbl.6
 	dodoc README xbl-README
-	dohtml *.html *.gif
-	make_desktop_entry xbl XBlockOut
-	prepgamesdirs
+	HTML_DOCS="*.html *.gif" einstalldocs
+
+	newicon xbl-game.gif ${PN}.gif
+	make_desktop_entry xbl XBlockOut /usr/share/pixmaps/${PN}.gif
 }