more fixes for the gnu patch

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

3 files changed, 54 insertions, 7 deletions

diff --git a/sys-freebsd/freebsd-mk-defs/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog
index baf3bcfe2619..02acb438dc1e 100644
--- a/sys-freebsd/freebsd-mk-defs/ChangeLog
+++ b/sys-freebsd/freebsd-mk-defs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-mk-defs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.39 2011/11/07 13:54:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.40 2011/11/07 17:07:37 aballier Exp $
+
+  07 Nov 2011; Alexis Ballier <aballier@gentoo.org>
+  files/freebsd-mk-defs-9.0-gnu.patch:
+  more fixes for the gnu patch
 
   07 Nov 2011; Alexis Ballier <aballier@gentoo.org>
   freebsd-mk-defs-9.0_rc1.ebuild, +files/freebsd-mk-defs-9.0-gnu.patch:
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index 5721bfdff069..c83ee88e9b75 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -6,7 +6,7 @@ AUX freebsd-mk-defs-7.1-gnu.patch 4022 RMD160 cc82950abb0d798e99bbba6fb70b420756
 AUX freebsd-mk-defs-8.0-gentoo.patch 11076 RMD160 96d87a4a2bf07278f7ef2c0b5c5dde73f1dc929d SHA1 f2d46e19d4b2f7d169652ff68c7d078f36185176 SHA256 5510a8e9530c3585374bba26942c46c9bc799da3ae0de9b6fa8bd364088260c5
 AUX freebsd-mk-defs-8.0-gnu.patch 4074 RMD160 a6571210e35ae4abe158b6231cd13aebe0046a0e SHA1 99c97fb846c811d940b59d610fc1db9767312611 SHA256 00034d4d94ec011f595864113d469ec83d11786802b997b2350e955c6d2d64a0
 AUX freebsd-mk-defs-9.0-gentoo.patch 11557 RMD160 a46c3709cc4ac486b4f50020194713780ad7dc4a SHA1 35e60fed7b8ee1fb4b1509d9ba53d39eb261f367 SHA256 315cf91aaf83ac42a25c7a0f6006f4cc78997dbd98a163c2d6b088c98fc24672
-AUX freebsd-mk-defs-9.0-gnu.patch 888 RMD160 2e18f6414312591513c57928fa26872b9d2b062f SHA1 7f56ce7e26c4b8109140fa2ff7784cb2cae3a67f SHA256 54e217e2d3df3ada561dfb4b925a8afd92e412093497e851ae812358b377eb8c
+AUX freebsd-mk-defs-9.0-gnu.patch 2353 RMD160 78f1146fab7134a6e7f54c1433086152f8814c64 SHA1 f73a973e7de1f957f9b13cdc0beb0f43b1b37f4d SHA256 49c84f315d006d443c4cef4123cd02aee72fef93d967c164977d83af8e6f5b6e
 DIST freebsd-share-7.2.tar.bz2 3878366 RMD160 11cdb0c952bd442a895a2c36c3c43e15927e5706 SHA1 e389971377f4bad980db2dba01936794296742b1 SHA256 15f28ba51609d319d3edc930cf6fc20850bb493707df907fdeace23d35118bf2
 DIST freebsd-share-8.0.tar.bz2 3754795 RMD160 7da07595137e521dbc3e8bc618f875edf88792fc SHA1 542c46d447aeabbb0bb1f652bcc476713b310644 SHA256 4cbb577bb7e76f87a27d3974459d0e146736d5e8002c49f5661f95f68c2939d1
 DIST freebsd-share-8.2.tar.bz2 3797560 RMD160 88f52550c5656f9a4186eb56e5661218345b2d87 SHA1 5d38349cb2b61d639cae6212677309e8da23e131 SHA256 dd082c6ddbf8e08ec91d9810d51af4111339bed912b0f74d05be283780292ba0
