version bump

(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

6 files changed, 123 insertions, 125 deletions

diff --git a/games-arcade/berusky/ChangeLog b/games-arcade/berusky/ChangeLog
index ed362766571c..10817a625412 100644
--- a/games-arcade/berusky/ChangeLog
+++ b/games-arcade/berusky/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-arcade/berusky
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/berusky/ChangeLog,v 1.7 2012/08/04 09:50:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/berusky/ChangeLog,v 1.8 2012/11/15 22:46:06 mr_bones_ Exp $
+
+*berusky-1.5.2 (15 Nov 2012)
+
+  15 Nov 2012; Michael Sterrett <mr_bones_@gentoo.org> +berusky-1.5.2.ebuild,
+  +files/berusky-1.5.2-gentoo.patch, -berusky-1.1.ebuild,
+  -files/berusky-1.1-gentoo.patch, -files/berusky-1.1-ovflfix.patch:
+  version bump
 
   04 Aug 2012; Agostino Sarubbo <ago@gentoo.org> berusky-1.4.ebuild:
   Stable for amd64, wrt bug #426750
@@ -29,4 +36,3 @@
   28 Aug 2007; Tupone Alfredo <tupone@gentoo.org>
   +files/berusky-1.1-gentoo.patch, +metadata.xml, +berusky-1.1.ebuild:
   New package, requested via bug #180372 by Matija Suklje
-
diff --git a/games-arcade/berusky/berusky-1.1.ebuild b/games-arcade/berusky/berusky-1.1.ebuild
deleted file mode 100644
index be43c5d5c1bb..000000000000
--- a/games-arcade/berusky/berusky-1.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/berusky/berusky-1.1.ebuild,v 1.6 2010/10/27 15:56:56 mr_bones_ Exp $
-
-EAPI=2
-inherit autotools eutils games
-
-DATAFILE=${PN}-data-1.0
-DESCRIPTION="free logic game based on an ancient puzzle named Sokoban."
-HOMEPAGE="http://www.anakreon.cz/en/Berusky.htm"
-SRC_URI="http://www.anakreon.cz/download/${PN}/tar.gz/${P}.tar.gz
-	http://www.anakreon.cz/download/${PN}/tar.gz/${DATAFILE}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]"
-
-src_prepare() {
-	mv ../${DATAFILE}/{berusky.ini,GameData,Graphics,Levels} . \
-		|| die "failed moving data"
-	epatch "${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-ovflfix.patch
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
-		-e "s:@GENTOO_BINDIR@:${GAMES_BINDIR}:" \
-		src/defines.h berusky.ini \
-		|| die "sed for patching path failed"
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README TODO
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r berusky.ini GameData Graphics Levels \
-		|| die "failed installing data"
-	make_desktop_entry ${PN}
-	prepgamesdirs
-}
diff --git a/games-arcade/berusky/berusky-1.5.2.ebuild b/games-arcade/berusky/berusky-1.5.2.ebuild
new file mode 100644
index 000000000000..08c3b0dcf18c
--- /dev/null
+++ b/games-arcade/berusky/berusky-1.5.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/berusky/berusky-1.5.2.ebuild,v 1.1 2012/11/15 22:46:06 mr_bones_ Exp $
+
+EAPI=4
+inherit autotools eutils games
+
+DATAFILE=${PN}-data-${PV}
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libsdl[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
+	eautoreconf
+}
+
+src_install() {
+	default
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r berusky.ini GameData Graphics Levels || die
+	make_desktop_entry ${PN}
+	prepgamesdirs
+}
diff --git a/games-arcade/berusky/files/berusky-1.1-gentoo.patch b/games-arcade/berusky/files/berusky-1.1-gentoo.patch
deleted file mode 100644
index 7a502142d496..000000000000
--- a/games-arcade/berusky/files/berusky-1.1-gentoo.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- src/defines.h.old	2007-08-28 15:40:15.000000000 +0200
-+++ src/defines.h	2007-08-28 15:41:24.000000000 +0200
-@@ -382,7 +382,7 @@
- 
- #define INI_USER_DIRECTORY "~/.berusky"
- #define INI_USER_LEVELS    "~/.berusky/User"
--#define INI_FILE_GLOBAL    "/var/games/berusky/berusky.ini"
-+#define INI_FILE_GLOBAL    "@GENTOO_DATADIR@/berusky.ini"
- #define INI_FILE_USER      "~/.berusky/berusky.ini"
- #define INI_FILE_LOCAL     "./berusky.ini"
- 
---- berusky.ini.old	2007-08-28 15:57:56.000000000 +0200
-+++ berusky.ini	2007-08-28 15:59:07.000000000 +0200
-@@ -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)
---- Makefile.am.old	2007-08-28 17:12:18.000000000 +0200
-+++ Makefile.am	2007-08-28 17:12:52.000000000 +0200
-@@ -5,8 +5,7 @@
- 
- SUBDIRS = po src data
- 
--beruskydocdir = ${prefix}/doc/berusky
--beruskydoc_DATA = \
-+EXTRA_DIST = \
- 	README\
- 	COPYING\
- 	AUTHORS\
-@@ -15,8 +14,6 @@
- 	NEWS\
- 	TODO
- 
--EXTRA_DIST = $(beruskydoc_DATA)
--
- 
- 
- # Copy all the spec files. Of cource, only one is actually used.
---- data/Makefile.am.old	2007-08-28 17:22:45.000000000 +0200
-+++ data/Makefile.am	2007-08-28 17:23:09.000000000 +0200
-@@ -4,10 +4,6 @@
- ## 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 = \
-+EXTRA_DIST = \
- 	berusky-data.spec\
- 	berusky.spec
--
--EXTRA_DIST = $(berusky_data_DATA)
diff --git a/games-arcade/berusky/files/berusky-1.1-ovflfix.patch b/games-arcade/berusky/files/berusky-1.1-ovflfix.patch
deleted file mode 100644
index 3c5cb43545eb..000000000000
--- a/games-arcade/berusky/files/berusky-1.1-ovflfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/editor.cpp.old	2010-10-27 10:33:00.000000000 +0200
-+++ src/editor.cpp	2010-10-27 10:33:21.000000000 +0200
-@@ -1606,7 +1606,7 @@
-   
-   va_list   arguments;
-   va_start(arguments,p_text);
--  vsnprintf(output_lines[1]+2,CONSOLE_MAX_INPUT_LINE,p_text,arguments);
-+  vsnprintf(output_lines[1]+2,CONSOLE_MAX_INPUT_LINE-2,p_text,arguments);
-   va_end(arguments);  
-   output_lines[1][0] = '*';
-   output_lines[1][1] = ' ';
diff --git a/games-arcade/berusky/files/berusky-1.5.2-gentoo.patch b/games-arcade/berusky/files/berusky-1.5.2-gentoo.patch
new file mode 100644
index 000000000000..a0e961f0bce2
--- /dev/null
+++ b/games-arcade/berusky/files/berusky-1.5.2-gentoo.patch
@@ -0,0 +1,73 @@
+diff -ru berusky-1.5.2.orig/Makefile.am berusky-1.5.2/Makefile.am
+--- berusky-1.5.2.orig/Makefile.am	2012-05-17 06:30:00.000000000 -0400
++++ berusky-1.5.2/Makefile.am	2012-11-15 17:26:23.271928805 -0500
+@@ -5,8 +5,7 @@
+ 
+ SUBDIRS = po src data
+ 
+-beruskydocdir = ${prefix}/doc/berusky
+-beruskydoc_DATA = \
++EXTRA_DIST = \
+ 	README\
+ 	COPYING\
+ 	AUTHORS\
+@@ -15,8 +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 \
+diff -ru berusky-1.5.2.orig/data/Makefile.am berusky-1.5.2/data/Makefile.am
+--- berusky-1.5.2.orig/data/Makefile.am	2012-05-17 06:30:00.000000000 -0400
++++ berusky-1.5.2/data/Makefile.am	2012-11-15 17:27:12.966230390 -0500
+@@ -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)
+diff -ru berusky-1.5.2.orig/data/berusky.ini berusky-1.5.2/data/berusky.ini
+--- berusky-1.5.2.orig/data/berusky.ini	2012-05-17 06:30:00.000000000 -0400
++++ berusky-1.5.2/data/berusky.ini	2012-11-15 17:27:52.708872231 -0500
+@@ -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)
+diff -ru berusky-1.5.2.orig/src/defines.h berusky-1.5.2/src/defines.h
+--- berusky-1.5.2.orig/src/defines.h	2012-09-22 15:21:33.000000000 -0400
++++ berusky-1.5.2/src/defines.h	2012-11-15 17:28:33.043493961 -0500
+@@ -445,7 +445,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