gentoo resync : 18.05.2019

4 files changed, 56 insertions, 82 deletions

diff --git a/games-action/bomberclone/Manifest b/games-action/bomberclone/Manifest
index 6dcdd927eb9e..374c880c7364 100644
--- a/games-action/bomberclone/Manifest
+++ b/games-action/bomberclone/Manifest
@@ -1,5 +1,4 @@
 AUX bomberclone-0.11.8-gcc52.patch 223 BLAKE2B bbce3a29a92c94a7e55e02514d1c3d197517d48e8660eabe11e13cf8dd75068a379f9e621f2b864640a7830df2d84b667b2b4356a7704e8403216774b2957f62 SHA512 a536ce4130f6dca9aaaeb79a4b4501edee1f52e020f333202f592477839409f4691ad95735cffd9f178e21c8ea8e885a908684f39e3477fd0d4137b9f8c49012
-AUX bomberclone-0.11.8-underlink.patch 434 BLAKE2B e0cf13a2d51d2597583877c8ab5add8cb76b1482f14fef7cf33c40573864f5c4c42ed346291635ec467c3f2d3baaf3a9673c9ede3f8a37d0a062d37064c71568 SHA512 78738422f3a83a9dbfa03976701bb136c4326b9bb6fca310968518c77c2a6440ba9291a568162773bf0f48691a8039e0c461972c0d8f9e40d4b54525a2db9840
-DIST bomberclone-0.11.8.tar.bz2 7966452 BLAKE2B ab090be622e891ae803529360d8bd753ac64b9d66b045d06946735a06e9203bf07a32dddd165f038ea484d584383ed760a5bf9e5d206638438ecb10583734225 SHA512 a5e52db43f7f508993231ec13bb2705f60e25cfc21d15c17d9b422c6fc948dc14cc8c4519acfac2e9b7b32a3072dc3a521fbf28b2150a86cfb4099ced72ab79b
-EBUILD bomberclone-0.11.8-r1.ebuild 1237 BLAKE2B 6c4ce8f2297f6a442dfa4d9a9f21212cc52c059423a472b6db4ba46f3925de8259f21107baf57ed4d961962905702b267262ce041a2ad7632a165b4f1abd7326 SHA512 9c344cee85908fe7603b763440daacba4d468f9ccf319667bf90b7e8740dfc474474cacee77fada4da1f09a8ccfab381f9ce91a36eedfc8d3a0b915d628ba802
+DIST bomberclone-0.11.9.tar.gz 8109837 BLAKE2B b5ec7cc80b2fe4f7517302029e5e943dd673ce910148f5985a9063f19e67c5fbdb21634f8fead60728b900383f24b67b1fc2b27d1a36c07ab1cfae8f228a4fb7 SHA512 80b3db728d7c54bc421a783c7e3753289e1ecb8500e9c8457d92ce226ebe60f47c2b04fd684c1aae57b1c5968ea3d1fce53c9c269a1fc9e685589fdd0513a439
+EBUILD bomberclone-0.11.9.ebuild 1105 BLAKE2B 1b500275d29529eb784d85ff62c0ea406b835d3b1713ed63af83fa4bcf331efc1fe41da6228c1489fd046eb3bc5137fb7dd9cd2d3c9d1dcc894d165ac11cfd5a SHA512 fcae8e0cb30445831be19c3591c8be072d710d929d7f3622bd36ea3395267db8d5c8e6dda7e9e76389fa234b54af0cb3df4c8b5ed5f3aa8e18ecdbe362a96d95
 MISC metadata.xml 334 BLAKE2B 5d34b252ed17c0a05782417336de98dfc5196ad854dd1705e286781eecee9d7e3081f46d1dc9014a39e8b236ca082a1c14af26e8ce4c26652e510644eda46b18 SHA512 0e309d5ada167696d234e2e2c44cb045607018801b9e03fab79bc2496c66f6e484364200320bf6124fb5fdd787d798de6052fa659862336d233cd6bd1eb8e5e9
