Fix for bug #139109.

Package-Manager: portage-2.1.1_pre2-r1

4 files changed, 29 insertions, 35 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 07d3190f2d4b..52050ecd32f8 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.22 2006/07/02 00:40:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.23 2006/07/04 11:09:41 the_paya Exp $
+
+  04 Jul 2006; Javier Villavicencio <the_paya@gentoo.org>
+  files/freebsd-lib-6.1-csu-amd64.patch, freebsd-lib-6.1.ebuild:
+  Fixes bug #139109.
 
   02 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/freebsd-lib-6.1-csu-amd64.patch, freebsd-lib-6.1.ebuild:
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index f41a914df2bf..64348fe4268e 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX freebsd-lib-6.0-binutils-asm.patch 1096 RMD160 1d2c2e60f2c8ca49fb8b01c65aca65b5cd59ea23 SHA1 1533aef95476da5b631d2ffb9b4892773ee5b2ae SHA256 5794228b1754d0b0a9a46fbae7e117ca91ca7da1d842339b279a4185014cbfd9
 MD5 7cb2f45f53fcb2792c6fca10be03d948 files/freebsd-lib-6.0-binutils-asm.patch 1096
 RMD160 1d2c2e60f2c8ca49fb8b01c65aca65b5cd59ea23 files/freebsd-lib-6.0-binutils-asm.patch 1096
@@ -21,10 +18,10 @@ AUX freebsd-lib-6.0-ssp.patch 4343 RMD160 2ae7e8ba8d2dd691a943049bc03703af02c97a
 MD5 ac618b629d4eaae493fc561717d146d5 files/freebsd-lib-6.0-ssp.patch 4343
 RMD160 2ae7e8ba8d2dd691a943049bc03703af02c97a5c files/freebsd-lib-6.0-ssp.patch 4343
 SHA256 74fe62e37428faaf4ebe4a6e3735c7cc900b1faeb2bf7a3016db23483a9606ab files/freebsd-lib-6.0-ssp.patch 4343
-AUX freebsd-lib-6.1-csu-amd64.patch 358 RMD160 d91638d6a6d0402521a04b38d24028cbe2fbbda1 SHA1 7b6aaa475a1a921b99648c785ef334035c48ef58 SHA256 18a8dd539e31973289e4075f932939e623e260da82759f6df5f1f7d7294a33bf
-MD5 38da88c7a3127f125296837e8d32d693 files/freebsd-lib-6.1-csu-amd64.patch 358
-RMD160 d91638d6a6d0402521a04b38d24028cbe2fbbda1 files/freebsd-lib-6.1-csu-amd64.patch 358
-SHA256 18a8dd539e31973289e4075f932939e623e260da82759f6df5f1f7d7294a33bf files/freebsd-lib-6.1-csu-amd64.patch 358
+AUX freebsd-lib-6.1-csu-amd64.patch 321 RMD160 21202a0e1961b09d8d08b8e96c68b2b8a9c9e894 SHA1 15ff05367773436a1a6c246e17a77dc63f912d00 SHA256 833f6ed18806c5b9d32f7d3384e001a52a4c29e30e93c8b765a4d7f856288fdc
+MD5 bc785e4d19ad673cb65a4c0072a0db4a files/freebsd-lib-6.1-csu-amd64.patch 321
+RMD160 21202a0e1961b09d8d08b8e96c68b2b8a9c9e894 files/freebsd-lib-6.1-csu-amd64.patch 321
+SHA256 833f6ed18806c5b9d32f7d3384e001a52a4c29e30e93c8b765a4d7f856288fdc files/freebsd-lib-6.1-csu-amd64.patch 321
 AUX freebsd-lib-bsdxml.patch 339 RMD160 27b501cda2ac76230a72dfc3ee6593cb50f8d4b0 SHA1 3b456d272de5d0c56bc650fe60f38524857f8b31 SHA256 c1ac47d6c7176475f0f4b86bb17288a980b44a799fb6f4e7b1920f69e0447dc9
 MD5 0fa8fbe7549748636959ef4bc4ea9660 files/freebsd-lib-bsdxml.patch 339
 RMD160 27b501cda2ac76230a72dfc3ee6593cb50f8d4b0 files/freebsd-lib-bsdxml.patch 339
@@ -53,14 +50,14 @@ EBUILD freebsd-lib-6.0-r3.ebuild 6540 RMD160 b5aba6b58d97cb6f6dd725bbc2a12f3539e
 MD5 1bde4db8e821cdb167f10b4514a0dbe2 freebsd-lib-6.0-r3.ebuild 6540
 RMD160 b5aba6b58d97cb6f6dd725bbc2a12f3539eac78e freebsd-lib-6.0-r3.ebuild 6540
 SHA256 d1007fb5b26aefbd85e08374ab32324643e734b704da97ad8461c59f327fdeb5 freebsd-lib-6.0-r3.ebuild 6540
