gentoo resync : 04.05.2021

4 files changed, 96 insertions, 54 deletions

diff --git a/games-arcade/burgerspace/Manifest b/games-arcade/burgerspace/Manifest
index 6d89612a99ad..65690163381d 100644
--- a/games-arcade/burgerspace/Manifest
+++ b/games-arcade/burgerspace/Manifest
@@ -1,3 +1,4 @@
-DIST burgerspace-1.9.2.tar.gz 505314 BLAKE2B 8a6de753e41de791fdc3a2ceb106f193da3de6c04c80c19b9f84cb03f569982ae8f3fe2e5541c1c389e16085d51867733d4911f04266497420eafd170d085095 SHA512 b2af53d6fcf1d52164870147aa8a5b08941ecb62f3d9bbce5c2872885923057481c21bc34f1e19b8aeb8a76acadd9a11c11fa7b6304438610e8a23e043b7deee
-EBUILD burgerspace-1.9.2-r1.ebuild 1072 BLAKE2B 6fe0998fa8432b88aabb3a678f1896663d04072ebba2898f004ba53367a69fe3fc07da253204b49ce26ff21ad180625e0969a5f3baa21b6399e4514dabb80b55 SHA512 0df0d428714509daeb313ba90170a84187df0a076ffb3e3453ff311d949a1a437860c20d6a8bd65be402196c9e23404b6e6cc3a735b48d06e1a1714bacb41a7d
+AUX burgerspace-1.9.3-autotools.patch 1637 BLAKE2B e607d152b43d1fe19cbff8d6504a1408deea1eb65a84f4e6054abb3fbe39ce68381c8f0433ec4b86814920ef6feb6ce9e1054a58ea488ac797d4a67bf47a35b0 SHA512 d084a6fc21e8d8ff2141f4a2869ce22d93962f035317568bd93fcc9af544b44449d53e8edb91642cf9af81a3f8d64f4dc8a144fac8e9174feda884f684693a91
+DIST burgerspace-1.9.3.tar.gz 517492 BLAKE2B 6d3cf554580a1a370720f349ae71edab7228c18426d4ae39a8f5bb9177071204715e527beea52aa6b11b9112db5a168951d92b0de60189cfdb1882c85c79d1f2 SHA512 59629ca497a0a379858ba69bb444182f935b58be6554109fb9b309713bd6bde0d771e63858802f9153a4e46bbfe63b5edf58f857bb94ca337dbba89ff3c610cb
+EBUILD burgerspace-1.9.3.ebuild 667 BLAKE2B 2b3e8e1ac52adc8693e984480f38a04bcedbf35dfcbaabd24e73439db8c3f832e3e71e06755f874994ef94c58f71cec330cc69aae6321013f80071fe632a3c0b SHA512 e96c6d8d1ac0dbfba7ba31065e7f066e1107724942b034fe474931e0984fb0a8d5fa42649bd804b7276f78c77144ebbd5f1ee2da7cfe11e832c21d5657fee6df
 MISC metadata.xml 335 BLAKE2B 5b9037f7c7ada3f92d51b965d65b0f47af853b60c4409d1e04522485eeb3a3783f58c4e6e5cb1dfb759d27d09254fae5593f0d12947ae3eb286d7867a6b7ca99 SHA512 78b9833542c259f024f8041b1e26710f42ab792919970e8d5e73c8da539c74e62bec318f5ee18d09b26baee3c17bc49f14f3e70a1032da46acd587c934407cd4
