version bump (bug #533904)

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

4 files changed, 160 insertions, 2 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/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
+}