From 7bd842afc221abb4613aa4eaaf319de6fb75ba96 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sun, 30 Jun 2013 01:08:10 -0600
Subject: mv libre/abs{-libre,} # and tidy up a bit

---
 libre/abs-libre/PKGBUILD    | 51 ---------------------------------------------
 libre/abs-libre/abs.install | 13 ------------
 libre/abs/PKGBUILD          | 42 +++++++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 64 deletions(-)
 delete mode 100644 libre/abs-libre/PKGBUILD
 delete mode 100644 libre/abs-libre/abs.install
 create mode 100644 libre/abs/PKGBUILD

diff --git a/libre/abs-libre/PKGBUILD b/libre/abs-libre/PKGBUILD
deleted file mode 100644
index 259cf007f..000000000
--- a/libre/abs-libre/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 166402 2012-09-07 16:49:13Z dreisner $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-_pkgname=abs
-pkgname=abs-libre
-#CARCH=mips64el
-pkgver=2.4.4
-pkgrel=1
-pkgdesc="Utilities to download and work with the Arch Build System (ABS)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://projects.archlinux.org/abs.git/"
-license=('GPL')
-depends=('bash' 'rsync')
-backup=(etc/abs.conf)
-source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('7258c739a93e02a4f31f114e9fc3b0ba'
-         'a628f7d5b1cd1e838366b88709690c24')
-provides=("${_pkgname}=${pkgver}")
-replaces=("${_pkgname}")
-conflicts=("${_pkgname}")
-
-build() {
-  cd "$_pkgname-$pkgver"
-
-  make
-}
-
-package() {
-  cd "$_pkgname-$pkgver"
-
-  make DESTDIR="${pkgdir}" install
-
-  # Add readme file, and make base /var/abs path
-  install -dm755 "${pkgdir}"/var/abs/local/
-  install -Dm644 README "${pkgdir}"/var/abs/README
-
-  sed -i -e 's|rsync.archlinux.org|parabolagnulinux.org|' ${pkgdir}/etc/abs.conf
-  sed -i -e 's|(core|(libre !libre-testing core|' ${pkgdir}/etc/abs.conf
-
-  # make adjustments to abs.conf
-  if [[ $CARCH = "i686" ]]; then
-    sed -i -e 's| multilib||' -e 's| !multilib-testing||' "${pkgdir}"/etc/abs.conf
-  fi
-  if [[ $CARCH = "x86_64" ]]; then
-    sed -i '/ARCH=/s|i686|x86_64|' "${pkgdir}"/etc/abs.conf
-  fi
-  if [[ $CARCH = "mips64el" ]]; then
-        sed -i -e 's| multilib||' -e 's| !multilib-testing||' ${pkgdir}/etc/abs.conf
-        sed -i '/ARCH=/s|i686|mips64el|' ${pkgdir}/etc/abs.conf
-  fi
-}
diff --git a/libre/abs-libre/abs.install b/libre/abs-libre/abs.install
deleted file mode 100644
index ac814c2fc..000000000
--- a/libre/abs-libre/abs.install
+++ /dev/null
@@ -1,13 +0,0 @@
-pre_upgrade() {
-    if [ "$(vercmp $2 2.3.2-1)" -lt 0 ]; then
-        echo "==> Fixing potential ABS tree permission issues (this may take a while...)"
-    
-        for dir in core extra community testing; do
-            if [ -d /var/abs/$dir ]; then
-                find /var/abs/$dir -type d -exec chown root:root {} \;
-                find /var/abs/$dir -type d -exec chmod 755 {} \;
-            fi
-        done
-    fi
-}
-
diff --git a/libre/abs/PKGBUILD b/libre/abs/PKGBUILD
new file mode 100644
index 000000000..f7e85d0ef
--- /dev/null
+++ b/libre/abs/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+replaces=('abs-libre')
+conflicts=('abs-libre')
+
+pkgname=abs
+pkgver=2.4.4
+pkgrel=1.1
+pkgdesc="Utilities to download and work with the Arch Build System (ABS)"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://projects.archlinux.org/abs.git/"
+license=('GPL')
+depends=('bash' 'rsync')
+backup=(etc/abs.conf)
+source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz{,.sig})
+md5sums=('7258c739a93e02a4f31f114e9fc3b0ba'
+         'a628f7d5b1cd1e838366b88709690c24')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="${pkgdir}" install
+
+  # Add readme file, and make base /var/abs path
+  install -dm755 "${pkgdir}"/var/abs/local/
+  install -Dm644 README "${pkgdir}"/var/abs/README
+
+  # make adjustments to abs.conf
+  sed -i -e 's|rsync.archlinux.org|parabolagnulinux.org|' "${pkgdir}"/etc/abs.conf
+  sed -i -e 's|(core|(libre !libre-testing core|' "${pkgdir}"/etc/abs.conf
+  if [[ $CARCH != "x86_64" ]]; then
+    sed -i -e 's| multilib||' -e 's| !multilib-testing||' "${pkgdir}"/etc/abs.conf
+  fi
+  sed -i "s/ARCH=.*/ARCH=$CARCH/" "${pkgdir}"/etc/abs.conf
+}
-- 
cgit v1.2.3-54-g00ecf