Version bump

Package-Manager: portage-2.2.0_alpha59/cvs/Linux i686

6 files changed, 50 insertions, 47 deletions

diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog
index 5a4ead11faab..0957b9c5046d 100644
--- a/media-gfx/fotoxx/ChangeLog
+++ b/media-gfx/fotoxx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/fotoxx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.21 2011/09/11 09:30:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.22 2011/09/22 11:31:16 grozin Exp $
+
+*fotoxx-11.09 (22 Sep 2011)
+
+  22 Sep 2011; Andrey Grozin <grozin@gentoo.org> -fotoxx-11.07.ebuild,
+  -files/fotoxx-11.07-docdir.patch, -files/fotoxx-11.07-makefile.patch,
+  +fotoxx-11.09.ebuild, +files/fotoxx-11.09.patch:
+  Version bump
 
   11 Sep 2011; Markus Meier <maekke@gentoo.org> fotoxx-11.08.1.ebuild:
   x86 stable, bug #382133
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index 6a8551e5070a..f215b478ba4c 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,20 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX fotoxx-11.07-docdir.patch 552 RMD160 d67a99dfb2f66f4e56dd516a965391fc5fba6183 SHA1 0a4d2196de9f2439514d8e98dc9eca1f89df2390 SHA256 d0aa130f9b1cd06e299a73922767cab712d2443c0f1f96b0179abb4e511ae282
-AUX fotoxx-11.07-makefile.patch 649 RMD160 0b801aec319849ad1ed965d0af89a34254531f61 SHA1 7b1627bfbe0047a096f0a38d6b1ee79bae6d7e90 SHA256 8ec14e7ee878721907ee41dd39a215d49f29aa1e3c892a5921cb61f4f58ec128
 AUX fotoxx-11.08.1-docdir.patch 552 RMD160 d67a99dfb2f66f4e56dd516a965391fc5fba6183 SHA1 0a4d2196de9f2439514d8e98dc9eca1f89df2390 SHA256 d0aa130f9b1cd06e299a73922767cab712d2443c0f1f96b0179abb4e511ae282
 AUX fotoxx-11.08.1-makefile.patch 739 RMD160 8786c71dc6f4748ec26c55c7948cbd88a9103633 SHA1 c323f7b4fcad8dd3427189a68b32d6b58db97a9b SHA256 e76d6764113be7c51df2ceb61cba82fe4d95cc43a78c5ccdef5313f5a620162f
-DIST fotoxx-11.07.tar.gz 1404130 RMD160 a8b6aa6cfb6310695621bcb07932f22a4f2ea3ab SHA1 011aeb57df73ba6689160379bf90f0b46991df65 SHA256 3c014a32049241ab39f13ea7d2bd3f8b2969ccfd2cf2c2b9858c475b8bb99c68
+AUX fotoxx-11.09.patch 1612 RMD160 bca51e13fb33d9a05781e5231d7e47242ea187ab SHA1 af5bf0c66a5417b19b412b93a67214196832cbb8 SHA256 a16b7ed2f17a9004cbb5e021c6adc268c06d6a4e4ee28dcae3041991ef3ff657
 DIST fotoxx-11.08.1.tar.gz 1477220 RMD160 640ea896325383b495702577c274dfbd75e4dc5f SHA1 cad763c6e6b295166ad8c54c0f74ea0ad47e2254 SHA256 5d161f5311b7dadfb32c03bff6b97cafab1019ac462ea6bb8031c2ea1d341f70
-EBUILD fotoxx-11.07.ebuild 1120 RMD160 8df96743edddb8615cf309ab01a426b276ac1b2f SHA1 7e348377a4c9b3459e2cffd390563bb57a793c39 SHA256 b008983291a18c824fa886071179e944e9182e8ff6b6db031dfcf83e44ef91b8
+DIST fotoxx-11.09.tar.gz 1481028 RMD160 17b9a54d542f85dac4ea9f4da56efab71ce21a8a SHA1 505e2552e4202a31aab0248c0f35f38367c02b7b SHA256 033251dd038389392cd30189a72dbeb522879524b7d838ec8119663257739373
 EBUILD fotoxx-11.08.1.ebuild 1120 RMD160 f0b556812abcf1dfef6cfddd3423e6ca1e4bd0ce SHA1 5b8942c4487ef4780b51a0461ee4ecfe40c1fd2e SHA256 e0e29e109ef7c7f99f7396ed93501b1baab6cd44e0c6b9a52e4b20123f305189
-MISC ChangeLog 4405 RMD160 eb239a1d57046ac48b73dd95d1d43239347631dc SHA1 0771d5667c68fd3178846077994480834d86fd79 SHA256 f4100e37a935ae830414f2020529101b94ca9d0fca32ffa1b9131013895cc2d7
+EBUILD fotoxx-11.09.ebuild 1070 RMD160 17b8711eb84ec15f7bd8ec68406e2293417f2c4d SHA1 33ac97f9f1821276f2523b528377bed465bfde0d SHA256 65b0c72ca4d381ff49c9d729de21f693c2ebdf6e6716d1e4de5323c98d3c3570
+MISC ChangeLog 4644 RMD160 582e90896484f50d2d8e3d43b1c8d5608267f8bd SHA1 be07258e383f20f40cf65f4ecd2892a446315bdf SHA256 8be9c7f70971937416e515eef6045a273e985cca5150ef4e8046badec4cffae6
 MISC metadata.xml 868 RMD160 8264b2cc211f3c453ab9d2e119d18e543133bee9 SHA1 bf7bf564db831fb3e8474e19ddbde50631808167 SHA256 b705d0b873a5a64e431884d3d975e3634a47b3a8c5a6e1d1392d4195a4e1e219
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk5sf9oACgkQkKaRLQcq0GJ8JwCfV/66adchHGjAClaXwODUMSwy
-l84AoJBin2cs5+UEBEuMUqcHy8EabcrK
-=vkdm
------END PGP SIGNATURE-----
diff --git a/media-gfx/fotoxx/files/fotoxx-11.07-docdir.patch b/media-gfx/fotoxx/files/fotoxx-11.07-docdir.patch
deleted file mode 100644
index 4c54ba3169a5..000000000000
--- a/media-gfx/fotoxx/files/fotoxx-11.07-docdir.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -r -U1 fotoxx-11.06.orig/zfuncs.cc fotoxx-11.06/zfuncs.cc
---- fotoxx-11.06.orig/zfuncs.cc	2011-06-04 20:53:41.000000000 +0700
-+++ fotoxx-11.06/zfuncs.cc	2011-06-07 03:25:04.000000000 +0700
-@@ -2999,3 +2999,3 @@
-    strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null);      //  /installoc/share/appname/locales
--   strncatv(zdocdir,199,work,"/share/doc/",zappname,null);                 //  /installoc/share/doc/appname
-+   strncatv(zdocdir,199,work,"/share/doc/",PF,null);                       //  /installoc/share/doc/appname
-    
diff --git a/media-gfx/fotoxx/files/fotoxx-11.07-makefile.patch b/media-gfx/fotoxx/files/fotoxx-11.07-makefile.patch
deleted file mode 100644
index 7f5f07842823..000000000000
--- a/media-gfx/fotoxx/files/fotoxx-11.07-makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -r -U1 fotoxx-11.07.orig/Makefile fotoxx-11.07/Makefile
---- fotoxx-11.07.orig/Makefile	2011-07-02 00:05:59.000000000 +0700
-+++ fotoxx-11.07/Makefile	2011-07-14 22:30:30.000000000 +0700
-@@ -6,4 +6,4 @@
- # defaults for parameters that may be pre-defined
--CXXFLAGS ?= -O3 -g -Wall
--LDFLAGS ?= -O3 -g -Wall -rdynamic
-+CXXFLAGS += -Wall
-+LDFLAGS += -rdynamic
- PREFIX ?= /usr
-@@ -16,3 +16,3 @@
- LOCALESDIR = $(SHAREDIR)/locales
--DOCDIR = $(PREFIX)/share/doc/fotoxx
-+DOCDIR = $(PREFIX)/share/doc/$(PF)
- MANDIR = $(PREFIX)/share/man/man1
-@@ -53,3 +53,3 @@
- zfuncs.o: zfuncs.cc
--	$(CXX) $(CFLAGS) zfuncs.cc
-+	$(CXX) $(CFLAGS) -DPF=\"$(PF)\" zfuncs.cc
- 
diff --git a/media-gfx/fotoxx/files/fotoxx-11.09.patch b/media-gfx/fotoxx/files/fotoxx-11.09.patch
new file mode 100644
index 000000000000..325910bdce57
--- /dev/null
+++ b/media-gfx/fotoxx/files/fotoxx-11.09.patch
@@ -0,0 +1,36 @@
+diff -r -U1 fotoxx-11.09.orig/Makefile fotoxx-11.09/Makefile
+--- fotoxx-11.09.orig/Makefile	2011-09-05 05:32:59.000000000 +0700
++++ fotoxx-11.09/Makefile	2011-09-22 18:20:29.000000000 +0700
+@@ -5,4 +5,4 @@
+ # defaults for parameters that may be pre-defined
+-CXXFLAGS ?= -O3 -g -Wall
+-LDFLAGS ?= -O3 -g -Wall -rdynamic
++CXXFLAGS += -Wall
++LDFLAGS += -rdynamic
+ PREFIX ?= /usr
+@@ -15,3 +15,3 @@
+ LOCALESDIR = $(SHAREDIR)/locales
+-DOCDIR = $(PREFIX)/share/doc/fotoxx
++DOCDIR = $(PREFIX)/share/doc/$(PF)
+ MANDIR = $(PREFIX)/share/man/man1
+@@ -19,3 +19,3 @@
+ 
+-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0`
++CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-2.0`
+ LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0`
+@@ -71,7 +71,2 @@
+ 	rm -f fotoxx.1.gz
+-	# menu (desktop) file (absolute paths to get around rpmbuild problem)
+-	cp -f data/desktop $(DESTDIR)$(MENUFILE)
+-	echo Exec=/usr/bin/fotoxx >> $(DESTDIR)$(MENUFILE)
+-	echo Icon=/usr/share/fotoxx/icons/fotoxx.png >> $(DESTDIR)$(MENUFILE)
+-	xdg-desktop-menu install $(DESTDIR)$(MENUFILE)
+ 
+diff -r -U1 fotoxx-11.09.orig/zfuncs.cc fotoxx-11.09/zfuncs.cc
+--- fotoxx-11.09.orig/zfuncs.cc	2011-09-05 05:32:59.000000000 +0700
++++ fotoxx-11.09/zfuncs.cc	2011-09-22 18:14:46.000000000 +0700
+@@ -3066,3 +3066,3 @@
+    strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null);      //  /installoc/share/appname/locales
+-   strncatv(zdocdir,199,work,"/share/doc/",zappname,null);                 //  /installoc/share/doc/appname
++   strncatv(zdocdir,199,work,"/share/doc/",PF,null);                       //  /installoc/share/doc/appname
+    
diff --git a/media-gfx/fotoxx/fotoxx-11.07.ebuild b/media-gfx/fotoxx/fotoxx-11.09.ebuild
index 54ad6a41a9a3..a3fa44082662 100644
--- a/media-gfx/fotoxx/fotoxx-11.07.ebuild
+++ b/media-gfx/fotoxx/fotoxx-11.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-11.07.ebuild,v 1.1 2011/07/14 15:41:02 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-11.09.ebuild,v 1.1 2011/09/22 11:31:17 grozin Exp $
 EAPI=3
 inherit eutils toolchain-funcs
 
@@ -21,8 +21,7 @@ RDEPEND="${DEPEND}
 	x11-misc/xdg-utils"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PF}-makefile.patch
-	epatch "${FILESDIR}"/${PF}-docdir.patch
+	epatch "${FILESDIR}"/${PF}.patch
 }
 
 src_compile() {