From b3a841a1f66eff75be29fba090b83ce4322d4721 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 12 Sep 2011 23:14:44 +0000
Subject: Mon Sep 12 23:14:44 UTC 2011

---
 multilib/libtool-multilib/PKGBUILD | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'multilib/libtool-multilib')

diff --git a/multilib/libtool-multilib/PKGBUILD b/multilib/libtool-multilib/PKGBUILD
index 77ca73c32..b10e9c329 100644
--- a/multilib/libtool-multilib/PKGBUILD
+++ b/multilib/libtool-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 55288 2011-09-08 23:39:10Z heftig $
+# $Id: PKGBUILD 55394 2011-09-11 20:34:04Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
@@ -6,15 +6,15 @@
 # NOTE: requires rebuild with each new gcc version
 
 pkgbase=libtool-multilib
-pkgname=(libtool-multilib lib32-libtool)
+pkgname=(libtool-multilib lib32-libltdl)
 pkgver=2.4
-pkgrel=4
+pkgrel=5
 pkgdesc="A generic library support script for multilib"
 arch=('x86_64')
 url="http://www.gnu.org/software/libtool"
 license=('GPL')
 _gccver=4.6.1
-makedepends=(sh tar "gcc-multilib=$_gccver")
+makedepends=("gcc-multilib=$_gccver")
 options=('!libtool')
 source=(ftp://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz)
 md5sums=('4e6144439d95d7332dc50ace6dd24c55')
@@ -48,21 +48,25 @@ check() {
 }
 
 package_libtool-multilib() {
+  depends=('sh' "libltdl=$pkgver" "gcc-multilib=$_gccver" "lib32-libltdl=$pkgver")
   groups=('multilib-devel')
-  depends=(sh tar "gcc-multilib=$_gccver" "lib32-libtool=$pkgver-$pkgrel")
+  install=libtool.install
   provides=("libtool=$pkgver-$pkgrel")
   conflicts=(libtool)
-  install=libtool.install
 
   cd "$srcdir/libtool-64"
-  make DESTDIR="$pkgdir" install
+  make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
+                         install-data-local
+  rm -rf ${pkgdir}/usr/share/libtool/libltdl/
 }
 
-package_lib32-libtool() {
-  pkgdesc="A generic library support script (32-bit)"
-  depends=(lib32-glibc)
+package_lib32-libltdl() {
+  pkgdesc="A system independent dlopen wrapper for GNU libtool (32-bit)"
+  depends=(lib32-glibc libltdl)
+  replaces=(lib32-libtool)
+  provides=("lib32-libtool=$pkgver-$pkgrel")
+  conflicts=(lib32-libtool)
 
   cd "$srcdir/libtool-32"
-  make DESTDIR="$pkgdir" install
-  rm -r "$pkgdir"/usr/{bin,include,share}
+  make DESTDIR="$pkgdir" install-libLTLIBRARIES
 }
-- 
cgit v1.2.3-54-g00ecf