Respecting user *FLAGS$; #341665, compiling in parallel, installation of .desktop files, added support for debug and nls

(Portage version: 2.2.0_alpha13/cvs/Linux x86_64)

3 files changed, 250 insertions, 2 deletions

diff --git a/media-gfx/flphoto/ChangeLog b/media-gfx/flphoto/ChangeLog
index 8ebe45557093..c9434eb64711 100644
--- a/media-gfx/flphoto/ChangeLog
+++ b/media-gfx/flphoto/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/flphoto
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/ChangeLog,v 1.19 2010/06/01 14:18:04 josejx Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/ChangeLog,v 1.20 2011/01/06 12:41:27 jlec Exp $
+
+*flphoto-1.3.1-r2 (06 Jan 2011)
+
+  06 Jan 2011; Justin Lecher <jlec@gentoo.org> +flphoto-1.3.1-r2.ebuild,
+  +files/flphoto-1.3.1-linking.patch:
+  Respecting user *FLAGS$; #341665, compiling in parallel, installation of
+  .desktop files, added support for debug and nls
 
   01 Jun 2010; Joseph Jezak <josejx@gentoo.org> -flphoto-1.2.ebuild,
   -flphoto-1.3.1.ebuild, flphoto-1.3.1-r1.ebuild, +files/espmsg.patch:
