3 files changed, 13 insertions, 23 deletions
diff --git a/libre/fakeroot/PKGBUILD b/libre/fakeroot-tcp/PKGBUILD
index f834dafe3..2d5d26d05 100644
--- a/libre/fakeroot/PKGBUILD
+++ b/libre/fakeroot-tcp/PKGBUILD
@@ -3,45 +3,40 @@
 # Contributor (Arch): Allan McRae <allan@archlinux.org>
 # Contributor (Arch): Jochem Kossen <j.kossen@home.nl>
 
-# NOTE: if building for armv7h, you may need to pass -N to libremakepkg,
-#       otherwise check() could fail
-
-pkgname=fakeroot
+pkgname=fakeroot-tcp
+_pkgname=fakeroot
 pkgver=1.24
 pkgrel=2
 pkgrel+=.parabola1
-pkgdesc='Tool for simulating superuser privileges'
+pkgdesc='Tool for simulating superuser privileges, with TCP IPC'
 arch=(x86_64)
 arch+=(i686 armv7h)
 license=(GPL)
-url='https://packages.debian.org/fakeroot'
+url='https://tracker.debian.org/pkg/fakeroot'
 install=fakeroot.install
 depends=(glibc filesystem sed util-linux sh)
 makedepends=(po4a)
-checkdepends=(sharutils)
-source=("https://deb.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.gz"
+provides=(${_pkgname}=${pkgver}-${pkgrel})
+conflicts=(${_pkgname})
+source=("https://deb.debian.org/debian/pool/main/f/$_pkgname/${_pkgname}_${pkgver}.orig.tar.gz"
         'silence-dlerror.patch')
 sha256sums=('2e045b3160370b8ab4d44d1f8d267e5d1d555f1bb522d650e7167b09477266ed'
             '347f6496c93ed0d91dcb554db92602b50520a16308e3b8bc33822bd69966267b')
 
 prepare() {
-  cd $pkgname-$pkgver
+  cd $_pkgname-$pkgver
   patch -p1 -i "$srcdir"/silence-dlerror.patch
 
   ./bootstrap
-
-  # fix chmod_dev, mknod and touchinstall tests
-  sed -e 's/\^b/\^-/' \
-      -e 's/\<root\>/$USER/' \
-      -i test/t.{chmod_dev,mknod,touchinstall}
 }
 
 build() {
-  cd $pkgname-$pkgver
+  cd $_pkgname-$pkgver
 
-  # SYSV IPC makes fakeroot fail with ARM emulation
+  # librechroot ARM builds fail with sysv IPC
   # https://labs.parabola.nu/issues/2775
   # https://archlinuxarm.org/forum/viewtopic.php?p=63781
+  local ipc
   if [ $CARCH = armv7h ]; then
     ipc=tcp
   else
@@ -59,18 +54,13 @@ build() {
   po4a -k 0 --rm-backups --variable 'srcdir=../doc/' po4a/po4a.cfg
 }
 
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
 package() {
-  cd $pkgname-$pkgver
+  cd $_pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
   install -dm755 "$pkgdir/etc/ld.so.conf.d/"
   echo '/usr/lib/libfakeroot' > "$pkgdir/etc/ld.so.conf.d/fakeroot.conf"
 
   # install README for sysv/tcp usage
-  install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README"
+  install -Dm644 README "$pkgdir/usr/share/doc/$_pkgname/README"
 }
diff --git a/libre/fakeroot/fakeroot.install b/libre/fakeroot-tcp/fakeroot.install
index caab92243..caab92243 100644
--- a/libre/fakeroot/fakeroot.install
+++ b/libre/fakeroot-tcp/fakeroot.install
diff --git a/libre/fakeroot/silence-dlerror.patch b/libre/fakeroot-tcp/silence-dlerror.patch
index a4472d8f7..a4472d8f7 100644
--- a/libre/fakeroot/silence-dlerror.patch
+++ b/libre/fakeroot-tcp/silence-dlerror.patch