version bump

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

7 files changed, 128 insertions, 145 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/Manifest b/games-arcade/berusky/Manifest
index fd4c7241780d..cd5aedd8f58e 100644
--- a/games-arcade/berusky/Manifest
+++ b/games-arcade/berusky/Manifest
@@ -1,25 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX berusky-1.1-gentoo.patch 2013 SHA256 8aeda3d49e08e72658ce91438b20ffe2c11dc992ec8a8bf11083eafe2454cc4a SHA512 3f50660b3f861c330ad7c011f7417631f480ed12a1d9790fbd76f1235c5f18a1236a2c76f907441d97df4fc22eda7ba1faf1ffca30222378d45a6b97af14c190 WHIRLPOOL 27f1570509cd3ad9bb0e7339ea9e9896f66a452776a0797c4a160d60692f112c56d1a74da719ad0f626dae2fc4b46f90a34828c3074899e650093a022cca24f8
-AUX berusky-1.1-ovflfix.patch 425 SHA256 85611c1110eb4ffb70dbfd4ebe0f3be7831695b06fa62648259c3d3caffacc20 SHA512 fec5edbb26412335ff68cfaba1d9e4c7a68b699cfa2c3be9d396d6d0ea39e29e2e4f2ac46b542b700bdcf751fdb33dbdc19ccfae438a15eb043a06bb695b7cef WHIRLPOOL 7239e16b7182a16760a71b2d60359630ea365b76e8b7148e4097b90c9d553f24e439c59fde5e93241c5064585fa98d450c79747d3b22dee1f2866c7976826464
 AUX berusky-1.4-gentoo.patch 1794 SHA256 9be49fe0a5ce44913c9a1d2946d366d6d6b33458acd33dc3fa970dd18fe7434d SHA512 8fd65c16db736e486877d530322b624a8ac39d1af33789fac33bd7fecf3d7c1fd18a59662c0d0f5a0a801409948e84c695ade113190d6199ad66d1f53dcca5e5 WHIRLPOOL 3fc70e92bf373bc4dcf692b2d7a3158b76a7401ec9eebf5c564d57a315065cc7f659926a3eb87158ccfb76aaebaa2ee9af9fee73d7c9e077195a2510606c1aae
-DIST berusky-1.1.tar.gz 408954 SHA256 8c38d0309af2d007bf2c1486e63680cc93f5ca2b35b7806807d36cbadeada51f
+AUX berusky-1.5.2-gentoo.patch 2541 SHA256 f22137322d98552e84bbe8b3afabba3efb9d16ef226eb1ecbbf4befc54b086b3 SHA512 48ddc8c0756ba1b6fb546574ea7520f1bf90a0abd3cde48f3a593c77869e35c6f1c6081de0816304d70f1c2a69113c79709ab79301e2f5d4d8aedd532dcb35ca WHIRLPOOL c82275e9c5c0322e97c064a2acfce804fdfa04da98e1a21e390420ab6f62547e5620ff84bf7f046ca4a892238530f719fc8ceeaf4167bd6bab6e5f2a5f53bbe6
 DIST berusky-1.4.tar.gz 452548 SHA256 173cdeac878dd36737093a2a2b1160e9dbb96ebff80ee0ae4d1eb13349902f3f SHA512 4aa8edc0d0b16b71ba13b96f32b344df3b0c98fc05bbf8a16c34ea7c92f8586362aec51e4c20d5d6974f230a7fc6e126236eeb0e759161999cf14d20c8b5076d WHIRLPOOL 26d888c426d1a8c5bf7e8ebbbd01f5ec3cd66491c7f1fc71b4459b4bf0f3e4c4abb6c6b5a6d96d1e8ef22a44a8fafe5f68711b261f2c1a729de6d499840c6707
-DIST berusky-data-1.0.tar.gz 957658 SHA256 72469d6c2869d6220f5ffb058fe59a27657478a9a37a5aeec76fab15eeeb05ed
+DIST berusky-1.5.2.tar.gz 469519 SHA256 c3abf2e134eaa594ca150528a60f9b4c53b26084876e36947713c788c30bdea0 SHA512 017a884e4885b00c764dc159be0bf91e9006c7d02b5ce4c5541de4ac521398337efe8afbe4cb1cc9aa429baa5315efb3ba058fbba89453fa747758433033ea3d WHIRLPOOL a56eab0dd87289f7af8254dc68291eb8ee94cb7b6ffccb26a8f50c99e133a8c3f685a758726ca01d48c0ca5f677dc0d460b906d89f333282f99a986337a8f7ac
 DIST berusky-data-1.4.tar.gz 964700 SHA256 3639f6b08cbbbbb176339b80e962878fb9666be5a1b28f39c6dbc721d4378381 SHA512 e889736244d70d3ac3924130322e25d2893eb3f158d3c609f69a755ffaecb1220157f6ebeda40b3ec00e1cfd1e91fbe73bc49d842de4b78fe59278da7acf4eff WHIRLPOOL b82ef84b3f48960764683e97ac87fbd6395e3a5b00519a4fee78a16a44293d6435b2f6f3ee85e8d7fff19f0804790381e6f77efe152c30577be88c55237b9bfe
