Fix broken build when linked with --as-needed (#131416).

Package-Manager: portage-2203-svn

4 files changed, 89 insertions, 7 deletions

diff --git a/net-wireless/gnome-bluetooth/ChangeLog b/net-wireless/gnome-bluetooth/ChangeLog
index 2a7165f8e266..06f68cdd23d7 100644
--- a/net-wireless/gnome-bluetooth/ChangeLog
+++ b/net-wireless/gnome-bluetooth/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/gnome-bluetooth
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.27 2006/04/22 09:47:31 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.28 2006/05/10 21:26:36 mrness Exp $
+
+  10 May 2006; Alin Nastac <mrness@gentoo.org>
+  +files/gnome-bluetooth-0.7.0-as-needed.patch,
+  gnome-bluetooth-0.7.0-r1.ebuild:
+  Fix broken build when linked with --as-needed (#131416).
 
 *gnome-bluetooth-0.7.0-r1 (22 Apr 2006)
 
diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index ffaefe8d9697..5726d1889dbf 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6155980185c743bbf197ac83668b8232 ChangeLog 4763
+MD5 d997ecdfffcde0eb59ef6e1af80740b3 ChangeLog 4953
 MD5 54d3d1f463b503f1ad2fe16ab183fe4b files/0.6.0-segv.patch 458
 MD5 ff63b2b07eb50db8962f544a45028bee files/digest-gnome-bluetooth-0.4.1 73
 MD5 6da6c9018b79e0077f1a3bb071a01cef files/digest-gnome-bluetooth-0.5.1 73
@@ -17,19 +17,20 @@ MD5 1b075164be0f7aab81714a3efd302a65 files/gnome-bluetooth-0.5.1-gobcrash.patch
 MD5 a254aa9cdd6ad1e9e5f2e7a78c636b25 files/gnome-bluetooth-0.5.1-obex_xfer_rate.patch 2108
 MD5 7a336fcfbc8755f917c623b810172ef5 files/gnome-bluetooth-0.6.0-libdir.patch 3089
 MD5 8cc59eb7dff1c8ee2161394f174d84fa files/gnome-bluetooth-0.7.0-aclocal_openobex.patch 2501
+MD5 8afe2d71f2823ecf6db9f3db8a17b121 files/gnome-bluetooth-0.7.0-as-needed.patch 2288
 MD5 37d60d0c9b935e84bf52f93e2438dfc9 gnome-bluetooth-0.4.1.ebuild 1261
 MD5 471bab257c095d36741706ce573a08d3 gnome-bluetooth-0.5.1-r1.ebuild 1347
 MD5 8be3b2e5c4ab65eb0947646d0cf4f88a gnome-bluetooth-0.5.1-r2.ebuild 1382
 MD5 ca451d450412e5dad4d0ca6c058b6891 gnome-bluetooth-0.5.1.ebuild 1289
 MD5 79a7f6c060b36fef60a48e584567c7f6 gnome-bluetooth-0.6.0-r1.ebuild 1433
 MD5 05d959e26d478b4c14acf590e58bdbfa gnome-bluetooth-0.6.0.ebuild 1404
-MD5 92b082de97c2b7c4862afdcfb002810f gnome-bluetooth-0.7.0-r1.ebuild 1474
+MD5 35ce162760c0deac3789b0c024bc0a73 gnome-bluetooth-0.7.0-r1.ebuild 1517
 MD5 7b69b6ce2c9525ab14dee0e15bd971ff gnome-bluetooth-0.7.0.ebuild 1511
 MD5 439de383d422683abddb9ff8b75aa67b metadata.xml 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFES7YvjG8pv1lIUX4RAvO0AKDByoHUE5Iu1o5obZvBvAetvNvHdACfZMUe
-Q0NoDSLtODMAKP1N/YugmG8=
-=I1p8
+iD8DBQFEYlqsjG8pv1lIUX4RArTcAKDZVvUMv1Q0vVvKQb5VnN1Vp3oxLwCg6IFF
++jT5s1O71CMw/E7FD5vxPk4=
+=n1DX
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.7.0-as-needed.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.7.0-as-needed.patch
new file mode 100644
index 000000000000..30af537f43e6
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.7.0-as-needed.patch
@@ -0,0 +1,75 @@
+Index: gnome-bluetooth-0.7.0/src/Makefile.am
+===================================================================
+--- gnome-bluetooth-0.7.0.orig/src/Makefile.am
++++ gnome-bluetooth-0.7.0/src/Makefile.am
+@@ -33,41 +33,42 @@ gnomebt-chooser.lo: gnomebt-controller.h
+ 
+ libgnomebt_la_LDFLAGS = \
+ 	-version-info $(GNOMEBT_LT_VERSION)
++libgnomebt_la_LIBADD = $(GNOME_BLUETOOTH_LIBS)
+ 
+ gnomebt_chooser_test_SOURCES = \
+ 	gnomebt-chooser-test.c
+ 
+ gnomebt_chooser_test_LDADD = \
+-	$(GNOME_BLUETOOTH_LIBS) libgnomebt.la
++	libgnomebt.la $(GNOME_BLUETOOTH_LIBS)
+ 
+ gnomebt_controller_test_SOURCES = \
+ 	gnomebt-controller-test.c
+ 
+ gnomebt_controller_test_LDADD = \
+-	$(GNOME_BLUETOOTH_LIBS) libgnomebt.la
++	libgnomebt.la $(GNOME_BLUETOOTH_LIBS)
+ 
+ gnomebt_fileactiondialog_test_SOURCES = \
+ 	gnomebt-fileactiondialog-test.c
+ 
+ gnomebt_fileactiondialog_test_LDADD = \
+-	$(GNOME_BLUETOOTH_LIBS) libgnomebt.la
++	libgnomebt.la $(GNOME_BLUETOOTH_LIBS)
+ 
+ gnomebt_permissiondialog_test_SOURCES = \
+ 	gnomebt-permissiondialog-test.c
+ 
+ gnomebt_permissiondialog_test_LDADD = \
+-	$(GNOME_BLUETOOTH_LIBS) libgnomebt.la
++	libgnomebt.la $(GNOME_BLUETOOTH_LIBS)
+ 
+ spinner_test_SOURCES = \
+ 	spinner-test.c
+ 
+ spinner_test_LDADD = \
+-	$(GNOME_BLUETOOTH_LIBS) libgnomebt.la
++	libgnomebt.la $(GNOME_BLUETOOTH_LIBS)
+ 
+ gconftest_SOURCES = \
+ 	gconftest.c
+ 
+-gconftest_LDFLAGS = \
++gconftest_LDADD = \
+ 	$(GNOME_BLUETOOTH_LIBS) $(BLUETOOTH_LIBS)
+ 
+ GOB_DIST = \
+@@ -121,13 +122,13 @@ gnomebt-chooser-py.c: gnomebt-chooser.de
+ pydir = @pythondir@/gnomebt/
+ 
+ controller_la_SOURCES = gnomebt-controller-py.c gnomebt-controller-pymodule.c
+-controller_la_LIBADD =  libgnomebt.la
+-controller_la_LDFLAGS = $(GNOME_BLUETOOTH_PYTHON_LIBS) \
+-			$(GNOME_BLUETOOTH_LIBS) \
+-			-module -avoid-version
++controller_la_LIBADD =  libgnomebt.la \
++			$(GNOME_BLUETOOTH_PYTHON_LIBS) \
++			$(GNOME_BLUETOOTH_LIBS)
++controller_la_LDFLAGS =	-module -avoid-version
+ 
+ chooser_la_SOURCES = gnomebt-chooser-py.c gnomebt-chooser-pymodule.c
+-chooser_la_LIBADD =  libgnomebt.la
+-chooser_la_LDFLAGS = 	$(GNOME_BLUETOOTH_PYTHON_LIBS) \
+-			$(GNOME_BLUETOOTH_LIBS) \
+-			-module -avoid-version
++chooser_la_LIBADD =  libgnomebt.la \
++			$(GNOME_BLUETOOTH_PYTHON_LIBS) \
++			$(GNOME_BLUETOOTH_LIBS)
++chooser_la_LDFLAGS = -module -avoid-version
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-0.7.0-r1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-0.7.0-r1.ebuild
index 9aa7a9b804ef..90fe99714cb1 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-0.7.0-r1.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-0.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-0.7.0-r1.ebuild,v 1.2 2006/04/23 17:15:08 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-0.7.0-r1.ebuild,v 1.3 2006/05/10 21:26:36 mrness Exp $
 
 inherit distutils gnome2 eutils multilib autotools
 
@@ -44,6 +44,7 @@ src_unpack() {
 	sed -i -e 's:${libdir:/${platlibdir:' acinclude.m4
 	sed -i -e 's:blueradio-48.png:blueradio.png:' python/manager.py
 	epatch "${FILESDIR}/${P}-aclocal_openobex.patch"
+	epatch "${FILESDIR}/${P}-as-needed.patch"
 	eautoreconf
 }