Fix --as-needed compilation, bug #247521.

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

3 files changed, 68 insertions, 10 deletions

diff --git a/gnome-extra/gnome-swallow/ChangeLog b/gnome-extra/gnome-swallow/ChangeLog
index 334b358136e2..4365bce13b2e 100644
--- a/gnome-extra/gnome-swallow/ChangeLog
+++ b/gnome-extra/gnome-swallow/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-swallow
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-swallow/ChangeLog,v 1.12 2006/08/11 20:04:18 dang Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-swallow/ChangeLog,v 1.13 2009/01/31 18:35:56 eva Exp $
+
+  31 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gnome-swallow-1.2-as-needed.patch, gnome-swallow-1.2.ebuild:
+  Fix --as-needed compilation, bug #247521.
 
   11 Aug 2006; Daniel Gryniewicz <dang@gentoo.org> gnome-swallow-1.2.ebuild:
   Fix typos in description; bug #143139
diff --git a/gnome-extra/gnome-swallow/files/gnome-swallow-1.2-as-needed.patch b/gnome-extra/gnome-swallow/files/gnome-swallow-1.2-as-needed.patch
new file mode 100644
index 000000000000..13ea1a1e27ba
--- /dev/null
+++ b/gnome-extra/gnome-swallow/files/gnome-swallow-1.2-as-needed.patch
@@ -0,0 +1,48 @@
+--- a/configure.ac	2009-01-31 20:18:50.000000000 +0100
++++ b/configure.ac	2009-01-31 20:20:55.000000000 +0100
+@@ -7,19 +7,10 @@
+ AC_LANG(C)
+ AC_PROG_CC
+ 
+-AC_PATH_PROG(PKG_CONFIG, pkg-config, , )
+-
+-if test -z "$PKG_CONFIG"; then 
+-	AC_MSG_ERROR([pkg-config is not installed.  I will not be able to find the GNOME headers.])
+-fi
+-
+-if ! $PKG_CONFIG --exists libpanelapplet-2.0; then
+-	AC_MSG_ERROR([pkg-config does not know about libpanelapplet-2.0.  
+-Do you have the development packages for the GNOME 2.0 Panel Applet library installed?
+-(the Debian package is 'libpanel-applet2-dev')])
+-fi
+-
+-AC_SUBST(PKG_CONFIG)
++PKG_PROG_PKG_CONFIG
++PKG_CHECK_MODULES(PANEL, [libpanelapplet-2.0])
++AC_SUBST(PANEL_CFLAGS)
++AC_SUBST(PANEL_LIBS)
+ 
+ AC_CONFIG_FILES([Makefile])
+-AC_OUTPUT
+\ Pas de fin de ligne à la fin du fichier.
++AC_OUTPUT
+--- a/Makefile.am	2009-01-31 20:21:02.000000000 +0100
++++ b/Makefile.am	2009-01-31 20:21:30.000000000 +0100
+@@ -1,15 +1,14 @@
+ paneldir = $(prefix)/lib/gnome-panel
+ serversdir = $(prefix)/lib/bonobo/servers
+-docdir = $(prefix)/share/doc/gnome-swallow
+ 
+ dist_doc_DATA = README
+ dist_servers_DATA = GNOME_Swallow.server
+ 
+ panel_PROGRAMS = gnome_swallow
+ 
+-INCLUDES = `@PKG_CONFIG@ --cflags libpanelapplet-2.0`
++INCLUDES = ${PANEL_CFLAGS}
+ 
+ gnome_swallow_SOURCES = gnome-swallow.c
+-gnome_swallow_LDFLAGS = `@PKG_CONFIG@ --libs libpanelapplet-2.0`
++gnome_swallow_LDADD = ${PANEL_LIBS} 
+ 
+ EXTRA_DIST = debian/dirs debian/control debian/changelog debian/copyright debian/install debian/rules
diff --git a/gnome-extra/gnome-swallow/gnome-swallow-1.2.ebuild b/gnome-extra/gnome-swallow/gnome-swallow-1.2.ebuild
index 7a55875ab36b..d0ede7f5f734 100644
--- a/gnome-extra/gnome-swallow/gnome-swallow-1.2.ebuild
+++ b/gnome-extra/gnome-swallow/gnome-swallow-1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-swallow/gnome-swallow-1.2.ebuild,v 1.6 2006/08/11 20:04:18 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-swallow/gnome-swallow-1.2.ebuild,v 1.7 2009/01/31 18:35:56 eva Exp $
 
-inherit gnome2
+inherit autotools gnome2
 
 DESCRIPTION="An applet for Gnome2 that 'swallows' normal apps. Useful for docks that are made for other DEs or WMs"
 HOMEPAGE="http://interreality.org/~tetron/technology/swallow/"
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc"
+KEYWORDS="~amd64 ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=gnome-base/libgnomeui-2
@@ -20,9 +20,15 @@ RDEPEND=">=gnome-base/libgnomeui-2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
 
-src_install() {
-	gnome2_src_install
-	rm -rf ${D}/usr/share/doc/gnome-swallow
+G2CONF="${G2CONF} --docdir=/usr/share/doc/${PF}"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix compilation with --as-needed, bug #247521
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+
+	eautoreconf
 }