-EBUILD berusky-1.1.ebuild 1282 SHA256 bccc42e0a21703d58fda4f8ca01af461e49ac8aaabe2e7a175e57eadad3edbc1 SHA512 005f478dcbc599c7db2421a2036dccce93bb7ed47ce32e6299b615077e5a5b60f55189e7dc076479673cbfa8b74a040c007d27dfba7aebe3d20a8ac2d7cc5b2e WHIRLPOOL c339ac406adbb7b0ce0f0d8fcb56fb7dacce16234ed169aac9e68211d2bbf240ca78d5f4640615c0dcff0aea965f0829d581911d669bff202c59ed5127d25f8d
+DIST berusky-data-1.5.2.tar.gz 5284651 SHA256 9e17ecb01716805d4c77e1eee2e13eb3ea64c387c34996a85cf7c29e9cd17a07 SHA512 e82ac0b11704e408145975e663cf7eb5875aae8e8853df8666d5b8cbb8efa8cd27a894c2fedcc6b39a7d75f84343f9126736763c26e36ef967c15fd27051da3c WHIRLPOOL 893607381c6611f270cf183d81639403295f16469100cddcda809d554d7a1b50595505361350b80be0ed45f66cadc18999fa3b9ba1fbf8311f29b57310a87101
 EBUILD berusky-1.4.ebuild 1206 SHA256 130e7e78b9b381444ad0fa36b46160f5d5371b6574c56b4944a49c3cd05dda96 SHA512 3f67a3281da41849a7754613abad0f5db16fbdf9ba068d22bd3389202cfb3b2d6c9da771668b931879a230f6a8aa19e0b8c71296053aa3411d4f38be421cea88 WHIRLPOOL 69c5c42a3ace3444100ebbef4195c2c2bc13727ccfcab3aad9aa5607dcb87b07175c0f6985d578bb9509d692b83d75cf8c78ec71dc01c087a78f3cbe4dafa5a5
-MISC ChangeLog 1179 SHA256 4facb0fc7b91224454428cec7bf8ba883b7630fb0bad6c1389b686ca72ac6e3f SHA512 541228a196acd948981f47d96872debd7b98d3170488ed0ad40cbcabdc6ffc114e67655bf176b32e51252ad3194f79ed7aa84fc76d0e316d0af5a838927a3434 WHIRLPOOL 5a40c02c555ca585ee0fd4e1a4e32e97a969148d1dd1646b5ffe4f01a109c9fd8f47ee0a8232628b4f68371a54e8108d0a8fc2035f8b629478804fc57c473ad4
+EBUILD berusky-1.5.2.ebuild 1127 SHA256 991bbd4f5a9ab61df752c0de46c6ec72148f57543d0384915908262f27d3d313 SHA512 3a231d578b0b26444cd25b30fcfef1e6d0caf7ac29b3b690918245b5f1e1a9c4ca75001e89a7dbf8ac5f50c358cbfa194bb906ebc43f9415f11b879b233390a2 WHIRLPOOL 556f1e4481ba8c729945faa9446c9ae4012686eedfe66783bd6ee0dc1949c6f8fe446642dc79f49d394c8d57be9d4dd368a559fa58f3ae349bde6f0030aa2fa1
+MISC ChangeLog 1435 SHA256 50e094084968c0ec747cfd534ca4932759cf79953bcf3fdcc3f1dd6f4cbd0eb1 SHA512 ae2c30338000c899f6b7ac54a10de3ac5da20b4a86b39df569c56eb70094539ba928024db0d63c9b724aecce9306323080bc59db2c6f3a9b677589ba96f89813 WHIRLPOOL bcce4e6c4439d80ea07146e63788f20d023a602c60d70cac1539b83bafc5ddf37e5bd08ffc298b97ffce1b6ef0fb4f82ce04d1eb845aa4dfe25607b9b044d447
 MISC metadata.xml 672 SHA256 97661c874a1e9c0afac821eec64bf4cb0f3f1d48894231c66cfc346da4f5e4c4 SHA512 60398909f1538fb89dcc282511c3d43aa9cc9aee9c763a676c3b0070a85fdc227a6780b7005d6b178607ce7e2649c9094e30fec2cfac223da6d5ae8671414680 WHIRLPOOL 13667fd434c1e8cf128c8ef84a80128bce7ae7520e05249384213a816a6e7cbedb63e79467cac4c8e46256d7d7c0addc8f17e272a62a77133006bc073c8bbb74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCgAGBQJQHPBuAAoJEOTDgjZ80txdiN0IAKIY8S03BVuc7p8umrRKu5a/
-G13bkN4Mp8He5Q1gnUobRfAOzLezGAdUQh817XvesHRde+5WrqsTMpDUNZBWe8J4
-yVOwj9PPycMmwY5yn7xGqylISUfpJyG3zrDXYadP4K0grjFbiUIiJRPfFmSUSw95
-7467+fUUpZs/cFktwaL8Dcccuexj5WxS1CitufTNolUb9tc5lSd4uqsxYBkknbrB
-phPwTlzBPWb7pSx1HSSrf5w/hlTyLGf7x8q5b6LVjmUsZEUWsuG6OFogDzfVLnd8
-dTermTzeqPW/16mtYzSqkfZnTVrjxI/nIFM7l4jHqkdAp0TRI1XjMylBP/mtnMw=
-=oU81
------END PGP SIGNATURE-----
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