gentoo resync : 20.02.2019

6 files changed, 50 insertions, 123 deletions

diff --git a/games-action/abuse/Manifest b/games-action/abuse/Manifest
index c644705201bd..b468516ec86b 100644
--- a/games-action/abuse/Manifest
+++ b/games-action/abuse/Manifest
@@ -1,6 +1,4 @@
-AUX abuse-0.8-gentoo-r1.patch 389 BLAKE2B de7d3292c2b940bfca2d2eabfffe8fdc82e24ee1e02be57cd1f720d9a6aa9e68bc764296e560461977ba286f0d3ea0483a9b7c97ff7c0e55061bb8b77f18b4c2 SHA512 b01b0ad0b129758cfde9949e5a645f5e261ea45e053b90f3bd5926222dd4a5cf384cf24d790790faa0e94d4062833892578f2dbcde5dbf5a5120a03ae69ef0d0
-AUX abuse-0.8-gentoo.patch 891 BLAKE2B b24d6ac109e82c2fb2926a5cf9894cff13f55618f1f46f6894c1341a2a49d27c3357cdcfa26aee0164a94aaa64da847a42651d0701b766699c8ecaf1a500c471 SHA512 544858fd991c611eeac9470c833b15be8c06c709f2b6dc473ab35ec7e5e4aae885a363d17f09080afcd4022229089cf46fe5b7c0abd14fb7b84449bb46ac35d9
 DIST abuse-0.8.tar.gz 6053500 BLAKE2B 4f52256b7bf13e0efa77ef50147a976fdf1fceec4ce20fb4b855a9961a7c816cf08bf51286b424da42072956a137bc3385357cfdb61bf37ff9f907284d99e09c SHA512 5c60dcf6910f9f751da26e919cd289c12349bb82eb925f9a41dc921263ece0d0f5f24c2ab2d1c718c0a5d0315453f92dfcba665fe5082eb4135ed737d2859d18
-EBUILD abuse-0.8-r1.ebuild 819 BLAKE2B 8c9b6493dadc25e67a9c527f4c26f97cfe9b00ccf5d830a33b034a55e0649774299a188a8308d8fd0b7d9bfc9e5784e5674c41640372c575478f24b078d29428 SHA512 7ccffcc2537959018093fcb6014d33c0ff68daa207b238bfbda6eab589b8c896a52f57070e9b7473c7ccadacf0b280ef57a839acded9699e0155aff1c165fe5a
-EBUILD abuse-0.8-r2.ebuild 779 BLAKE2B 643b1526814ec65e36be6403a99e4f99044318a76ded4b6b00fbbd9eefad89e3ec3354f60d8e1f625b454418a56a24a5ca28aad9b26adb5e2e3a3af750412814 SHA512 c690c39ad57bbe47c7cd4bcb78c4639d64deac821bb02924b8eeb01e1a1df7fb334e6b23446ccc8f8723da60ea9ab4b9f9b8b85f02ed86cb05a3f7baa2aed893
+DIST abuse-0.9_p20181213.tar.gz 4668746 BLAKE2B 5834d9a3a3172ec6364adf4ffc4196e76b2f104a77d7c5eb94f72cb00e326a66b56bf66083ab8fd566d1bc97b7f8ac6ac1edb4ad60605526761487a45a4136ac SHA512 4a7bdd67880a86a686f896d42b9a7f0c3a6e8a9e8891e514ebb68634b6b31641f5ade91da0f0bd4e6da7081b67c3bf944246ec3538a547e5ee68b4d8f4cebbeb
+EBUILD abuse-0.9_p20181213.ebuild 1108 BLAKE2B 4a3c4fdab371235c0b88b0e8a91ae2a3be249eb05eea55938620d3199ff6c72ff1be45c1ec7f33d086aa8d85d49529761aaa6187b2505e2497ed8b22734c7ff1 SHA512 18b0c4b7d343f4e58f30cf1d4b018b3ce6c071c2158250308fd16d10152821744901c20f942e8a149e97ffc4af45e12902cd274fd87234e3186a11ed59a6fd02
 MISC metadata.xml 259 BLAKE2B de713fcef8fdf70397a1488db3be1d10415e1177b400921c0017b69bcfb1849bb5eaef32ca00118ff25391d52d2071af70c83b6357fbf5199e4745d34e9994e1 SHA512 8516e2364a64325b483a394a14c52e32b029beccd05586623e5dba0b861970722c3709070c8fd4b80a23f0a84b74a475485b0f2b05f44fae6f27f163714aef68
