gentoo resync : 16.04.2018

4 files changed, 34 insertions, 134 deletions

diff --git a/games-arcade/berusky/Manifest b/games-arcade/berusky/Manifest
index f2bdfce0867b..2a96470e7f2e 100644
--- a/games-arcade/berusky/Manifest
+++ b/games-arcade/berusky/Manifest
@@ -1,6 +1,5 @@
-AUX berusky-1.7.1-gentoo.patch 1828 BLAKE2B 4b3219c819127a12a7adebb00633107ed5b398d847602b242dc95a10a94f538f37b15c9e31c233277e502908d6995fa87311b8b5bc18dc1e3f703c544881e48e SHA512 7763f361765238190fc5063d550fc119e054b6061fe380b01640970c08bb906302db7150bb5dc818b27094fa4c9292c5f71ba9782e0c3b5942aee1ea30b7ebc4
 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.ebuild 1390 BLAKE2B 293e711dbf327f12b989291a70009339284cc3fafa630c7d5bb437b600a037ffc5a0b2318816de98c4489da136ba0936ef9c35876e3d81f71b2733ae7a96b252 SHA512 351de112f5f0202818357f7b1641b5ba4df72cc76c5829d2616a1f92faf42ab8e531211a535be9e78fe6799c80944b73ff084b646fd4c61002440e5911599797
+EBUILD berusky-1.7.1-r1.ebuild 744 BLAKE2B 0175d17f9d04d05ac36b8d646788509e358f663312a1001160a36c8d30673d026fa55e55bfb067a8b71b3037579eaf9aa4aa200e714f100c4156552f84cdb83c SHA512 40031b87dd26eacdd5180709eb60e22cd3a04a8246b23e889163c550b735e8e2307d5ee98a14ebdb875e6c33bc7e8f138b113bb325a119c362eb37f97a745cf9
 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-r1.ebuild
new file mode 100644
index 000000000000..d56b0203f7d5
--- /dev/null
+++ b/games-arcade/berusky/berusky-1.7.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop gnome2
+
+DATAFILE="${PN}-data-1.7"
+DESCRIPTION="Free logic game based on an ancient puzzle named Sokoban"
+HOMEPAGE="http://anakreon.cz/?q=node/1"
+SRC_URI="http://www.anakreon.cz/download/${P}.tar.gz
+	http://www.anakreon.cz/download/${DATAFILE}.tar.gz
+	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png"
+
+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
+"
+
+src_install() {
+	gnome2_src_install
+	rm -rf "${ED}"/usr/doc
+	doicon -s 32 "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN}
+}
diff --git a/games-arcade/berusky/berusky-1.7.1.ebuild b/games-arcade/berusky/berusky-1.7.1.ebuild
deleted file mode 100644
index 93f816e6bc87..000000000000
--- a/games-arcade/berusky/berusky-1.7.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils gnome2-utils games
-
-DATAFILE=${PN}-data-1.7
-DESCRIPTION="free logic game based on an ancient puzzle named Sokoban"
-HOMEPAGE="http://anakreon.cz/?q=node/1"
-SRC_URI="http://www.anakreon.cz/download/${P}.tar.gz
-	http://www.anakreon.cz/download/${DATAFILE}.tar.gz
-	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png"
-
-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"
-
-src_prepare() {
-	mv ../${DATAFILE}/{berusky.ini,GameData,Graphics,Levels} . || die
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
-		-e "s:@GENTOO_BINDIR@:${GAMES_BINDIR}:" \
-		src/defines.h berusky.ini \
-		|| die
-	sed -i \
-		-e "/AC_INIT/s/configure.in/${PN}, ${PV}/" \
-		configure.in || die
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r berusky.ini GameData Graphics Levels
-	doicon -s 32 "${DISTDIR}"/${PN}.png
-	make_desktop_entry ${PN}
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-arcade/berusky/files/berusky-1.7.1-gentoo.patch b/games-arcade/berusky/files/berusky-1.7.1-gentoo.patch
deleted file mode 100644
index f26c233c39e0..000000000000
--- a/games-arcade/berusky/files/berusky-1.7.1-gentoo.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- Makefile.am
-+++ 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 \
---- data/Makefile.am
-+++ 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)
---- berusky.ini
-+++ berusky.ini
-@@ -1,9 +1,9 @@
- # Configuration for berusky game
- 
- # Game data location
--level_data = /usr/share/berusky/Levels
--game_data = /usr/share/berusky/GameData
--graphics_data = /usr/share/berusky/Graphics
-+level_data = @GENTOO_DATADIR@/Levels
-+game_data = @GENTOO_DATADIR@/GameData
-+graphics_data = @GENTOO_DATADIR@/Graphics
- 
- # Graphics settings for game and editor
- # game runs in 640x480
-@@ -17,7 +17,7 @@
- 
- # Game binary & tmp dir
- # they're used by editor for "run level" command
--game_binary = /usr/bin/berusky
-+game_binary = @GENTOO_BINDIR@/berusky
- tmp_data = /var/tmp
- 
- # Dir for users levels (it's the default level dir for level editor)
---- src/defines.h
-+++ 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    "@GENTOO_DATADIR@/"INI_FILE_NAME
- #define INI_FILE_USER      "~/.berusky/"INI_FILE_NAME
- #define INI_FILE_LOCAL     "./"INI_FILE_NAME
- #elif WINDOWS