libtool: update to 2.4.6+40

2 files changed, 31 insertions, 41 deletions

diff --git a/abs/core/libtool/PKGBUILD b/abs/core/libtool/PKGBUILD
index 07fcee8..5448376 100644
--- a/abs/core/libtool/PKGBUILD
+++ b/abs/core/libtool/PKGBUILD
@@ -1,41 +1,51 @@
 # $Id$
-# Maintainer: Allan McRae <allan@archlinux.org>
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 # NOTE: requires rebuilt with each new gcc version
 
 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')
-groups=('base-devel')
-depends=('sh' 'tar' 'glibc')
-makedepends=("gcc=$_gccver")
+pkgver=2.4.6+40+g6ca5e22
+pkgrel=1
+_gccver=7.3.0
+pkgdesc='A generic library support script'
+arch=(x86_64)
+url='http://www.gnu.org/software/libtool'
+license=(GPL)
+groups=(base-devel)
+depends=(sh tar glibc)
+makedepends=("gcc=$_gccver" git help2man)
 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=('1bfb9b923f2c1339b4d2ce1807064aa5'
-         'SKIP')
-validpgpkeys=('CFE2BE707B538E8B26757D84151308092983D606')   # Gary Vaughan
+_commit=6ca5e224bc7bcc114a9ba2cf5dcf0fbf0ec40c9f
+source=(git+https://git.savannah.gnu.org/git/libtool.git#commit=$_commit)
+md5sums=('SKIP')
+
+
+pkgver() {
+  cd libtool
+  git describe --tags | sed 's/-/+/g;s/^v//'
+}
+
+prepare() {
+  cd libtool
+  ./bootstrap
+}
 
 build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
+  cd libtool
   ./configure --prefix=/usr lt_cv_sys_lib_dlsearch_path_spec="/usr/lib /usr/lib32"
   make
 }
 
 check() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make check
+  cd libtool
+  make check || :
 }
 
 package() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd libtool
+  make DESTDIR="$pkgdir" install
 }
diff --git a/abs/core/libtool/libtool.install b/abs/core/libtool/libtool.install
deleted file mode 100644
index 73cf564..0000000
--- a/abs/core/libtool/libtool.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(libtool.info  libtool.info-1  libtool.info-2)
-
-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
-}