Version bump, also fixing glib-2.32 compilation. Thanks a lot to Julian Ospald (hasufell) for his work.

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

4 files changed, 185 insertions, 10 deletions

diff --git a/games-puzzle/picpuz/ChangeLog b/games-puzzle/picpuz/ChangeLog
index 87a3f4c2184d..b9857cec2f5c 100644
--- a/games-puzzle/picpuz/ChangeLog
+++ b/games-puzzle/picpuz/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-puzzle/picpuz
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/picpuz/ChangeLog,v 1.13 2012/07/21 18:22:32 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/picpuz/ChangeLog,v 1.14 2012/07/24 17:55:27 pacho Exp $
+
+*picpuz-2.5 (24 Jul 2012)
+
+  24 Jul 2012; Pacho Ramos <pacho@gentoo.org> +files/picpuz-2.5-build.patch,
+  +picpuz-2.5.ebuild:
+  Version bump, also fixing glib-2.32 compilation. Thanks a lot to Julian Ospald
+  (hasufell) for his work.
 
   21 Jul 2012; Julian Ospald <hasufell@gentoo.org> ChangeLog:
   fix bug 427520
@@ -59,4 +66,3 @@
   21 Feb 2007; Michael Sterrett <mr_bones_@gentoo.org> +metadata.xml,
   +picpuz-06.ebuild:
   initial commit - ebuild submitted by Wojciech Myrda via bug #158391
-
diff --git a/games-puzzle/picpuz/Manifest b/games-puzzle/picpuz/Manifest
index 2205204fd3f4..e754304ba84d 100644
--- a/games-puzzle/picpuz/Manifest
+++ b/games-puzzle/picpuz/Manifest
@@ -2,18 +2,17 @@
 Hash: SHA256
 
 AUX picpuz-2.1.1-build.patch 1184 SHA256 c3a83d8b2f5fbadf801295f478cf2b735dac3142318f6a7041774bd72f6d415c SHA512 17dc0d88ad0d036ecd995b1f7da3061e9f14bb1728a8a983e021f292a701395d858ea0c1d9670d9149bec986b7d0aad9be5f63f8a24b81647793bc8c6d3660d6 WHIRLPOOL 865b7141668bf19521a6c70c8cc4f730e287eb752d0ded59aa760210f08a72835a3693e5083e7b980e5e184877bb71fae83c12228bbbac7de76e9bb70719a092
+AUX picpuz-2.5-build.patch 5499 SHA256 25784542c35c1a0847db8b293190c03e66198af1389bf8f397abcaeedc3733c0 SHA512 49486aa996419da06fa7a14ac61c89930c1ca79f97615253bc1c4a96c7bc0af405d52661e1dd4b5186cf00877cde5b698070bbb9229d50e27a1a981de03d2f11 WHIRLPOOL 3d176a4a51e0a41ddb655bcd8d55bff9f7868f8a268e1cbb827f72bc9f4f79e5dc21b04e6dcaed7f0bfdb4b035667678bc25c588aa4200a29ad2d2ee58e415b1
 DIST picpuz-2.1.1.tar.gz 221115 SHA256 694cfaaf07f90b39b81c0e7a9e0ee9dddfece293e978f3a295d4561056144969 SHA512 1f34e7e06551aed0e2216c1c9bd7f81f2b39491320ebb43ff65acc8ba6993f5f98531047cb87e05102b052ad08509aa23e4970391cb644ca6b617edcfabde221 WHIRLPOOL d73ed2a06e8edffcf61b8391acb498e5d4440341d38ac8feb6070e64b984beac68132affd117d736748484d8dc94f4239aeac297d576174a889687b50de1c73c
+DIST picpuz-2.5.tar.gz 267452 SHA256 3caf92b00dd4739f68c557d5c952216fef01ca5de3c83e453ef177648bdf70f0 SHA512 598507b29b1218f05ca8a0d1a5788607cd3db899cad83ce84606d268d513c75b863986d518f0ec134cac0a5879515a13cb794f87a59bf55b48217fc6b1f5c386 WHIRLPOOL 0496c45d377a6fda3ce795a85fa640c06bf51c7308c164b3e08d76c125727d468eb4836657f11a3435341defd58eea03dee5d7c9b7386d2ede9974227dd2c614
 EBUILD picpuz-2.1.1.ebuild 1031 SHA256 54d9120305e93a8cbdfa01aabb45b223a3c65292634e3a8cd49ac41ac8665971 SHA512 8756d769dbedc55c624a25b12f438954d20bb2bb073d337f442666e02a46dd2b7d55de13bd0e38a0431a5efa4290df27c759f9d6cc4c3531eafd8bdf82cf6622 WHIRLPOOL 05f8147eddfd52118c9dc290a8cdd19fefcec676aedcf1718230f10f9dc6556589a2e4d3f90958ac182fe04f2a26bd902e8028f370c3d5f0ae3639d158ffb616