diff --git a/games-arcade/burgerspace/burgerspace-1.9.2-r1.ebuild b/games-arcade/burgerspace/burgerspace-1.9.2-r1.ebuild
deleted file mode 100644
index 11de206aa181..000000000000
--- a/games-arcade/burgerspace/burgerspace-1.9.2-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Clone of the 1982 BurgerTime video game by Data East"
-HOMEPAGE="https://perso.b2b2c.ca/~sarrazip/dev/burgerspace.html"
-SRC_URI="https://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="network"
-RESTRICT="test" # doesn't really test anything
-
-RDEPEND=">=dev-games/flatzebra-0.1.6"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/^pkgsounddir/ s:sounds.*:\$(PACKAGE)/sounds:" \
-		-e "/^desktopentrydir/ s:=.*:=/usr/share/applications:" \
-		-e "/^pixmapdir/ s:=.*:=/usr/share/pixmaps:" \
-		src/Makefile.am \
-		|| die
-
-	sed -i \
-		-e "/Categories/s:Application;::" \
-		-e "/Icon/s:\..*::" \
-		-e "/Terminal/s:0:false:" \
-		src/burgerspace.desktop.in \
-		|| die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with network)
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	doman doc/${PN}.6
-	dodoc AUTHORS NEWS README THANKS
-}
diff --git a/games-arcade/burgerspace/burgerspace-1.9.3.ebuild b/games-arcade/burgerspace/burgerspace-1.9.3.ebuild
new file mode 100644
index 000000000000..8e1c711405ca
--- /dev/null
+++ b/games-arcade/burgerspace/burgerspace-1.9.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="Clone of the 1982 BurgerTime video game by Data East"
+HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/burgerspace.html"
+SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="network"
+RESTRICT="test" # doesn't really test anything
+
+RDEPEND=">=dev-games/flatzebra-0.1.7"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.9.3-autotools.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with network)
+}
diff --git a/games-arcade/burgerspace/files/burgerspace-1.9.3-autotools.patch b/games-arcade/burgerspace/files/burgerspace-1.9.3-autotools.patch
new file mode 100644
index 000000000000..cd7db7a1d73a
--- /dev/null
+++ b/games-arcade/burgerspace/files/burgerspace-1.9.3-autotools.patch
@@ -0,0 +1,62 @@
+* Install "doc/burgerspace-server.6" only when installing the server
+* Use "$datarootdir" for FDO specified paths
+  This is recommended by Debian, as $datadir could be specified to lie
+  on a different file system, whereas icons/desktop/pixmaps are specified
+  by freedesktop.org and are based on $datarootdir
+  -> https://blogs.gnome.org/hughsie/2014/06/16/datarootdir-v-s-datadir/
+* Do not install LICENSE
+  The fact that the source is licensed under the GPL doesn't require installing
+  the COPYING file along.
+* Nested sound files in "$pkgdatadir", i.e., $(datadir)/$(PACKAGE)
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,12 +2,13 @@
+ 
+ SUBDIRS = src
+ 
+-man_MANS = doc/burgerspace.6 doc/burgerspace-server.6
++man_MANS = doc/burgerspace.6
++if BUILD_NETWORK
++man_MANS += doc/burgerspace-server.6
++endif
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+ doc_DATA = \
+ 	AUTHORS \
+-	COPYING \
+ 	NEWS \
+ 	README \
+ 	THANKS
+@@ -17,6 +18,7 @@
+ 	$(RPMBUILD) -ta $(distdir).tar.gz
+ 
+ EXTRA_DIST = \
++	COPYING \
+ 	bootstrap \
+ 	autogen.sh \
+ 	$(PACKAGE).spec \
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -74,10 +74,10 @@
+ 	PKGSOUNDDIR=$(srcdir)/sounds ./$(PACKAGE)
+ 
+ 
+-desktopentrydir = $(datadir)/applications
++desktopentrydir = $(datarootdir)/applications
+ desktopentry_DATA = $(PACKAGE).desktop
+ 
+-pixmapdir = $(datadir)/pixmaps
++pixmapdir = $(datarootdir)/pixmaps
+ pixmap_DATA = images/$(PACKAGE).png
+ 
+ 
+@@ -193,7 +193,7 @@
+ 	images/digit8.xpm \
+ 	images/digit9.xpm
+ 
+-pkgsounddir = $(datadir)/sounds/$(PACKAGE)
++pkgsounddir = $(pkgdatadir)/sounds
+ pkgsound_DATA = \
+ 	sounds/ingredient-bounces.wav \
+ 	sounds/ingredient-in-plate.wav \