gentoo resync : 28.04.2021

3 files changed, 73 insertions, 8 deletions

diff --git a/games-arcade/berusky/Manifest b/games-arcade/berusky/Manifest
index 4829f249da2f..8c1081673b4e 100644
--- a/games-arcade/berusky/Manifest
+++ b/games-arcade/berusky/Manifest
@@ -1,5 +1,6 @@
+AUX berusky-1.7.1-r2-gentoo.patch 1162 BLAKE2B 86c6baa7ea3355e1681c044ed167a378d6ae07b1cfd5b5740fc3ebb829bd721777ab52afd11b7f5d19e21f5ae48915763b711354e423d286e0ed0a6e2f665a24 SHA512 a5ce4b43a82892ba0a131ab02a5b04356930c6898e85e71841e64cd874fec82dcff7f337bf393f9a9a0274c233701b1988b117e0e8b339d9439a0434b6d7d12e
 DIST berusky-1.7.1.tar.gz 483794 BLAKE2B 8e1d6f6c2c47d72fdba73506f8d3ea231649b4eb4fae3e663e9111ed99fbf300b2a160573d54781f9dcb3f9bf62bcb57634d0b3e8abb77f8baffc70254b4640e SHA512 0b0c4d736bfd9b0b62accf11d932271e355cbcbf911e35adb0ccd0bb1b45e06c392d60830bddef04a24689ccfcee7302f2653f6357474ccceba4fd66c44d4383
 DIST berusky-data-1.7.tar.gz 5366663 BLAKE2B 88dbb0063be83b2cc60208e9e5d95ee3014ad381ba1a070d5e781b527324d9d1d4d8a8a56da64e76672995e09f9b57630cd7ba282e2da543dbc6773628362403 SHA512 1ccae352b8033df0dd8fe6f09b1daa83b0e25a67999d41a0f21019014620825551a4e22827f96bc28ccdf0958df85c9f3cfd2e8f1e83dd7edac5b0479413d438
 DIST berusky.png 1714 BLAKE2B 31c8c9c820fa030c5329c3a990bd2430797794e460c22301bb8f7f9577a4d5cfaae23e1ba0640389ffea7dad0146afd5d20ff2ca0fa3d65085207af1a0f625df SHA512 a8a5f7f8dca8d686bc05239adda10673e937361514b1aea07dc9fe66f2e009ae7c20b75ab63fd4db8ed206026a009d8620af3471bbb966b5e9b576ce89f66e54
-EBUILD berusky-1.7.1-r1.ebuild 745 BLAKE2B 53ac8329a31131a346d61477548a02e411a3dce90da4a83652cb6b6ea2e4b018671e6856f48dbea5964e477db5646fd4aee7f2be099dcf8fd0972522ccf86a81 SHA512 a19aa6b233b50c16fc849b283758b1fed95d4f27b61b91cdee801f3427155e69aed4dd858b91b054fa41aed156c538e6ae80741a2eda208eb75fc1ccf69aea19
+EBUILD berusky-1.7.1-r2.ebuild 1013 BLAKE2B 7e5e131aef673f489d2320c14fdd3c6f3eb4bf5ec375ab09d52eabc509f2b7a1d5d136b6c301535db16362ffaeed6a8cd7df60c8d4b9acca22d3d9a7fd4404db SHA512 096423bc6de331213caea01bb58ebb4aff7cf1de69a05f2979b784c3d4b283514d143acf1af5cb9556d33c508c3f1a63aa2785026e80efc8521fa3b42c847846
 MISC metadata.xml 763 BLAKE2B 8aca8e43b681e917a1746a8e8932dee1aeaf0485f32a5e253874c28765b85e90c7a13c722d1c959a12ab5a419936df968f6e5d99fe54d6c4b432a8ae09441f4b SHA512 07baeac7dc22893b3e6bdf8c7ab687ba05ea622bd044e92d364d32358b2961bced3ea1263fb3434cb4ca386d9f90818834a5a3bc8d016cdc69a06e248d694ee1
diff --git a/games-arcade/berusky/berusky-1.7.1-r1.ebuild b/games-arcade/berusky/berusky-1.7.1-r2.ebuild
index 57077ecfc396..66d347e826c9 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 000000000000..6fd1381ad2ac
--- /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