[gentoo-commits] repo/gentoo:master commit in: games-arcade/berusky/, games-arcade/berusky/files/

[Sam James]

commit:     689665a811a72189bcb6ea55363097db738c9810
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 19:12:37 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 19:13:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689665a8

games-arcade/berusky: install data files again

This was lost a few years ago in the games.eclass porting. Only now did
somebody notice!

Closes: https://bugs.gentoo.org/785259
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...sky-1.7.1-r1.ebuild => berusky-1.7.1-r2.ebuild} | 31 ++++++++++----
 .../berusky/files/berusky-1.7.1-r2-gentoo.patch    | 47 ++++++++++++++++++++++
 2 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/games-arcade/berusky/berusky-1.7.1-r1.ebuild b/games-arcade/berusky/berusky-1.7.1-r2.ebuild
similarity index 62%
rename from games-arcade/berusky/berusky-1.7.1-r1.ebuild
rename to games-arcade/berusky/berusky-1.7.1-r2.ebuild
index 57077ecfc39..66d347e826c 100644
--- a/games-arcade/berusky/berusky-1.7.1-r1.ebuild
+++ b/games-arcade/berusky/berusky-1.7.1-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit desktop gnome2
 
 DATAFILE="${PN}-data-1.7"
@@ -14,20 +15,36 @@ SRC_URI="https://www.anakreon.cz/download/${P}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	media-libs/libsdl[X,video]
 	media-libs/sdl-image[png]
 	x11-libs/gtk+:2
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.1-r1-gentoo.patch
+)
+
+src_prepare() {
+	mv ../${DATAFILE}/{berusky.ini,GameData,Graphics,Levels} . || die
+
+	default
+}
 
 src_install() {
 	gnome2_src_install
-	rm -rf "${ED}"/usr/doc
+
+	rm -rf "${ED}"/usr/doc || die
+
+	insinto /usr/share/${PN}
+	doins -r GameData Graphics Levels
+
+	insinto /var/lib/${PN}
+	doins berusky.ini
+
 	doicon -s 32 "${DISTDIR}"/${PN}.png
 	make_desktop_entry ${PN}
 }

diff --git a/games-arcade/berusky/files/berusky-1.7.1-r2-gentoo.patch b/games-arcade/berusky/files/berusky-1.7.1-r2-gentoo.patch
new file mode 100644
index 00000000000..6fd1381ad2a
--- /dev/null
+++ b/games-arcade/berusky/files/berusky-1.7.1-r2-gentoo.patch
@@ -0,0 +1,47 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,8 +5,7 @@
+ 
+ SUBDIRS = po src data
+ 
+-beruskydocdir = ${prefix}/doc/berusky
+-beruskydoc_DATA = \
++EXTRA_DIST = \
+ 	README\
+ 	COPYING\
+ 	AUTHORS\
+@@ -15,10 +14,6 @@
+ 	NEWS\
+ 	TODO
+ 
+-EXTRA_DIST = $(beruskydoc_DATA)
+-
+-
+-
+ # Copy all the spec files. Of cource, only one is actually used.
+ dist-hook:
+ 	for specfile in *.spec; do \
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -3,10 +3,3 @@
+ ## Created by Anjuta - will be overwritten
+ ## If you don't want it to overwrite it,
+ ## 	Please disable it in the Anjuta project configuration
+-
+-berusky_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/@PACKAGE@
+-
+-berusky_data_DATA = \
+-	berusky.ini
+-
+-EXTRA_DIST = $(berusky_data_DATA)
+--- a/src/defines.h
++++ b/src/defines.h
+@@ -446,7 +446,7 @@
+ #define INI_USER_DIRECTORY "~/.berusky"
+ #define INI_USER_LEVELS    "~/.berusky/User"
+ #define INI_USER_PROFILES  "~/.berusky/Profiles"
+-#define INI_FILE_GLOBAL    "/var/games/berusky/"INI_FILE_NAME
++#define INI_FILE_GLOBAL    "/var/lib/berusky/"INI_FILE_NAME
+ #define INI_FILE_USER      "~/.berusky/"INI_FILE_NAME
+ #define INI_FILE_LOCAL     "./"INI_FILE_NAME
+ #elif WINDOWS