diff --git a/media-gfx/flphoto/files/flphoto-1.3.1-linking.patch b/media-gfx/flphoto/files/flphoto-1.3.1-linking.patch
new file mode 100644
index 000000000000..e297c6d62eae
--- /dev/null
+++ b/media-gfx/flphoto/files/flphoto-1.3.1-linking.patch
@@ -0,0 +1,173 @@
+diff --git a/Makefile.in b/Makefile.in
+index 76703be..0dddba1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -50,7 +50,7 @@ EXEEXT		=	@EXEEXT@
+ 
+ CFLAGS		=	@CFLAGS@ @CPPFLAGS@ $(OPTIM)
+ CXXFLAGS	=	@CXXFLAGS@ @CPPFLAGS@ $(OPTIM)
+-LDFLAGS		=	@LDFLAGS@ $(OPTIM)
++LDFLAGS		=	@LDFLAGS@
+ LIBS		=	@LIBS@
+ OPTIM		=	@OPTIM@ @DEFS@
+ 
+@@ -85,16 +85,13 @@ VPATH		=	$(srcdir)
+ # Rules...
+ #
+ 
+-.SILENT:
+ 
+ .SUFFIXES:	.c .cxx .h .mo .o .po
+ .c.o:
+-	echo Compiling $<...
+ 	$(CC) $(CFLAGS) -I. -I$(srcdir) -c $<
+ .cxx.o:
+-	echo Compiling $<...
+ 	$(CXX) $(CXXFLAGS) -I. -I$(srcdir) -c $<
+-.po:	espmsg$(EXEEXT)
++.po: espmsg$(EXEEXT)
+ 	echo Generating $@...
+ 	./espmsg $< compile
+ 
+@@ -108,8 +105,7 @@ TARGETS	=	\
+ 		fldcraw$(EXEEXT) \
+ 		flphoto$(EXEEXT) \
+ 		espmsg$(EXEEXT) \
+-		testexif$(EXEEXT) \
+-		$(TRANSLATIONS)
++		testexif$(EXEEXT)
+ CFILES	=	\
+ 		espmsglib.c \
+ 		i18n.c \
+@@ -154,6 +150,7 @@ OBJS	=	$(CFILES:.c=.o) $(CXXFILES:.cxx=.o)
+ 
+ all:	Makefile config.h $(TARGETS) testslideshow
+ 
++translations: $(TRANSLATIONS)
+ 
+ #
+ # Clean all object files...
+@@ -210,6 +207,8 @@ install: $(TARGETS) @INSTALLDESKTOP@
+ 	$(CP) $(srcdir)/doc/*.jpg $(DESTDIR)$(docdir)
+ 	$(RM) $(DESTDIR)$(docdir)/*.png
+ 	$(CP) $(srcdir)/doc/*.png $(DESTDIR)$(docdir)
++
++install-translations: translations
+ 	echo Installing flphoto translations in $(DESTDIR)$(FLPHOTO_LOCALE)
+ 	-$(MKDIR) $(DESTDIR)$(FLPHOTO_LOCALE)
+ 	for file in $(TRANSLATIONS); do \
+@@ -221,9 +220,9 @@ install: $(TARGETS) @INSTALLDESKTOP@
+ 
+ install-desktop:
+ 	echo Installing flPhoto desktop files...
+-	-$(MKDIR) $(DESTDIR)/etc/X11/applnk/Graphics
+-	$(RM) $(DESTDIR)/etc/X11/applnk/Graphics/flphoto.desktop
+-	$(CP) flphoto.desktop $(DESTDIR)/etc/X11/applnk/Graphics
++	-$(MKDIR) $(DESTDIR)/usr/share/applications
++	$(RM) $(DESTDIR)/usr/share/applications/flphoto.desktop
++	$(CP) flphoto.desktop $(DESTDIR)/usr/share/applications
+ 	-$(MKDIR) $(DESTDIR)/usr/share/pixmaps
+ 	$(RM) $(DESTDIR)/usr/share/pixmaps/flphoto.png
+ 	$(CP) doc/flphoto.png $(DESTDIR)/usr/share/pixmaps
+@@ -255,7 +254,7 @@ uninstall: @UNINSTALLDESKTOP@
+ 
+ uninstall-desktop:
+ 	echo Removing flPhoto desktop files...
+-	$(RM) $(DESTDIR)/etc/X11/applnk/Graphics/flphoto.desktop
++	$(RM) $(DESTDIR)/usr/share/applications/flphoto.desktop
+ 	$(RM) $(DESTDIR)/usr/share/pixmaps/flphoto.png
+ 	$(RM) $(DESTDIR)/usr/share/mimelnk/application/x-flphoto.desktop
+ 
+@@ -318,8 +317,8 @@ po/flphoto.pot:	$(CFILES) $(CXXFILES) espmsg$(EXEEXT)
+ #
+ 
+ fldcraw$(EXEEXT):	fldcraw.c
+-	echo Compiling and linking fldcraw$(EXEEXT)...
+-	$(CC) $(CFLAGS) -DNO_JPEG -DNO_LCMS -o fldcraw$(EXEEXT) fldcraw.c -lm
++	$(CC) $(CFLAGS) -DNO_JPEG -DNO_LCMS -c fldcraw.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o fldcraw$(EXEEXT) fldcraw.o -lm
+ 
+ 
+ #
+@@ -327,8 +326,7 @@ fldcraw$(EXEEXT):	fldcraw.c
+ #
+ 
+ flphoto$(EXEEXT):	$(OBJS)
+-	echo Linking flphoto$(EXEEXT)...
+-	$(CXX) $(CXXFLAGS) -o flphoto$(EXEEXT) $(OBJS) $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o flphoto$(EXEEXT) $(OBJS) $(LIBS)
+ 
+ 
+ #
+@@ -336,8 +334,7 @@ flphoto$(EXEEXT):	$(OBJS)
+ #
+ 
+ espmsg$(EXEEXT):		espmsg.o espmsglib.o
+-	echo Linking espmsg$(EXEEXT)...
+-	$(CC) $(CFLAGS) -o espmsg$(EXEEXT) espmsg.o espmsglib.o $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o espmsg$(EXEEXT) espmsg.o espmsglib.o $(LIBS)
+ 
+ 
+ #
+@@ -345,8 +342,7 @@ espmsg$(EXEEXT):		espmsg.o espmsglib.o
+ #
+ 
+ testexif$(EXEEXT):	testexif.o Fl_EXIF_Data.o
+-	echo Linking testexif$(EXEEXT)...
+-	$(CXX) $(CXXFLAGS) -o testexif$(EXEEXT) testexif.o Fl_EXIF_Data.o $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o testexif$(EXEEXT) testexif.o Fl_EXIF_Data.o $(LIBS)
+ 
+ 
+ #
+@@ -359,8 +355,7 @@ TSSOBJS	=	\
+ 		testslideshow.o
+ 
+ testslideshow$(EXEEXT):	$(TSSOBJS)
+-	echo Linking $@...
+-	$(CXX) -o $@ $(TSSOBJS) $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(TSSOBJS) $(LIBS)
+ 
+ $(TSSOBJS):	Compositor.h Fl_Slideshow.h
+ 
+diff --git a/configure.in b/configure.in
+index 07279a0..60b5c66 100644
+--- a/configure.in
++++ b/configure.in
+@@ -47,14 +47,14 @@ CFLAGS="${CFLAGS:=}"
+ CXXFLAGS="${CXXFLAGS:=}"
+ LDFLAGS="${LDFLAGS:=}"
+ AC_SUBST(LDFLAGS)
+-OPTIM="-O"
++OPTIM=""
+ AC_SUBST(OPTIM)
+ 
+ AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],
+ if eval "test x$enable_debug = xyes"; then
+  	OPTIM="-g"
+ else
+-	LDFLAGS="$LDFLAGS -s"
++	LDFLAGS="$LDFLAGS"
+ fi)
+ 
+ AC_ARG_WITH(docdir, [  --with-docdir           set directory for documentation],
+@@ -166,11 +166,6 @@ fi
+ 
+ dnl Update compiler options...
+ if test -n "$GCC"; then
+-	if test -z "$OPTIM"; then
+-        	OPTIM="-Os"
+-	fi
+-
+-	OPTIM="-Wall -Wno-return-type $OPTIM"
+ 
+ 	# See if GCC supports -fno-rtti...
+ 	AC_MSG_CHECKING(if GCC supports -fno-rtti)
+@@ -339,7 +334,7 @@ AC_SUBST(MAN5EXT)
+ 
+ dnl See if we have the X11 desktop stuff used by GNOME and KDE...
+ AC_MSG_CHECKING(if GNOME/KDE desktop is in use)
+-if test -d /etc/X11/applnk; then
++if test -d /usr/share/applications; then
+ 	AC_MSG_RESULT(yes)
+ 	INSTALLDESKTOP="install-desktop"
+ 	UNINSTALLDESKTOP="uninstall-desktop"
diff --git a/media-gfx/flphoto/flphoto-1.3.1-r2.ebuild b/media-gfx/flphoto/flphoto-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..71c364c34805
--- /dev/null
+++ b/media-gfx/flphoto/flphoto-1.3.1-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/flphoto-1.3.1-r2.ebuild,v 1.1 2011/01/06 12:41:27 jlec Exp $
+
+EAPI=3
+
+inherit autotools eutils fdo-mime
+
+DESCRIPTION="Basic image management and display program based on the FLTK toolkit"
+HOMEPAGE="http://www.easysw.com/~mike/flphoto/"
+SRC_URI="mirror://sourceforge/fltk/${P}-source.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="cups debug gphoto2 nls"
+
+DEPEND="
+	dev-libs/openssl
+	media-libs/jpeg
+	media-libs/libpng
+	sys-libs/zlib
+	x11-libs/fltk:1.1
+	x11-libs/libX11
+	x11-misc/shared-mime-info
+	cups? ( net-print/cups )
+	gphoto2? ( media-gfx/gphoto2 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/flphoto-1.3.1-glibc28.patch \
+		"${FILESDIR}"/flphoto-1.3.1-linking.patch \
+		"${FILESDIR}"/espmsg.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-docdir=/usr/share/doc/${PF} \
+		$(use_enable debug)
+}
+
+src_compile() {
+	emake || die
+	if use nls; then
+		emake translations || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	if use nls; then
+		emake DESTDIR="${D}" install-translations || die
+	fi
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}"/album.xml || die
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}