respect LDFLAGS wrt #336203

(Portage version: 2.2.0_alpha145/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

3 files changed, 17 insertions, 71 deletions

diff --git a/dev-libs/libhome/ChangeLog b/dev-libs/libhome/ChangeLog
index 056723ca231d..11ba9fedbdfc 100644
--- a/dev-libs/libhome/ChangeLog
+++ b/dev-libs/libhome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libhome
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libhome/ChangeLog,v 1.13 2012/11/27 19:00:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libhome/ChangeLog,v 1.14 2012/12/15 18:05:13 hasufell Exp $
+
+  15 Dec 2012; Julian Ospald <hasufell@gentoo.org>
+  -files/libhome-0.10.1-Makefile.patch, files/libhome-0.10.2-Makefile.patch:
+  respect LDFLAGS wrt #336203
 
   27 Nov 2012; Pacho Ramos <pacho@gentoo.org> -libhome-0.10.1.ebuild,
   metadata.xml:
diff --git a/dev-libs/libhome/files/libhome-0.10.1-Makefile.patch b/dev-libs/libhome/files/libhome-0.10.1-Makefile.patch
deleted file mode 100644
index 1455d96f1be1..000000000000
--- a/dev-libs/libhome/files/libhome-0.10.1-Makefile.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Index: libhome-0.10.1/Makefile.in
-===================================================================
---- libhome-0.10.1.orig/Makefile.in
-+++ libhome-0.10.1/Makefile.in
-@@ -114,27 +114,32 @@ home_expire_cache: home_expire_cache.o l
- install:: install-man install-lib
- 
- install-man:: home.conf.5
--	${INSTALL_DATA} home.conf.5 ${mandir}/man5/
--@DO_PROXY@	${INSTALL_DATA} home_proxy.8 ${mandir}/man8/
-+	${INSTALL} -d $(DESTDIR)${mandir}/man5
-+@DO_PROXY@	${INSTALL} -d $(DESTDIR)${mandir}/man8
-+	${INSTALL_DATA} home.conf.5 $(DESTDIR)${mandir}/man5/
-+@DO_PROXY@	${INSTALL_DATA} home_proxy.8 $(DESTDIR)${mandir}/man8/
- 
- install-lib:: all
--	${LIBTOOL} --mode=install ${INSTALL_DATA} libhome.la ${libdir}/
-+	${INSTALL} -d $(DESTDIR)${libdir}
-+	${INSTALL} -d $(DESTDIR)${bindir}
-+@DO_PROXY@	${INSTALL} -d $(DESTDIR)${sbindir}
-+	${INSTALL} -d $(DESTDIR)${includedir}/home
-+	${LIBTOOL} --mode=install ${INSTALL_DATA} libhome.la $(DESTDIR)${libdir}/
- 	test "@PRELOAD_LIB@" = "" || \
--	${LIBTOOL} --mode=install ${INSTALL_DATA} @PRELOAD_LIB@ ${libdir}/
--	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} home_finger ${bindir}/
--	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} home_su ${bindir}/
--	-mkdir -p ${includedir}/home	
--	${INSTALL_DATA} hpwd.h ${includedir}/home/pwd.h
--	${INSTALL_DATA} hpwd.h ${includedir}/home/
--	${INSTALL_DATA} hparam.h ${includedir}/home/
--	${INSTALL_DATA} home_version.h ${includedir}/home/
-+	${LIBTOOL} --mode=install ${INSTALL_DATA} @PRELOAD_LIB@ $(DESTDIR)${libdir}/
-+	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} home_finger $(DESTDIR)${bindir}/
-+	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} home_su $(DESTDIR)${bindir}/
-+	${INSTALL_DATA} -D hpwd.h $(DESTDIR)${includedir}/home/pwd.h
-+	${INSTALL_DATA} -D hpwd.h $(DESTDIR)${includedir}/home/
-+	${INSTALL_DATA} -D hparam.h $(DESTDIR)${includedir}/home/
-+	${INSTALL_DATA} -D home_version.h $(DESTDIR)${includedir}/home/
- 	chmod +x libhome.sh
--	${INSTALL_SCRIPT} libhome.sh ${bindir}/
--@DO_PROXY@	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} home_proxy ${sbindir}/
--@DO_NSS@	${LIBTOOL} --mode=install ${INSTALL_DATA} ${NSS_LIB} ${libdir}/
-+	${INSTALL_SCRIPT} -D libhome.sh $(DESTDIR)${bindir}/
-+@DO_PROXY@	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} home_proxy $(DESTDIR)${sbindir}/
-+@DO_NSS@	${LIBTOOL} --mode=install ${INSTALL_DATA} ${NSS_LIB} $(DESTDIR)${libdir}/
- 
- install-nss:: nss
--@DO_NSS@	${LIBTOOL} --mode=install ${INSTALL_DATA} ${NSS_LIB} ${libdir}/
-+@DO_NSS@	${LIBTOOL} --mode=install ${INSTALL_DATA} ${NSS_LIB} $(DESTDIR)${libdir}/
- 
- compat:
- 	-mkdir compat
-Index: libhome-0.10.1/configure.in
-===================================================================
---- libhome-0.10.1.orig/configure.in
-+++ libhome-0.10.1/configure.in
-@@ -510,7 +510,7 @@ then
-   fi
-   case $db_version in
-   3) AC_SEARCH_LIBS(db_strerror, db-3.3 db-3.2 db-3.1 db-3.0 db-3 db3);;
--  4) AC_SEARCH_LIBS(db_strerror, db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4,,
-+  4) AC_SEARCH_LIBS(db_strerror, db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4,,
-       AC_SEARCH_LIBS(db_strerror_4002, db-4.2));;
-   esac
- fi
diff --git a/dev-libs/libhome/files/libhome-0.10.2-Makefile.patch b/dev-libs/libhome/files/libhome-0.10.2-Makefile.patch
index c60917ce652e..54915fd4bb04 100644
--- a/dev-libs/libhome/files/libhome-0.10.2-Makefile.patch
+++ b/dev-libs/libhome/files/libhome-0.10.2-Makefile.patch
@@ -1,8 +1,15 @@
-Index: libhome-0.10.1/Makefile.in
-===================================================================
---- libhome-0.10.1.orig/Makefile.in
-+++ libhome-0.10.1/Makefile.in
-@@ -114,27 +114,32 @@ home_expire_cache: home_expire_cache.o l
+--- Makefile.in
++++ Makefile.in
+@@ -61,7 +61,7 @@
+ LIBTOOL=./libtool
+ 
+ COMPILE=${LIBTOOL} --mode=compile ${CC} ${CPPFLAGS} ${CFLAGS}
+-LINK=${LIBTOOL} --mode=link ${CC} ${CFLAGS}
++LINK=${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${LDFLAGS}
+ 
+ 
+ hparam.o: version.h
+@@ -114,27 +114,32 @@
  install:: install-man install-lib
  
  install-man:: home.conf.5