Resolve some file conflicts

hurd/PKGBUILD

@@ -62,11 +62,15 @@ package() {
   mv "$pkgdir"/include "$pkgdir"/usr/include
   mv "$pkgdir"/lib "$pkgdir"/usr/lib
   mv "$pkgdir"/sbin/* "$pkgdir"/usr/bin
-  # ArchHurd TODO: Move /bin to /usr/hin - conflicts with executables from shadow
-#  mv "$pkgdir"/bin/* "$pkgdir"/usr/bin
-  rmdir "$pkgdir"/sbin # "$pkgdir"/bin
+  mv "$pkgdir"/bin/* "$pkgdir"/usr/bin
+  rmdir "$pkgdir"/sbin "$pkgdir"/bin
   mv "$pkgdir"/share "$pkgdir"/usr/share
   mv "$pkgdir"/libexec/* "$pkgdir"/usr/lib
   rmdir "$pkgdir"/libexec
+
+  # uptime gets provided by procps-ng
+  mv "$pkgdir"/usr/bin/uptime{,-hurd}
+  # fsck gets provided by util-linux
+  mv "$pkgdir"/usr/bin/fsck{,-hurd}
 }
 

procps-ng/PKGBUILD

@@ -49,4 +49,8 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
+
+	mv "$pkgdir"/usr/bin/ps{,-procps}
+	mv "$pkgdir"/usr/bin/vmstat{,-procps}
+	mv "$pkgdir"/usr/bin/w{,-procps}
 }

shadow/PKGBUILD

@@ -37,7 +37,7 @@ sha1sums=('SKIP'
           '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
           '12427b1ca92a9b85ca8202239f0d9f50198b818f'
           '0e56fed7fc93572c6bf0d8f3b099166558bb46f1'
-          'bb3509087947d08bfb6e5d1b5c033856b9146ad9'
+          'e913e943334af4c25223177bb23404ac3e3b0685'
           '12427b1ca92a9b85ca8202239f0d9f50198b818f'
           '611be25d91c3f8f307c7fe2485d5f781e5dee75f'
           'a154a94b47a3d0c6c287253b98c0d10b861226d0'
@@ -131,4 +131,7 @@ package() {
   # move everything else to /usr/bin, because this isn't handled by ./configure
   mv "$pkgdir"/usr/sbin/* "$pkgdir"/usr/bin
   rmdir "$pkgdir/usr/sbin"
+
+  # login gets provided by hurd
+  mv "$pkgdir"/usr/bin/login{,-shadow}
 }

util-linux/PKGBUILD

@@ -39,7 +39,6 @@ build() {
               --bindir=/usr/bin \
               --localstatedir=/run \
               --enable-fs-paths-extra=/usr/bin \
-              --enable-vipw \
               --enable-newgrp \
               --enable-write \
               --enable-mesg \
@@ -78,11 +77,11 @@ package_util-linux() {
   # adjust for usrmove
   # TODO(dreisner): fix configure.ac upstream so that this isn't needed
   cd "$pkgdir"
-  mv {,usr/}sbin/* usr/bin
+  mv sbin/* usr/bin
   rmdir sbin usr/sbin
 
   ### runtime libs are shipped as part of libutil-linux
-  rm "$pkgdir"/usr/lib/lib*.{a,so}*
+  rm "$pkgdir"/usr/lib/lib*.{a,so,la}*
 
   ### install systemd-sysusers
   install -Dm644 "$srcdir/util-linux.sysusers" \
@@ -95,6 +94,9 @@ package_util-linux() {
     "$pkgdir/usr/lib/systemd/system/rfkill-unblock@.service"
   install -Dm644 "$srcdir/rfkill-block_.service" \
     "$pkgdir/usr/lib/systemd/system/rfkill-block@.service"
+
+  # nologin gets provided by shadow
+  mv "$pkgdir"/usr/bin/nologin{,-util-linux}
 }
 
 package_libutil-linux() {