Respect $LD and $LDFLAGS (bug #185050)

Package-Manager: portage-2.1.3_rc8

4 files changed, 49 insertions, 23 deletions

diff --git a/sys-auth/pam_chroot/ChangeLog b/sys-auth/pam_chroot/ChangeLog
index 7c0bacf57951..47723a06de08 100644
--- a/sys-auth/pam_chroot/ChangeLog
+++ b/sys-auth/pam_chroot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-auth/pam_chroot
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_chroot/ChangeLog,v 1.2 2007/07/12 09:29:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_chroot/ChangeLog,v 1.3 2007/07/12 20:38:39 hawking Exp $
+
+  12 Jul 2007; Ali Polatel <hawking@gentoo.org>
+  +files/pam_chroot-0.9.1-makefile.patch, pam_chroot-0.9.1.ebuild:
+  Respect $LD and $LDFLAGS (bug #185050)
 
   12 Jul 2007; Diego Pettenò <flameeyes@gentoo.org>
   pam_chroot-0.9.1.ebuild:
diff --git a/sys-auth/pam_chroot/Manifest b/sys-auth/pam_chroot/Manifest
index a89ad611ae70..c1703e653093 100644
--- a/sys-auth/pam_chroot/Manifest
+++ b/sys-auth/pam_chroot/Manifest
@@ -1,15 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX pam_chroot-0.9.1-makefile.patch 492 RMD160 963d9366335edd9658d0a44dc678b9893ae28833 SHA1 eff6b654ac031865b567f629e0840b993db06c92 SHA256 52a4f2bfd69b18741bb5173433dbd25766053246517ed9dea921d7c06c08b981
+MD5 111a82c1e87e9ea2bd8f06f9b0f910cb files/pam_chroot-0.9.1-makefile.patch 492
+RMD160 963d9366335edd9658d0a44dc678b9893ae28833 files/pam_chroot-0.9.1-makefile.patch 492
+SHA256 52a4f2bfd69b18741bb5173433dbd25766053246517ed9dea921d7c06c08b981 files/pam_chroot-0.9.1-makefile.patch 492
 DIST pam_chroot-0.9.1.tar.bz2 14665 RMD160 e8258d63ecec7decf2964f1816355d1731a4d86e SHA1 46fa898d6ba3d621b2972f22f82389912eb29f68 SHA256 92704e384f3470e4940210067669499ee32046ecf350250d44c4137d094c687b
-EBUILD pam_chroot-0.9.1.ebuild 830 RMD160 11c6dadb2bcf745d3a66c31aaedf8f01f8d7ae94 SHA1 cbd2b898f0b200853dc65e3405cac2cf326fc1bc SHA256 c464b966f53015a1458612182fd002eb4ea444c8fc57cc0b4252ad87ca3cce7c
-MD5 49903af00f965b8c6934d784b32454e1 pam_chroot-0.9.1.ebuild 830
-RMD160 11c6dadb2bcf745d3a66c31aaedf8f01f8d7ae94 pam_chroot-0.9.1.ebuild 830
-SHA256 c464b966f53015a1458612182fd002eb4ea444c8fc57cc0b4252ad87ca3cce7c pam_chroot-0.9.1.ebuild 830
-MISC ChangeLog 510 RMD160 41a1e2ccac17473310f7ce051b93cfc04e10f55a SHA1 729c24efc90bfcc2d449e1c1f9ef2e86e470d70e SHA256 f9dcfaacc88afae36cf7b88db2256195a9ba2d2c24b9bc413a29a4fd1c2f1eed
-MD5 41741b649348103a1bb614fd18a6cd76 ChangeLog 510
-RMD160 41a1e2ccac17473310f7ce051b93cfc04e10f55a ChangeLog 510
-SHA256 f9dcfaacc88afae36cf7b88db2256195a9ba2d2c24b9bc413a29a4fd1c2f1eed ChangeLog 510
+EBUILD pam_chroot-0.9.1.ebuild 925 RMD160 8e5bcee5e0889265db113e025724efe7bedefa19 SHA1 01c9bada88279cb1f95f7eb52b7fcaefd9de3bc5 SHA256 06265b555485aa5a4c34a69e2aff2bf45f0c88cfb7ec28ad6c72242ee51e7574
+MD5 d643a9835b39cd72b2760bda3dc022e2 pam_chroot-0.9.1.ebuild 925
+RMD160 8e5bcee5e0889265db113e025724efe7bedefa19 pam_chroot-0.9.1.ebuild 925
+SHA256 06265b555485aa5a4c34a69e2aff2bf45f0c88cfb7ec28ad6c72242ee51e7574 pam_chroot-0.9.1.ebuild 925
+MISC ChangeLog 665 RMD160 ed235fd934ad43735ebaea390cc9401a7382111e SHA1 765ea60e80fe08e0bd9197c2f06bdfa2eba82bbc SHA256 902459dd88d53f813f5fa5614c3e48e1355e3535ac0cf55586f5f5859662cbd3
+MD5 6acd00665a0b1660646d58a345deadfe ChangeLog 665
+RMD160 ed235fd934ad43735ebaea390cc9401a7382111e ChangeLog 665
+SHA256 902459dd88d53f813f5fa5614c3e48e1355e3535ac0cf55586f5f5859662cbd3 ChangeLog 665
 MISC metadata.xml 249 RMD160 78a4fd95a85ce3683a0dfbe8617b414b78ba967a SHA1 c40c40f78036437d6a0792baddce95bc21e9cd39 SHA256 ebd2e47f9e03169c781cdc0d24e73877f7e0ce30214becfe7b2f3e6d186a1e58
 MD5 12bb77a843e388c22065f3c10e25e26b metadata.xml 249
 RMD160 78a4fd95a85ce3683a0dfbe8617b414b78ba967a metadata.xml 249
@@ -17,10 +18,3 @@ SHA256 ebd2e47f9e03169c781cdc0d24e73877f7e0ce30214becfe7b2f3e6d186a1e58 metadata
 MD5 41d9bb78e56d9640634c9c7944f6e775 files/digest-pam_chroot-0.9.1 250
 RMD160 bfd08fbc07df06206baab00b7e0c178b470d5654 files/digest-pam_chroot-0.9.1 250
 SHA256 1eae406fef365a19c53e17d9ccf5685b16b103644589f5fdcd04f794bae8e83b files/digest-pam_chroot-0.9.1 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
-
-iD8DBQFGlfS6AiZjviIA2XgRAscGAJ9BF25mb/EiarvZatlj0/cP6R2yqQCfc0wd
-fwVTM3jGZX/JwRN7gH1ZdsE=
-=5f9a
------END PGP SIGNATURE-----
diff --git a/sys-auth/pam_chroot/files/pam_chroot-0.9.1-makefile.patch b/sys-auth/pam_chroot/files/pam_chroot-0.9.1-makefile.patch
new file mode 100644
index 000000000000..7f9d194e3243
--- /dev/null
+++ b/sys-auth/pam_chroot/files/pam_chroot-0.9.1-makefile.patch
@@ -0,0 +1,21 @@
+--- Makefile.orig	2004-05-05 03:07:47.000000000 +0300
++++ Makefile	2007-07-12 22:57:23.000000000 +0300
+@@ -1,16 +1,15 @@
+ # $Id: pam_chroot-0.9.1-makefile.patch,v 1.1 2007/07/12 20:38:39 hawking Exp $
+ 
+ CC=gcc
+-CFLAGS=-fPIC -O2 -Wall -Werror -pedantic
++CFLAGS:=-fPIC -Wall -Werror -pedantic $(CFLAGS)
+ CPPFLAGS=-I.
+-LDFLAGS=-x --shared -lpam
+ 
+ OUT=pam_chroot.so
+ 
+ all:	$(OUT)
+ 
+ %.so: %.o
+-	ld $(LDFLAGS) -o $@ $<
++	$(LD) -x --shared $(LDFLAGS) -o $@ $< -lpam
+ 
+ clean:
+ 	rm -f *.o $(OUT)
diff --git a/sys-auth/pam_chroot/pam_chroot-0.9.1.ebuild b/sys-auth/pam_chroot/pam_chroot-0.9.1.ebuild
index 0ff4f90fcbc8..f9bc53f3158b 100644
--- a/sys-auth/pam_chroot/pam_chroot-0.9.1.ebuild
+++ b/sys-auth/pam_chroot/pam_chroot-0.9.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_chroot/pam_chroot-0.9.1.ebuild,v 1.2 2007/07/12 09:29:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_chroot/pam_chroot-0.9.1.ebuild,v 1.3 2007/07/12 20:38:39 hawking Exp $
 
-inherit toolchain-funcs pam flag-o-matic
+inherit toolchain-funcs pam flag-o-matic eutils
 
 DESCRIPTION="Linux-PAM module that allows a user to be chrooted in auth, account, or session."
 HOMEPAGE="http://sourceforge.net/projects/pam-chroot/"
@@ -17,9 +17,16 @@ DEPEND="virtual/pam
 	!<sys-libs/pam-0.99"
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-makefile.patch"
+}
+
 src_compile() {
-	append-flags "-fPIC"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
+		LDFLAGS="$(raw-ldflags)" || die "emake failed"
 }
 
 src_install() {