version bump with patch from Denilson (bug #301789)

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

4 files changed, 102 insertions, 3 deletions

diff --git a/games-puzzle/sgt-puzzles/ChangeLog b/games-puzzle/sgt-puzzles/ChangeLog
index de8195679c7d..5aff49f15249 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog,v 1.2 2009/09/11 12:02:01 tupone Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog,v 1.3 2010/04/01 16:41:45 mr_bones_ Exp $
+
+*sgt-puzzles-8906 (01 Apr 2010)
+
+  01 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +sgt-puzzles-8906.ebuild, +files/sgt-puzzles-8906-gentoo.patch:
+  version bump with patch from Denilson (bug #301789)
 
   11 Sep 2009; Tupone Alfredo <tupone@gentoo.org>
   +files/sgt-puzzles-8605-gentoo.patch, sgt-puzzles-8605.ebuild:
diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest
index 0a1f88e1cb17..c659675f254c 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,6 +1,9 @@
 AUX sgt-puzzles-8605-gentoo.patch 1316 RMD160 30e84619a9b25e4deebc1f7d7d02f872f1e6653d SHA1 aa9a064d4f4872f7112176e72a0ea5603957a10d SHA256 4f39cd5d488a7e5885bb47a548fc9a7fda8fdc156a0e691562415377cd980938
+AUX sgt-puzzles-8906-gentoo.patch 974 RMD160 626f0996afd53eb1d973fd7fe2da5c0d66af08ef SHA1 76e98287e2107dd7cfc7ccf3ed8a76ac3936b93a SHA256 b58b01bb4637cb8972a0bfc9b3b14f8e2e3ae30d621decb76e28bccb8131d697
 DIST puzzles-r8605.tar.gz 2155649 RMD160 0dd87cfad27c22ab46680943dd89fcd219af10e5 SHA1 1400fbdeffb5f9c42c3e050f86a95e2b21465641 SHA256 eae484f74061ed340a31c2fb5248c2003cd5d7b04ee581185e187e45c9f10003
+DIST puzzles-r8906.tar.gz 2759745 RMD160 f3be49b410984520f96e46dbd9589329e8d08f08 SHA1 b992726f04951eaf1ad24f4eb750cea1a8df1e66 SHA256 8af0706444d7a95ba67facd72bbd4522d19a2ee65921491da6cb2560ae3fe7ef
 EBUILD sgt-puzzles-8605.ebuild 1692 RMD160 c721d9c9c166bb7ec566e07db927e6671f9500f5 SHA1 0e816618e2c86c2dbe3c8a8598206ac416a33bd7 SHA256 da56a69ebb836cf233cf6ddcb3a218c194eaffa4a74cc48aefc500200756b71f
+EBUILD sgt-puzzles-8906.ebuild 1672 RMD160 4836a447d4d8c1bf11f454a5dc03efb522d9476c SHA1 612f145d4cbc7d05fe55206d8580e68de35ae6c4 SHA256 b69afe5f1579d009ffdab9ec93dfc79a15c63bb20b7f58d74ba2f7a0f59847d2
 EBUILD sgt-puzzles-99999999.ebuild 1732 RMD160 c8da6a412b523ef78fa589decc89927ca34806d6 SHA1 23e94b7fa6b050c80b8d265d308dde9ce537122c SHA256 d76cc26d9dcf5ae12990489ef7ae5abe2cc5c727706679450f9868762b728b65
-MISC ChangeLog 682 RMD160 9d5561d173676efd7dd07b83a678d97bc19c1f94 SHA1 85a0c50ca1556629de69f0b16fd07c984e78d72b SHA256 b114ed7a797fa198d6c123082880c135f0f44641f18094e1b8f5aa2699b24817
+MISC ChangeLog 894 RMD160 5e658379d733dd93107e30872c76b6007e89ed52 SHA1 0512cf7b5e77e8f0702ad1ae09de7edac3a80543 SHA256 febbca30483d9957f8169824c96a21d96f458be8b7b0bd89569156cd2e4b5f09
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles-8906-gentoo.patch b/games-puzzle/sgt-puzzles/files/sgt-puzzles-8906-gentoo.patch
new file mode 100644
index 000000000000..31e7f796a611
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/files/sgt-puzzles-8906-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-8906.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-8906.ebuild
new file mode 100644
index 000000000000..d8641844e6df
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-8906.ebuild
@@ -0,0 +1,68 @@
+# 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-8906.ebuild,v 1.1 2010/04/01 16:41:45 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils games
+if [[ ${PV} == "99999999" ]] ; then
+	ESVN_REPO_URI="svn://svn.tartarus.org/sgt/puzzles/trunk"
+	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-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 || 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}
+		newicon icons/${file}-48d24.png ${PN}-${file}.png || die
+		make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}" "${PN}-${file}"
+	done
+
+	dodoc puzzles.txt puzzles.chm
+	if use doc ; then
+		dohtml *.html
+		doinfo puzzles.info
+		dodoc puzzles.pdf puzzles.ps
+	fi
+
+	prepgamesdirs
+}