From d41913e22ecdc14498e28e5d4dbd094692c8d5d0 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 9 Jul 2012 17:39:51 +0200
Subject: [PATCH] eglibc: switch to /usr.

---
 srcpkgs/eglibc/eglibc-nscd.template | 4 ++--
 srcpkgs/eglibc/template             | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/eglibc/eglibc-nscd.template b/srcpkgs/eglibc/eglibc-nscd.template
index 7fcc837dd3..89e0f22cd4 100644
--- a/srcpkgs/eglibc/eglibc-nscd.template
+++ b/srcpkgs/eglibc/eglibc-nscd.template
@@ -11,8 +11,8 @@ long_desc="
 
 do_install() {
 	vmove usr/sbin/nscd usr/sbin
-	vinstall ${FILESDIR}/nscd.service 644 lib/systemd/system
-	vinstall ${FILESDIR}/nscd.socket 644 lib/systemd/system
+	vinstall ${FILESDIR}/nscd.service 644 usr/lib/systemd/system
+	vinstall ${FILESDIR}/nscd.socket 644 usr/lib/systemd/system
 	vinstall ${FILESDIR}/nscd.tmpfiles.d 644 usr/lib/tmpfiles.d nscd.conf
 	vinstall ${FILESDIR}/nscd.conf 644 etc
 	vinstall ${FILESDIR}/nscd.logrotate 644 etc/logrotate.d nscd
diff --git a/srcpkgs/eglibc/template b/srcpkgs/eglibc/template
index 270bb24249..d9ba476a1c 100644
--- a/srcpkgs/eglibc/template
+++ b/srcpkgs/eglibc/template
@@ -3,7 +3,7 @@ pkgname=eglibc
 _distver="2.15.1"
 _datesvn="20120525"
 version="${_distver}.${_datesvn}"
-revision=1
+revision=2
 wrksrc="eglibc-${_distver}_${_datesvn}"
 depends="base-files eglibc-locales>=$version"
 makedepends="bison perl"
@@ -85,4 +85,9 @@ do_install() {
 		/usr/lib/gconv/gconv-modules; do
 		echo "# $pkgname-$version" >> ${DESTDIR}${f}
 	done
+
+	# Switch to /usr.
+	vmkdir usr/sbin
+	vmove "lib/*" usr/lib
+	vmove "sbin/*" usr/sbin
 }