Version bump.

Package-Manager: portage-2.1.3_rc8

4 files changed, 107 insertions, 8 deletions

diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index fa860fad5525..117584da7bae 100644
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/libarchive
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.1 2007/07/13 13:13:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.2 2007/07/14 13:24:41 flameeyes Exp $
+
+*libarchive-2.2.5 (14 Jul 2007)
+
+  14 Jul 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +libarchive-2.2.5.ebuild:
+  Version bump.
 
   13 Jul 2007; Diego Pettenò <flameeyes@gentoo.org>
   +files/libarchive-2.1.5-acl.patch, +files/libarchive-2.1.9-static.patch,
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 0162b7b34ab8..0b8c8663e0f6 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -10,14 +10,19 @@ MD5 1dd8a4adb1851e0a84fa752b970ff445 files/libarchive-2.1.9-static.patch 1323
 RMD160 e69e1b894c9ce6d1a4098731d10ebedcd2a812c8 files/libarchive-2.1.9-static.patch 1323
 SHA256 6ab2eee004a6ec228acea4ceda9515c84edd9ca1187b8a918bef541d3dd9492d files/libarchive-2.1.9-static.patch 1323
 DIST libarchive-2.2.4.tar.gz 636879 RMD160 2aa2e4124c1081acfdc666335b659457dccb4fd6 SHA1 171c25a40f6cc3eee3be3343f2b9436b22368f18 SHA256 186d3aa24817f64b12cb0ff4c8b4a76df33921446b912ca015a05b66f8755df0
+DIST libarchive-2.2.5.tar.gz 637691 RMD160 fda5c804679e29954b387ae2c06b32bca4ae7bd4 SHA1 fd04f17397c7af6c8964bde02146eda391413bf4 SHA256 510102b594b8cfd8fa6b3718f40a8ef059a95ed453a97b60ad9a3502c0f16f26
 EBUILD libarchive-2.2.4.ebuild 1868 RMD160 03bc43fdf4a3ee5d92cb08c5401837ca7e75a786 SHA1 4cc0629e72c8f1462c268ccd1692eccb59d6381a SHA256 c0d2905e5f14678164d95ff0c9dd359c5bfa867b664fa5a4ea848f951ebf458d
 MD5 bb22d30882b5d99c194d375a0fdb5bef libarchive-2.2.4.ebuild 1868
 RMD160 03bc43fdf4a3ee5d92cb08c5401837ca7e75a786 libarchive-2.2.4.ebuild 1868
 SHA256 c0d2905e5f14678164d95ff0c9dd359c5bfa867b664fa5a4ea848f951ebf458d libarchive-2.2.4.ebuild 1868
-MISC ChangeLog 12959 RMD160 3f3c735222125a63340d5703b78fbb3fc1f4900a SHA1 a879062ecaa880aeb5c104940ad05d08104d4611 SHA256 acab9b3ed71108436e0db5f47d65f7a0e0cbeeefb56c5a23da73196303bca598
-MD5 a80eedc57bf14182df279ec4901f494e ChangeLog 12959
-RMD160 3f3c735222125a63340d5703b78fbb3fc1f4900a ChangeLog 12959
-SHA256 acab9b3ed71108436e0db5f47d65f7a0e0cbeeefb56c5a23da73196303bca598 ChangeLog 12959
+EBUILD libarchive-2.2.5.ebuild 1869 RMD160 6f44791e1160d427c659681d5bb7f327d6217b61 SHA1 6e6db6c476a8548ef7ef4c69a2fb446587bbe5fa SHA256 11b51f0bd89b1e88888c4e12e8f71f400e2c43868e80dae0df4434f10f55126a
+MD5 e1000bf2fb0883793ae49aba88849ed6 libarchive-2.2.5.ebuild 1869
+RMD160 6f44791e1160d427c659681d5bb7f327d6217b61 libarchive-2.2.5.ebuild 1869
+SHA256 11b51f0bd89b1e88888c4e12e8f71f400e2c43868e80dae0df4434f10f55126a libarchive-2.2.5.ebuild 1869
+MISC ChangeLog 13090 RMD160 0b138cbab3450738bc61240b11bb8f04b35f24a5 SHA1 6e1a4407b34ee398222bc311702e006cf6ec04a9 SHA256 4f9ae3a6bbd73205a7ae53776655545f69922888abef4ec1b2624f3336c4826a
+MD5 69d1146b070f9015036272fcdaf461ae ChangeLog 13090
+RMD160 0b138cbab3450738bc61240b11bb8f04b35f24a5 ChangeLog 13090
+SHA256 4f9ae3a6bbd73205a7ae53776655545f69922888abef4ec1b2624f3336c4826a ChangeLog 13090
 MISC metadata.xml 337 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 SHA1 c32d51164489ed68a27016c26aafae04b70ee447 SHA256 c82266892e94c9792cadf25c0ba9c4cf42d5279903e791b80e8f735ec91d923b
 MD5 abbe0170afef9b0f317830b41e537afa metadata.xml 337
 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 metadata.xml 337