@@ -15,12 +15,12 @@ EBUILD freebsd-mk-defs-7.2.ebuild 879 RMD160 089804b593696a818cc9de284704e942fe6
 EBUILD freebsd-mk-defs-8.0.ebuild 879 RMD160 c1bbd5e97bb7948c7020f50840e6f1db88cf1462 SHA1 f844b6f86536e79942ed3a747488a7087d7f3b42 SHA256 06619dbe8ff3e746da248c6fd0ef79fd60f7e46cb479d8480f38bb0c4ffe47b8
 EBUILD freebsd-mk-defs-8.2.ebuild 879 RMD160 88f45fe8e048302390574226edcf3761dfa0b2bf SHA1 3ff8593feb34da7cb850885ea3c4ef0e5cfd7430 SHA256 212cea22f0e963889075dba7cbdf47a3a4509991c2112965b59bf61a71833bdc
 EBUILD freebsd-mk-defs-9.0_rc1.ebuild 844 RMD160 b1ecf62dcc4a2c0e53b7864c97d018424746e258 SHA1 d6b3a2fa05869bf73b310580abe173c29194a43b SHA256 095f12cc05a66187bc5e8e3db49d31986b27921a2c4e9587abec5ebb365bfa61
-MISC ChangeLog 8885 RMD160 9904ed5e799ffc15d9319d83a68d79671dccf4a4 SHA1 c07b4b5fc9fed5116e50b44da8c848295158e118 SHA256 ff394f56f3ac818f80ac3f8076917645577d6eb3978687256ddcb6cfd3d08bf9
+MISC ChangeLog 9008 RMD160 1991fbe0fee286b258d241cacd2ba3e5fa92f020 SHA1 bc9ba4a446d14b881790b41421b2cf0aeb8085fc SHA256 ad8b7bf60b4655f1d0a2e733cdf6a1ef6a0a1ef43254bdbe3ad05a20550cc759
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk634wEACgkQvFcC4BYPU0pAywCbB7X87mWRLhAYRmuBBO/BL/RT
-6swAoM4Z20eWyHeDuKE5BBuONl3IX7UF
-=IvW+
+iEYEARECAAYFAk64EF4ACgkQvFcC4BYPU0oqhACfQD2VPrRSyfe770LzARgBlIBc
+sRgAn0fVJQLqUmiG0tmE1bvHSfZ8FCmF
+=hMAf
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch
index a591622b8589..bd7d7e6116c3 100644
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch
@@ -2,7 +2,50 @@ Index: work/share/mk/bsd.lib.mk
 ===================================================================
 --- work.orig/share/mk/bsd.lib.mk
 +++ work/share/mk/bsd.lib.mk
-@@ -245,13 +245,6 @@ _EXTRADEPEND:
+@@ -146,11 +146,7 @@ _LIBS=		lib${LIB}.a
+ lib${LIB}.a: ${OBJS} ${STATICOBJS}
+ 	@${ECHO} building static ${LIB} library
+ 	@rm -f ${.TARGET}
+-.if !defined(NM)
+-	@${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
+-.else
+-	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
+-.endif
++	@${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
+ 	${RANLIB} ${.TARGET}
+ .endif
+ 
+@@ -163,11 +159,7 @@ POBJS+=		${OBJS:.o=.po} ${STATICOBJS:.o=
+ lib${LIB}_p.a: ${POBJS}
+ 	@${ECHO} building profiled ${LIB} library
+ 	@rm -f ${.TARGET}
+-.if !defined(NM)
+-	@${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
+-.else
+-	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
+-.endif
++	@${AR} cq ${.TARGET} ${POBJS} ${ARADD}
+ 	${RANLIB} ${.TARGET}
+ .endif
+ 
+@@ -189,15 +181,9 @@ ${SHLIB_NAME}: ${SOBJS}
+ .if defined(SHLIB_LINK)
+ 	@ln -fs ${.TARGET} ${SHLIB_LINK}
+ .endif
+-.if !defined(NM)
+ 	@${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \
+ 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
+-	    `lorder ${SOBJS} | tsort -q` ${LDADD}
+-.else
+-	@${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \
+-	    -o ${.TARGET} -Wl,-soname,${SONAME} \
+-	    `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
+-.endif
++	    `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
+ 	@[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
+ 		(${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \
+ 		${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS})
+@@ -245,13 +231,6 @@ _EXTRADEPEND:
  
  .if !target(install)