Version bump

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

5 files changed, 47 insertions, 42 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/Manifest b/media-gfx/fotoxx/Manifest
index 37d81a4a966d..df2e12c13aa6 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,12 +1,12 @@
 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
-AUX fotoxx-11.10.patch 1612 RMD160 bca51e13fb33d9a05781e5231d7e47242ea187ab SHA1 af5bf0c66a5417b19b412b93a67214196832cbb8 SHA256 a16b7ed2f17a9004cbb5e021c6adc268c06d6a4e4ee28dcae3041991ef3ff657
 AUX fotoxx-11.11.1.patch 1450 RMD160 bce1cffd1335af7db76452a8f1f72247be6d66f1 SHA1 a14273662f261d906ba870f4e14725942a6af298 SHA256 25257af2ce0383fe5037c45c45ea70be62621af590baa1e0f90ea042f5caa89f
+AUX fotoxx-11.12.1.patch 1441 RMD160 dbe66ccdee22c77cad8db1d5a715a4288c43f9c3 SHA1 0a0fdacfdf5ba8e4d04ef69a7db3fad93f82bf41 SHA256 0c78e02cb68ad35610c2cca7081664b17a45f398a78be4d5d8c1acc8bcc219af
 DIST fotoxx-11.08.1.tar.gz 1477220 RMD160 640ea896325383b495702577c274dfbd75e4dc5f SHA1 cad763c6e6b295166ad8c54c0f74ea0ad47e2254 SHA256 5d161f5311b7dadfb32c03bff6b97cafab1019ac462ea6bb8031c2ea1d341f70
-DIST fotoxx-11.10.tar.gz 1489681 RMD160 437c4aa15f6790c824add961ff41c1d69e74af20 SHA1 5fe99eed26be43742b39c10b4a399379cdc5d29a SHA256 9895e569de22d2f964a68b1dbfc89169bbdd4c7a7dd1401cdcad98362b6444b1
 DIST fotoxx-11.11.1.tar.gz 1471552 RMD160 8d74c14b291edb5c4ddc7a5e3ba4287301897bf7 SHA1 e37a0cd38427797d702735d6a57126f5ad400bf3 SHA256 b3c803b3bb0b3457ddc6dcbc8acd30d941b7d15a598e971cdcc7441794e26cb6
+DIST fotoxx-11.12.1.tar.gz 1693442 RMD160 d17672022b437c6bc6d013f635ca0dc4a1e46a47 SHA1 e9f6d58a56020e0548163c4b42687d8a23591c18 SHA256 700036e7cafd4895d824d5e865559169b772a3956af02a09ad51f1e648fb0c6c
 EBUILD fotoxx-11.08.1.ebuild 1120 RMD160 f0b556812abcf1dfef6cfddd3423e6ca1e4bd0ce SHA1 5b8942c4487ef4780b51a0461ee4ecfe40c1fd2e SHA256 e0e29e109ef7c7f99f7396ed93501b1baab6cd44e0c6b9a52e4b20123f305189
-EBUILD fotoxx-11.10.ebuild 1070 RMD160 41801b53295328d3ed1aa68c1eadee711757bd91 SHA1 8a22ff2c22c88bd869e7afe5cab1e239d5a6bce1 SHA256 d304411298cb5a5227e09044659b6d2d04f5b2885b08834836573cc95f4886ce
 EBUILD fotoxx-11.11.1.ebuild 1072 RMD160 7c3a33500b512b674ba024a210ae7f159dfeea1e SHA1 445c0db5fd73add91000d9fab972162fbcf002f2 SHA256 d9a6c2a71425ba562b30c5a6b10a7101113cafe83606398128a558a9f77826a3
-MISC ChangeLog 4991 RMD160 1d1759581ed5563fd854a29f65d1b420ab040028 SHA1 bfe49fd2e3b0896b01189b8d7cf3f63be30223a9 SHA256 0d54bab48d56e70416d3cc7989f81d4eba43f8a256ec2cb4428e337de350db1d
+EBUILD fotoxx-11.12.1.ebuild 1072 RMD160 d065d43fcdce8eb3de79117d8c1b94aa192715ab SHA1 7f721f288295b76a6291b5d86b55d5da726ddbec SHA256 667e64801ec3c4ccb0ea05c40c328db08cbfc306cd785295b1988f7419c10c42
+MISC ChangeLog 5193 RMD160 c04beabfac486b1d117352d4f74909f9b1b5342a SHA1 eab486687450f5d112d7888abee8e9ac89be01de SHA256 06f78777b10cb42eded52cefad740478a4c65935680b4b0e3a6bfacfb7b77957
 MISC metadata.xml 846 RMD160 38cd87d0455a77e2d4f4c8d3a3f0ef918ddf97ca SHA1 784b23036f4b98e161f2a499a04da565d24c5d6f SHA256 ff01900af25b8eff99bd0e031c99608cd77d762a293a0432fd2161ad30aee020
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