version bump

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

4 files changed, 122 insertions, 2 deletions

diff --git a/games-puzzle/sgt-puzzles/ChangeLog b/games-puzzle/sgt-puzzles/ChangeLog
index 436593cf0a32..a94316e8e189 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog,v 1.15 2013/01/24 05:13:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog,v 1.16 2013/06/13 04:12:11 mr_bones_ Exp $
+
+*sgt-puzzles-9861 (13 Jun 2013)
+
+  13 Jun 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/sgt-puzzles-9861-gentoo.patch, +sgt-puzzles-9861.ebuild:
+  version bump
 
   24 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
   -files/sgt-puzzles-9023-gentoo.patch, -sgt-puzzles-9023.ebuild:
diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest
index 02669742a220..4ff9f51b77b2 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,6 +1,9 @@
 AUX sgt-puzzles-9306-gentoo.patch 926 SHA256 411172b6ecb12a65f93255edfb67c463832bfa351809ccb0161a4511836be30d SHA512 90024f0d53026ef4905e38177be12af65c22799257184bab764a108c1bf2ce20c437b700d0b29078f5b3401f1b786233abc9a5bbc22c1a487d5c5de165899139 WHIRLPOOL b44ce5e77bb01472dd59115903a813451a54212b5f753267c83615fe5b24de081a3f7007acd28b8f1208da2c2033198e4fb98580ecf0d70e25bb12407a08ce14
+AUX sgt-puzzles-9861-gentoo.patch 1121 SHA256 dcc74ecf92bed9456b08033b5e71f82b540d478a7129143ce099d5a91d92efb6 SHA512 9774831c8797020ed71e13514af3f92b76e30e92062bd6753df63afe0b4f9e392192cd45411aac147368d82d878da9e68c0a55468cde53e350aaf78fa4386a75 WHIRLPOOL fba2b122295d922d163a81830e5efbba91310195262afb27b5ba0422025230c4c256154c0c71272c23d5c31e6520879ca2ffb9763be1781facc12f5f590e6b24
 DIST puzzles-r9306.tar.gz 2975070 SHA256 940d0e6c16d1c7aaf27d375356da3e73ae55607113d245c7e697985ff7200c74
+DIST puzzles-r9861.tar.gz 3255388 SHA256 cc08ffd96c20dfe249d6db0e97f32608e8c52da9ca00a0e8d7d67fd4a474c3a2 SHA512 fc8abf5912e7ecdf5c5166c6b8f354e5f6dc8c42d646ffeae812c3cea21496f9ff03671268453a32c3246d1c94dfaba83628bf65ebeb645b3deb208ee3045ba1 WHIRLPOOL 1f91bc25d5c8dbf531d71eb3783169477834c232810f529cf682d69a121688584af7dc51b00c380e85dfee3119f9644d2f741f4c9f9dfc2054bc72fa5dd88de5
 EBUILD sgt-puzzles-9306.ebuild 1853 SHA256 ba341883ea6452733928e154afdfdcb0de883b523ee8eb65ecdc3073ea1a1b57 SHA512 8c90fb26b94904292987283d6cbb89636af0eb2b250a7fa5579eb500264fcd6c8f53d9dd1403468a04433b61b00a7cf1cf3f03e2d3ec0c7961f20ff39c36ea77 WHIRLPOOL b03351e7bec9ae6b79d290623db8b7ef803ae3eb41c1fa0614c5b2be4fc425eeb5099f4691a0c926d9e4c432a28782225133916ea8e94a31abb9ef9ecbf79a65
+EBUILD sgt-puzzles-9861.ebuild 2112 SHA256 a39afcce88d8bfe019d4b3d95b297fd14f58012d96166979880e71c78027ad40 SHA512 5deb4b5a270044af8fd920e7abf6b5ba187590c6fd1548c45bf23a9ce14ed6cd246de48081ab19f60fcc57d9406b26778920e9fdf2568e802eb50c8fc1e6a96c WHIRLPOOL 000e22379d5686bd38db92d80c0b4d4f15c7cee5e8fafaa127e21237b57060be6ec7545a385ff95b15961f97fb4e287b5be1789fdc4d5422758e55ae96f3cc39
 EBUILD sgt-puzzles-99999999.ebuild 1924 SHA256 bd9844ba3217dc3ebccc254d8902550dc162d02af2886db3679ee2ab4dedbbd2 SHA512 e5cea540e0f338c83e3beba738582d79a4665c06b7941137100a8b582f1652d31c74868818866e0bc23b82fc3e05468cc1a9ecb65133831bb145d3a4943dde19 WHIRLPOOL 6e3d686cd341a9108240691911f4bc232d3eab1e23e2db75e1f6edb599c9f0ab461c0bc0d177e44b06414051d2a8f770fceca3e59823cf541813653907cde68e
