Fix underlinking (#496136 by kalle)

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 116 insertions, 21 deletions

diff --git a/media-gfx/gtkam/ChangeLog b/media-gfx/gtkam/ChangeLog
index 4b8590fb121b..e615c3ca9eb5 100644
--- a/media-gfx/gtkam/ChangeLog
+++ b/media-gfx/gtkam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gtkam
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.86 2013/12/08 19:07:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.87 2013/12/28 16:14:31 pacho Exp $
+
+  28 Dec 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gtkam-0.2.0-underlinking.patch, gtkam-0.2.0.ebuild:
+  Fix underlinking (#496136 by kalle)
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gtkam-0.2.0.ebuild:
   x86 stable, bug #478252
diff --git a/media-gfx/gtkam/files/gtkam-0.2.0-underlinking.patch b/media-gfx/gtkam/files/gtkam-0.2.0-underlinking.patch
new file mode 100644
index 000000000000..c1bacf0f24f2
--- /dev/null
+++ b/media-gfx/gtkam/files/gtkam-0.2.0-underlinking.patch
@@ -0,0 +1,86 @@
+diff -ur gtkam-0.2.0/configure.ac gtkam-0.2.0.new/configure.ac
+--- gtkam-0.2.0/configure.ac	2012-07-10 09:50:52.000000000 +0200
++++ gtkam-0.2.0.new/configure.ac	2013-12-28 17:10:16.899893905 +0100
+@@ -32,7 +32,6 @@
+ dnl Some programs we need
+ dnl ---------------------------------------------------------------------------
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ AM_PROG_LIBTOOL
+ AC_PROG_INSTALL
+@@ -86,9 +85,7 @@
+ )
+ LIBS="$save_LIBS"
+ 
+-PKG_CHECK_MODULES([GTK], [gtk+-2.0])
+-AC_SUBST([GTK_CFLAGS])
+-AC_SUBST([GTK_LIBS])
++GP_CHECK_LIBRARY([GTK2], [gtk+-2.0])
+ 
+ 
+ dnl ---------------------------------------------------------------------------
+Sólo en gtkam-0.2.0.new/: configure.ac.orig
+diff -ur gtkam-0.2.0/src/Makefile.am gtkam-0.2.0.new/src/Makefile.am
+--- gtkam-0.2.0/src/Makefile.am	2009-10-10 11:10:26.000000000 +0200
++++ gtkam-0.2.0.new/src/Makefile.am	2013-12-28 17:10:13.118834763 +0100
+@@ -6,7 +6,7 @@
+ 	$(LIBEXIF_GTK_CFLAGS)		\
+ 	$(LIBGPHOTO2_CFLAGS)		\
+ 	$(GNOME_CFLAGS) 		\
+-	$(GTK_CFLAGS)			\
++	$(GTK2_CFLAGS)			\
+ 	$(BONOBO_CFLAGS)		\
+ 	$(GTKAM_GIMP_CFLAGS)
+ 
+@@ -46,14 +46,14 @@
+ 	gtkam-exif.c gtkam-exif.h 		\
+ 	gtkam-main.c gtkam-main.h 		\
+ 	i18n.h main.c
+-gtkam_LDADD = \
+-	libgtkam.a	\
+-	$(LIBEXIF_LIBS) \
+-	$(LIBEXIF_GTK_LIBS) \
++gtkam_LDADD = 			\
++	libgtkam.a		\
++	$(LIBEXIF_LIBS) 	\
++	$(LIBEXIF_GTK_LIBS) 	\
+ 	$(LIBGPHOTO2_LIBS)	\
+-	$(GTKAM_LIBS) 	\
+-	$(BONOBO_LIBS)	\
+-	$(GNOME_LIBS)	\
++	$(GTK2_LIBS) 		\
++	$(BONOBO_LIBS)		\
++	$(GNOME_LIBS)		\
+ 	$(INTLLIBS)
+ 
+ if HAVE_GIMP
+@@ -69,6 +69,7 @@
+ 	$(LIBEXIF_LIBS)		\
+ 	$(LIBEXIF_GTK_LIBS) 	\
+ 	$(LIBGPHOTO2_LIBS)	\
++	$(GTK2_LIBS) 		\
+ 	$(BONOBO_LIBS)		\
+ 	$(GNOME_LIBS)		\
+ 	$(INTLLIBS)
+diff -ur gtkam-0.2.0/test/Makefile.am gtkam-0.2.0.new/test/Makefile.am
+--- gtkam-0.2.0/test/Makefile.am	2009-10-10 11:10:25.000000000 +0200
++++ gtkam-0.2.0.new/test/Makefile.am	2013-12-28 17:10:13.119834775 +0100
+@@ -4,7 +4,7 @@
+ 	$(LIBEXIF_GTK_CFLAGS)		\
+ 	$(LIBGPHOTO2_CFLAGS)		\
+ 	$(GNOME_CFLAGS) 		\
+-	$(GTK_CFLAGS)			\
++	$(GTK2_CFLAGS)			\
+ 	$(BONOBO_CFLAGS)		\
+ 	$(GTKAM_GIMP_CFLAGS)
+ 
+@@ -13,7 +13,7 @@
+ 	$(LIBEXIF_LIBS)			\
+ 	$(LIBEXIF_GTK_LIBS)		\
+ 	$(LIBGPHOTO2_LIBS)	\
+-	$(GTK_LIBS)			\
++	$(GTK2_LIBS)			\
+ 	$(BONOBO_LIBS)			\
+ 	$(INTLLIBS)
+ 
diff --git a/media-gfx/gtkam/gtkam-0.2.0.ebuild b/media-gfx/gtkam/gtkam-0.2.0.ebuild
index 75e9341b09d5..67d63a1daf2a 100644
--- a/media-gfx/gtkam/gtkam-0.2.0.ebuild
+++ b/media-gfx/gtkam/gtkam-0.2.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.2.0.ebuild,v 1.3 2013/12/08 19:07:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.2.0.ebuild,v 1.4 2013/12/28 16:14:31 pacho Exp $
 
-EAPI="4"
+EAPI=5
 GCONF_DEBUG="yes"
 
-inherit eutils gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="A frontend for gPhoto 2"
 HOMEPAGE="http://gphoto.org/proj/gtkam"
@@ -16,38 +16,43 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 IUSE="gimp gnome nls"
 
-# FIXME: why is exif not optional ?
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="
+	x11-libs/gtk+:2
 	>=media-libs/libgphoto2-2.5.0
 	>=media-libs/libexif-0.3.2
 	media-libs/libexif-gtk
 	gimp? ( >=media-gfx/gimp-2 )
 	gnome? (
 		>=gnome-base/libbonobo-2
-		>=gnome-base/libgnomeui-2 )"
+		>=gnome-base/libgnomeui-2 )
+"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
 	app-text/scrollkeeper
-	nls? ( >=sys-devel/gettext-0.14.1 )"
-
-pkg_setup() {
-	DOCS="AUTHORS CHANGES NEWS README TODO"
-	G2CONF="${G2CONF}
-		$(use_with gimp)
-		$(use_with gnome)
-		$(use_with gnome bonobo)
-		$(use_enable nls)
-		--disable-scrollkeeper
-		--with-rpmbuild=/bin/false"
-}
+	nls? ( >=sys-devel/gettext-0.14.1 )
+"
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# Fix .desktop validity, bug #271569
 	epatch "${FILESDIR}/${PN}-0.1.18-desktop-validation.patch"
+
+	# Fix underlinking, bug #496136
+	epatch "${FILESDIR}/${PN}-0.2.0-underlinking.patch"
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with gimp) \
+		$(use_with gnome) \
+		$(use_with gnome bonobo) \
+		$(use_enable nls) \
+		--with-rpmbuild=/bin/false
 }
+
 src_install() {
 	gnome2_src_install
 	rm -rf "${ED}"/usr/share/doc/gtkam || die "rm failed"