Version bump

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

4 files changed, 85 insertions, 14 deletions

diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog
index 0957b9c5046d..a88463408bc7 100644
--- a/media-gfx/fotoxx/ChangeLog
+++ b/media-gfx/fotoxx/ChangeLog
@@ -1,6 +1,12 @@
 # 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.22 2011/09/22 11:31:16 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.23 2011/10/12 04:50:19 grozin Exp $
+
+*fotoxx-11.10 (12 Oct 2011)
+
+  12 Oct 2011; Andrey Grozin <grozin@gentoo.org> +fotoxx-11.10.ebuild,
+  +files/fotoxx-11.10.patch:
+  Version bump
 
 *fotoxx-11.09 (22 Sep 2011)
 
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index 767a7471e718..35a91dbea5a3 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 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.09.patch 1612 RMD160 bca51e13fb33d9a05781e5231d7e47242ea187ab SHA1 af5bf0c66a5417b19b412b93a67214196832cbb8 SHA256 a16b7ed2f17a9004cbb5e021c6adc268c06d6a4e4ee28dcae3041991ef3ff657
+AUX fotoxx-11.10.patch 1612 RMD160 bca51e13fb33d9a05781e5231d7e47242ea187ab SHA1 af5bf0c66a5417b19b412b93a67214196832cbb8 SHA256 a16b7ed2f17a9004cbb5e021c6adc268c06d6a4e4ee28dcae3041991ef3ff657
 DIST fotoxx-11.08.1.tar.gz 1477220 RMD160 640ea896325383b495702577c274dfbd75e4dc5f SHA1 cad763c6e6b295166ad8c54c0f74ea0ad47e2254 SHA256 5d161f5311b7dadfb32c03bff6b97cafab1019ac462ea6bb8031c2ea1d341f70
 DIST fotoxx-11.09.tar.gz 1481028 RMD160 17b9a54d542f85dac4ea9f4da56efab71ce21a8a SHA1 505e2552e4202a31aab0248c0f35f38367c02b7b SHA256 033251dd038389392cd30189a72dbeb522879524b7d838ec8119663257739373
+DIST fotoxx-11.10.tar.gz 1489681 RMD160 437c4aa15f6790c824add961ff41c1d69e74af20 SHA1 5fe99eed26be43742b39c10b4a399379cdc5d29a SHA256 9895e569de22d2f964a68b1dbfc89169bbdd4c7a7dd1401cdcad98362b6444b1
 EBUILD fotoxx-11.08.1.ebuild 1120 RMD160 f0b556812abcf1dfef6cfddd3423e6ca1e4bd0ce SHA1 5b8942c4487ef4780b51a0461ee4ecfe40c1fd2e SHA256 e0e29e109ef7c7f99f7396ed93501b1baab6cd44e0c6b9a52e4b20123f305189
 EBUILD fotoxx-11.09.ebuild 1070 RMD160 17b8711eb84ec15f7bd8ec68406e2293417f2c4d SHA1 33ac97f9f1821276f2523b528377bed465bfde0d SHA256 65b0c72ca4d381ff49c9d729de21f693c2ebdf6e6716d1e4de5323c98d3c3570
-MISC ChangeLog 4644 RMD160 582e90896484f50d2d8e3d43b1c8d5608267f8bd SHA1 be07258e383f20f40cf65f4ecd2892a446315bdf SHA256 8be9c7f70971937416e515eef6045a273e985cca5150ef4e8046badec4cffae6
+EBUILD fotoxx-11.10.ebuild 1070 RMD160 41801b53295328d3ed1aa68c1eadee711757bd91 SHA1 8a22ff2c22c88bd869e7afe5cab1e239d5a6bce1 SHA256 d304411298cb5a5227e09044659b6d2d04f5b2885b08834836573cc95f4886ce
+MISC ChangeLog 4789 RMD160 4acfd45a94ca8dbc57ebb3e67bcfade69af9cc3a SHA1 670a4b6b724df285117256674800fb61b337bc8f SHA256 fee8bb20929561553e532671ba6b17a5dc4144e8e136af2ea0959756382ecc3b
 MISC metadata.xml 846 RMD160 38cd87d0455a77e2d4f4c8d3a3f0ef918ddf97ca SHA1 784b23036f4b98e161f2a499a04da565d24c5d6f SHA256 ff01900af25b8eff99bd0e031c99608cd77d762a293a0432fd2161ad30aee020
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59ovkACgkQfXuS5UK5QB18nQQAhNarAEOi3rYwgziMPrSu5hqW
-V3v4ez/n3tNskbOyOyFEwoHZjdyYlns8H6DM3NHzuOyNCvhVVcLUc4s+nAHWw47h
-6MMlQfhMGYpfMk5CIv1nmnCHJ4CFJNMPuw2JJujxKE1LkDfFXd4Ub+QcUskOdKF4
-X7dt6sBkrd+xfmwth2Y=
-=C21C
------END PGP SIGNATURE-----
diff --git a/media-gfx/fotoxx/files/fotoxx-11.10.patch b/media-gfx/fotoxx/files/fotoxx-11.10.patch
new file mode 100644
index 000000000000..325910bdce57
--- /dev/null
+++ b/media-gfx/fotoxx/files/fotoxx-11.10.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.10.ebuild b/media-gfx/fotoxx/fotoxx-11.10.ebuild
new file mode 100644
index 000000000000..992f57973d77
--- /dev/null
+++ b/media-gfx/fotoxx/fotoxx-11.10.ebuild
@@ -0,0 +1,38 @@
+# 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 $
+EAPI=3
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Program for improving image files made with a digital camera."
+HOMEPAGE="http://kornelix.squarespace.com/fotoxx"
+SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/gtk+:2
+	media-libs/tiff"
+RDEPEND="${DEPEND}
+	media-libs/exiftool
+	media-gfx/ufraw
+	x11-misc/xdg-utils"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PF}.patch
+}
+
+src_compile() {
+	tc-export CXX
+	emake || die "emake failed"
+}
+
+src_install() {
+	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
+	# and README, CHANGES, TRANSLATIONS must not be compressed
+	emake DESTDIR="${D}" install || die "emake install failed"
+	make_desktop_entry ${PN} "Fotoxx" /usr/share/${PN}/icons/${PN}.png \
+		"Application;Graphics;2DGraphics"
+}