version bump

Package-Manager: portage-2.1.8.3/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 6955613a0df4..8fec542e87d6 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.4 2010/06/29 17:09:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog,v 1.5 2010/07/29 20:50:25 mr_bones_ Exp $
+
+*sgt-puzzles-8972 (29 Jul 2010)
+
+  29 Jul 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +sgt-puzzles-8972.ebuild, +files/sgt-puzzles-8972-gentoo.patch:
+  version bump
 
   29 Jun 2010; Michael Sterrett <mr_bones_@gentoo.org>
   sgt-puzzles-8906.ebuild, sgt-puzzles-99999999.ebuild:
diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest
index 62b041320996..ca5eba85d51e 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,6 +1,9 @@
 AUX sgt-puzzles-8906-gentoo.patch 974 RMD160 626f0996afd53eb1d973fd7fe2da5c0d66af08ef SHA1 76e98287e2107dd7cfc7ccf3ed8a76ac3936b93a SHA256 b58b01bb4637cb8972a0bfc9b3b14f8e2e3ae30d621decb76e28bccb8131d697
+AUX sgt-puzzles-8972-gentoo.patch 974 RMD160 626f0996afd53eb1d973fd7fe2da5c0d66af08ef SHA1 76e98287e2107dd7cfc7ccf3ed8a76ac3936b93a SHA256 b58b01bb4637cb8972a0bfc9b3b14f8e2e3ae30d621decb76e28bccb8131d697
 DIST puzzles-r8906.tar.gz 2759745 RMD160 f3be49b410984520f96e46dbd9589329e8d08f08 SHA1 b992726f04951eaf1ad24f4eb750cea1a8df1e66 SHA256 8af0706444d7a95ba67facd72bbd4522d19a2ee65921491da6cb2560ae3fe7ef
+DIST puzzles-r8972.tar.gz 2892363 RMD160 12cbdb32b16abff4ca0da0b80525307658c371ec SHA1 025a035e5b9c3e0c1ff32f01374413cd1812ed5b SHA256 f3333fe29aa2e2d5826c4cf10fce9258ba746e81900d3ca8cbfbc05b1edecb85
 EBUILD sgt-puzzles-8906.ebuild 1859 RMD160 60884ac6441a365e12754637a8195431399e0e86 SHA1 13b513b059209b8c088697f977b1c7adcb0a0f7a SHA256 fcfcd452dc0a6701f9865a01f4688c110186c6329b9aa30099a4a893bd14737b
+EBUILD sgt-puzzles-8972.ebuild 1859 RMD160 1e40779bfdbaa3ce4ca9b6090a09ddad8e1593bb SHA1 9fdb64dcfcb3c49f90a6b9dc6a6660da0c900c24 SHA256 1e547ab5b068f5fdf4be51a6613e386e3d7f3e7e2da7b91250b85eb2dc0aa6db
 EBUILD sgt-puzzles-99999999.ebuild 1928 RMD160 da46810f59ee227c7f0110f73d2967238a363637 SHA1 886a230c74876006d0ad0abedb0d12527b3e3a10 SHA256 14fd1d8d335605712e2e580abf37d51ab48f606b7b8485be71bea9f0201fa079
-MISC ChangeLog 1126 RMD160 587d76e991ab4d387703a58d926a312119012b6a SHA1 e8f427d52271027f633529ca826709c198a84c3d SHA256 745154dbd29e38d1ca2b02e857a691977941e33cc5ecad72fb396cbd309ec734
+MISC ChangeLog 1296 RMD160 6d129c204a7f041adcb52502df431ba9a3627193 SHA1 4db49a576f848c4921fbe8bc1b8eee2ce6ef9acf SHA256 510b8198591c02ec549ce279947b4db1127ed511c48c474e093917406daa689e
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles-8972-gentoo.patch b/games-puzzle/sgt-puzzles/files/sgt-puzzles-8972-gentoo.patch
new file mode 100644
index 000000000000..31e7f796a611
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/files/sgt-puzzles-8972-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-8972.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-8972.ebuild
new file mode 100644
index 000000000000..adc7a1d4527d
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-8972.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-8972.ebuild,v 1.1 2010/07/29 20:50:25 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
+}