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

(Portage version: 2.2.0_alpha84-r1/cvs/Linux x86_64)

3 files changed, 13 insertions, 69 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/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)