Fix building with -Wl,--as-needed wrt #248573 by Kacper Kowalik.

(Portage version: 2.2_rc62/cvs/Linux x86_64)

3 files changed, 63 insertions, 7 deletions

diff --git a/x11-misc/lintar/ChangeLog b/x11-misc/lintar/ChangeLog
index 5dd150e7df72..5cb7b34968cd 100644
--- a/x11-misc/lintar/ChangeLog
+++ b/x11-misc/lintar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/lintar
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lintar/ChangeLog,v 1.4 2007/02/21 23:49:56 jokey Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lintar/ChangeLog,v 1.5 2010/02/06 20:11:57 ssuominen Exp $
+
+  06 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> lintar-0.6.2.ebuild,
+  +files/lintar-0.6.2-asneeded.patch:
+  Fix building with -Wl,--as-needed wrt #248573 by Kacper Kowalik.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-misc/lintar/files/lintar-0.6.2-asneeded.patch b/x11-misc/lintar/files/lintar-0.6.2-asneeded.patch
new file mode 100644
index 000000000000..811b72332ca4
--- /dev/null
+++ b/x11-misc/lintar/files/lintar-0.6.2-asneeded.patch
@@ -0,0 +1,43 @@
+http://bugs.gentoo.org/show_bug.cgi?id=248573
+
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -6,11 +6,8 @@
+ 						prefs_dialog.c prefs_dialog.h prog.c prog.h \
+ 						prog_single.c prog_single.h prog_tar.c prog_tar.h prog_zip.c prog_zip.h
+ 
+-CFLAGS   += -Wall -g
+-
+-LDFLAGS  += `pkg-config --libs gtk+-2.0 gnome-vfs-2.0`
+-
+-INCLUDES += `pkg-config --cflags gtk+-2.0 gnome-vfs-2.0`
++lintar_LDADD  = @DEPS_LIBS@
++lintar_CFLAGS = @DEPS_CFLAGS@
+ 
+ CLEANFILES      = *~
+ DISTCLEANFILES  = .deps/*.P
+--- configure.ac
++++ configure.ac
+@@ -1,6 +1,7 @@
+ # Process this file with autoconf to produce a configure script.
+ AC_INIT(lintar, 0.6.2, jrh@gps.tsc.upc.es)
+ AM_INIT_AUTOMAKE(lintar, 0.6.2)
++AC_USE_SYSTEM_EXTENSIONS
+ 
+ AC_CONFIG_SRCDIR([src/lintar_global.c])
+ 
+@@ -9,12 +10,13 @@
+ 
+ # Checks for programs.
+ AC_PROG_CC
++AM_PROG_CC_C_O
+ 
+ AC_PATH_PROG(USE_PKG_CONFIG, pkg-config,,)
+ if test -z $USE_PKG_CONFIG; then
+    AC_MSG_ERROR([[Need pkg-config to compile lintar.]])
+ fi
+-
++PKG_CHECK_MODULES(DEPS, gtk+-2.0 gnome-vfs-2.0 )
+ 
+ AC_PATH_PROG(LINTAR_PROG_CP, cp,,)
+ if test -z $LINTAR_PROG_CP; then
diff --git a/x11-misc/lintar/lintar-0.6.2.ebuild b/x11-misc/lintar/lintar-0.6.2.ebuild
index 97794c5f53de..c4e1e464340f 100644
--- a/x11-misc/lintar/lintar-0.6.2.ebuild
+++ b/x11-misc/lintar/lintar-0.6.2.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lintar/lintar-0.6.2.ebuild,v 1.3 2006/10/23 07:02:55 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lintar/lintar-0.6.2.ebuild,v 1.4 2010/02/06 20:11:57 ssuominen Exp $
+
+EAPI=2
+WANT_AUTOMAKE=1.9
+inherit autotools eutils
 
 DESCRIPTION="A decompressing tool written in GTK+."
 HOMEPAGE="http://lintar.sourceforge.net/"
@@ -11,12 +15,17 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2
+RDEPEND="x11-libs/gtk+:2
 	>=gnome-base/gnome-vfs-2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
+}
+
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc ABOUT-NLS AUTHORS BUGS ChangeLog README NEWS TODO
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS BUGS ChangeLog README NEWS TODO
 }