3 files changed, 24 insertions, 56 deletions
diff --git a/libre/parabolaiso-data/PKGBUILD b/libre/parabolaiso-data/PKGBUILD
deleted file mode 100644
index dab1db253..000000000
--- a/libre/parabolaiso-data/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributor: Andreas Grapentin <andreas@grapentin.org>
-# Contributor: André Silva <emulatorman@hyperbola.info>
-
-pkgname=parabolaiso-data
-pkgver=5
-pkgrel=1
-pkgdesc="Data files of parabolaiso, the tool to create ISO images"
-arch=('any')
-url="https://projects.parabola.nu/packages/parabolaiso.git"
-license=('GPL')
-_url='https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2'
-source=("${_url}/ShellBinPkg/UefiShell/X64/Shell.efi"
-	      "${_url}/EdkShellBinPkg/FullShell/X64/Shell_Full.efi")
-sha256sums=('91fbfd1b7239143a5c50e2c630aadc03bb49263eba4d8a0a1e6b3c9845208b88'
-            'ea5e763a8a5f9733dbf7c33ffa16a19e078c6af635b51d8457bc377a22106a8c')
-
-package() {
-  cd $srcdir
-
-  datadir="usr/share/parabolaiso/data"
-
-  install -d $pkgdir/$datadir
-
-  install -D -m644 Shell.efi $pkgdir/$datadir/Shell.efi
-  install -D -m644 Shell_Full.efi $pkgdir/$datadir/Shell_Full.efi
-}
diff --git a/libre/parabolaiso-git/PKGBUILD b/libre/parabolaiso-git/PKGBUILD
deleted file mode 100644
index edd6dac42..000000000
--- a/libre/parabolaiso-git/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer (Arch): Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-# Maintainer (Arch): Pierre Schmitz <pierre@archlinux.de>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
-
-_pkgname=parabolaiso
-pkgname=parabolaiso-git
-pkgver=r819.8041f96
-_gitver=8041f96ddead8fcdda7c59e3922cdac5fb32093d
-pkgrel=1
-pkgdesc='Tools for creating Parabola GNU/Linux-libre live and install iso images'
-arch=('any')
-url='https://projects.parabola.nu/packages/parabolaiso.git/'
-license=('GPL')
-depends=('make' 'squashfs-tools' 'libisoburn' 'dosfstools' 'parabolaiso-data')
-makedepends=('git')
-replaces=('archiso' 'parabolaiso')
-conflicts=('archiso' 'parabolaiso')
-provides=('archiso' 'parabolaiso')
-source=("$_pkgname-$pkgver::git+https://projects.parabola.nu/packages/$_pkgname.git/#commit=$_gitver")
-md5sums=('SKIP')
-
-pkgver() {
-  cd $_pkgname-$pkgver
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-package() {
-  cd $_pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
diff --git a/libre/parabolaiso/PKGBUILD b/libre/parabolaiso/PKGBUILD
new file mode 100644
index 000000000..6b10f1e37
--- /dev/null
+++ b/libre/parabolaiso/PKGBUILD
@@ -0,0 +1,24 @@
+# Maintainer (Arch): Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
+# Maintainer (Arch): Pierre Schmitz <pierre@archlinux.de>
+# Contributor: André Silva <emulatorman@hyperbola.info>
+# Maintainer: David P. <megver83@parabola.nu>
+
+pkgname=parabolaiso
+pkgver=34
+pkgrel=1
+pkgdesc='Tools for creating Parabola GNU/Linux-libre live and install iso images'
+arch=('any')
+license=('GPL')
+url='https://git.parabola.nu/packages/parabolaiso.git/'
+depends=('make' 'arch-install-scripts' 'squashfs-tools' 'libisoburn' 'dosfstools' 'lynx')
+replaces=('archiso' 'parabolaiso-git' 'parabolaiso-data')
+conflicts=('archiso' 'parabolaiso-git' 'parabolaiso-data')
+provides=('archiso' 'parabolaiso-git' 'parabolaiso-data')
+source=("https://repo.parabola.nu/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
+sha256sums=('a20ca59312b9e52818af01a80b128195eda9432b1e2e3adfa3aa1d6fccbf446f'
+            'SKIP')
+validpgpkeys=(6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78) # David P.
+
+package() {
+    make -C "${pkgname}-${pkgver}" DESTDIR="${pkgdir}" install
+}