version bump (bug #533904)

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

5 files changed, 165 insertions, 3 deletions

diff --git a/games-arcade/rocksndiamonds/ChangeLog b/games-arcade/rocksndiamonds/ChangeLog
index fcd31285f2df..1d17a266ba20 100644
--- a/games-arcade/rocksndiamonds/ChangeLog
+++ b/games-arcade/rocksndiamonds/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-arcade/rocksndiamonds
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog,v 1.45 2012/08/24 08:31:56 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog,v 1.46 2014/12/31 21:19:46 mr_bones_ Exp $
+
+*rocksndiamonds-3.3.1.2 (31 Dec 2014)
+
+  31 Dec 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/rocksndiamonds-3.3.1.2-parallel-build.patch,
+  +files/rocksndiamonds-3.3.1.2-perms.patch, +rocksndiamonds-3.3.1.2.ebuild:
+  version bump (bug #533904)
 
   24 Aug 2012; Michael Sterrett <mr_bones_@gentoo.org>
   rocksndiamonds-3.3.0.1-r1.ebuild:
diff --git a/games-arcade/rocksndiamonds/Manifest b/games-arcade/rocksndiamonds/Manifest
index bb59de472de6..3775537bec03 100644
--- a/games-arcade/rocksndiamonds/Manifest
+++ b/games-arcade/rocksndiamonds/Manifest
@@ -1,5 +1,7 @@
 AUX rocksndiamonds-3.3.0.1-parallel-build.patch 392 SHA256 ba1bc3e33d6173d4bd245730d9691a1618afe5061949259c9f76c510f380bad4 SHA512 92db9fc99043fa38ac88bbd36879253da981fb3d461f1a66463250dd46bc462bacbf6b1221f8421de17ce24527940511c0ad7ebfcc1fdac3fe21b5a7f68bc7f9 WHIRLPOOL 857ee82615b253ade151da367d50a5e42bce41ea7caf4211b5af2b151d3bd79a76467c46401ad9383bf8d0a794c93ff144dcffa81e63a6daedc7e27b2f4d1f93
 AUX rocksndiamonds-3.3.0.1-perms.patch 1258 SHA256 56914fc689f21847eb7a382a8df5301a85562ec3bb1b59dcfd0c1bb0c9ac9c84 SHA512 b89ba59d29d88cfe10e9b16fa500b20d29677aa567469c644f57d10d2cb6dcf6009ef607cd5b1a9bb8aab36ec96f7293fc5b283bedc3013c6e74cc0486ee0196 WHIRLPOOL 3b4a3ec8d7dcd4b7af2bf510f4e16ec9e6e340b312f883258805511882e7af20e489a2bc5c10d38ffc43678b7a3acba195659443c0cf3d3ec3e30d129a7df3b8
+AUX rocksndiamonds-3.3.1.2-parallel-build.patch 582 SHA256 b7f0f24331d875d0b9e43fce1577b48647ad0485271b984064ec0b4ebac0fdfe SHA512 300e4cc6e21bb6d52b681b053cdb700298e04224545c6745a6c33d0a9bf1c9726cdc63f877fa6aeeca7b9b2e0c96f723f0d10c9d6fc141f56c6eaf31acd12cc3 WHIRLPOOL 8f063cb128b8f43b78235de5b4a820dad3119d5969ef1e9d98f35555ea84180e6cd9d76d87ac6ef007e7ee1c5f5c6e340e0c7ecbdcc95d058a4b95694eb91eca
+AUX rocksndiamonds-3.3.1.2-perms.patch 1258 SHA256 56914fc689f21847eb7a382a8df5301a85562ec3bb1b59dcfd0c1bb0c9ac9c84 SHA512 b89ba59d29d88cfe10e9b16fa500b20d29677aa567469c644f57d10d2cb6dcf6009ef607cd5b1a9bb8aab36ec96f7293fc5b283bedc3013c6e74cc0486ee0196 WHIRLPOOL 3b4a3ec8d7dcd4b7af2bf510f4e16ec9e6e340b312f883258805511882e7af20e489a2bc5c10d38ffc43678b7a3acba195659443c0cf3d3ec3e30d129a7df3b8
 DIST BD2K3-1.0.0.zip 4715324 SHA256 5fc5130c859e69d6907bff87e01ff2296d59f7376202a8aacc03e55f359fb351 SHA512 80f172584d2077a3ade0749790802ef9cecde75283d6b889e7d2fedf9b55fd1fd7f1f1fd5596b17d5b2a542172699a929ea626086e77d28fde11487440c43622 WHIRLPOOL fa172ee6d691be22211eb55e47425f13fc32b0c415216921a3f778e099da5a3baaccee4988bb5c9cf1fbb79a2c3af6bd81427e3235632c89d19ed21608976a46
 DIST Boulder_Dash_Dream-1.0.0.zip 10923437 SHA256 6f9dc48023830fbdc318d8f18013b5a7e84ab3c815ba566a4a2c46faeb65c969 SHA512 f2765f52653b4f9d6c4a6548076281f6749d08c2dfd220345bdc0058b94d51c49ef81acdc87ff71bc1b3f337f3cc6a1d08b9e5a02d6aaeaeac5d894f97ba3d8e WHIRLPOOL 6638737d61489dbe9df4b7e67f1c753fa6162d06fab2d5a36ed569e8e25dccfe9713d46be1a326dcadace895048c85c7ffd35e7caa23c6fc7107f6af2faf3f2c
 DIST Contributions-1.2.0.zip 9499312 SHA256 d533dc69cd136d2bb7d76d674ab087285799191e0a516320aba8ac2368ce6dd2 SHA512 463e629bd4f592e24a82d20f1f249cea9e266a7c370bb5b079add8daa125d1af69a69746b696dd92f89b90e50972c6b2ba007aab87beed4cd980c0c7bdb81920 WHIRLPOOL f99c6456caaf160e00b0dc2e5d9f59a47fa493cd479e33e1c443a35d61b80f4ec476cd7e5b25349976a7bd588bd792988849c16a4c6133783f14444b7b9fc888
@@ -11,6 +13,8 @@ DIST rockslevels-dx-1.0.tar.gz 211151 SHA256 23f1710710eef1dcd1c490670de16d2d58d
 DIST rockslevels-emc-1.0.tar.gz 3824268 SHA256 a04e554fb8b6d010c73e21de090f116dad6054e43e00edc80c59c71a8a1eaa0c SHA512 9abad888fa00bc305444367c5ab8ffdad95eaca22613573e44d5ecd93b1a9a1cbc931497c064002d90fd3174c4661d0b009ede7746b2fe8da0a00072303a1301 WHIRLPOOL d7ce616105621d9a7ee7f3c8406188ad9b0fdf01cd3d17339b8d350ebc5fdcfdc4eb78952198df045309999caca5fcff8c79deb01210437224960baf6bc611af
 DIST rockslevels-sp-1.0.tar.gz 373564 SHA256 770d75a5926bb924c6787a6f95ee9f7af743b629ea14005ab0375b57eb488f25 SHA512 2d44e9238a72846b9d4fbab90288aa3b23af4957ffe0d42d95c523fd22f3587572864b3fc0b277894d2f3f56d6eff52ea009e5b2d59aebc34163a1067662d729 WHIRLPOOL 9f3cf3b764b7a137591f287b55f4cab4918e03b0a7a663f7cbe658a280b181c161e53b0855d5bafa57f4072af470199eced2fb1bc98d13369dc373f46baf8205
 DIST rocksndiamonds-3.3.0.1.tar.gz 2494558 SHA256 974897f14136ecec91c7bdded8d904d74f2064a6c8a6c6c83f2f7111108747d3 SHA512 1b10444b2a739cbd7f229d98d2a8cfd50465ce2259af5954698f17e0e2c922eae7017f771e3ddcb1c4d5cf6a26aa82885bbe3a2369d8eae4f8f4101a3f43c9ce WHIRLPOOL 00f4e3d4f2fc06ff60dff02e920a806e3aa3473e1d87c61067a480540b3446031ac52c920f33dbc3bcf8f405d6c9c4c995013f44df6efaed58660c219aeefeb1
+DIST rocksndiamonds-3.3.1.2.tar.gz 2614904 SHA256 c117c20026299c6c935bd531ef9b0dc767731f600881d12ceb80c831483755f3 SHA512 b627e4a8e2f03dc380b5a111cc42f296b283e63b20e019f522a8a1431fe9c138eb0dc7aa0fa03dd843c3a93bcd0a90704e651f5a590cb7d4c3e3b46976125755 WHIRLPOOL 6c8d76747b8a0e254e649966b5e8f03ad12e6b15f0a3f4b98efe7df482db55ed4351d7c25d5f45b8b7d3098bf6f65c4bb2ac58ecaa66a6397532169fc7cb5bf4
 EBUILD rocksndiamonds-3.3.0.1-r1.ebuild 3356 SHA256 de312b9038e82c31a3cd510cd0fc2e5d870ae5c1a970c1f183e2b308f670a232 SHA512 9acb58fc11be674c9ecf905e3a6ebfa20757969eb9af89380865ccd66a892fec85406ce4b9b83f90a9f83855f24d5606449400ac289733f8b3aa0d127c1c360e WHIRLPOOL 9a2d65de1ef19446a19e33a01da3aa27de251d8c3be0b289abe70cd677fc553e5c3b4b811508d9a925580881d947e40881b264616d5302993cb233427178034b
-MISC ChangeLog 7194 SHA256 ab7dddb0cb636d216b99fbeef7cebb4846ed6abd80d9c647e6e1193025d27723 SHA512 e35875785e2327160c3710a27786050f90ba680b5bdb9617d50f5db312f1f102cf73f73e293e7025cf73329340ed39fe09d3b8dba8846e58c4bb9bb7d4d98364 WHIRLPOOL f57b5b19b301fdf6ce00cb0dbf07d733a89aad2a8950ea6cf52e9f29dc2ab5a76b295e804cfdfd0e22c1cd473ac1501dd3a074cdf63352958b42a0626b7ae979
+EBUILD rocksndiamonds-3.3.1.2.ebuild 3227 SHA256 8960adf124f9dd70f8816ca11ee9ea50631427b339efd8c7652e7f3211b14848 SHA512 bff20a4b1e759ec83b9feae6575795077cf936249638be0ce4e8c5c151c00d0c0b595833b6178c17bdf80b1e267dffd36b3dd451a130b30efa423fad68aa448e WHIRLPOOL aedea6e28f75167530aed2e12d34121987a5c459ebdc6938984e1baac5ee1bec91710c53191bdaf8a59e16f7642a1d5db92709bdb297be54416136a59ab3c1b7
+MISC ChangeLog 7449 SHA256 616513566c6fd700517593a9c7c0494ab7083e712c16255c424752db54a2c380 SHA512 115cfc12f6a3c1793c588492fa502c4766f90acf564d746e2ca5220922ab10651fed67a6359e41fdc75b81852bcee0fc7bdc0f5f37b3e8554284d1a3263da89b WHIRLPOOL fd8b343b8cd668aed29e305c799c4f703f4e6fdcb65cce06dcc6bbf43f532e5d2951e5c4d177edbdd6305e00fc136b1f9fb11d733868bc96e747000b8d28091b
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-parallel-build.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-parallel-build.patch
new file mode 100644
index 000000000000..0aa709652129
--- /dev/null
+++ b/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-parallel-build.patch
@@ -0,0 +1,12 @@
+diff -ru rocksndiamonds-3.3.1.2.orig/src/Makefile rocksndiamonds-3.3.1.2/src/Makefile
+--- rocksndiamonds-3.3.1.2.orig/src/Makefile	2013-11-24 08:05:56.000000000 -0500
++++ rocksndiamonds-3.3.1.2/src/Makefile	2014-12-31 15:47:37.539941795 -0500
+@@ -255,7 +255,7 @@
+ # build targets
+ # -----------------------------------------------------------------------------
+ 
+-all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir $(PROGNAME)
++all: $(PROGNAME)
+ 
+ $(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
+ 	$(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-perms.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-perms.patch
new file mode 100644
index 000000000000..65a06e6cdf77
--- /dev/null
+++ b/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-perms.patch
@@ -0,0 +1,29 @@
+diff -up rocksndiamonds-3.3.0.1/src/libgame/setup.c.CVE-2011-4606 rocksndiamonds-3.3.0.1/src/libgame/setup.c
+--- rocksndiamonds-3.3.0.1/src/libgame/setup.c.CVE-2011-4606	2011-12-12 14:28:30.083078680 -0500
++++ rocksndiamonds-3.3.0.1/src/libgame/setup.c	2011-12-12 14:34:36.758744753 -0500
+@@ -1293,11 +1293,14 @@ void sortTreeInfo(TreeInfo **node_first)
+ #define MODE_W_ALL		(S_IWUSR | S_IWGRP | S_IWOTH)
+ #define MODE_X_ALL		(S_IXUSR | S_IXGRP | S_IXOTH)
+ 
++#define MODE_R_PRIVATE		(S_IRUSR)
+ #define MODE_W_PRIVATE		(S_IWUSR)
++#define MODE_X_PRIVATE		(S_IXUSR)
++
+ #define MODE_W_PUBLIC		(S_IWUSR | S_IWGRP)
+ #define MODE_W_PUBLIC_DIR	(S_IWUSR | S_IWGRP | S_ISGID)
+ 
+-#define DIR_PERMS_PRIVATE	(MODE_R_ALL | MODE_X_ALL | MODE_W_PRIVATE)
++#define DIR_PERMS_PRIVATE	(MODE_R_PRIVATE | MODE_X_PRIVATE | MODE_W_PRIVATE)
+ #define DIR_PERMS_PUBLIC	(MODE_R_ALL | MODE_X_ALL | MODE_W_PUBLIC_DIR)
+ 
+ #define FILE_PERMS_PRIVATE	(MODE_R_ALL | MODE_W_PRIVATE)
+@@ -1456,7 +1459,8 @@ void createDirectory(char *dir, char *te
+   if (running_setgid)
+     posix_umask(last_umask & group_umask);
+   else
+-    dir_mode |= MODE_W_ALL;
++    if (permission_class == PERMS_PUBLIC)
++      dir_mode |= MODE_W_ALL;
+ 
+   if (!fileExists(dir))
+     if (posix_mkdir(dir, dir_mode) != 0)
diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.ebuild
new file mode 100644
index 000000000000..ae1580690e2a
--- /dev/null
+++ b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.ebuild,v 1.1 2014/12/31 21:19:46 mr_bones_ Exp $
+
+EAPI=5
+inherit flag-o-matic eutils games
+
+DESCRIPTION="A Boulderdash clone"
+HOMEPAGE="http://www.artsoft.org/rocksndiamonds/"
+SRC_URI="http://www.artsoft.org/RELEASES/unix/rocksndiamonds/${P}.tar.gz
+	http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Contributions-1.2.0.zip
+	http://www.artsoft.org/RELEASES/rocksndiamonds/levels/BD2K3-1.0.0.zip
+	http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Boulder_Dash_Dream-1.0.0.zip
+	http://www.artsoft.org/RELEASES/rocksndiamonds/levels/rnd-contrib-1.0.0.tar.gz
+	http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Snake_Bite-1.0.0.zip
+	http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Sokoban-1.0.0.zip
+	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-emc-1.0.tar.gz
+	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-sp-1.0.tar.gz
+	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-dx-1.0.tar.gz
+	mirror://gentoo/rnd_jue-v8.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X sdl"
+
+RDEPEND="X? ( x11-libs/libX11 )
+	!sdl? ( x11-libs/libX11 )
+	sdl? (
+		>=media-libs/libsdl-1.2.3[joystick,video]
+		>=media-libs/sdl-mixer-1.2.4[mod,mp3,timidity]
+		media-libs/sdl-net
+		>=media-libs/sdl-image-1.2.2[gif]
+		media-libs/smpeg
+	)"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	X? ( x11-libs/libXt )
+	!sdl? ( x11-libs/libXt )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+	unpack \
+		rockslevels-emc-1.0.tar.gz \
+		rockslevels-sp-1.0.tar.gz \
+		rockslevels-dx-1.0.tar.gz
+	cd levels
+	unpack \
+		rnd_jue-v8.tar.bz2 \
+		BD2K3-1.0.0.zip \
+		rnd-contrib-1.0.0.tar.gz \
+		Snake_Bite-1.0.0.zip \
+		Contributions-1.2.0.zip \
+		Boulder_Dash_Dream-1.0.0.zip \
+		Sokoban-1.0.0.zip
+}
+
+src_prepare() {
+	# make it parallel-friendly.
+	epatch \
+		"${FILESDIR}"/${P}-parallel-build.patch \
+		"${FILESDIR}"/${P}-perms.patch
+	sed -i \
+		-e 's:\$(MAKE_CMD):$(MAKE) -C $(SRC_DIR):' \
+		-e '/^MAKE/d' \
+		-e '/^CC/d' \
+		Makefile || die
+
+	sed -i \
+		-e '/^LDFLAGS/s/=/+=/' \
+		src/Makefile || die
+}
+
+src_compile() {
+	replace-cpu-flags k6 k6-1 k6-2 i586
+
+	local makeopts="RO_GAME_DIR=${GAMES_DATADIR}/${PN} RW_GAME_DIR=${GAMES_STATEDIR}/${PN}"
+	if use X || { ! use X && ! use sdl; } ; then
+		emake -j1 clean
+		emake ${makeopts} OPTIONS="${CFLAGS}" x11
+		mv rocksndiamonds{,.x11}
+	fi
+	if use sdl ; then
+		emake -j1 clean
+		emake ${makeopts} OPTIONS="${CFLAGS}" sdl
+		mv rocksndiamonds{,.sdl}
+	fi
+}
+
+src_install() {
+	if use X || { ! use X && ! use sdl; } ; then
+		dogamesbin rocksndiamonds.x11
+	fi
+	if use sdl ; then
+		dogamesbin rocksndiamonds.sdl
+		dosym rocksndiamonds.sdl "${GAMES_BINDIR}/rocksndiamonds"
+	else
+		dosym rocksndiamonds.x11 "${GAMES_BINDIR}/rocksndiamonds"
+	fi
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r docs graphics levels music sounds
+
+	newman rocksndiamonds.{1,6}
+	dodoc CREDITS ChangeLog README
+	newicon graphics/gfx_classic/rocks_icon_32x32.pcx ${PN}.pcx
+	make_desktop_entry rocksndiamonds "Rocks 'N' Diamonds" /usr/share/pixmaps/${PN}.pcx
+
+	prepgamesdirs
+}