Header and space fixes

7 files changed, 42 insertions, 43 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 43fbd59973b4..9b13d24db47b 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,10 +1,10 @@
-MD5 28ff6c000b78933c78851c17d6f230d5 glibc-2.3.2-r2.ebuild 17298
-MD5 39ad671104db0d30dc02308b7b0e1c70 glibc-2.2.5-r8.ebuild 9684
-MD5 2a2fcaebbcad155c51a8f577389410e9 glibc-2.3.2-r3.ebuild 17013
+MD5 283ca03fd736122c6426fc5b305c7eae glibc-2.3.2-r2.ebuild 17292
+MD5 ec652c5641efa40df96db52e3b00f91e glibc-2.2.5-r8.ebuild 9682
+MD5 2b2d26cb58b784d3042435723abd78ca glibc-2.3.2-r3.ebuild 17007
 MD5 034d2d137a64c9ccce22c9e5da595d12 ChangeLog 15862
-MD5 c2be70dfe7fa800313eb4f87cfa3c314 glibc-2.3.2-r1.ebuild 16084
-MD5 fac8cbf7358118a734aa61cc2e898b3d glibc-2.3.2-r4.ebuild 17186
-MD5 357f80990fafd8a798d9ff8a4c2d3c76 glibc-2.3.1-r4.ebuild 10373
+MD5 176861ab67e44e4c4447704a7314f7a0 glibc-2.3.2-r1.ebuild 16078
+MD5 d46d3199c73293c56ee9baff67546ba8 glibc-2.3.2-r4.ebuild 17182
+MD5 911665b60e1101be73f4b3213131abf5 glibc-2.3.1-r4.ebuild 10287
 MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
 MD5 82be016c42c7cc353ee563fcbcbc4769 files/nscd 840
 MD5 184eddb92615fb991dce41b9edbfa690 files/glibc-manpages-2.3.2.tar.bz2 14700
diff --git a/sys-libs/glibc/glibc-2.2.5-r8.ebuild b/sys-libs/glibc/glibc-2.2.5-r8.ebuild
index bc41d5b28674..12180a5dec3e 100644
--- a/sys-libs/glibc/glibc-2.2.5-r8.ebuild
+++ b/sys-libs/glibc/glibc-2.2.5-r8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r8.ebuild,v 1.11 2003/09/07 00:22:30 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r8.ebuild,v 1.12 2003/09/07 15:37:03 azarah Exp $
 
 IUSE="nls pic build"
 
diff --git a/sys-libs/glibc/glibc-2.3.1-r4.ebuild b/sys-libs/glibc/glibc-2.3.1-r4.ebuild
index 99e28ba7c9dc..87cf1e2b2d28 100644
--- a/sys-libs/glibc/glibc-2.3.1-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.3.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.1-r4.ebuild,v 1.15 2003/09/07 00:22:30 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.1-r4.ebuild,v 1.16 2003/09/07 15:37:04 azarah Exp $
 
 IUSE="nls pic build"
 
