From 6370ae5c715a94a0390b77d10adb6e8ee3b39ef9 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@parabola.nu>
Date: Mon, 3 Jun 2013 11:37:50 -0300
Subject: filesystem upgrade for /usr/bin merge

---
 libre/filesystem/PKGBUILD | 51 +++++++++++++++++++++++++++--------------------
 libre/filesystem/profile  |  2 +-
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index eac7300d4..60fa5924b 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=filesystem
-pkgver=2013.03
+pkgver=2013.05
 pkgrel=2
 pkgdesc='Base filesystem (Parabola rebranded)'
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,26 +21,6 @@ source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
         'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf'
         'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'parabola.7.txt'
         'locale.sh')
-md5sums=('7b8e40f8f793e60f471511641bb1c9f2'
-         '6be47d893fd49b2e4a8c0e811b350861'
-         '9e4533df61f0c82d6b2e2371f7376282'
-         '4c4540eeb748bf1f71d631b8c1dcf0b3'
-         'f28150d4c0b22a017be51b9f7f9977ed'
-         '6e488ffecc8ba142c0cf7e2d7aeb832e'
-         '1cfd310dff0804a7d21958487c32a3b1'
-         '2ef2429c2c98d0883906aa6f5363be80'
-         '693c97f2c9a519bb97a17008e92c2b74'
-         '1745349eb24ed21b4cfaa6f423bddb76'
-         '7bc65f234dfb6abf24e7c3b03e86f4ff'
-         'd41d8cd98f00b204e9800998ecf8427e'
-         '0e145e18fea8fd190b30d45764f5707c'
-         '6f48288b6fcaf0065fcb7b0e525413e0'
-         '22518e922891f9359f971f4f5b4e793c'
-         'f45389e116ab0b9e9968287617d27c7d'
-         'f3b6ae7db8adffaaa4bffc6099dcbd50'
-         'a8a962370cd0128465d514e6a1f74130'
-         'd5732ffdb3488e1383d4ea199343e767'
-         '3807d07215d9116331fe1cf8feeaa0f8')
 
 build() {
 	cd ${srcdir}
@@ -90,7 +70,7 @@ package() {
 	#
 	# setup /usr hierarchy
 	#
-	for d in bin include lib sbin share/misc src; do
+	for d in bin include lib share/misc src; do
 		install -d -m755 usr/${d}
 	done
 	for d in $(seq 8); do
@@ -111,6 +91,13 @@ package() {
 		ln -s lib ${pkgdir}/usr/lib32
 	)
 
+	#
+	# add bin symlinks
+	#
+	ln -s usr/bin ${pkgdir}/bin
+	ln -s usr/bin ${pkgdir}/sbin
+	ln -s bin ${pkgdir}/usr/sbin
+
 	#
 	# install parabola(7) manpage
 	#
@@ -124,3 +111,23 @@ package() {
 	done
 	ln -s ../man usr/local/share/man
 }
+md5sums=('7b8e40f8f793e60f471511641bb1c9f2'
+         '6be47d893fd49b2e4a8c0e811b350861'
+         '9e4533df61f0c82d6b2e2371f7376282'
+         '4c4540eeb748bf1f71d631b8c1dcf0b3'
+         'f28150d4c0b22a017be51b9f7f9977ed'
+         '6e488ffecc8ba142c0cf7e2d7aeb832e'
+         '1cfd310dff0804a7d21958487c32a3b1'
+         '2ef2429c2c98d0883906aa6f5363be80'
+         '693c97f2c9a519bb97a17008e92c2b74'
+         '1745349eb24ed21b4cfaa6f423bddb76'
+         '7bc65f234dfb6abf24e7c3b03e86f4ff'
+         'd41d8cd98f00b204e9800998ecf8427e'
+         '0e145e18fea8fd190b30d45764f5707c'
+         '6f48288b6fcaf0065fcb7b0e525413e0'
+         '22518e922891f9359f971f4f5b4e793c'
+         'f45389e116ab0b9e9968287617d27c7d'
+         '0b6f835598c7640184e476057b3c7722'
+         'a8a962370cd0128465d514e6a1f74130'
+         'd5732ffdb3488e1383d4ea199343e767'
+         '3807d07215d9116331fe1cf8feeaa0f8')
diff --git a/libre/filesystem/profile b/libre/filesystem/profile
index 3bc22db9f..59d0abc83 100644
--- a/libre/filesystem/profile
+++ b/libre/filesystem/profile
@@ -4,7 +4,7 @@
 umask 022
 
 # Set our default path
-PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"
+PATH="/usr/local/sbin:/usr/local/bin:/usr/bin"
 export PATH
 
 # Load profiles from /etc/profile.d
-- 
cgit v1.2.3