Version bump

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

4 files changed, 43 insertions, 38 deletions

diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog
index 788ea40a927d..9fad2934aebf 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.24 2011/11/06 09:20:22 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.25 2011/12/04 08:42:39 grozin Exp $
+
+*fotoxx-11.12.1 (04 Dec 2011)
+
+  04 Dec 2011; Andrey Grozin <grozin@gentoo.org> -fotoxx-11.10.ebuild,
+  -files/fotoxx-11.10.patch, +fotoxx-11.12.1.ebuild,
+  +files/fotoxx-11.12.1.patch:
+  Version bump
 
 *fotoxx-11.11.1 (06 Nov 2011)
 
diff --git a/media-gfx/fotoxx/files/fotoxx-11.10.patch b/media-gfx/fotoxx/files/fotoxx-11.10.patch
deleted file mode 100644
index 325910bdce57..000000000000
--- a/media-gfx/fotoxx/files/fotoxx-11.10.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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/files/fotoxx-11.12.1.patch b/media-gfx/fotoxx/files/fotoxx-11.12.1.patch
new file mode 100644
index 000000000000..163173bdd0b6
--- /dev/null
+++ b/media-gfx/fotoxx/files/fotoxx-11.12.1.patch
@@ -0,0 +1,34 @@
+diff -r -U1 fotoxx-11.12.1.orig/Makefile fotoxx-11.12.1/Makefile
+--- fotoxx-11.12.1.orig/Makefile	2011-12-02 21:10:01.000000000 +0700
++++ fotoxx-11.12.1/Makefile	2011-12-04 15:26:12.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
+@@ -14,3 +14,3 @@
+ LOCALESDIR = $(SHAREDIR)/locales
+-DOCDIR = $(PREFIX)/share/doc/fotoxx
++DOCDIR = $(PREFIX)/share/doc/$(PF)
+ MANDIR = $(PREFIX)/share/man/man1
+@@ -18,3 +18,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`
+@@ -75,5 +75,2 @@
+ 	rm -f fotoxx.1.gz
+-	# menu (desktop) file
+-	cp -f desktop $(DESTDIR)$(MENUFILE)
+-	xdg-desktop-menu install $(DESTDIR)$(MENUFILE)
+ 
+diff -r -U1 fotoxx-11.12.1.orig/zfuncs.cc fotoxx-11.12.1/zfuncs.cc
+--- fotoxx-11.12.1.orig/zfuncs.cc	2011-12-02 21:10:01.000000000 +0700
++++ fotoxx-11.12.1/zfuncs.cc	2011-12-04 15:28:27.000000000 +0700
+@@ -3123,3 +3123,3 @@
+    strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null);      //  /prefix/share/appname/locales
+-   strncatv(zdocdir,199,work,"/share/doc/",zappname,null);                 //  /prefix/share/doc/appname
++   strncatv(zdocdir,199,work,"/share/doc/",PF,null);                       //  /prefix/share/doc/appname
+    
diff --git a/media-gfx/fotoxx/fotoxx-11.10.ebuild b/media-gfx/fotoxx/fotoxx-11.12.1.ebuild
index 992f57973d77..ba8b92b10c65 100644
--- a/media-gfx/fotoxx/fotoxx-11.10.ebuild
+++ b/media-gfx/fotoxx/fotoxx-11.12.1.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.10.ebuild,v 1.1 2011/10/12 04:50:19 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-11.12.1.ebuild,v 1.1 2011/12/04 08:42:39 grozin Exp $
 EAPI=3
 inherit eutils toolchain-funcs