Use libtoolize to build libarchive, to have the shared version.

Package-Manager: portage-2.0.51.22

5 files changed, 105 insertions, 7 deletions

diff --git a/dev-libs/libarchive/ChangeLog b/dev-libs/libarchive/ChangeLog
index d03981be6746..ba3a0cee8054 100644
--- a/dev-libs/libarchive/ChangeLog
+++ b/dev-libs/libarchive/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libarchive
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libarchive/ChangeLog,v 1.4 2005/07/28 15:28:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libarchive/ChangeLog,v 1.5 2005/08/13 15:34:27 flameeyes Exp $
+
+*libarchive-1.02.027-r1 (13 Aug 2005)
+
+  13 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libarchive-1.02.027-libtool.patch, +libarchive-1.02.027-r1.ebuild:
+  Use libtoolize to build libarchive, to have the shared version.
 
   28 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
   libarchive-1.02.027.ebuild:
diff --git a/dev-libs/libarchive/Manifest b/dev-libs/libarchive/Manifest
index 4ad146f63a2f..67e882919665 100644
--- a/dev-libs/libarchive/Manifest
+++ b/dev-libs/libarchive/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 bc553f9a9d8c321440f23fd1994f2925 ChangeLog 1019
 MD5 6530e11ad3afae081d8c1cd12c6fdd39 libarchive-1.02.027.ebuild 691
+MD5 45386ed25b5c1a63e390e4fb028833f0 libarchive-1.02.027-r1.ebuild 1146
 MD5 985eb3e6f7fb60fd3651ba1cae41c609 metadata.xml 464
-MD5 6be68ca9d2d1e8b8ab5ea81f2e2162b0 ChangeLog 784
-MD5 7050cbd8598ed396d741592975d848ce files/digest-libarchive-1.02.027 71
+MD5 180a813572b34500cce919b95ec86b65 files/libarchive-1.02.027-libtool.patch 1554
 MD5 7fe214e0de0090f3344a9e4a1792a5b3 files/libarchive-1.02.027-osx.patch 609
+MD5 7050cbd8598ed396d741592975d848ce files/digest-libarchive-1.02.027 71
+MD5 7050cbd8598ed396d741592975d848ce files/digest-libarchive-1.02.027-r1 71
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC6PnQj5H05b2HAEkRAqLhAJ0ebBxnmLhYO/XXhpunlyX2Nfv7uwCfetpU
-nklARz7yX47xvoV3XU6nIK0=
-=OrDW
+iD8DBQFC/hMjj5H05b2HAEkRAk1yAJ9pVZXlfgQkUhDBQv6jTeqmVPeWaACeNYN9
+NrQoTMzVwn2aZAChlVdOJug=
+=Pky5
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libarchive/files/digest-libarchive-1.02.027-r1 b/dev-libs/libarchive/files/digest-libarchive-1.02.027-r1
new file mode 100644
index 000000000000..91785e04e367
--- /dev/null
+++ b/dev-libs/libarchive/files/digest-libarchive-1.02.027-r1
@@ -0,0 +1 @@
+MD5 b59180f515666e65b4338f3b1ec1f53e libarchive-1.02.027.tar.gz 192947
diff --git a/dev-libs/libarchive/files/libarchive-1.02.027-libtool.patch b/dev-libs/libarchive/files/libarchive-1.02.027-libtool.patch
new file mode 100644
index 000000000000..86706a04d71f
--- /dev/null
+++ b/dev-libs/libarchive/files/libarchive-1.02.027-libtool.patch
@@ -0,0 +1,44 @@
+Only in libarchive-1.02.027-linknow/: AUTHORS
+Only in libarchive-1.02.027-linknow/: ChangeLog
+diff -ur libarchive-1.02.027/configure.ac libarchive-1.02.027-linknow/configure.ac
+--- libarchive-1.02.027/configure.ac	2005-06-10 17:02:54.000000000 +0200
++++ libarchive-1.02.027-linknow/configure.ac	2005-08-13 16:08:06.000000000 +0200
+@@ -8,7 +8,7 @@
+ 
+ # Checks for programs.
+ AC_PROG_CC
+-AC_PROG_RANLIB
++AC_PROG_LIBTOOL
+ AC_CHECK_TOOL([STRIP],[strip])
+ 
+ # Checks for libraries.
+Only in libarchive-1.02.027-linknow/: COPYING
+diff -ur libarchive-1.02.027/Makefile.am libarchive-1.02.027-linknow/Makefile.am
+--- libarchive-1.02.027/Makefile.am	2005-06-10 17:02:54.000000000 +0200
++++ libarchive-1.02.027-linknow/Makefile.am	2005-08-13 16:12:25.000000000 +0200
+@@ -1,13 +1,13 @@
+ # $FreeBSD: src/lib/libarchive/Makefile.am,v 1.3 2005/01/25 06:07:28 kientzle Exp $
+ 
+-lib_LIBRARIES=	libarchive.a
++lib_LTLIBRARIES= libarchive.la
+ 
+ include_HEADERS= archive_entry.h
+ # Note: archive.h is built from archive.h.in, so don't
+ # include archive.h in the distfile, but do install it.
+ nodist_include_HEADERS= archive.h
+ 
+-libarchive_a_SOURCES=					\
++libarchive_la_SOURCES=					\
+ 	archive_check_magic.c				\
+ 	archive_entry.c					\
+ 	archive_entry.h					\
+@@ -45,6 +45,7 @@
+ 	archive_write_set_format_pax.c			\
+ 	archive_write_set_format_shar.c			\
+ 	archive_write_set_format_ustar.c
++libarchive_la_LIBADD=-lz -lbz2
+ 
+ dist_man_MANS=	archive_entry.3				\
+ 	archive_read.3					\
+Only in libarchive-1.02.027-linknow/: NEWS
+Only in libarchive-1.02.027-linknow/: README
diff --git a/dev-libs/libarchive/libarchive-1.02.027-r1.ebuild b/dev-libs/libarchive/libarchive-1.02.027-r1.ebuild
new file mode 100644
index 000000000000..995d7b844e81
--- /dev/null
+++ b/dev-libs/libarchive/libarchive-1.02.027-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libarchive/libarchive-1.02.027-r1.ebuild,v 1.1 2005/08/13 15:34:27 flameeyes Exp $
+
+inherit eutils
+
+DESCRIPTION="Library to create and read several different archive formats."
+HOMEPAGE="http://people.freebsd.org/~kientzle/libarchive/"
+SRC_URI="http://people.freebsd.org/~kientzle/libarchive/src/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
+IUSE=""
+
+RDEPEND="app-arch/bzip2
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	sys-devel/automake
+	sys-devel/libtool"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Make libarchive compilable on OSX
+	epatch ${FILESDIR}/${P}-osx.patch
+	# Build with libtool to build shared library
+	epatch ${FILESDIR}/${P}-libtool.patch
+
+	touch NEWS README AUTHORS ChangeLog COPYING
+
+	libtoolize --copy --force || die "libtoolize failed"
+	autoreconf -i || die "autoreconf failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install
+
+	dodir /$(get_libdir)
+	mv ${D}/usr/$(get_libdir)/*.so* ${D}/$(get_libdir)
+	gen_usr_ldscript libarchive.so
+}