Fix build failure with LDFLAGS=-Wl,--as-needed, thanks to stephan wezel <s.wezel@web.de> (#187534).

Package-Manager: portage-2.1.3.16

4 files changed, 38 insertions, 16 deletions

diff --git a/net-dialup/capisuite/ChangeLog b/net-dialup/capisuite/ChangeLog
index cde6fac7c531..16f5a2ca2e70 100644
--- a/net-dialup/capisuite/ChangeLog
+++ b/net-dialup/capisuite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/capisuite
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/ChangeLog,v 1.30 2007/07/13 08:24:48 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/ChangeLog,v 1.31 2007/11/15 10:11:48 mrness Exp $
+
+  15 Nov 2007; Alin Năstac <mrness@gentoo.org>
+  +files/capisuite-0.4.5-as-needed.patch, capisuite-0.4.5-r4.ebuild:
+  Fix build failure with LDFLAGS=-Wl,--as-needed, thanks to stephan wezel
+  <s.wezel@web.de> (#187534).
 
   13 Jul 2007; Alin Năstac <mrness@gentoo.org> -capisuite-0.4.5-r3.ebuild,
   capisuite-0.4.5-r4.ebuild:
diff --git a/net-dialup/capisuite/Manifest b/net-dialup/capisuite/Manifest
index 7446cfb79f68..71e72ed20221 100644
--- a/net-dialup/capisuite/Manifest
+++ b/net-dialup/capisuite/Manifest
@@ -5,6 +5,10 @@ AUX capisuite 487 RMD160 88091c7a9041ca43b4c0204efcb4624bb3d2e517 SHA1 12c83f7bf
 MD5 a6bdc491a9d9a33c0f41c68f06a320ca files/capisuite 487
 RMD160 88091c7a9041ca43b4c0204efcb4624bb3d2e517 files/capisuite 487
 SHA256 280de49af348cfc838c22c942e61ae59e478867924935a4c9fd2ea4887d63ea9 files/capisuite 487
+AUX capisuite-0.4.5-as-needed.patch 761 RMD160 af5d008fa6a8780b3211439640de71795f3a47e7 SHA1 68a314a3126507c80513e7812c7f4c5f455cd47e SHA256 53751ba6c6a2cbc99b250ba2e089642c73d2f6235babcee05f43cdc36eaf8001
+MD5 40035e4b742e2d4ca2464b0f9ced36f5 files/capisuite-0.4.5-as-needed.patch 761
+RMD160 af5d008fa6a8780b3211439640de71795f3a47e7 files/capisuite-0.4.5-as-needed.patch 761
+SHA256 53751ba6c6a2cbc99b250ba2e089642c73d2f6235babcee05f43cdc36eaf8001 files/capisuite-0.4.5-as-needed.patch 761
 AUX capisuite-0.4.5-capi4linux_v3.diff 4395 RMD160 fe35892044e30b3ddc8c9259e2afccb8d567c334 SHA1 8a8be7685c2b508e0d002b68c57ea1b8400b2f81 SHA256 69d1e2ea6668bb237b0b4bbfb4058ebb9c53b4c3b4e676c7ce1cb422031b1693
 MD5 ae0010a9739f9b1273dd9a679d43d913 files/capisuite-0.4.5-capi4linux_v3.diff 4395
 RMD160 fe35892044e30b3ddc8c9259e2afccb8d567c334 files/capisuite-0.4.5-capi4linux_v3.diff 4395
@@ -30,14 +34,14 @@ MD5 bd2ad19acf9244ce2fcfaa06ad5f53e1 files/capisuite.logrotated 1003
 RMD160 9ededfb533e51659da71f052b921c01901425ec6 files/capisuite.logrotated 1003
 SHA256 d8e3135693c5040f1b817c2776235fd35fa926a98e378a9ce6f2733d0095cc53 files/capisuite.logrotated 1003
 DIST capisuite-0.4.5.tar.gz 1184603 RMD160 f28b9cb42a6cfa6d790ec76e74a33a0b7a799762 SHA1 c0a8b19a23df1272f56fd6692ee7e758013ab5d2 SHA256 3e94e42eae6477a222c608c2cd040568fd9fcfa4e8eb0b06a538175d44cbae96
-EBUILD capisuite-0.4.5-r4.ebuild 2333 RMD160 b78986f76ecfdd17f5aa4fd55e8fc7ccf50fac66 SHA1 2607e2973378f3349315237182dfc8b15e54aa15 SHA256 a0da1d5019632188c9c9327d13e774c238f72be1fdc858b80b1e3b87984bf29d
-MD5 4db96fd7b8c2952daaf0df74b96fc4e3 capisuite-0.4.5-r4.ebuild 2333
-RMD160 b78986f76ecfdd17f5aa4fd55e8fc7ccf50fac66 capisuite-0.4.5-r4.ebuild 2333
-SHA256 a0da1d5019632188c9c9327d13e774c238f72be1fdc858b80b1e3b87984bf29d capisuite-0.4.5-r4.ebuild 2333
-MISC ChangeLog 5259 RMD160 59cc9feb03e7388c53f70ccaf3661db4fcb52503 SHA1 5040f7b3f65a317a2b089a867f0922b9fd43b5a6 SHA256 5bf892ff07766f1844b83fb28c9b43dcde4c21067fa7687b36dea6afa61db991
-MD5 58a8f031a59519cb4587a2332d76eb6d ChangeLog 5259
-RMD160 59cc9feb03e7388c53f70ccaf3661db4fcb52503 ChangeLog 5259
-SHA256 5bf892ff07766f1844b83fb28c9b43dcde4c21067fa7687b36dea6afa61db991 ChangeLog 5259
+EBUILD capisuite-0.4.5-r4.ebuild 2381 RMD160 3824a334f43ac5012121cde92aa7a90140391ee8 SHA1 c114769228833673e69d1218d679d336f3844a12 SHA256 66189c619b138ba5237f700074ebd2a53fb02855bcee60b8ee191fba789da6a2
+MD5 9b6b42e9592107c3981b3e9f153568ad capisuite-0.4.5-r4.ebuild 2381
+RMD160 3824a334f43ac5012121cde92aa7a90140391ee8 capisuite-0.4.5-r4.ebuild 2381
+SHA256 66189c619b138ba5237f700074ebd2a53fb02855bcee60b8ee191fba789da6a2 capisuite-0.4.5-r4.ebuild 2381
+MISC ChangeLog 5481 RMD160 ea566e30c5c0e0ea7b867e52db7adf60493e7cb6 SHA1 9bce0bdb32112a7353a4fb174e5b1f05bf0eb567 SHA256 ecad562f16c2872717e2da77bb47eeefbd428218e83de0ee6496ba1a46b4fafa
+MD5 e6cbb52c35a7d09891542b7fbd4e94c3 ChangeLog 5481
+RMD160 ea566e30c5c0e0ea7b867e52db7adf60493e7cb6 ChangeLog 5481
+SHA256 ecad562f16c2872717e2da77bb47eeefbd428218e83de0ee6496ba1a46b4fafa ChangeLog 5481
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
@@ -46,9 +50,9 @@ MD5 6a8be9e8fe8118a0fe77a1abd91ed4fc files/digest-capisuite-0.4.5-r4 250
 RMD160 2a72ca3e4b5cee3982affea7a62598efe66e3e85 files/digest-capisuite-0.4.5-r4 250
 SHA256 04079b93ff77674c492ff98f2d6d1e56ec57d7a46b67f67f91bbad5a7e6e405c files/digest-capisuite-0.4.5-r4 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGlzbZVSA5X31g7/gRAu6iAKCf9zuV+84jX0LGfwwmJo5/cZy6fQCePekN
-BrLN27J+CQrBE3FGL3M16e4=
-=iPRw
+iD8DBQFHPBtvVSA5X31g7/gRAtrYAJ4rHl5VIlWXuo4xX2u341z3DebQfwCgqkoF
+CuE3I7Gffz4RsPSz3I/NlgA=
+=Wj9R
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/capisuite/capisuite-0.4.5-r4.ebuild b/net-dialup/capisuite/capisuite-0.4.5-r4.ebuild
index cab0bbec1b6c..4af2b901328f 100644
--- a/net-dialup/capisuite/capisuite-0.4.5-r4.ebuild
+++ b/net-dialup/capisuite/capisuite-0.4.5-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/capisuite-0.4.5-r4.ebuild,v 1.2 2007/07/13 08:24:48 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/capisuite-0.4.5-r4.ebuild,v 1.3 2007/11/15 10:11:48 mrness Exp $
 
 inherit eutils flag-o-matic multilib python
 
@@ -29,6 +29,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+
 	# taken from capisuite-0.4.5-5.src.rpm (SuSE-9.3)
 	epatch "${FILESDIR}/${P}-capi4linux_v3.diff"
 
@@ -81,9 +83,9 @@ src_install() {
 
 pkg_postinst() {
 	python_version
-	python_mod_compile ${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/cs_helpers.py
+	python_mod_compile "${ROOT}"usr/$(get_libdir)/python${PYVER}/site-packages/cs_helpers.py
 }
 
 pkg_postrm() {
-	python_mod_cleanup ${ROOT}usr/$(get_libdir)/python*/site-packages
+	python_mod_cleanup "${ROOT}"usr/$(get_libdir)/python*/site-packages
 }
diff --git a/net-dialup/capisuite/files/capisuite-0.4.5-as-needed.patch b/net-dialup/capisuite/files/capisuite-0.4.5-as-needed.patch
new file mode 100644
index 000000000000..d740366ddca2
--- /dev/null
+++ b/net-dialup/capisuite/files/capisuite-0.4.5-as-needed.patch
@@ -0,0 +1,11 @@
+--- acinclude.m4.old	2007-08-02 21:34:26.000000000 +0200
++++ acinclude.m4	2007-08-02 21:42:36.000000000 +0200
+@@ -155,7 +155,7 @@
+ _python_libbasemod=`grep '^BASEMODLIBS=' $python_configdir/Makefile | sed 's/^.*=//'`
+ 
+ pgac_tab="	" # tab character
+-python_libspec=`echo X"$_python_libs $_python_libc $_python_libm -lpython$python_version $_python_liblocalmod $_python_libbasemod" | sed -e 's/^X//' -e "s/[[ $pgac_tab]][[ $pgac_tab]]*/ /g"`
++python_libspec=`echo X"-lpython$python_version $_python_liblocalmod $_python_libbasemod $_python_libm $_python_libs $_python_libc" | sed -e 's/^X//' -e "s/[[ $pgac_tab]][[ $pgac_tab]]*/ /g"`
+ LIBS="$LIBS $python_libspec"
+ LDFLAGS="$LDFLAGS -L$python_configdir $python_linkforshared"
+ AC_MSG_RESULT([${python_libspec}])