Version bump for both stable and beta branches.

Package-Manager: portage-2.1.4.4

4 files changed, 170 insertions, 2 deletions

diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index 06f5c0ed96da..87a18160c4c7 100644
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/libarchive
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.23 2008/03/16 15:55:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.24 2008/04/05 14:49:32 flameeyes Exp $
+
+*libarchive-2.5.1_beta (05 Apr 2008)
+*libarchive-2.4.17 (05 Apr 2008)
+
+  05 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +libarchive-2.4.17.ebuild, +libarchive-2.5.1_beta.ebuild:
+  Version bump for both stable and beta branches.
 
   16 Mar 2008; Raúl Porcel <armin76@gentoo.org>
   libarchive-2.5.0_beta.ebuild:
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index f49935f35f85..3670fa0e249e 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,10 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST libarchive-2.4.12.tar.gz 823753 RMD160 9330cbeb6a2130ea476dce324b010506ec14e9a8 SHA1 78ce56e823277a5574ee54d05555b79bac3a679c SHA256 c4731d48779c91536c8ae3b28b64c785c4b322a6f8b26c3ccccf2ac743ef738c
 DIST libarchive-2.4.14.tar.gz 833049 RMD160 8829dadd6855e585e9d7a348795a951b5f8b3944 SHA1 d4e48601767256e6b8898bf0d9869aeb64c8ad76 SHA256 3bfb0845f21b25e4a00897eb28864d55c8c34ae6f3275d807ab1442d4253573c
+DIST libarchive-2.4.17.tar.gz 826206 RMD160 10be300628e7d81ab24f1fb1e51aaa90ff3e1b14 SHA1 9921f7a96ab22f3542990d87107812174504f879 SHA256 27dcdf1bdebb53190268858c0ff07b1113bb27e9050e6990492d2ed03466b5f9
 DIST libarchive-2.4.5.tar.gz 803319 RMD160 ae0eedc64ea7c68be8874564e8966c304c5e27fb SHA1 f5d26c3f8460cc07d15ffb0b165f084bcb1a0963 SHA256 8e156e08b35c6fd422457566e697347ec19914b007352b2c686e9f860ceddcc5
 DIST libarchive-2.5.0b.tar.gz 842005 RMD160 014e27ac835f66540e92fc0e84020b2439ae1d01 SHA1 555591f5fd7ef3109bb6f5236ba57289b29837ae SHA256 171d35a82d10ef00884dd824bdca7c0b5c60200417646b48da52910d6f682210
+DIST libarchive-2.5.1b.tar.gz 847906 RMD160 c28938db31a53a439d87b461490f904ec4dddafd SHA1 500ba426c7c1d2d7ba8019688364d745998f7b2c SHA256 abd6889acc5ea10a416564be5ac0bdba0969952938cbfbfa5e48b1c3cef92ee2
 EBUILD libarchive-2.4.12.ebuild 1700 RMD160 e00760e535974f709b2b80ab0d3ff750d94e1f68 SHA1 0f55a3148433c61b20596455461e31f4f5e0d627 SHA256 7a4d37b873547e7c41977fbbee261fa5d029a732af0b4d023adf2237b39d1bc9
 EBUILD libarchive-2.4.14.ebuild 1736 RMD160 b77a7f92b083ce0cd457b5f06b53894697903c8c SHA1 6e7f0d26e92bbca6c1154352a00c7b6c8e7c0f35 SHA256 19facb7acd176a9c03088f4b441aa4d28aa7e3ab38a99fcb76cd3c5046e25a77
+EBUILD libarchive-2.4.17.ebuild 1736 RMD160 9b68fcfdc438c0b6948ee97fcbe70a50ac2a3db4 SHA1 e7a38e1410d97e79bb8b1a1ab1d889a2e13a7233 SHA256 5443541b07f052866e5f9d0d2a130192c328f59fff4a628a0f305b87fbf3a81c
 EBUILD libarchive-2.4.5.ebuild 1643 RMD160 72fb72d357bf3f3e7915caeed57dee9951e6b227 SHA1 c15b1173156afaa1297dab72fd145459b2bace95 SHA256 9d8e062395e20de770758e5e19b104d552fc749cacda0e42e0875355a5f2adb1
 EBUILD libarchive-2.5.0_beta.ebuild 1747 RMD160 a75513c02086be0d24c8325c7b79e2ed842ff9b0 SHA1 06c832cba18ce35eb9e1cf2f5b7f61d0964c6564 SHA256 d0b13d9b33ddb3dc0305a75785311fea3b88a2128f2a730257d5b7e6bf2a36e6
