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

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 81 insertions, 12 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/Manifest b/gnome-extra/gnome-swallow/Manifest
index 34a0cbd5db19..dfae8ab900df 100644
--- a/gnome-extra/gnome-swallow/Manifest
+++ b/gnome-extra/gnome-swallow/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gnome-swallow-1.2-as-needed.patch 1520 RMD160 fb0a3aa36bbb84086d8def080637bd8936bec41f SHA1 cea14734abb1be878ea827570cc773fb8c426029 SHA256 a457506d1bf665bca0d47bc689123998140f437e0c52224b2df8f972f9c006b9
 DIST gnome-swallow-1.2.tar.gz 90732 RMD160 c142a44f10a105bedcd74b85522413daa50dc3b0 SHA1 ac4ae83b57301ffdcd8c7870211f378878c132e3 SHA256 09df0782e216591d1bff90e50b894242fa135f577f3502223e57734dc304afc8
-EBUILD gnome-swallow-1.2.ebuild 804 RMD160 dde788960610a3993ced2a05e5cc61619c364971 SHA1 1f8ab439766667940cb264b4aa4eb44c73337d6f SHA256 2f6c2c9a1394126a88587fedb34b0f390df5f74284bfdf0ea7a32e1caabba506
-MISC ChangeLog 1544 RMD160 9491f61007b9c517936711249cb3ad8b78fe1df1 SHA1 475a84f5710028f22a3fea22fd340c860188e1fb SHA256 7e7e0e76aeb7bd3646571a12e8027b2d05078346bd7bb42f19a123113c410380
+EBUILD gnome-swallow-1.2.ebuild 918 RMD160 acbeb395d60c8ed5bc5bd524ca7f14bdacc295ff SHA1 1fc9fbf6963242bb0e1d5e2e685cffed82fba39b SHA256 ff7bc0bcfb849aed894325c697c0d1989018c909902770238cc607e70e148792
+MISC ChangeLog 1712 RMD160 92b51dc574ed9f498544e393dddd182553b16628 SHA1 e2c1f0e9173863c201d94e43551c4aa83faa8188 SHA256 928a6b675b8f5d048a70a45c3f4b072ccffc638d1d1137e7e6bbd19369d3aae4
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmEqB8ACgkQ1fmVwcYIWAYUtACeJ4A6mfOYcUHayaSKMOAdhFZ3
+mQQAn2bnpjIV1FZ5kWWnUQIDmFq0RvWT
+=/Qld
+-----END PGP SIGNATURE-----
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
 }