@@ -153,27 +153,26 @@ src_unpack() {
 		epatch ${FILESDIR}/${PV}/${P}-ulps-mips.patch
 	fi
 
-    # Some patches for hppa.
-    # <gmsoft@gentoo.org> (27 Jan 2003)
-    if [ "${ARCH}" = "hppa" ]
-    then
-        cd ${S}
-        epatch ${FILESDIR}/${PV}/glibc23-00-hppa-pthreads.dpatch
-        epatch ${FILESDIR}/${PV}/glibc23-01-hppa-dl-machine.dpatch
-        epatch ${FILESDIR}/${PV}/glibc23-02-hppa-min-kern-unwind-fde.dpatch
-        epatch ${FILESDIR}/${PV}/glibc23-03-hppa-mcontext.dpatch
-        epatch ${FILESDIR}/${PV}/glibc23-04-hppa-fcntl64.dpatch
-        epatch ${FILESDIR}/${PV}/glibc23-05-hppa-buildhack.dpatch
-        epatch ${FILESDIR}/${PV}/glibc23-06-hppa-tests.dpatch
-        epatch ${FILESDIR}/${PV}/glibc23-07-hppa-atomicity.dpatch
-        epatch ${FILESDIR}/${PV}/glibc23-08-hppa-configure.dpatch
-        epatch ${FILESDIR}/${PV}/glibc23-hppa-shmlba.dpatch
-    fi
-
+	# Some patches for hppa.
+	# <gmsoft@gentoo.org> (27 Jan 2003)
+	if [ "${ARCH}" = "hppa" ]
+	then
+		cd ${S}
+		epatch ${FILESDIR}/${PV}/glibc23-00-hppa-pthreads.dpatch
+		epatch ${FILESDIR}/${PV}/glibc23-01-hppa-dl-machine.dpatch
+		epatch ${FILESDIR}/${PV}/glibc23-02-hppa-min-kern-unwind-fde.dpatch
+		epatch ${FILESDIR}/${PV}/glibc23-03-hppa-mcontext.dpatch
+		epatch ${FILESDIR}/${PV}/glibc23-04-hppa-fcntl64.dpatch
+		epatch ${FILESDIR}/${PV}/glibc23-05-hppa-buildhack.dpatch
+		epatch ${FILESDIR}/${PV}/glibc23-06-hppa-tests.dpatch
+		epatch ${FILESDIR}/${PV}/glibc23-07-hppa-atomicity.dpatch
+		epatch ${FILESDIR}/${PV}/glibc23-08-hppa-configure.dpatch
+		epatch ${FILESDIR}/${PV}/glibc23-hppa-shmlba.dpatch
+	fi
 }
 
 src_compile() {
-	local myconf=""
+	local myconf=
 
 	# These should not be set, else the
 	# zoneinfo do not always get installed ...
diff --git a/sys-libs/glibc/glibc-2.3.2-r1.ebuild b/sys-libs/glibc/glibc-2.3.2-r1.ebuild
index 093a1868b8fa..859d459a2eaa 100644
--- a/sys-libs/glibc/glibc-2.3.2-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r1.ebuild,v 1.22 2003/09/07 00:22:30 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r1.ebuild,v 1.23 2003/09/07 15:37:05 azarah Exp $
 
 IUSE="nls pic build nptl"
 
@@ -434,8 +434,8 @@ src_install() {
 		rm -f ${D}/usr/lib/librt.so
 		cat > ${D}/usr/lib/librt.so <<EOF
 /* GNU ld script
-   librt.so.1 needs libpthread.so.0 to come before libc.so.6*
-   in search scope.  */
+	librt.so.1 needs libpthread.so.0 to come before libc.so.6*
+	in search scope.  */
 EOF
 		grep "OUTPUT_FORMAT" ${D}/usr/lib/libc.so >> ${D}/usr/lib/librt.so
 		echo "GROUP ( /lib/${LIBPTHREADSO} /lib/${LIBRTSO} )" \
diff --git a/sys-libs/glibc/glibc-2.3.2-r2.ebuild b/sys-libs/glibc/glibc-2.3.2-r2.ebuild
index b9361e12e6e1..4c853e7efd69 100644
--- a/sys-libs/glibc/glibc-2.3.2-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r2.ebuild,v 1.11 2003/09/07 00:22:30 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r2.ebuild,v 1.12 2003/09/07 15:37:05 azarah Exp $
 
 IUSE="nls pic build nptl"
 
@@ -496,8 +496,8 @@ src_install() {
 		rm -f ${D}/usr/lib/librt.so
 		cat > ${D}/usr/lib/librt.so <<EOF
 /* GNU ld script
-   librt.so.1 needs libpthread.so.0 to come before libc.so.6*
-   in search scope.  */
+	librt.so.1 needs libpthread.so.0 to come before libc.so.6*
+	in search scope.  */
 EOF
 		grep "OUTPUT_FORMAT" ${D}/usr/lib/libc.so >> ${D}/usr/lib/librt.so
 		echo "GROUP ( /lib/${LIBPTHREADSO} /lib/${LIBRTSO} )" \
diff --git a/sys-libs/glibc/glibc-2.3.2-r3.ebuild b/sys-libs/glibc/glibc-2.3.2-r3.ebuild
index 6b9681473f68..efb4a805db4a 100644
--- a/sys-libs/glibc/glibc-2.3.2-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r3.ebuild,v 1.6 2003/09/07 00:22:30 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r3.ebuild,v 1.7 2003/09/07 15:37:05 azarah Exp $
 
 IUSE="nls pic build nptl"
 
@@ -488,8 +488,8 @@ src_install() {
 		rm -f ${D}/usr/lib/librt.so
 		cat > ${D}/usr/lib/librt.so <<EOF
 /* GNU ld script
-   librt.so.1 needs libpthread.so.0 to come before libc.so.6*
-   in search scope.  */
+	librt.so.1 needs libpthread.so.0 to come before libc.so.6*
+	in search scope.  */
 EOF
 		grep "OUTPUT_FORMAT" ${D}/usr/lib/libc.so >> ${D}/usr/lib/librt.so
 		echo "GROUP ( /lib/${LIBPTHREADSO} /lib/${LIBRTSO} )" \
diff --git a/sys-libs/glibc/glibc-2.3.2-r4.ebuild b/sys-libs/glibc/glibc-2.3.2-r4.ebuild
index 2ea6223036b2..b7f6576e95d0 100644
--- a/sys-libs/glibc/glibc-2.3.2-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r4.ebuild,v 1.1 2003/09/07 15:17:47 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r4.ebuild,v 1.2 2003/09/07 15:37:05 azarah Exp $
 
 IUSE="nls pic build nptl"
 
@@ -494,8 +494,8 @@ src_install() {
 		rm -f ${D}/usr/lib/librt.so
 		cat > ${D}/usr/lib/librt.so <<EOF
 /* GNU ld script
-   librt.so.1 needs libpthread.so.0 to come before libc.so.6*
-   in search scope.  */
+	librt.so.1 needs libpthread.so.0 to come before libc.so.6*
+	in search scope.  */
 EOF
 		grep "OUTPUT_FORMAT" ${D}/usr/lib/libc.so >> ${D}/usr/lib/librt.so
 		echo "GROUP ( /lib/${LIBPTHREADSO} /lib/${LIBRTSO} )" \