Respect LDFLAGS, bug #209722

(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 i686, RepoMan options: --force)

4 files changed, 26 insertions, 11 deletions

diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index f1bd4a162637..061bfcc4c94c 100644
--- a/sys-apps/lm_sensors/ChangeLog
+++ b/sys-apps/lm_sensors/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/lm_sensors
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.86 2008/08/11 17:59:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.87 2008/08/13 16:13:57 armin76 Exp $
+
+  13 Aug 2008; Raúl Porcel <armin76@gentoo.org> lm_sensors-2.10.4.ebuild,
+  lm_sensors-2.10.7.ebuild, lm_sensors-3.0.2.ebuild:
+  Respect LDFLAGS, bug #209722
 
 *lm_sensors-2.10.7 (11 Aug 2008)
 
diff --git a/sys-apps/lm_sensors/lm_sensors-2.10.4.ebuild b/sys-apps/lm_sensors/lm_sensors-2.10.4.ebuild
index b0f0dca63d70..2e9c4e328807 100644
--- a/sys-apps/lm_sensors/lm_sensors-2.10.4.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-2.10.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.4.ebuild,v 1.9 2008/05/18 18:54:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.4.ebuild,v 1.10 2008/08/13 16:13:57 armin76 Exp $
 
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib
 
@@ -73,11 +73,15 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.10.4-sensors-detect-gentoo.patch
+	epatch "${FILESDIR}"/${P}-sensors-detect-gentoo.patch
 
 	if use sensord; then
-		sed -i -e 's:^# \(PROG_EXTRA\):\1:' "${S}"/Makefile
+		sed -i -e 's:^# \(PROG_EXTRA\):\1:' Makefile
 	fi
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile
+	sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' lib/Module.mk
 }
 
 src_compile()  {
diff --git a/sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild b/sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild
index 0f99e7ffcbe1..f515c2ebfdda 100644
--- a/sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild,v 1.1 2008/08/11 17:59:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild,v 1.2 2008/08/13 16:13:57 armin76 Exp $
 
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib
 
@@ -73,11 +73,15 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.10.7-sensors-detect-gentoo.patch
+	epatch "${FILESDIR}"/${P}-sensors-detect-gentoo.patch
 
 	if use sensord; then
-		sed -i -e 's:^# \(PROG_EXTRA\):\1:' "${S}"/Makefile
+		sed -i -e 's:^# \(PROG_EXTRA\):\1:' Makefile
 	fi
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile
+	sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' lib/Module.mk
 }
 
 src_compile()  {
diff --git a/sys-apps/lm_sensors/lm_sensors-3.0.2.ebuild b/sys-apps/lm_sensors/lm_sensors-3.0.2.ebuild
index 1001da9758f1..fcab67327a01 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.0.2.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-3.0.2.ebuild,v 1.1 2008/07/01 20:32:59 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-3.0.2.ebuild,v 1.2 2008/08/13 16:13:57 armin76 Exp $
 
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib
 
@@ -52,6 +52,10 @@ src_unpack() {
 	if use sensord; then
 		sed -i -e 's:^# \(PROG_EXTRA\):\1:' "${S}"/Makefile
 	fi
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile
+	sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' lib/Module.mk
 }
 
 src_compile()  {
@@ -78,10 +82,9 @@ src_install() {
 		newinitd "${FILESDIR}"/sensord-init.d sensord
 	fi
 
-	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS INSTALL QUICKSTART \
-		README* TODO
+	dodoc CHANGES CONTRIBUTORS INSTALL README*
 
-	dodoc doc/donations doc/fancontrol.txt doc/fan-divisors doc/FAQ \
+	dodoc doc/donations doc/fancontrol.txt doc/fan-divisors \
 		doc/progs doc/temperature-sensors doc/vid
 
 	dohtml doc/lm_sensors-FAQ.html doc/useful_addresses.html