fx broken build when /usr/lib/libshadow.la exists (#82212)

Package-Manager: portage-2.0.51-r15

4 files changed, 51 insertions, 7 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index 3723b7eb6f9a..dfae7f177839 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/freeradius
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.24 2005/02/28 18:06:49 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.25 2005/03/02 06:49:10 mrness Exp $
+
+  02 Mar 2005; Alin Nastac <mrness@gentoo.org>
+  +files/freeradius-1.0.2-whole-archive-gentoo.patch,
+  freeradius-1.0.2.ebuild:
+  Fix broken build when /usr/lib/libshadow.la exists (#82212).
 
 *freeradius-1.0.2 (28 Feb 2005)
 
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 46a8d88272c7..e7b57ed5be8b 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA1
 
 MD5 4308f34e173a67aa9bb9183204d0fa00 freeradius-1.0.1.ebuild 2749
-MD5 41ac78dfadb93801a0d88c0bdb4912e8 freeradius-1.0.2.ebuild 2685
-MD5 eda7c0278f935b9ac2f3a1970e7ce013 ChangeLog 3434
+MD5 8d5d6edaac024acafdc5461a329329f2 freeradius-1.0.2.ebuild 2738
+MD5 33b04d5f01824071676fc4592033d938 ChangeLog 3626
 MD5 1542bf76e28581e9d6bcfdc75e46f33d metadata.xml 252
 MD5 fc6693f3df5a0694610110287a28568a files/radius.conf 129
 MD5 386aaf4470ecc4b4e0c43dec2bc02ba7 files/radius.init 807
 MD5 9f0188ba482e825cf2a89584f8caa813 files/digest-freeradius-1.0.1 69
 MD5 5a26f9881af51aed070957e5fc4ed808 files/digest-freeradius-1.0.2 69
 MD5 3c2119ec1d8d807fe5ed14944747f0f8 files/freeradius-1.0.1-gcc34.patch 715
+MD5 6b0efd384f551fab6b82794e91dbb4d5 files/freeradius-1.0.2-whole-archive-gentoo.patch 1728
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFCI13KjiC39V7gKu0RAkp/AKCUCdA+wu4D+URKWHwtqfVgZJatFQCghghT
-+GDGoY/Zro++69DQpEjSAas=
-=vOtf
+iD8DBQFCJWH5jiC39V7gKu0RAviWAKCcXidHbUNAwqY/l1W0/0/CzBHVxgCeKZVL
+AdzEMMeyhSA2PQG0+nrDGkc=
+=SjNS
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/freeradius/files/freeradius-1.0.2-whole-archive-gentoo.patch b/net-dialup/freeradius/files/freeradius-1.0.2-whole-archive-gentoo.patch
new file mode 100644
index 000000000000..a91911b67b57
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-1.0.2-whole-archive-gentoo.patch
@@ -0,0 +1,36 @@
+diff -Nru freeradius-1.0.2.orig/aclocal.m4 freeradius-1.0.2/aclocal.m4
+--- freeradius-1.0.2.orig/aclocal.m4	2005-02-13 03:03:20.000000000 +0200
++++ freeradius-1.0.2/aclocal.m4	2005-03-02 08:37:42.301666608 +0200
+@@ -1421,7 +1421,7 @@
+     *)
+       # ancient GNU ld didn't support --whole-archive et. al.
+       if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
+-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++	whole_archive_flag_spec="$wlarc"'--no-whole-archive'
+       else
+ 	whole_archive_flag_spec=
+       fi
+diff -Nru freeradius-1.0.2.orig/configure freeradius-1.0.2/configure
+--- freeradius-1.0.2.orig/configure	2005-03-02 08:32:15.000000000 +0200
++++ freeradius-1.0.2/configure	2005-03-02 08:37:58.710172136 +0200
+@@ -3511,7 +3511,7 @@
+     *)
+       # ancient GNU ld didn't support --whole-archive et. al.
+       if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
+-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++	whole_archive_flag_spec="$wlarc"'--no-whole-archive'
+       else
+ 	whole_archive_flag_spec=
+       fi
+diff -Nru freeradius-1.0.2.orig/ltconfig freeradius-1.0.2/ltconfig
+--- freeradius-1.0.2.orig/ltconfig	2003-06-24 14:03:39.000000000 +0300
++++ freeradius-1.0.2/ltconfig	2005-03-02 08:38:21.478710792 +0200
+@@ -1246,7 +1246,7 @@
+     *)
+       # ancient GNU ld didn't support --whole-archive et. al.
+       if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
+-        whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++        whole_archive_flag_spec="$wlarc"'--no-whole-archive'
+       else
+         whole_archive_flag_spec=
+       fi
diff --git a/net-dialup/freeradius/freeradius-1.0.2.ebuild b/net-dialup/freeradius/freeradius-1.0.2.ebuild
index 90a1192e1183..da75d671375d 100644
--- a/net-dialup/freeradius/freeradius-1.0.2.ebuild
+++ b/net-dialup/freeradius/freeradius-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.0.2.ebuild,v 1.1 2005/02/28 18:06:49 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.0.2.ebuild,v 1.2 2005/03/02 06:49:10 mrness Exp $
 
 inherit eutils
 
@@ -30,6 +30,8 @@ src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
 
+	epatch ${FILESDIR}/${P}-whole-archive-gentoo.patch
+
 	export WANT_AUTOCONF=2.1
 	autoconf
 }