diff --git a/games-action/abuse/abuse-0.8-r1.ebuild b/games-action/abuse/abuse-0.8-r1.ebuild
deleted file mode 100644
index 29a6bbc7fda4..000000000000
--- a/games-action/abuse/abuse-0.8-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop
-
-DESCRIPTION="Port of Abuse by Crack Dot Com"
-HOMEPAGE="http://abuse.zoy.org/"
-SRC_URI="http://abuse.zoy.org/raw-attachment/wiki/download/${P}.tar.gz"
-
-LICENSE="GPL-2 WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.1.6[sound,opengl,video]
-	media-libs/sdl-mixer
-	virtual/opengl"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	# Source-based install
-	default
-
-	doicon doc/${PN}.png
-	make_desktop_entry abuse Abuse
-}
-
-pkg_postinst() {
-	elog "NOTE: If you had previous version of abuse installed"
-	elog "you may need to remove ~/.abuse for the game to work correctly."
-}
diff --git a/games-action/abuse/abuse-0.8-r2.ebuild b/games-action/abuse/abuse-0.8-r2.ebuild
deleted file mode 100644
index 515f3cde59a1..000000000000
--- a/games-action/abuse/abuse-0.8-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop
-
-DESCRIPTION="Port of Abuse by Crack Dot Com"
-HOMEPAGE="http://abuse.zoy.org/"
-SRC_URI="http://abuse.zoy.org/raw-attachment/wiki/download/${P}.tar.gz"
-
-LICENSE="GPL-2 WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.1.6[sound,opengl,video]
-	media-libs/sdl-mixer
-	virtual/opengl"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo-r1.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Prevent segfault at start: https://bugs.archlinux.org/task/52915
-	econf --enable-debug
-}
-
-src_install() {
-	# Source-based install
-	default
-
-	doicon doc/${PN}.png
-	make_desktop_entry abuse Abuse
-}
diff --git a/games-action/abuse/abuse-0.9_p20181213.ebuild b/games-action/abuse/abuse-0.9_p20181213.ebuild
new file mode 100644
index 000000000000..5feb6d8953b0
--- /dev/null
+++ b/games-action/abuse/abuse-0.9_p20181213.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils desktop xdg-utils
+
+COMMIT="42b6acd19af00689e8f34355e3b13323d8ea3f79"
+DATA_PV="0.8"
+
+DESCRIPTION="Port of Abuse by Crack Dot Com"
+HOMEPAGE="https://github.com/Xenoveritas/abuse"
+SRC_URI="https://github.com/Xenoveritas/abuse/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
+	http://abuse.zoy.org/raw-attachment/wiki/download/${PN}-${DATA_PV}.tar.gz"
+
+LICENSE="GPL-2 public-domain WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=media-libs/libsdl2-2.0.3[sound,video]
+	media-libs/sdl2-mixer"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+	ln -snf ../../${PN}-${DATA_PV}/data/{music,sfx} data/ || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# https://github.com/Xenoveritas/abuse/pull/6
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doicon -s 32 doc/${PN}.png
+	make_desktop_entry abuse Abuse
+}
+
+pkg_postinst() { xdg_icon_cache_update; }
+pkg_postrm() { xdg_icon_cache_update; }
diff --git a/games-action/abuse/files/abuse-0.8-gentoo-r1.patch b/games-action/abuse/files/abuse-0.8-gentoo-r1.patch
deleted file mode 100644
index 8be2eaf92580..000000000000
--- a/games-action/abuse/files/abuse-0.8-gentoo-r1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru abuse-0.8.orig/Makefile.am abuse-0.8/Makefile.am
---- abuse-0.8.orig/Makefile.am	2011-05-09 03:58:04.000000000 -0400
-+++ abuse-0.8/Makefile.am	2011-05-16 22:22:51.642655295 -0400
-@@ -2,8 +2,6 @@
- 
- SUBDIRS = src data doc
- 
--EXTRA_DIST = COPYING.GPL COPYING.WTFPL PACKAGERS bootstrap
--
- dist-hook:
- 	@echo ""
- 	@echo "          ===================================================="
diff --git a/games-action/abuse/files/abuse-0.8-gentoo.patch b/games-action/abuse/files/abuse-0.8-gentoo.patch
deleted file mode 100644
index c5d97834d9ec..000000000000
--- a/games-action/abuse/files/abuse-0.8-gentoo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru abuse-0.8.orig/Makefile.am abuse-0.8/Makefile.am
---- abuse-0.8.orig/Makefile.am	2011-05-09 03:58:04.000000000 -0400
-+++ abuse-0.8/Makefile.am	2011-05-16 22:22:51.642655295 -0400
-@@ -2,8 +2,6 @@
- 
- SUBDIRS = src data doc
- 
--EXTRA_DIST = COPYING.GPL COPYING.WTFPL PACKAGERS bootstrap
--
- dist-hook:
- 	@echo ""
- 	@echo "          ===================================================="
-diff -ru abuse-0.8.orig/configure.ac abuse-0.8/configure.ac
---- abuse-0.8.orig/configure.ac	2011-05-09 03:58:04.000000000 -0400
-+++ abuse-0.8/configure.ac	2011-05-16 22:22:35.771824632 -0400
-@@ -90,8 +90,6 @@
- fi
- AM_CONDITIONAL(HAVE_NONFREE, test "${ac_cv_have_nonfree}" = "yes")
- 
--# Optimizations
--CXXFLAGS="${CXXFLAGS} ${OPT} ${REL}"
- # Code qui fait des warnings == code de porc == deux baffes dans ta gueule
- CXXFLAGS="${CXXFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wsign-compare"
-