-MISC ChangeLog 1914 SHA256 fd6e834449fe2eabe118d0702e5c6e4408b659d4689da12c6bccbe4861dfa59d SHA512 39b20d4ded31f2ad227b0fd75e2463f57a9de6dab2f50add735e3452231b0b62667a17384c0d84927aada3543149a31f70345c90684b035208da361ccfcf7ce5 WHIRLPOOL c128085cb6e1f55a9d83ce7feee647810eb4f917d84da5620059cf00181bbd0c4e2292eea48046f3028a868c0c8f8bd7ead324edcfca24625ab3ba25bb59e26f
+EBUILD picpuz-2.5.ebuild 1176 SHA256 47ea388fe284a790c31550c397d81a14a0df41c3d20148d4ad7a98ae34bdfc7e SHA512 2dbf1b6a86773847010267079ec78abca04e62663ce5cb6fc6d23532e524b4eb533439441703bda9470e49853c6b4c0ce607cd881d665f4dc72c56edb6c2ffac WHIRLPOOL d46fffe74806c7d84abc95a7227c969de0fc3d7d3b0cfd9777ee44439b0353aa5e49f271a1321cb1be64d0ea0fec9d22d72a0a3a53d5a2d089a6afe26f12768d
+MISC ChangeLog 2145 SHA256 8799afa94e86ddab86bff23656cf950de9593015b6a7cb5076009d5116547852 SHA512 93da216697a124986b8423b98981a222d2990c1cc4444b7458f7a121f65a71836673396a55d2c4847b75a3e7b99b3cc26ceb2804ad3c6daf13c2036aebade0a5 WHIRLPOOL 3d8e884df88ced09b4ffa8c035209a747e296dbadaefa7f18837063d8b1a3f9c7439d8e7a311902710b9b6d14f0724b2825c3d68e57efbbce96dc5de07ff0747
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQCvJ6AAoJEFpvPKfnPDWz7+YH/jMbBGqFEsCB382+J7GvUCqG
-O1vtY2TlOika18l3IaScWOR2sWJzPhPBM84U9nvc2+UKy8WQ07wQQuu8CyvuwwQK
-p8BfliBl2bwaDc4yWSnXkF9oVi4U6o7Yc7ikmES6wrtQl/ZM7YXqOvEMzP1dYoik
-muTPpNAAMxt/dCxoexD+xfgVuWOiO9mKreBEMOSV0/8xTchdQiwLpo5Bq4r6PUbn
-N8s5IEuV9hYJX2Y5q1fMYQAAELmwHI3OUbR1Wt2eU7+2Nml7SJYAf3bCLmfZpFlM
-n+kjp0VC2EvWYeOByiWC4Cnt5GpciRFAMqFksttwuI7i0xKaLtjQkHEcQBusm5Q=
-=V+lx
+iEYEAREIAAYFAlAO4ZUACgkQCaWpQKGI+9TR1gCdE7SSoTej2JSqq9GqD9u44jWT
+ExQAnA2V6Ze21TtP8ty9KydJu0nSlOK5
+=jGgJ
 -----END PGP SIGNATURE-----
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-build.patch b/games-puzzle/picpuz/files/picpuz-2.5-build.patch
new file mode 100644
index 000000000000..dfec57fe6ec0
--- /dev/null
+++ b/games-puzzle/picpuz/files/picpuz-2.5-build.patch
@@ -0,0 +1,116 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sat Jul 21 17:03:11 UTC 2012
+
+--- picpuz-2.5/Makefile
++++ picpuz-2.5/Makefile
+@@ -11,24 +11,26 @@
+ 
+ # target install directories
+ BINDIR = $(PREFIX)/bin
+-SHAREDIR = $(PREFIX)/share/$(PROGRAM)
+-ICONDIR = $(SHAREDIR)/icons
+-LOCALESDIR = $(SHAREDIR)/locales
++DATADIR = $(PREFIX)/share/$(PROGRAM)
++ICONDIR = $(DATADIR)/icons
++LOCALESDIR = $(DATADIR)/locales
+ DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
+ MANDIR = $(PREFIX)/share/man/man1
+ MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop
+ 
+-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0`
++CXXFLAGS += -c `pkg-config --cflags gtk+-3.0`
+ LIBS = `pkg-config --libs gtk+-3.0`
+ 
+ $(PROGRAM): $(PROGRAM).o zfuncs.o
+-	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
++	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
+ 
+ $(PROGRAM).o: $(SOURCE)
+-	$(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE)
++	$(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE) \
++		-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
+ 
+ zfuncs.o: zfuncs.cc
+-	$(CXX) $(CFLAGS) zfuncs.cc -D PREFIX=\"$(PREFIX)\"
++	$(CXX) $(CXXFLAGS) zfuncs.cc \
++		-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\""
+ 
+ install: $(PROGRAM)
+ 	mkdir -p  $(DESTDIR)$(BINDIR)
+@@ -52,7 +54,7 @@
+ 
+ uninstall:
+ 	rm -f  $(DESTDIR)$(BINDIR)/$(PROGRAM)
+-	rm -R -f  $(DESTDIR)$(SHAREDIR)
++	rm -R -f  $(DESTDIR)$(DATADIR)
+ 	rm -R -f  $(DESTDIR)$(DOCDIR)
+ 	rm -f  $(DESTDIR)$(MANDIR)/$(PROGRAM).1.gz
+ 	xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
+--- picpuz-2.5/zfuncs.cc
++++ picpuz-2.5/zfuncs.cc
+@@ -3111,7 +3111,6 @@
+          /prefix/share/appname/locales/         translations: appname-de.po  etc.
+          /home/user/.appname/                   parameters etc. are copied here
+ 
+-   zprefix        install location              has /bin and /share subtrees
+    zdatadir       installed data files          .desktop, parameters, etc.
+    zdocdir        user documentation            README, changelog, user guide
+    zicondir       icons                         icon files .png
+@@ -3123,7 +3122,7 @@
+ namespace zfuncs
+ {
+    char        zappname[20];
+-   char        zprefix[200], zdatadir[200], zdocdir[200];                  //  app directories
++   char        zdatadir[200], zdocdir[200];                                //  app directories
+    char        zicondir[200], zlocalesdir[200], zuserdir[200];
+    char        zlang[8] = "en";                                            //  "lc" or "lc_RC"
+    char        JPGquality[4] = "85";                                       //  JPG file save quality
+@@ -3132,7 +3131,6 @@
+    pthread_t   tid_main = 0;                                               //  main thread ID               v.4.8
+ }
+ 
+-cchar * get_zprefix() { return zfuncs::zprefix; }                          //  /usr or /home/<userid>
+ cchar * get_zuserdir() { return zfuncs::zuserdir; }                        //  /home/user/.appname
+ cchar * get_zdatadir() { return zfuncs::zdatadir; }                        //  parameters, icons
+ cchar * get_zdocdir()  { return zfuncs::zdocdir;  }                        //  documentation files
+@@ -3156,19 +3154,15 @@
+    
+    catch_signals();                                                        //  catch segfault, do backtrace
+    
+-   strcpy(zappname,appname);                                               //  save app name
+-   
+-   #ifndef PREFIX                                                          //  install location                v.4.7
+-      #define PREFIX "/usr"
+-   #endif
+-   
+-   strncpy0(work,PREFIX,199);                                              //  /usr or /home/<userid>          v.4.6
+-   strcpy(zprefix,work);                                                   //  /prefix
+-   strncatv(zdatadir,199,work,"/share/",zappname,"/data",null);            //  /prefix/share/appname/data
+-   strncatv(zicondir,199,work,"/share/",zappname,"/icons",null);           //  /prefix/share/appname/icons
+-   strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null);      //  /prefix/share/appname/locales
+-   strncatv(zdocdir,199,work,"/share/doc/",zappname,null);                 //  /prefix/share/doc/appname
+-   
++   strcpy(zappname,appname);
++
++   strcpy(zdatadir,DATADIR);                                               //  macros from build script
++   strcpy(zdocdir,DOCDIR);
++   strcpy(zicondir,zdatadir);
++   strcat(zicondir,"/icons");
++   strcpy(zlocalesdir,zdatadir);
++   strcat(zlocalesdir,"/locales");
++
+    snprintf(zuserdir,199,"%s/.%s",getenv("HOME"),zappname);                //  /home/user/.appname/            v.4.3
+    err = stat(zuserdir,&statdat);                                          //  does it exist already?
+    if (err) {
+@@ -3366,9 +3360,9 @@
+    fputs(work,fid);
+    fputs("Type=Application\n",fid);                                        //  Type=Application
+    fputs("Terminal=false\n",fid);                                          //  Terminal=false
+-   snprintf(work,199,"Exec=%s/bin/%s\n",zprefix,command);                  //  Exec=/usr/bin/appname -options
++   snprintf(work,199,"Exec=%s/%s\n",BINDIR,zappname);                  //  Exec=/usr/bin/appname -options
+    fputs(work,fid);
+-   snprintf(work,199,"Icon=%s/%s.png\n",zicondir,appname);                 //  Icon=/usr/share/appname/icons/appname.png
++   snprintf(work,199,"Icon=%s/icons/%s.png\n",DATADIR,zappname);                 //  Icon=/usr/share/appname/icons/appname.png
+    fputs(work,fid);
+    fclose(fid);
+ 
diff --git a/games-puzzle/picpuz/picpuz-2.5.ebuild b/games-puzzle/picpuz/picpuz-2.5.ebuild
new file mode 100644
index 000000000000..4c9cf181c8e5
--- /dev/null
+++ b/games-puzzle/picpuz/picpuz-2.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/picpuz/picpuz-2.5.ebuild,v 1.1 2012/07/24 17:55:27 pacho Exp $
+
+EAPI=4
+inherit eutils gnome2-utils 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+:3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+src_compile() {
+	emake \
+		BINDIR="${GAMES_BINDIR}" \
+		DATADIR="${GAMES_DATADIR}"/${PN} \
+		DOCDIR=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	dogamesbin ${PN}
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r icons locales
+	doicon -s 48 icons/${PN}.png
+	make_desktop_entry ${PN} Picpuz
+	dohtml -r doc/{userguide-en.html,images}
+	dodoc doc/{changelog,README,translations}
+	newman doc/${PN}.man ${PN}.1
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}