gentoo resync : 25.10.2021

5 files changed, 78 insertions, 29 deletions

diff --git a/games-puzzle/toppler/Manifest b/games-puzzle/toppler/Manifest
index 57eacbc0d987..d189ce18c4b6 100644
--- a/games-puzzle/toppler/Manifest
+++ b/games-puzzle/toppler/Manifest
@@ -1,4 +1,6 @@
+AUX toppler-1.1.6-fix-docdir.patch 599 BLAKE2B f21c1662c10aab661ff77fee328dc4adf106b89dbee925a251cdf68d4eb3276a230091d389f763b46c7ce22767dabababda3509d72019473bc8859984b3f0c76 SHA512 4862ce1e438c0e2bcc990f1e3de3d5fc00479e7b36131f90392c778859f8591779c8e586ef7179392fc586e29e719f020a654add173ecdb02e7fc4f4371187ed
 AUX toppler-1.1.6-gentoo.patch 2004 BLAKE2B cc1221d33b4cf30bda597c4b95e669aa6c4ba7698669e5a762a89a4d8a5f8c637c81d07c47c22e7f0f85f96e9bd40f7da7e8c0be937ed28ec11c863e6604863f SHA512 0fc2d8eb7200c0c4e4986e0f53298d8a7b49f8be0d46bf2dc370e145a4ff39f7342874b5d80a18f703f7d134fd59274a72679afa7317f94609469042942dbfb4
+AUX toppler-1.1.6-use-gamestat-group.patch 476 BLAKE2B 5b0e8a84e946194acd355ec1b7c0f4962399fd2ef707596a93f31c3eae087694994471d78bfcfe482cd1b00bb49e521a5d3598ed8fef312783f95b5e0c274ee7 SHA512 8f317ff8f336cbf7bab32dfbaec8a5f08c7d6a431b01df1fd7431630163cb70448531267b32f12b44f2f61c8076f5c1a71375b1c998c523acc32eeca5c0e67ce
 DIST toppler-1.1.6.tar.gz 2117137 BLAKE2B 1cff164e71924786d109a0c3f36ade3df8251872d454cb86d25b6f95553473dd10d5bc0f90fa0a3c43bcebfb6f3ef105ddf0d77f974282d65d0c510176b04ac9 SHA512 e0f6b7b72e38ba3402ba3608116fb51bf36cad129fb5591db62489829f4ed1ec49a4a3b7b1db4aaa34cd1561ee5228d91577f550aad2d55520ccefdff9bda9e9
-EBUILD toppler-1.1.6-r1.ebuild 558 BLAKE2B af00a1ff59f976c81fcb7c27be2cc1b9a2c1111fa569a5a2243a760572c6743fef0cf169755cda011a1b6c7ee0d941a82a391a699245310d3fca89e1fd2c2308 SHA512 199e0ce86bbdaf9689dd519b68de170e372dc9d8b38d6e1880fd6fbb11f94a615698f8cda31dcc6ec9806fd7a5fa3aee9a0812ffd9811415e8d77baf2e8c6dad
+EBUILD toppler-1.1.6-r2.ebuild 749 BLAKE2B ae060851e6e97ec72d45287fd41c547611ece71cbdef387eb9e60de473643548146d483becdc3f7430896af1ee2be72f309462027ac5c11077e202eecb9f4b1f SHA512 fa7532968eabc5b45bc6a519ddcbe67f4e1d483cd79ee0b3deeb6f15f01683e097ca23316f16de2162fcee5c25bb4bed246bfa9d21ff9fe44a47d31181798df3
 MISC metadata.xml 331 BLAKE2B ba0b05cb789e40b1d187da575992af91d6dba5449a95082c2a31d8f26cd1026f0ec8b76359007afd025c6fa9fdc21684b39a69f4e1ca4d04596c4a8705d76f45 SHA512 ac8ec99d3d1d0ede79bbdad728b12cc9a9dcc20347beb53d1973fcb99445e630f71afe56d86ddd41f735d699f30f415accc035becd0a402c3575750087aee1de