diff --git a/games-action/bomberclone/bomberclone-0.11.8-r1.ebuild b/games-action/bomberclone/bomberclone-0.11.8-r1.ebuild
deleted file mode 100644
index 08185dddd02d..000000000000
--- a/games-action/bomberclone/bomberclone-0.11.8-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop vcs-clean
-
-DESCRIPTION="BomberMan clone with network game support"
-HOMEPAGE="https://www.bomberclone.de/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc64 ~x86"
-IUSE="X"
-
-DEPEND=">=media-libs/libsdl-1.1.0[video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[mod]
-	X? ( x11-libs/libXt )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc52.patch
-	"${FILESDIR}"/${P}-underlink.patch
-)
-
-src_prepare() {
-	default
-
-	ecvs_clean
-	mv configure.{in,ac} || die
-	sed -i -e 's/configure.in/configure.ac/' configure.ac || die
-	sed -i \
-		-e "s:/share/games/:share/:" \
-		configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with X x) \
-		--datadir="${EPREFIX}"/usr/share
-	sed -i \
-		-e "/PACKAGE_DATA_DIR/ s:/usr/games/share/games/:/usr/share:" \
-		config.h || die
-}
-
-src_install() {
-	default
-
-	dobin src/${PN}
-
-	insinto /usr/share/${PN}
-	doins -r data/{gfx,maps,player,tileset,music}
-	find "${D}" -name "Makefile*" -exec rm -f '{}' + || die
-
-	doicon data/pixmaps/bomberclone.png
-	make_desktop_entry bomberclone Bomberclone
-}
diff --git a/games-action/bomberclone/bomberclone-0.11.9.ebuild b/games-action/bomberclone/bomberclone-0.11.9.ebuild
new file mode 100644
index 000000000000..9958da287a64
--- /dev/null
+++ b/games-action/bomberclone/bomberclone-0.11.9.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop xdg-utils
+
+DESCRIPTION="Bomberman clone with network game support"
+HOMEPAGE="https://www.bomberclone.de/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc64 ~x86"
+
+DEPEND=">=media-libs/libsdl-1.1.0[video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[mod]"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.11.8-gcc52.patch
+)
+
+src_prepare() {
+	default
+
+	mv -v configure.{in,ac} || die
+	sed -i 's/configure\.in/configure.ac/g' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	LIBS="-lm" \
+	econf \
+		--disable-werror \
+		--without-x
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		bomberclonedocdir=\${prefix}/share/doc/${PF} \
+		install
+
+	doicon -s 64 data/pixmaps/${PN}.png
+	make_desktop_entry ${PN} Bomberclone
+
+	# Delete useless documentation.
+	rm -v "${ED}"/usr/share/doc/${PF}/{COPYING,INSTALL,*.nsi} || die
+}
+
+pkg_postinst() { xdg_icon_cache_update; }
+pkg_postrm() { xdg_icon_cache_update; }
diff --git a/games-action/bomberclone/files/bomberclone-0.11.8-underlink.patch b/games-action/bomberclone/files/bomberclone-0.11.8-underlink.patch
deleted file mode 100644
index 18c063b56db9..000000000000
--- a/games-action/bomberclone/files/bomberclone-0.11.8-underlink.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure.in	2011-06-18 18:23:48.633605738 +0200
-+++ b/configure.in	2011-06-18 18:26:26.910628408 +0200
-@@ -33,7 +33,7 @@
-     )
-     
-     CFLAGS="$SDL_CFLAGS $CFLAGS"
--    LIBS="$SDL_LIBS $LIBS"
-+    LIBS="$SDL_LIBS $LIBS -lm"
- 
- 
- dnl Checks for header files.
-@@ -84,7 +84,7 @@
- 	CFLAGS="$CFLAGS -Wall"
- 	AC_MSG_WARN(Disable Warning as Error Treatment)
- else
--	CFLAGS="$CFLAGS -Wall -Werror"
-+	CFLAGS="$CFLAGS -Wall"
- fi
- 
-