3 files changed, 87 insertions, 1 deletions
diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog
index 4c235e5aefa0..120cd49de0c9 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.15 2011/03/16 10:01:50 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.16 2011/04/05 18:54:04 grozin Exp $
+
+*fotoxx-11.04 (05 Apr 2011)
+
+  05 Apr 2011; Andrey Grozin <grozin@gentoo.org> +fotoxx-11.04.ebuild,
+  +files/fotoxx-11.04-makefile.patch:
+  Version bump
 
 *fotoxx-11.03.1 (16 Mar 2011)
 
diff --git a/media-gfx/fotoxx/files/fotoxx-11.04-makefile.patch b/media-gfx/fotoxx/files/fotoxx-11.04-makefile.patch
new file mode 100644
index 000000000000..1053d4a3b7b1
--- /dev/null
+++ b/media-gfx/fotoxx/files/fotoxx-11.04-makefile.patch
@@ -0,0 +1,36 @@
+diff -r -U1 fotoxx-11.02.orig/Makefile fotoxx-11.02/Makefile
+--- fotoxx-11.02.orig/Makefile	2011-02-01 16:16:20.000000000 +0600
++++ fotoxx-11.02/Makefile	2011-02-10 00:09:50.000000000 +0600
+@@ -7,8 +7,8 @@
+ # defaults for parameters that may be pre-defined
+-CXXFLAGS ?= -O3 -g -Wall
+-LDFLAGS ?= -O3 -g -Wall -rdynamic
++CXXFLAGS += -Wall
++LDFLAGS += -rdynamic
+ PREFIX ?= /usr/local
+ 
+-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0`
+-LFLAGS = $(LDFLAGS) `pkg-config --libs gtk+-2.0 gthread-2.0`
++CXXFLAGS += -c `pkg-config --cflags gtk+-2.0`
++LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0`
+ 
+@@ -16,3 +16,3 @@
+ DATADIR = $(PREFIX)/share/$(PROGRAM)
+-DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
++DOCDIR = $(PREFIX)/share/doc/$(PF)
+ MANDIR = $(PREFIX)/share/man/man1
+@@ -22,3 +22,3 @@
+ $(PROGRAM): $(PROGRAM).o zfuncs.o
+-	$(CXX) $(LFLAGS) -ltiff -o $(PROGRAM) $(PROGRAM).o zfuncs.o
++	$(CXX) $(LDFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o -ltiff $(LIBS)
+ 	@ ./dependencies.sh
+@@ -26,3 +26,3 @@
+ $(PROGRAM).o: $(SOURCE)
+-	$(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE)   \
++	$(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE) \
+ 	  -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
+@@ -30,3 +30,3 @@
+ zfuncs.o: zfuncs.cc
+-	$(CXX) $(CFLAGS) zfuncs.cc	         \
++	$(CXX) $(CXXFLAGS) zfuncs.cc \
+ 	  -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\""
diff --git a/media-gfx/fotoxx/fotoxx-11.04.ebuild b/media-gfx/fotoxx/fotoxx-11.04.ebuild
new file mode 100644
index 000000000000..65cd5d34ed48
--- /dev/null
+++ b/media-gfx/fotoxx/fotoxx-11.04.ebuild
@@ -0,0 +1,44 @@
+# 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.04.ebuild,v 1.1 2011/04/05 18:54:04 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}-makefile.patch
+}
+
+src_compile() {
+	tc-export CXX
+	emake PREFIX=/usr || die
+}
+
+src_install() {
+	pushd doc > /dev/null
+	mv ${PN}.man ${PN}.1
+	doman ${PN}.1
+	rm COPYING ${PN}.1
+	bzip2 -9 userguide-changes
+	popd > /dev/null
+	# 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}" PREFIX=/usr install || die
+	make_desktop_entry ${PN} "Fotoxx" /usr/share/${PN}/icons/${PN}.png \
+		"Application;Graphics;2DGraphics"
+}