version bump (bug #346831)

Package-Manager: portage-2.1.9.24/cvs/Linux i686

4 files changed, 107 insertions, 2 deletions

diff --git a/games-puzzle/sgt-puzzles/ChangeLog b/games-puzzle/sgt-puzzles/ChangeLog
index 1b60576b6a04..1a994e31f09c 100644
--- a/games-puzzle/sgt-puzzles/ChangeLog
+++ b/games-puzzle/sgt-puzzles/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-puzzle/sgt-puzzles
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog,v 1.7 2010/09/21 20:31:58 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog,v 1.8 2010/11/28 05:52:31 mr_bones_ Exp $
+
+*sgt-puzzles-9023 (28 Nov 2010)
+
+  28 Nov 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +sgt-puzzles-9023.ebuild, +files/sgt-puzzles-9023-gentoo.patch:
+  version bump (bug #346831)
 
   21 Sep 2010; Markos Chandras <hwoarang@gentoo.org>
   sgt-puzzles-8972.ebuild:
diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest
index 1484f632de39..ddc4fbc6513d 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,6 +1,9 @@
 AUX sgt-puzzles-8972-gentoo.patch 974 RMD160 626f0996afd53eb1d973fd7fe2da5c0d66af08ef SHA1 76e98287e2107dd7cfc7ccf3ed8a76ac3936b93a SHA256 b58b01bb4637cb8972a0bfc9b3b14f8e2e3ae30d621decb76e28bccb8131d697
+AUX sgt-puzzles-9023-gentoo.patch 974 RMD160 626f0996afd53eb1d973fd7fe2da5c0d66af08ef SHA1 76e98287e2107dd7cfc7ccf3ed8a76ac3936b93a SHA256 b58b01bb4637cb8972a0bfc9b3b14f8e2e3ae30d621decb76e28bccb8131d697
 DIST puzzles-r8972.tar.gz 2892363 RMD160 12cbdb32b16abff4ca0da0b80525307658c371ec SHA1 025a035e5b9c3e0c1ff32f01374413cd1812ed5b SHA256 f3333fe29aa2e2d5826c4cf10fce9258ba746e81900d3ca8cbfbc05b1edecb85
+DIST puzzles-r9023.tar.gz 2952780 RMD160 3ccdecb005199df7097cb59c6a8089a58919a58b SHA1 6c8d57ddcc26bfa7f59bf49d9733767998881338 SHA256 f3ff8a3e4f33be808336b06ed6b0a360a4af960cc7482333d6a47b6651861802
 EBUILD sgt-puzzles-8972.ebuild 1856 RMD160 6d8d547b3aaf72d48b18ea2aa5df7fd8715f49ed SHA1 5b80bc906164dc28cc5af7d0e9e89b559f0f1629 SHA256 ed2365d35b3314495fe718b0fdf3cc32ef59aae18527c0364b8025932e893ad6
+EBUILD sgt-puzzles-9023.ebuild 1859 RMD160 01b54e26f598fc25addc7d1a038788bba88d2093 SHA1 e9c1e6b3eb3d2dcdade4d77ad3adc9746638a95d SHA256 b505156bb30a487a90dc480355e703d16ea70e1705732b0f1e56b4b874eb1b43
 EBUILD sgt-puzzles-99999999.ebuild 1928 RMD160 da46810f59ee227c7f0110f73d2967238a363637 SHA1 886a230c74876006d0ad0abedb0d12527b3e3a10 SHA256 14fd1d8d335605712e2e580abf37d51ab48f606b7b8485be71bea9f0201fa079
-MISC ChangeLog 1522 RMD160 d89d06d72c9936ab2131615d15b076a10f6f24dd SHA1 d773253b9a1fe37a9661883096891edf2e7e6687 SHA256 b36edf8cd7197222da144b440e983e7d1ad82ec0a28e07617ca82e97b143eb70
+MISC ChangeLog 1707 RMD160 336b6833536c5f919cde5f40344b350a8866d6c7 SHA1 564ecd5b571f5302b723ba7985a86f0750e44b4f SHA256 8cd421d5de0abf7efceecd1178548a87893c6d7fb492ae6b66e56f7e478529fe
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles-9023-gentoo.patch b/games-puzzle/sgt-puzzles/files/sgt-puzzles-9023-gentoo.patch
new file mode 100644
index 000000000000..31e7f796a611
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/files/sgt-puzzles-9023-gentoo.patch
@@ -0,0 +1,22 @@
+--- mkfiles.pl.old	2010-03-07 11:14:11.000000000 -0300
++++ mkfiles.pl	2010-03-07 11:24:20.000000000 -0300
+@@ -1110,8 +1110,8 @@
+     "\n".
+     &splitline("CFLAGS := -O2 -Wall -Werror -ansi -pedantic -g " .
+ 	       (join " ", map {"-I$dirpfx$_"} @srcdirs) .
+-	       " `\$(GTK_CONFIG) --cflags` \$(CFLAGS)")."\n".
+-    "XLIBS = `\$(GTK_CONFIG) --libs`\n".
++	       " `pkg-config gtk+-2.0 --cflags` \$(CFLAGS)")."\n".
++    "XLIBS = `pkg-config gtk+-2.0 --libs`\n".
+     "ULIBS =#\n".
+     "INSTALL=install\n",
+     "INSTALL_PROGRAM=\$(INSTALL)\n",
+@@ -1130,7 +1130,7 @@
+       $objstr = &objects($p, "X.o", undef, undef);
+       print &splitline($prog . ": " . $objstr), "\n";
+       $libstr = &objects($p, undef, undef, "-lX");
+-      print &splitline("\t\$(CC) -o \$@ $objstr $libstr \$(${type}LIBS)", 69),
++      print &splitline("\t\$(CC) \$(LDFLAGS) -o \$@ $objstr $libstr \$(${type}LIBS)", 69),
+ 	  "\n\n";
+     }
+     foreach $d (&deps("X.o", undef, $dirpfx, "/")) {
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-9023.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-9023.ebuild
new file mode 100644
index 000000000000..a96d209ae287
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-9023.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-9023.ebuild,v 1.1 2010/11/28 05:52:31 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs games
+if [[ ${PV} == "99999999" ]] ; then
+	ESVN_REPO_URI="svn://svn.tartarus.org/sgt/puzzles"
+	inherit subversion
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-r${PV}.tar.gz"
+	S=${WORKDIR}/puzzles-r${PV}
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
+HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-util/pkgconfig
+	doc? ( >=app-doc/halibut-1.0 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	./mkfiles.pl
+	sed -i \
+		-e 's:= -O2 -Wall -Werror -ansi -pedantic -g:= $(CPPFLAGS):' \
+		-e '/LDFLAGS/s:=:=$(LDFLAGS) :' \
+		Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+	if use doc ; then
+		halibut --text --html --info --pdf --ps puzzles.but
+	fi
+}
+
+src_install() {
+	dodir "${GAMES_BINDIR}"
+	emake DESTDIR="${D}" gamesdir="${GAMES_BINDIR}" install || die
+	dodoc README HACKING
+
+	local file name
+	for file in *.R ; do
+		[[ ${file} == "nullgame.R" ]] && continue
+		name=$(sed -n 's/^[a-z]*\.exe://p' "${file}")
+		file=${file%.R}
+		if [[ ${PV} -lt 99999999 ]] ; then
+			newicon icons/${file}-48d24.png ${PN}-${file}.png || die
+			make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}" "${PN}-${file}"
+		else
+			# No icons with the live version
+			make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}"
+		fi
+	done
+
+	dodoc puzzles.txt puzzles.chm
+	if use doc ; then
+		dohtml *.html
+		doinfo puzzles.info
+		dodoc puzzles.pdf puzzles.ps
+	fi
+
+	prepgamesdirs
+}