Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

3 files changed, 21 insertions, 65 deletions

diff --git a/~brendan/guile/PKGBUILD b/~brendan/guile/PKGBUILD
index c6297290a..af8827563 100644
--- a/~brendan/guile/PKGBUILD
+++ b/~brendan/guile/PKGBUILD
@@ -1,27 +1,32 @@
-# Maintainer: Brendan Tildesley <brendan.tildesley@gmail.com>
+# Maintainer: Patrick McCarty <pnorcks at gmail dot com>
+# Contributor: Emmanuel 'guinness' Boudreault
+# Parabola Maintainer: Brendan Tildesley (brendyn)
+#
+# This is `guile-devel' from AUR, with very little changes.
 pkgname=guile
-pkgver=2.0.3
+pkgver=2.0.5
 pkgrel=1
-pkgdesc="GNU Ubiquitous Intelligent Language for Extensions - portable Scheme implementation written in C."
+pkgdesc="GNU Ubiquitous Intelligent Language for Extensions - a portable, embeddable Scheme implementation written in C"
 url="http://www.gnu.org/software/guile/"
-license=('GPL3' 'LGPL3')
-arch=(i686 x86_64 mips64el)
-depends=('gmp>=4.1' 'libtool' 'gettext' 'libunistring' 'gc' 'libffi')
-builddepends=('pkgconfig')
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gmp>=4.3.1' 'libtool' 'ncurses>=5.7' 'texinfo'
+         'libunistring' 'gc' 'libffi')
+conflicts=('guile' 'guile-git')
+provides=("guile=$pkgver")
 install=guile.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('4fde55bbd612adda267420d86d8b395d49031809')
-# I think .xz is only provided for latest release, so change to .gz if it vanishes
+options=('!libtool')
+source=(ftp://ftp.gnu.org/pub/gnu/guile/guile-${pkgver}.tar.gz)
+sha256sums=('2a026ea6cdbc51ca71bcd9787839debfa45ac5db1e26dc00b30ca9b128b10956')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-	--disable-static \
-	--disable-error-on-warning
+  cd "${srcdir}/guile-${pkgver}"
+
+  ./configure --prefix=/usr
   make LDFLAGS+="-lpthread"
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/guile-${pkgver}"
   make DESTDIR="${pkgdir}" install
-}
\ No newline at end of file
+}
diff --git a/~brendan/libunistring/PKGBUILD b/~brendan/libunistring/PKGBUILD
deleted file mode 100644
index 634195741..000000000
--- a/~brendan/libunistring/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Former Arch maintainer: Emmanuel 'guinness' Boudreault
-# Current Arch maintainer: Patrick McCarty <pnorcks at gmail dot com>
-# Parabola maintainer: Brendan Tildesley <brendan.tildesley@gmail.com>
-
-pkgname=libunistring
-pkgver=0.9.3
-pkgrel=1
-pkgdesc="GNU library for manipulating Unicode strings and C strings."
-url="http://www.gnu.org/software/libunistring/"
-arch=('i686' 'x86_64')
-license=('GPL3' 'LGPL3')
-depends=('glibc')
-install=${pkgname}.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('db8eca3b64163abadf8c40e5cecc261f')
-sha256sums=('610d3ec724fbdaa654afe3cff20b9f4d504be3fd296fded2e0f7f764041006a3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
-}
\ No newline at end of file
diff --git a/~brendan/libunistring/libunistring.install b/~brendan/libunistring/libunistring.install
deleted file mode 100644
index 58dd2ef8e..000000000
--- a/~brendan/libunistring/libunistring.install
+++ /dev/null
@@ -1,22 +0,0 @@
-infodir=usr/share/info
-filelist=(libunistring.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et: