1 files changed, 17 insertions, 27 deletions
diff --git a/abs/core/libtool/PKGBUILD b/abs/core/libtool/PKGBUILD
index 493c799..07fcee8 100644
--- a/abs/core/libtool/PKGBUILD
+++ b/abs/core/libtool/PKGBUILD
@@ -4,23 +4,29 @@
 
 # NOTE: requires rebuilt with each new gcc version
 
-pkgname=('libtool' 'libltdl')
-pkgver=2.4.2
-_gccver=4.9.2
-pkgrel=15
+pkgname=libtool
+pkgver=2.4.6
+pkgrel=4
+_gccver=5.3.0
 pkgdesc="A generic library support script"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libtool"
 license=('GPL')
-makedepends=("gcc=${_gccver}")
+groups=('base-devel')
+depends=('sh' 'tar' 'glibc')
+makedepends=("gcc=$_gccver")
+provides=("libltdl=$pkgver" "libtool-multilib=$pkgver")
+conflicts=('libltdl' 'libtool-multilib')
+replaces=('libltdl' 'libtool-multilib')
+install=libtool.install
 source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
-         '1e6ba57420c82c663c85e745d11c7eed')
-validpgpkeys=('CFE2BE707B538E8B26757D84151308092983D606')
+md5sums=('1bfb9b923f2c1339b4d2ce1807064aa5'
+         'SKIP')
+validpgpkeys=('CFE2BE707B538E8B26757D84151308092983D606')   # Gary Vaughan
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr lt_cv_sys_lib_dlsearch_path_spec="/usr/lib /usr/lib32"
   make
 }
 
@@ -29,23 +35,7 @@ check() {
   make check
 }
 
-package_libtool() {
-  depends=('sh' "libltdl=$pkgver" 'tar' "gcc=${_gccver}")
-  groups=('base-devel')
-  install=libtool.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  
-  make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
-                         install-data-local
-  rm -r ${pkgdir}/usr/share/libtool/libltdl/
-}
-
-package_libltdl() {
-  pkgdesc="A system independent dlopen wrapper for GNU libtool"
-
+package() {
   cd ${srcdir}/${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \
-                         install-ltdlincludeHEADERS install-data-local
-  rm -r ${pkgdir}/usr/share/{aclocal,libtool/config}
+  make DESTDIR=${pkgdir} install
 }