-EBUILD freebsd-lib-6.1.ebuild 6977 RMD160 35025d0a76d44f610d681c8ce8df2044e253f48c SHA1 5ad7e39d220310ac7940d6035eef2c039e731a2f SHA256 e19ba4fecbae7d51aeb4926a29296f1a427ccc41b3ede7cf8f206e7813dc12e1
-MD5 50db172da12b21262f35408811225987 freebsd-lib-6.1.ebuild 6977
-RMD160 35025d0a76d44f610d681c8ce8df2044e253f48c freebsd-lib-6.1.ebuild 6977
-SHA256 e19ba4fecbae7d51aeb4926a29296f1a427ccc41b3ede7cf8f206e7813dc12e1 freebsd-lib-6.1.ebuild 6977
-MISC ChangeLog 9049 RMD160 8fbe76cd4df0d186a98924a98eb43d0f67b9fa46 SHA1 5b0b267b51a6616c705788c827d5736dc1087b22 SHA256 c22ac596f9a56f6c886ff31dd0c46e4b1b1b6f5dbd450086139c34cecf393eb5
-MD5 a9f7a9fe2934cdb2d0787e343e9a3cf5 ChangeLog 9049
-RMD160 8fbe76cd4df0d186a98924a98eb43d0f67b9fa46 ChangeLog 9049
-SHA256 c22ac596f9a56f6c886ff31dd0c46e4b1b1b6f5dbd450086139c34cecf393eb5 ChangeLog 9049
+EBUILD freebsd-lib-6.1.ebuild 6976 RMD160 632f038abca59d8f104d9d6aa9141ebfb1cbb10a SHA1 8886590acf9c6d15ab2d18d8e9298cbf873c87c9 SHA256 96853f57a69b875d0e8e68a46d6dd6bd0dd8399aa805f0fa81e692b803b8269f
+MD5 fc9cdb14cea6fb29da1f5e721f56a6a7 freebsd-lib-6.1.ebuild 6976
+RMD160 632f038abca59d8f104d9d6aa9141ebfb1cbb10a freebsd-lib-6.1.ebuild 6976
+SHA256 96853f57a69b875d0e8e68a46d6dd6bd0dd8399aa805f0fa81e692b803b8269f freebsd-lib-6.1.ebuild 6976
+MISC ChangeLog 9193 RMD160 0df568f4fbc9653b04a28e06a88f8a1f7690d741 SHA1 fc2e85b4c3bf3c6ad4f409bc5b19756a4f45c401 SHA256 91440c5b8a0cda8c5ebb576f1b038294e21297297882aef85c30c22cc1a7500a
+MD5 14d9b684e8b362b28cc15a4ebee15386 ChangeLog 9193
+RMD160 0df568f4fbc9653b04a28e06a88f8a1f7690d741 ChangeLog 9193
+SHA256 91440c5b8a0cda8c5ebb576f1b038294e21297297882aef85c30c22cc1a7500a ChangeLog 9193
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -71,10 +68,3 @@ SHA256 f0deccdb9489aa7f2a1dcad0b619427916876a3a58d1b020d754852396c59766 files/di
 MD5 7a392338e5c80064105ffb19a6575361 files/digest-freebsd-lib-6.1 2072
 RMD160 2f3e680d7a90f8387d086addff4fff68fd4c51de files/digest-freebsd-lib-6.1 2072
 SHA256 e4f88af696b9cdd96f0553e2928d59ce138c08f8d4925b32b6ea59c3030d7f21 files/digest-freebsd-lib-6.1 2072
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEpxYQAiZjviIA2XgRArgwAKC9L8Sci2hHXJN3AX8OoZwOWnzmBgCeJNCb
-bIqs7Q68ZQP3ll3ZIlxsfMo=
-=xbo0
------END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu-amd64.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu-amd64.patch
index d159cc0efef9..7bf15f17a8be 100644
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu-amd64.patch
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu-amd64.patch
@@ -1,10 +1,10 @@
---- lib-orig/csu/amd64/Makefile 2003-06-30 12:53:39 +0000

-+++ lib-mod/csu/amd64/Makefile  2006-07-01 03:10:53 +0000

-@@ -16,6 +16,7 @@

-        ${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.CURDIR}/crt1.c

-

- realinstall:

-+       mkdir ${DESTDIR}${LIBDIR}

-        ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \

-            ${OBJS} ${DESTDIR}${LIBDIR}

-

+--- lib/csu/amd64/Makefile.orig	2006-07-04 07:49:58 -0300
++++ lib/csu/amd64/Makefile	2006-07-04 07:50:15 -0300
+@@ -16,6 +16,7 @@
+ 	${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.CURDIR}/crt1.c
+ 
+ realinstall:
++	mkdir ${DESTDIR}${LIBDIR}
+ 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ 	    ${OBJS} ${DESTDIR}${LIBDIR}
+ 
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild
index a5124ed9d7c2..1532d7046eb9 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild,v 1.7 2006/07/02 00:40:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild,v 1.8 2006/07/04 11:09:41 the_paya Exp $
 
 inherit bsdmk freebsd flag-o-matic toolchain-funcs
 
@@ -78,7 +78,7 @@ PATCHES="${FILESDIR}/${PN}-bsdxml.patch
 	${FILESDIR}/${PN}-6.0-flex-2.5.31.patch
 	${FILESDIR}/${PN}-6.0-binutils-asm.patch
 	${FILESDIR}/${PN}-6.0-ssp.patch
-	${FILESDIR}/${P}-csu.amd64.patch"
+	${FILESDIR}/${P}-csu-amd64.patch"
 
 # Here we disable and remove source which we don't need or want
 # In order: