Bump to pacman-4.0.1, dropping old pacmen. Fixes bug #400933 where pacman was incompatible with >=libarchive-3.

Package-Manager: portage-2.2.0_alpha84-r1/cvs/Linux x86_64

4 files changed, 30 insertions, 88 deletions

diff --git a/sys-apps/pacman/ChangeLog b/sys-apps/pacman/ChangeLog
index 062aea10a06e..e12805e9fdc1 100644
--- a/sys-apps/pacman/ChangeLog
+++ b/sys-apps/pacman/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/pacman
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pacman/ChangeLog,v 1.8 2011/10/18 00:58:32 binki Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pacman/ChangeLog,v 1.9 2012/01/28 18:53:03 binki Exp $
+
+*pacman-4.0.1 (28 Jan 2012)
+
+  28 Jan 2012; Nathan Phillip Brink <binki@gentoo.org> -pacman-3.5.4.ebuild,
+  -pacman-4.0.0.ebuild, +pacman-4.0.1.ebuild:
+  Bump to pacman-4.0.1, dropping old pacmen. Fixes bug #400933 where pacman was
+  incompatible with >=libarchive-3.
 
 *pacman-4.0.0 (18 Oct 2011)
 
diff --git a/sys-apps/pacman/Manifest b/sys-apps/pacman/Manifest
index eb6f21056a03..ae2fc0a97b64 100644
--- a/sys-apps/pacman/Manifest
+++ b/sys-apps/pacman/Manifest
@@ -1,27 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX pacman-4.0.0-gpgme.patch 1588 RMD160 8d2328303e784d6da38d0a184b6865a28bc58c0f SHA1 c793b5d29e7260767f8937526146993d464d8b1c SHA256 19e285aca79c1c0499a013eee30a22a9b16e6d8cd8c3583ffc8c597e39bbb2ed
-DIST pacman-3.5.4.tar.gz 1676599 RMD160 7845369a63240795d59a86186a7d04c4a3c24f4c SHA1 880e9db07edfad8032262e593fd7dc22a6d798fe SHA256 8dae177eaca66a521bbc2582a6919c9682e161b457871d03a340410d50fb7e45
-DIST pacman-4.0.0.tar.gz 1921691 RMD160 9f54817ba7141fb3f05f23a129aea7114308d0bf SHA1 097e4671ccf02d0995101798613b27de6b0f8866 SHA256 c83bbb8d386b492f9d00a6944c8bcaf84a4372a5f1111d3014638af02abed23e
-EBUILD pacman-3.5.4.ebuild 1470 RMD160 fe26c3b751bae77a5d665ac5bb2e49b36644f6bb SHA1 1b64a24fb4a666e5a6f1cb17a6fad186f4d69633 SHA256 a633fa29652da14f6fa7c3e3f871900a6da1001fb11d1589b277ffc2cda25ab0
-EBUILD pacman-4.0.0.ebuild 1884 RMD160 7116eb394506bf2e989efcf0659815fb4a3e6f8b SHA1 30e7989ae32ea6997dc8a40144c5d2a76ef9cf21 SHA256 db9fc5cf05df54ac3b95aab2f1fc64e79e2276c0cf92307f876f79ea4ee5827f
-MISC ChangeLog 1755 RMD160 68652a8704197f69ae96b2f7fdfaa65e614bdffd SHA1 a93ad161bdee3438e4d5b717de6a2b5f4f145d09 SHA256 ab7ba07c67bf711baa014fc9152aa4b732d51bf9c59c1b252dc4df8763b6256b
+DIST pacman-4.0.1.tar.gz 1897685 RMD160 bd7da5ef866dba08e8f53df691e6d11abc1989d9 SHA1 9dedc26c84ab61cae72e5a6221c30fa4b0247cce SHA256 04f6822b31022100de6cd0a1905b199bbd1eaf878ef0726b6242ee032f3c33b1
+EBUILD pacman-4.0.1.ebuild 1892 RMD160 937214d1dc6b63c22847f8701bbab752d0ae4199 SHA1 7cdad1af7bf5bd8de750f6d80a57eeb943e8a3e0 SHA256 1b74812c682a32ebf21f8993177d7821bc276b528fdf50e714fe21f92929e323
+MISC ChangeLog 2024 RMD160 cd7ab6a651a6e5aa94a61ea262f7402cd690e04f SHA1 9710816e1ebf9c009ae2b2b6fde6cc9900fdbbc0 SHA256 cdb9b645ee36b4c8fe059e9ffb5317f55ae65a32c5b7c91e08b0fb89059d805a
 MISC metadata.xml 365 RMD160 e70af71ae1ca20b37f824bbcbc84059f51708f68 SHA1 9b4244189e85668c1a4c4b11c372b83a38759c47 SHA256 9fc1ef7dbfcf2bf60550a9012a41fb77c8795d2af3cf59a4c6fd1f59169b2d1f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOnNBlAAoJEHQ6UuhrqBBQjaMP/jDJrAvIKb749N0J96sr1DPk
