Version bump

(Portage version: 2.2.15/cvs/Linux i686, signed Manifest commit with key 0x3AFFCE974D34BD8C!)

4 files changed, 21 insertions, 52 deletions

diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog
index c1f9d76301d2..d8279d2c80ff 100644
--- a/media-gfx/fotoxx/ChangeLog
+++ b/media-gfx/fotoxx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/fotoxx
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.65 2014/10/13 13:58:48 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.66 2014/12/20 16:53:00 grozin Exp $
+
+*fotoxx-14.12 (20 Dec 2014)
+
+  20 Dec 2014; Andrey Grozin <grozin@gentoo.org> -fotoxx-14.08.ebuild,
+  +fotoxx-14.12.ebuild, -files/fotoxx-14.08.patch, +files/fotoxx-14.12.patch:
+  Version bump
 
 *fotoxx-14.10.2 (13 Oct 2014)
 
diff --git a/media-gfx/fotoxx/files/fotoxx-14.08.patch b/media-gfx/fotoxx/files/fotoxx-14.08.patch
deleted file mode 100644
index 820ef1834ecd..000000000000
--- a/media-gfx/fotoxx/files/fotoxx-14.08.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -r -U1 fotoxx-14.08.orig/Makefile fotoxx-14.08/Makefile
---- fotoxx-14.08.orig/Makefile	2014-08-01 18:26:48.000000000 +0700
-+++ fotoxx-14.08/Makefile	2014-08-03 16:11:40.201653715 +0700
-@@ -5,5 +5,4 @@
- # defaults for parameters that may be pre-defined
--CXXFLAGS ?= -O2 -Wall -ggdb
--
--LDFLAGS ?= -rdynamic 
-+CXXFLAGS += -Wall
-+LDFLAGS += -rdynamic
- PREFIX ?= /usr
-@@ -16,3 +15,3 @@
- LOCALESDIR = $(SHAREDIR)/locales
--DOCDIR = $(PREFIX)/share/doc/fotoxx
-+DOCDIR = $(PREFIX)/share/doc/$(PF)
- MANDIR = $(PREFIX)/share/man/man1
-@@ -21,4 +20,4 @@
- 
--CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0`
--LIBS = `pkg-config --libs gtk+-3.0` 
-+CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-3.0`
-+LIBS = `pkg-config --libs gtk+-3.0` -lpthread
- 
-@@ -73,3 +72,2 @@
- 	rm -f  $(DESTDIR)$(MANDIR)/fotoxx.1.gz
--	xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
- 	rm -f  $(DESTDIR)$(MENUFILE)
-@@ -80,2 +78,3 @@
- 	mkdir -p  $(DESTDIR)$(DOCDIR)
-+	mkdir -p  $(DESTDIR)$(APPDATADIR)
- 	mkdir -p  $(DESTDIR)$(MANDIR)
-@@ -94,6 +93,2 @@
- 	rm -f fotoxx.1.gz
--	# menu (desktop) file
--	cp -f desktop $(DESTDIR)$(MENUFILE)
--	# chmod +x $(DESTDIR)$(MENUFILE)
--	xdg-desktop-menu install --novendor $(DESTDIR)$(MENUFILE)
- 
-@@ -104,3 +99,2 @@
- 	rm -f  $(DESTDIR)$(MANDIR)/fotoxx.1.gz
--	xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
- 	rm -f  $(DESTDIR)$(MENUFILE)
-diff -r -U1 fotoxx-14.08.orig/zfuncs.cc fotoxx-14.08/zfuncs.cc
---- fotoxx-14.08.orig/zfuncs.cc	2014-08-01 18:26:48.000000000 +0700
-+++ fotoxx-14.08/zfuncs.cc	2014-08-03 16:13:01.706650287 +0700
-@@ -3973,3 +3973,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/$(PF)
-    
diff --git a/media-gfx/fotoxx/files/fotoxx-14.12.patch b/media-gfx/fotoxx/files/fotoxx-14.12.patch
new file mode 100644
index 000000000000..15fdaa9abacf
--- /dev/null
+++ b/media-gfx/fotoxx/files/fotoxx-14.12.patch
@@ -0,0 +1,13 @@
+diff -r -U1 fotoxx-14.10.2.orig/Makefile fotoxx-14.10.2/Makefile
+--- fotoxx-14.10.2.orig/Makefile	2014-10-09 15:17:09.000000000 +0700
++++ fotoxx-14.10.2/Makefile	2014-10-13 20:44:55.061728475 +0700
+@@ -16,3 +16,3 @@
+ LOCALESDIR = $(SHAREDIR)/locales
+-DOCDIR = $(PREFIX)/share/doc/fotoxx
++DOCDIR = $(PREFIX)/share/doc/$(PF)
+ MANDIR = $(PREFIX)/share/man/man1
+@@ -90,4 +90,2 @@
+ 	rm -f fotoxx.1.gz
+-	# menu (desktop) file
+-	cp -f desktop $(DESTDIR)$(MENUFILE)
+ 
diff --git a/media-gfx/fotoxx/fotoxx-14.08.ebuild b/media-gfx/fotoxx/fotoxx-14.12.ebuild
index b1ffd26cf8f8..498dc429d2c4 100644
--- a/media-gfx/fotoxx/fotoxx-14.08.ebuild
+++ b/media-gfx/fotoxx/fotoxx-14.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-14.08.ebuild,v 1.1 2014/08/03 08:04:02 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-14.12.ebuild,v 1.1 2014/12/20 16:53:00 grozin Exp $
 
 EAPI=4