2 files changed, 19 insertions, 40 deletions
diff --git a/abs/extra/guile/PKGBUILD b/abs/extra/guile/PKGBUILD
index 642bf8a..73ff747 100644
--- a/abs/extra/guile/PKGBUILD
+++ b/abs/extra/guile/PKGBUILD
@@ -4,26 +4,35 @@
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=guile
-pkgver=2.0.11
-pkgrel=3
+pkgver=2.2.3
+pkgrel=1
 pkgdesc='Portable, embeddable Scheme implementation written in C'
-url='http://www.gnu.org/software/guile/'
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gmp' 'libltdl' 'ncurses' 'texinfo' 'libunistring' 'gc' 'libffi')
-install=guile.install
-source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('e532c68c6f17822561e3001136635ddd')
+url='https://www.gnu.org/software/guile/'
+arch=(x86_64)
+license=(GPL)
+depends=(gmp libltdl ncurses texinfo libunistring gc libffi)
+source=(https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz{,.sig})
+validpgpkeys=('3CE464558A84FDC69DB40CFB090B11993D9AEBB5' # Ludovic Courtès <ludo@gnu.org>
+              'FF478FB264DE32EC296725A3DDC0F5358812F8F2' # Andy Wingo
+              '4FD4D288D445934E0A14F9A5A8803732E4436885') # Andy Wingo <wingo@pobox.com>"
+sha256sums=('87ee07caef33c97ddc74bf3c29ce7628cfac12061f573e4a29a3a1176754610a'
+            'SKIP')
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr \
     --disable-static  \
     --disable-error-on-warning
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
   make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
-  rm "$pkgdir"/usr/lib/libguile-2.0.so.22.7.2-gdb.scm
+  rm "$pkgdir"/usr/lib/libguile-2.?.so.*-gdb.scm
 }
diff --git a/abs/extra/guile/guile.install b/abs/extra/guile/guile.install
deleted file mode 100644
index 5d1eeaf..0000000
--- a/abs/extra/guile/guile.install
+++ /dev/null
@@ -1,30 +0,0 @@
-infodir=/usr/share/info
-files=(goops.info
-       guile-tut.info
-       guile.info
-       guile.info-1
-       guile.info-2
-       guile.info-3
-       guile.info-4
-       guile.info-5
-       guile.info-6
-       guile.info-7
-       r5rs.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
-}