Version bump

(Portage version: 2.2.0_alpha59/cvs/Linux i686)

5 files changed, 46 insertions, 32 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/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() {