-uy4n/z69HcKhITJ5baVlrXN8tu9a8Spj4fYoDOl1zPwPJp3NNR0O4hFwKd8EczRK
-iGVQXdvkWGmh5OF1uz2MtMUJhqj5r2VecInZfPtefutjGb1UYJ7gxQahjMWxWieJ
-1VbTalj3Khmpya0Vk+z7cNZPZK5FeH51Q2zslJh/j+dVxJhgmKNDFXrDuXq2RUYY
-U/OSC+ZrZ8gM8VqxgWJl/E2hq3RKuBCUvhGyi+9GOnhhmz7MqfK5eI1xejrrbnSR
-3bDn1t3xHRY/LKx5Uwf1SoUFIt49IlLZy3lEvIVcRv6ADCjWMOy/9TfdoHvomN4n
-aOZw/SdGbOODXXIfvrHM6ceFDK/bLehhrgcdqWAFjMl4SSCeg4zSEan45LZ0dlTy
-4ZyWgcH4aJQKuAVc8/PhscLWd2zzXSOks/cKxeDOSySQUtDl6N2n5gJY5K9TRiJn
-efBglfqqv/4RbE9UvavKwYQps1Qza4aC3zeYoj5rDEWCczjNi8fLTZgrk/K8Xbo1
-yo1RVTZyg0KqkmTJrQpsPAb30Pg+dz7F728POkbLzjeJwEjB7awuSHp8IAH+J/LW
-rOPlCuuCyhJGuh0Xs14kuS3TiDoeLrHAJnd3BbgqXT6F8MHbq51F3JahphJj8nJN
-Gzzfw0T4EcJjBdeOOzbK
-=4pM5
+iQIcBAEBCgAGBQJPJEOLAAoJEHQ6UuhrqBBQr8wP+gIBPi7gx2G6f24sySUT0Mam
+Ekt1DvIhSrrMq1si9w2x7exwlgXSve/SvuSM3Wuvz0gIFZRRMq9jNZ23WVhcqFwg
+YOrwoF+kKve20Clk9x/l4kQxTEYLBx1n6I6o/F8j0ESg/DGxbtSSfxowdylfxZoY
+zC0S/Pei+Ir8epOGxwvIsPlEh6A6SyiHjdVI7azCAe04srlaAS79nI7ek8b2mlvY
+bgrK3RGNmX5y6yPLBRj44z2NgWl1BeRiQX0QXxyefL4tmjOFFn8ukZ3q2vaAozO5
+/cJqoQ4lTji0zylI/55I6gp4SBglnvdBfafXgc55/fx4nzIJZqjpeQdkDMWs8vWy
+z+qP0RoT15wCXJveLG52z4lhJUOXeCLr/fczfGpV2spA0lqllFtqBx0gUHb0A//P
+G0UjJvonbsnuu/Vng6T5ROWu72x8w10Q1QcqK3giGGiqvgnrPCg7I1yRczsD74nE
+n6/ExPCJvOk3EHLGrUMW6wmH7pWbzqKqFnvkpWVfMz+GO/ir4/L2NWrohcGQe89E
+QPEi1bnlUl2EqjnlywYjA13QKtLvnw8NNibJrfqx6zR2UpSSZFD4AEhDOzHXLGUE
+yAQJhz4ZPgBq6t8S9wiZkD26lkl0xPIczr3n39JJXAU1FSg7YzUcwzZfvDfQGnK7
+6KaOE8D888R1SWAZ699S
+=Dmy7
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pacman/pacman-3.5.4.ebuild b/sys-apps/pacman/pacman-3.5.4.ebuild
deleted file mode 100644
index 7fd718653cbc..000000000000
--- a/sys-apps/pacman/pacman-3.5.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pacman/pacman-3.5.4.ebuild,v 1.1 2011/08/23 04:05:45 binki Exp $
-
-EAPI=4
-
-inherit autotools autotools-utils
-
-DESCRIPTION="Archlinux's binary package manager"
-HOMEPAGE="http://archlinux.org/pacman/"
-SRC_URI="ftp://ftp.archlinux.org/other/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug doc test"
-
-COMMON_DEPEND="app-arch/libarchive
-	dev-libs/openssl
-	virtual/libiconv
-	virtual/libintl
-	sys-devel/gettext"
-RDEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-lang/python )"
-
-RESTRICT="test"
-
-src_prepare() {
-	# Remove a line that adds -Werror in ./configure when --enable-debug
-	# is passed:
-	sed -i -e '/-Werror/d' configure.ac || die "-Werror"
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var
-		--disable-git-version
-		--without-fetch
-		--with-openssl
-		# Help protect users from shooting their Gentoo installation in
-		# its foot.
-		--with-root-dir="${EPREFIX}"/var/chroot/archlinux
-		$(use_enable debug)
-		$(use_enable doc)
-		$(use_enable doc doxygen)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	dodir /etc/pacman.d
-}
-
-pkg_postinst() {
-	einfo "Please see http://ohnopub.net/~ohnobinki/gentoo/arch/ for information"
-	einfo "about setting up an archlinux chroot."
-}
diff --git a/sys-apps/pacman/pacman-4.0.0.ebuild b/sys-apps/pacman/pacman-4.0.1.ebuild
index 7552b08c6dcf..234d4ecb218e 100644
--- a/sys-apps/pacman/pacman-4.0.0.ebuild
+++ b/sys-apps/pacman/pacman-4.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pacman/pacman-4.0.0.ebuild,v 1.1 2011/10/18 00:58:32 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pacman/pacman-4.0.1.ebuild,v 1.1 2012/01/28 18:53:03 binki Exp $
 
 EAPI=4
 
@@ -36,7 +36,7 @@ RESTRICT="test"
 src_prepare() {
 	# Adds AM_GPGME_PATH call which requires app-crypt/gpgme to be
 	# DEPENDed on unconditionally:
-	epatch "${FILESDIR}"/${P}-gpgme.patch
+	epatch "${FILESDIR}"/${PN}-4.0.0-gpgme.patch
 
 	# Remove a line that adds -Werror in ./configure when --enable-debug
 	# is passed:
@@ -49,7 +49,7 @@ src_configure() {
 		--localstatedir=/var
 		--disable-git-version
 		--with-openssl
-		# Help protect users from shooting their Gentoo installation in
+		# Help protect user from shooting his/her Gentoo installation in
 		# its foot.
 		--with-root-dir="${EPREFIX}"/var/chroot/archlinux
 		$(use_enable debug)