From 09b286be63e80eb067abf6c33cb6023598e81a30 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 24 Oct 2012 07:20:40 +0200
Subject: [PATCH] glibc: relax dep versions; move nsswitch.conf to base-files.

---
 srcpkgs/glibc/files/nsswitch.conf  | 15 ---------------
 srcpkgs/glibc/glibc-devel.template |  2 +-
 srcpkgs/glibc/template             | 22 +++++++++++-----------
 3 files changed, 12 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/glibc/files/nsswitch.conf

diff --git a/srcpkgs/glibc/files/nsswitch.conf b/srcpkgs/glibc/files/nsswitch.conf
deleted file mode 100644
index 90638a446e0..00000000000
--- a/srcpkgs/glibc/files/nsswitch.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# /etc/nsswitch.conf
-#
-# See nsswitch.conf(5) for information.
-#
-passwd: 	files
-group: 		files
-shadow: 	files
-
-hosts: 		files mdns4_minimal [NOTFOUND=return] dns mdns4
-networks: 	files
-
-protocols: 	files
-services: 	files
-ethers: 	files
-rpc: 		files
diff --git a/srcpkgs/glibc/glibc-devel.template b/srcpkgs/glibc/glibc-devel.template
index 0c05fc1ebf3..f2cccd24c25 100644
--- a/srcpkgs/glibc/glibc-devel.template
+++ b/srcpkgs/glibc/glibc-devel.template
@@ -1,6 +1,6 @@
 # Template file for 'glibc-devel'.
 #
-depends="kernel-libc-headers>=3.4<3.5 glibc>=$version"
+depends="kernel-libc-headers glibc>=${version}"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 89567ff517c..8478cf9697a 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -2,22 +2,15 @@
 pkgname=glibc
 _majorver=2.16
 version=${_majorver}.0
-revision=9
+revision=10
 short_desc="The GNU C library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/libc"
 license="GPL-2, LGPL-2.1, BSD"
-nostrip_files="
-ld-${_majorver}.so
-libc-${_majorver}.so
-libpthread-${_majorver}.so
-libthread_db-1.0.so"
-conf_files="/etc/rpc /etc/ld.so.conf /etc/nsswitch.conf"
+conf_files="/etc/rpc /etc/ld.so.conf"
 subpackages="glibc-devel glibc-locales nscd"
 depends="base-files glibc-locales"
-makedepends="bison perl kernel-libc-headers>=3.4<3.5"
-replaces="glibc>=0"
-softreplace=yes
+makedepends="bison perl kernel-libc-headers>=3.6<3.7"
 distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.xz"
 checksum=1edc36aa2a6cb7127971fce8e02eecffe9c7956297ad3ef10dd4c09f486d5924
 long_desc="
@@ -27,6 +20,14 @@ long_desc="
  as C++ and Objective C; the runtime facilities of other programming
  languages use the C library to access the underlying operating system."
 
+nostrip_files="
+ ld-${_majorver}.so
+ libc-${_majorver}.so
+ libpthread-${_majorver}.so
+ libthread_db-1.0.so"
+
+softreplace=yes
+
 do_configure() {
 	mkdir build && cd build
 
@@ -81,7 +82,6 @@ do_install() {
 		sed -i "s|^RTLDLIST.*$|RTLDLIST=\"$rtldlist\"|" \
 			${DESTDIR}/usr/bin/ldd
 	fi
-	install -m644 ${FILESDIR}/nsswitch.conf ${DESTDIR}/etc
 	install -d ${DESTDIR}/etc/ld.so.conf.d
 	echo "/usr/local/lib" > ${DESTDIR}/etc/ld.so.conf.d/usr_local.conf
 	chmod 644 ${DESTDIR}/etc/ld.so.conf.d/usr_local.conf