@@ -25,10 +30,13 @@ SHA256 c82266892e94c9792cadf25c0ba9c4cf42d5279903e791b80e8f735ec91d923b metadata
 MD5 53696d479c86b015e22391c32b61a9d0 files/digest-libarchive-2.2.4 250
 RMD160 454948c529e1df57ec59333b90a0f3836330ecee files/digest-libarchive-2.2.4 250
 SHA256 2ecca5a95f31cc517355482604cdb19437b11d7ec5ff2884dc8707c780791eeb files/digest-libarchive-2.2.4 250
+MD5 2966b42242cab7fca60366cbba3d2247 files/digest-libarchive-2.2.5 250
+RMD160 877a1da054277f1a417f3f75f486847ba8ab0a06 files/digest-libarchive-2.2.5 250
+SHA256 0e27651ef8ee2d9ab0e9ef357624c785c01cf40612d4731e7fd6fcccae82a4cf files/digest-libarchive-2.2.5 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGl3rHAiZjviIA2XgRAtMgAKCkwe4XIsrmZ0TnvZb0At672U4tsACgnTq2
-JYGJsnscgEtlzu0PZ89chM8=
-=9LDE
+iD8DBQFGmM7eAiZjviIA2XgRAoyPAKDXrXFktBQ4fwdcv+LbxttUp+32SACdFwGK
+F9R5wlmSXbvZVxn32GDMKlw=
+=Bwog
 -----END PGP SIGNATURE-----
diff --git a/app-arch/libarchive/files/digest-libarchive-2.2.5 b/app-arch/libarchive/files/digest-libarchive-2.2.5
new file mode 100644
index 000000000000..40607dd0ccc8
--- /dev/null
+++ b/app-arch/libarchive/files/digest-libarchive-2.2.5
@@ -0,0 +1,3 @@
+MD5 4b7773786e185a16353440c7e62a289a libarchive-2.2.5.tar.gz 637691
+RMD160 fda5c804679e29954b387ae2c06b32bca4ae7bd4 libarchive-2.2.5.tar.gz 637691
+SHA256 510102b594b8cfd8fa6b3718f40a8ef059a95ed453a97b60ad9a3502c0f16f26 libarchive-2.2.5.tar.gz 637691
diff --git a/app-arch/libarchive/libarchive-2.2.5.ebuild b/app-arch/libarchive/libarchive-2.2.5.ebuild
new file mode 100644
index 000000000000..96db9e83dafd
--- /dev/null
+++ b/app-arch/libarchive/libarchive-2.2.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.2.5.ebuild,v 1.1 2007/07/14 13:24:41 flameeyes Exp $
+
+inherit eutils autotools toolchain-funcs flag-o-matic
+
+MY_P="${P/_beta/b}"
+
+DESCRIPTION="BSD tar command"
+HOMEPAGE="http://people.freebsd.org/~kientzle/libarchive/"
+SRC_URI="http://people.freebsd.org/~kientzle/libarchive/src/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="build static acl xattr"
+
+RDEPEND="!dev-libs/libarchive
+	kernel_linux? (
+		acl? ( sys-apps/acl )
+		xattr? ( sys-apps/attr )
+	)
+	!static? ( !build? (
+		app-arch/bzip2
+		sys-libs/zlib ) )"
+DEPEND="${RDEPEND}
+	kernel_linux? ( sys-fs/e2fsprogs
+		virtual/os-headers )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-2.1.9-static.patch
+	epatch "${FILESDIR}"/${PN}-2.1.5-acl.patch
+
+	eautoreconf
+	epunt_cxx
+}
+
+src_compile() {
+	local myconf
+
+	if use static || use build ; then
+		myconf="${myconf} --enable-static-bsdtar"
+	else
+		myconf="${myconf} --disable-static-bsdtar"
+	fi
+
+	# Upstream doesn't seem to care to fix the problems
+	# and I don't want to continue running after them.
+	append-flags -fno-strict-aliasing
+
+	econf \
+		--bindir=/bin \
+		$(use_enable acl) \
+		$(use_enable xattr) \
+		${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+
+	# Create tar symlink for FreeBSD
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		dosym bsdtar /bin/tar
+		dosym bsdtar.1 /usr/share/man/man1/tar.1
+	fi
+
+	if use build; then
+		rm -rf "${D}"/usr
+		rm -rf "${D}"/lib/*.so*
+		return 0
+	fi
+
+	dodir /$(get_libdir)
+	mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)
+	gen_usr_ldscript libarchive.so
+}