-MISC ChangeLog 2721 SHA256 0dc2367fe3a18da361b62472f4358600f772e8b27b6f8c5d7eabb755b9df60a3 SHA512 c7c09a13dd73b6882e228e1ca62ba5c7ba6daa59d8a2b63394b928463efe3aaedd6aa50c35a0afe5f78688f676b4ffb378f689f2e965b8ded445748580cdfac9 WHIRLPOOL 9860149b968764903b5e21bcfaca73a8a182e62e26a50bd05a0d74749cd171dca9162412ac5570da462bd6e16bc6235258242cba9e0e77747b1382d2f620eaf6
+MISC ChangeLog 2891 SHA256 3b356d19b606d73dad7ccb8eea5dccfb3817f76c57ccd0266fab45247036b85b SHA512 a31949816e8654d47fc36794de5673d7d4bc740c320f574b817946859aa47122fb7586d5eb846040c9353a2f8edb5bd94336a8e904fe8e3fc86971f124e20150 WHIRLPOOL baed07570fcb2042ac28ad725737a2b4a6e9e25bca2c429287085ba0f277d6d1ad542ffa63a266d4079ff6cb1c28233bd6eec01776feb45e5711ac39a81568c2
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles-9861-gentoo.patch b/games-puzzle/sgt-puzzles/files/sgt-puzzles-9861-gentoo.patch
new file mode 100644
index 000000000000..c4ac19eed57e
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/files/sgt-puzzles-9861-gentoo.patch
@@ -0,0 +1,23 @@
+diff -ru puzzles-r9861.orig/mkfiles.pl puzzles-r9861/mkfiles.pl
+--- puzzles-r9861.orig/mkfiles.pl	2013-03-30 16:16:21.000000000 -0400
++++ puzzles-r9861/mkfiles.pl	2013-06-11 17:59:54.255885226 -0400
+@@ -1117,8 +1117,8 @@
+     "\n".
+     &splitline("CFLAGS := -O2 -Wall -Werror -ansi -pedantic -g " .
+ 	       (join " ", map {"-I$dirpfx$_"} @srcdirs) .
+-	       " `\$(GTK_CONFIG) --cflags` \$(CFLAGS)")."\n".
+-    "XLIBS = `\$(GTK_CONFIG) --libs` -lm\n".
++	       " `pkg-config gtk+-2.0 --cflags` \$(CFLAGS)")."\n".
++    "XLIBS = `pkg-config gtk+-2.0 --libs` -lm\n".
+     "ULIBS = -lm#\n".
+     "INSTALL=install\n",
+     "INSTALL_PROGRAM=\$(INSTALL)\n",
+@@ -1138,7 +1138,7 @@
+       $objstr = &objects($p, "X.o", undef, undef);
+       print &splitline("\$(BINPREFIX)" . $prog . ": " . $objstr), "\n";
+       $libstr = &objects($p, undef, undef, "-lX");
+-      print &splitline("\t\$(CC) -o \$@ $objstr $libstr \$(XLFLAGS) \$(${type}LIBS)", 69),
++      print &splitline("\t\$(CC) \$(LDFLAGS) -o \$@ $objstr $libstr \$(XLFLAGS) \$(${type}LIBS)", 69),
+ 	  "\n\n";
+     }
+     foreach $d (&deps("X.o", undef, $dirpfx, "/")) {
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-9861.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-9861.ebuild
new file mode 100644
index 000000000000..6809f54c6ab8
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-9861.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-9861.ebuild,v 1.1 2013/06/13 04:12:11 mr_bones_ Exp $
+
+EAPI=5
+inherit eutils gnome2-utils 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
+	virtual/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)"
+	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
+	dodoc README HACKING
+
+	local file name
+	for file in *.R ; do
+		[[ ${file} == "nullgame.R" ]] && continue
+		name=$(awk -F: '/exe:/ { print $3 }' "${file}")
+		file=${file%.R}
+		if [[ ${PV} -lt 99999999 ]] ; then
+			newicon -s 48 icons/${file}-48d24.png ${PN}-${file}.png
+			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
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	[[ ${PV} -lt 99999999 ]] && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	[[ ${PV} -lt 99999999 ]] && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	[[ ${PV} -lt 99999999 ]] && gnome2_icon_cache_update
+}