-MISC ChangeLog 16509 RMD160 c27a963208a263a950ae9b076a28dbf7cdc572cf SHA1 904732312984796985082b9fcce284e2de395e64 SHA256 f1ec0d05ef0c88e3c79c5b14985ca9f269e3bad442bb5b1309335a84a774ad3e
+EBUILD libarchive-2.5.1_beta.ebuild 1749 RMD160 fea4660b8a4050920c4158cf0e1b41996bce57e1 SHA1 ed91497bc6fa2b29d8347ca583389715f7f24c60 SHA256 59cbca2438f97dd4a475700b14a2eaa261f410d841f59324885db15b95f86013
+MISC ChangeLog 16746 RMD160 431536e916843250c562a1b29b60f9e0721060ed SHA1 453a0d64cd4d5a308202b216889cda4418d784eb SHA256 40bd50538c9b5451e5ca8df2b4023a9e622453cb8c72b1edb23536410ddd11be
 MISC metadata.xml 337 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 SHA1 c32d51164489ed68a27016c26aafae04b70ee447 SHA256 c82266892e94c9792cadf25c0ba9c4cf42d5279903e791b80e8f735ec91d923b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkf3kYMACgkQAiZjviIA2XhFogCfZIdfurQU0pj/vB2mswZas30G
+NXAAoMqMnWVVkB1LMdW9FOZkh4VfQdWM
+=Nxl9
+-----END PGP SIGNATURE-----
diff --git a/app-arch/libarchive/libarchive-2.4.17.ebuild b/app-arch/libarchive/libarchive-2.4.17.ebuild
new file mode 100644
index 000000000000..15cf1c366e93
--- /dev/null
+++ b/app-arch/libarchive/libarchive-2.4.17.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.4.17.ebuild,v 1.1 2008/04/05 14:49:32 flameeyes Exp $
+
+inherit eutils libtool toolchain-funcs
+
+DESCRIPTION="BSD tar command"
+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 ~hppa ~ppc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="build static acl xattr kernel_linux"
+
+RDEPEND="!dev-libs/libarchive
+	kernel_linux? (
+		acl? ( sys-apps/acl )
+		xattr? ( sys-apps/attr )
+	)
+	!static? ( !build? (
+		app-arch/bzip2
+		sys-libs/zlib ) )"
+DEPEND="${RDEPEND}
+	|| ( app-arch/sharutils sys-freebsd/freebsd-ubin )
+	kernel_linux? ( sys-fs/e2fsprogs
+		virtual/os-headers )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	elibtoolize
+	epunt_cxx
+}
+
+src_compile() {
+	local myconf
+
+	if ! use static && ! use build ; then
+		myconf="--enable-bsdtar=shared --enable-bsdcpio=shared"
+	fi
+
+	econf --bindir=/bin --enable-bsdcpio \
+		$(use_enable acl) $(use_enable xattr) \
+		${myconf} \
+		--disable-dependency-tracking || 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
+		# We may wish to switch to symlink bsdcpio to cpio too one day
+	fi
+
+	dodoc NEWS README
+
+	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
+}
diff --git a/app-arch/libarchive/libarchive-2.5.1_beta.ebuild b/app-arch/libarchive/libarchive-2.5.1_beta.ebuild
new file mode 100644
index 000000000000..4286a4c2aa7c
--- /dev/null
+++ b/app-arch/libarchive/libarchive-2.5.1_beta.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.5.1_beta.ebuild,v 1.1 2008/04/05 14:49:32 flameeyes Exp $
+
+MY_P="${P/_beta/b}"
+
+inherit eutils libtool toolchain-funcs
+
+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 ~ia64 ~ppc ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="build static acl xattr kernel_linux"
+
+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}"
+	elibtoolize
+	epunt_cxx
+}
+
+src_compile() {
+	local myconf
+
+	if ! use static && ! use build ; then
+		myconf="--enable-bsdtar=shared --enable-bsdcpio=shared"
+	fi
+
+	econf --bindir=/bin --enable-bsdcpio \
+		$(use_enable acl) $(use_enable xattr) \
+		${myconf} \
+		--disable-dependency-tracking || 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
+		# We may wish to switch to symlink bsdcpio to cpio too one day
+	fi
+
+	dodoc NEWS README
+
+	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
+}