version bump

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

4 files changed, 85 insertions, 13 deletions

diff --git a/games-puzzle/picpuz/ChangeLog b/games-puzzle/picpuz/ChangeLog
index ef9acc83ffdb..6f0e06b55cc1 100644
--- a/games-puzzle/picpuz/ChangeLog
+++ b/games-puzzle/picpuz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-puzzle/picpuz
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/picpuz/ChangeLog,v 1.8 2009/11/26 19:58:11 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/picpuz/ChangeLog,v 1.9 2010/02/19 09:09:05 mr_bones_ Exp $
+
+*picpuz-2.1.1 (19 Feb 2010)
+
+  19 Feb 2010; Michael Sterrett <mr_bones_@gentoo.org> +picpuz-2.1.1.ebuild,
+  +files/picpuz-2.1.1-build.patch:
+  version bump
 
   26 Nov 2009; Markus Meier <maekke@gentoo.org> picpuz-2.0.ebuild:
   amd64/x86 stable, bug #294535
diff --git a/games-puzzle/picpuz/Manifest b/games-puzzle/picpuz/Manifest
index c07263137886..931d1b8d20ac 100644
--- a/games-puzzle/picpuz/Manifest
+++ b/games-puzzle/picpuz/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX picpuz-2.0-build.patch 1084 RMD160 fe44b1d271fba5dd168dfcb8b157413fe2a8b57b SHA1 f3ddf0a742bd74fe6cf15929166285501eb045db SHA256 11cf58ee8d82c7e1e57f74bfbb63b839d9a0a317bffc6be7f74261e52ab30211
+AUX picpuz-2.1.1-build.patch 1207 RMD160 ec8d1741e55695089223e73d9225fc0606b04649 SHA1 d368f293dc3ce3347fbb0517d0ddba1463f65cdd SHA256 8ee9246778015c5f368ed8aeb12f3d41a96cb832cdeae38962aefd237f8fea2a
 DIST picpuz-2.0.tar.gz 212478 RMD160 989bf44de9619069f4a5a8fe2fdecd16f35df4d0 SHA1 69404f54576360858955bd4fb3299749462cf9a3 SHA256 4231aadee55f9fbd57336da083c3cd744f2f0b60774ba36f9957583e7d5b9634
+DIST picpuz-2.1.1.tar.gz 221115 RMD160 7c187429530a6aaee2dc59907e34a7501589ea3d SHA1 7a9232fb254b572dc23f07ded9877081150f1641 SHA256 694cfaaf07f90b39b81c0e7a9e0ee9dddfece293e978f3a295d4561056144969
 EBUILD picpuz-2.0.ebuild 1036 RMD160 581698a0cad2ae214b00678fd6a4d9d9232c85f7 SHA1 8f90d3ef718abf0258facb3abec4bd5874891679 SHA256 598cc6c864dd0584d5e10812c2e2c48bf9e1de734adc0163b07ee07d7d34615c
-MISC ChangeLog 1360 RMD160 4c84bfad21e30e6ac67e39e20425dad3e78ff9d3 SHA1 f24dacd28341479c8695b2a30907c26153afcf18 SHA256 3b2e5b6050df961ad3d016207643efbd1f9590fe91b4982393c19334f6188359
+EBUILD picpuz-2.1.1.ebuild 1037 RMD160 7b7e68c4e998ef391dfedfc9d6ed53c7a802be0d SHA1 78bf57ef5e13d6e47ebae46809a5836240368184 SHA256 8c6dc183c6f5bf93f59b49ade50428315de27156db887b92a209c95a63a84a99
+MISC ChangeLog 1520 RMD160 fc262174e4432fa266e4bee5e288f923876ce47a SHA1 5a5f00eead341395fc40de1e6bc531dac4b79b09 SHA256 e8bef1109a2930731492d453f1ec3d1770be86c74ecf0e2ccec5b37e0ae8272f
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAksO3dkACgkQkKaRLQcq0GLfPQCeLF9FZln2nUFwmbNdZNZ98D9D
-OIEAoI/7LEZRwfwyiYT69T+23R7sg/A+
-=eTfk
------END PGP SIGNATURE-----
diff --git a/games-puzzle/picpuz/files/picpuz-2.1.1-build.patch b/games-puzzle/picpuz/files/picpuz-2.1.1-build.patch
new file mode 100644
index 000000000000..252a912c7d8e
--- /dev/null
+++ b/games-puzzle/picpuz/files/picpuz-2.1.1-build.patch
@@ -0,0 +1,33 @@
+diff -ru picpuz-2.1.1.orig/Makefile picpuz-2.1.1/Makefile
+--- picpuz-2.1.1.orig/Makefile	2010-02-01 08:19:04.000000000 -0500
++++ picpuz-2.1.1/Makefile	2010-02-19 03:36:42.343749782 -0500
+@@ -4,9 +4,8 @@
+ VERSION = 2.1.1
+ SOURCE = $(PROGRAM)-$(VERSION).cpp
+ 
+-# replace CFLAGS and LFLAGS -O3 with -g for GDB debugging
+-CFLAGS = -O3 -Wall -c `pkg-config --cflags gtk+-2.0`
+-LFLAGS = -O3 -Wall -rdynamic `pkg-config --libs gtk+-2.0`
++CXXFLAGS += -O3 -Wall -c `pkg-config --cflags gtk+-2.0`
++LIBS = `pkg-config --libs gtk+-2.0` -lpthread
+ 
+ # use $PREFIX if defined, else assume /usr/local
+ ifeq "$(PREFIX)" ""
+@@ -20,14 +19,14 @@
+ DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
+ 
+ $(PROGRAM): $(PROGRAM).o zfuncs.o
+-	@ g++ $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o
++	@ $(CXX) $(LDFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o $(LIBS)
+ 
+ $(PROGRAM).o: $(SOURCE)
+-	@ g++ $(CFLAGS) -o $(PROGRAM).o $(SOURCE)		\
++	@ $(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE)		\
+ 	  -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
+ 
+ zfuncs.o: zfuncs.cpp
+-	@ g++ $(CFLAGS) zfuncs.cpp	\
++	@ $(CXX) $(CXXFLAGS) zfuncs.cpp	\
+ 	  -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\""
+ 
+ install: $(PROGRAM)
diff --git a/games-puzzle/picpuz/picpuz-2.1.1.ebuild b/games-puzzle/picpuz/picpuz-2.1.1.ebuild
new file mode 100644
index 000000000000..17cd4d94bad0
--- /dev/null
+++ b/games-puzzle/picpuz/picpuz-2.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/picpuz/picpuz-2.1.1.ebuild,v 1.1 2010/02/19 09:09:05 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils games
+
+DESCRIPTION="a jigsaw puzzle program"
+HOMEPAGE="http://kornelix.squarespace.com/picpuz/"
+SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+src_compile() {
+	emake \
+		BINDIR="${GAMES_BINDIR}" \
+		DATADIR="${GAMES_DATADIR}"/${PN} \
+		DOCDIR=/usr/share/doc/${PF}/html \
+		|| die "emake failed"
+}
+
+src_install() {
+	dogamesbin ${PN} || die "dogamesbin failed"
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r icons locales || die "doins failed"
+	doicon icons/${PN}.png
+	make_desktop_entry ${PN} Picpuz
+	dohtml -r doc/{userguide-en.html,images}
+	dodoc doc/{CHANGES,README,TRANSLATIONS}
+	prepgamesdirs
+}