diff --git a/games-puzzle/toppler/files/toppler-1.1.6-fix-docdir.patch b/games-puzzle/toppler/files/toppler-1.1.6-fix-docdir.patch
new file mode 100644
index 000000000000..410e43dec30d
--- /dev/null
+++ b/games-puzzle/toppler/files/toppler-1.1.6-fix-docdir.patch
@@ -0,0 +1,20 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -33,16 +33,14 @@ toppler_SOURCES =                  \
+   txtsys.cc        txtsys.h        \
+   qnxicon.c
+ 
+-docdir = $(datadir)/doc
+ pixmapsdir = $(datadir)/pixmaps
+ applicationsdir = $(datadir)/applications
+-pkgdocdir = $(docdir)/$(PACKAGE)
+ pkglocalstatedir = $(localstatedir)/$(PACKAGE)
+ 
+ dist_pixmaps_DATA = $(PACKAGE).xpm
+ applications_DATA = $(PACKAGE).desktop
+ dist_man_MANS = toppler.6
+-dist_pkgdoc_DATA = AUTHORS COPYING ChangeLog NEWS README
++dist_doc_DATA = AUTHORS COPYING ChangeLog NEWS README
+ dist_pkgdata_DATA = \
+   toppler.dat toppler.ogg
+ 
diff --git a/games-puzzle/toppler/files/toppler-1.1.6-use-gamestat-group.patch b/games-puzzle/toppler/files/toppler-1.1.6-use-gamestat-group.patch
new file mode 100644
index 000000000000..9de870deafcc
--- /dev/null
+++ b/games-puzzle/toppler/files/toppler-1.1.6-use-gamestat-group.patch
@@ -0,0 +1,16 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -55,11 +55,11 @@ EXTRA_DIST = \
+   toppler.qpg
+ 
+ install-exec-hook:
+-	-chgrp games $(DESTDIR)$(bindir)/toppler
++	-chgrp gamestat $(DESTDIR)$(bindir)/toppler
+ 	-chmod 2755 $(DESTDIR)$(bindir)/toppler
+ 
+ install-data-hook:
+-	-chgrp games $(DESTDIR)$(pkglocalstatedir)/$(PACKAGE).hsc
++	-chgrp gamestat $(DESTDIR)$(pkglocalstatedir)/$(PACKAGE).hsc
+ 	-chmod 0664 $(DESTDIR)$(pkglocalstatedir)/$(PACKAGE).hsc
+ 
+ abs_builddir = @abs_builddir@
diff --git a/games-puzzle/toppler/toppler-1.1.6-r1.ebuild b/games-puzzle/toppler/toppler-1.1.6-r1.ebuild
deleted file mode 100644
index 98307d76c751..000000000000
--- a/games-puzzle/toppler/toppler-1.1.6-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Reimplementation of Nebulous using SDL"
-HOMEPAGE="http://toppler.sourceforge.net/"
-SRC_URI="mirror://sourceforge/toppler/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	media-libs/libsdl[video]
-	media-libs/sdl-mixer[vorbis]
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure() {
-	econf $(use_enable nls)
-}
diff --git a/games-puzzle/toppler/toppler-1.1.6-r2.ebuild b/games-puzzle/toppler/toppler-1.1.6-r2.ebuild
new file mode 100644
index 000000000000..08ec6d310bb3
--- /dev/null
+++ b/games-puzzle/toppler/toppler-1.1.6-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Reimplementation of Nebulous using SDL"
+HOMEPAGE="http://toppler.sourceforge.net/"
+SRC_URI="mirror://sourceforge/toppler/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="acct-group/gamestat
+	media-libs/libsdl[joystick,video]
+	media-libs/sdl-mixer[vorbis]
+	sys-libs/zlib
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-fix-docdir.patch
+	"${FILESDIR}"/${P}-use-gamestat-group.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}