Version bump, add curl USE flag.

Package-Manager: portage-2.1.2_pre3-r9

5 files changed, 15 insertions, 180 deletions

diff --git a/dev-util/bzr/Manifest b/dev-util/bzr/Manifest
index 8c0c40d8480d..ca977415af72 100644
--- a/dev-util/bzr/Manifest
+++ b/dev-util/bzr/Manifest
@@ -29,41 +29,34 @@ AUX bzr-0.9-binary-diff.patch 3660 RMD160 6272a1ae8b7bcbd52a02b7e2687167ff6b70bf
 MD5 56bc12a57f4b60f074871a84be58d6b7 files/bzr-0.9-binary-diff.patch 3660
 RMD160 6272a1ae8b7bcbd52a02b7e2687167ff6b70bf50 files/bzr-0.9-binary-diff.patch 3660
 SHA256 a00e42dc7161d96a13e8f279862174ba2bd534e8da68d46c9a60f7308e96714b files/bzr-0.9-binary-diff.patch 3660
-DIST bzr-0.10.tar.gz 950911 RMD160 046dd9479e516b6e9b526df5f9baa2a7ec185a5b SHA1 d3cf0662e3b20678fb3161a0bb1cab4fa2d40e2a SHA256 4a9b5b2d0b2c33c91dabeb0831b3da660189eb38ad9c28c929ea64b79fecc20f
 DIST bzr-0.11.tar.gz 1040731 RMD160 3e6b283669587455d1c59af614a6a7e5eba15c0c SHA1 ce629bba4594bb15ab996caa3d7dc12680ee49dd SHA256 f2e30edef95caeb91db9c568fc8f1a7cff628e7417c4f6d025908499970bbc17
-EBUILD bzr-0.10-r1.ebuild 2048 RMD160 fcca7c85632376226ddba74149b61fe53b1161c8 SHA1 290745481e4d829ee2e2d62e8dab1080046ed847 SHA256 c18bae17227fb29cc92788968e3263f31dfa823566a2c499e22d7c1aa04dab2a
-MD5 a4fff8e769cf8f8a63774df2b364025b bzr-0.10-r1.ebuild 2048
-RMD160 fcca7c85632376226ddba74149b61fe53b1161c8 bzr-0.10-r1.ebuild 2048
-SHA256 c18bae17227fb29cc92788968e3263f31dfa823566a2c499e22d7c1aa04dab2a bzr-0.10-r1.ebuild 2048
-EBUILD bzr-0.10.ebuild 1877 RMD160 aaae7e5748b438bfa0825815979cd40fe07974af SHA1 a94b038f457adf84aac61eb850e0f4e20f5bc29c SHA256 4adb46fd5775d5072633cce158de835d152e0e378f3d9b33a1c1f6c6618da57e
-MD5 5081318e817501cc30ce8f3b216674ad bzr-0.10.ebuild 1877
-RMD160 aaae7e5748b438bfa0825815979cd40fe07974af bzr-0.10.ebuild 1877
-SHA256 4adb46fd5775d5072633cce158de835d152e0e378f3d9b33a1c1f6c6618da57e bzr-0.10.ebuild 1877
+DIST bzr-0.12.tar.gz 1088557 RMD160 a29a113749d8f99fce70379e07b72a16080164b1 SHA1 5678e85702c68096acede28fb4d8cf95d2115ef8 SHA256 cd4b860b1bbdf6577877b99f3f8ba93d4eb03235d06ee9f877ca846a1022f620
 EBUILD bzr-0.11.ebuild 1925 RMD160 0fb14463d586eb12c644649a7908ffc4a46244a6 SHA1 c564154e97bec7004b19433d651239536b11c601 SHA256 a67784845094dc0d1870a90ca94700d32bb35de2650c8328d0de5616bbac4e52
 MD5 50a87869d64ce32bf9b2705679dd81cb bzr-0.11.ebuild 1925
 RMD160 0fb14463d586eb12c644649a7908ffc4a46244a6 bzr-0.11.ebuild 1925
 SHA256 a67784845094dc0d1870a90ca94700d32bb35de2650c8328d0de5616bbac4e52 bzr-0.11.ebuild 1925
-MISC ChangeLog 4230 RMD160 9c2bca4d445f288206da7116cc7b68d7a1de3e6b SHA1 63b2f678f351460eef064d945d54169af04e99b8 SHA256 b76bd3900f925ae46e6a9c82084a5f53b84271a130ebc5e283813dd09dc4a981
-MD5 6ee3c44f0169ba30eca30af4765ef401 ChangeLog 4230
-RMD160 9c2bca4d445f288206da7116cc7b68d7a1de3e6b ChangeLog 4230
-SHA256 b76bd3900f925ae46e6a9c82084a5f53b84271a130ebc5e283813dd09dc4a981 ChangeLog 4230
+EBUILD bzr-0.12.ebuild 1960 RMD160 248248fa0faf74be732ffc2a135ff25b4a3d4992 SHA1 982886625318d87149737099a8b364fc4b57437f SHA256 922f616466beeb6ec9a52565d27b5fe3f5ec2878edb6d1f95a932b952efd9c9a
+MD5 2334b0ad47749effd8b11212582602ed bzr-0.12.ebuild 1960
+RMD160 248248fa0faf74be732ffc2a135ff25b4a3d4992 bzr-0.12.ebuild 1960
+SHA256 922f616466beeb6ec9a52565d27b5fe3f5ec2878edb6d1f95a932b952efd9c9a bzr-0.12.ebuild 1960
+MISC ChangeLog 4399 RMD160 97fd8d07c5d474034bef5dc6e5f8f55693fda7e4 SHA1 e8e697c7fe7aa0fe704cd8a3408843bcf413fc4c SHA256 4b5ce2011f74ce37f1334c09ef3715a9971ed8c286e5d839c8d41c6668fccbef
+MD5 54f1aaa1182810e9aa4cba589c5c1920 ChangeLog 4399
+RMD160 97fd8d07c5d474034bef5dc6e5f8f55693fda7e4 ChangeLog 4399
+SHA256 4b5ce2011f74ce37f1334c09ef3715a9971ed8c286e5d839c8d41c6668fccbef ChangeLog 4399
 MISC metadata.xml 218 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b SHA1 0dc0efeb1f1c4a4e691f1f10d4dd28814582c74e SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2
 MD5 bc29fb845d6836abeba3eeff41da8476 metadata.xml 218
 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b metadata.xml 218
 SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2 metadata.xml 218
-MD5 a3776c07753c3aa16849d9c78a184c26 files/digest-bzr-0.10 226
-RMD160 aec5a4186769b27ef2215af354bde68765f35835 files/digest-bzr-0.10 226
-SHA256 28ba75424157825714d6121567c2d8588c245052c1f491015ddea92ec5edea3c files/digest-bzr-0.10 226
-MD5 a3776c07753c3aa16849d9c78a184c26 files/digest-bzr-0.10-r1 226
-RMD160 aec5a4186769b27ef2215af354bde68765f35835 files/digest-bzr-0.10-r1 226
-SHA256 28ba75424157825714d6121567c2d8588c245052c1f491015ddea92ec5edea3c files/digest-bzr-0.10-r1 226
 MD5 d6bfb53a80a747b71f74e9911a62c30d files/digest-bzr-0.11 229
 RMD160 a47d9668272f75f612e1afac805d69700db4220b files/digest-bzr-0.11 229
 SHA256 59377e7281a04f624952a6d499275e6eb16fbab24fef0561bfb5c517889e972d files/digest-bzr-0.11 229
+MD5 0e66c6c4cc84b7a94cf354418515bcd5 files/digest-bzr-0.12 229
+RMD160 4d17e4d0a58bf45eac92f692811b13d22a7fb4c0 files/digest-bzr-0.12 229
+SHA256 b5a60c7b3d22746db28fd2d1e4b22df079640295999aec7f5080daa2f7475fb2 files/digest-bzr-0.12 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFIGatUElL7eJpfEQRAq79AJ4sTm1P83pln5n3+zpuJDHLC9xKCwCgtJEO
-yiObOSierHnxFogO4pIsTjk=
-=aQTO
+iD8DBQFFRormUElL7eJpfEQRAqg5AJ9Odl1se0LfadHJwOnFH7keKwKP5wCfcOoU
+vj7Dl0Gb3QnnjlkdIeeBA0U=
+=VJMS
 -----END PGP SIGNATURE-----
diff --git a/dev-util/bzr/bzr-0.10-r1.ebuild b/dev-util/bzr/bzr-0.10-r1.ebuild
deleted file mode 100644
index 6e4ebe43b960..000000000000
--- a/dev-util/bzr/bzr-0.10-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-0.10-r1.ebuild,v 1.1 2006/09/24 20:59:17 marienz Exp $
-
-inherit distutils bash-completion elisp-common eutils
-
-DESCRIPTION="next generation distributed version control"
-HOMEPAGE="http://bazaar-vcs.org/"
-SRC_URI="http://bazaar-vcs.org/releases/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
-IUSE="emacs test"
-
-python_rdep="dev-python/celementtree >=dev-python/paramiko-1.5"
-DEPEND=">=dev-lang/python-2.4
-	emacs? ( virtual/emacs )
-	test? ( $python_rdep )"
-RDEPEND=">=dev-lang/python-2.4
-	$python_rdep"
-
-PYTHON_MODNAME="bzrlib"
-
-DOCS="HACKING NEWS NEWS.developers"
-
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Install the manpage in /usr/share/man instead of /usr/man
-	epatch "${FILESDIR}/${P}-fix-manpage-location.patch"
-
-	# Mostly work with python 2.5 (some tar export related things are
-	# still broken, but will be fixed in bzr 0.11).
-	epatch "${FILESDIR}/${P}-python-2.5-compat.patch"
-}
-
-src_compile() {
-	distutils_src_compile
-	if use emacs; then
-		elisp-compile contrib/emacs/bzr-mode.el || die "Emacs modules failed!"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	if use emacs; then
-		insinto "${SITELISP}"
-		doins contrib/emacs/bzr-mode.el*
-		elisp-site-file-install "${FILESDIR}/70bzr-gentoo.el"
-	fi
-	insinto /usr/share/zsh/site-functions
-	doins contrib/zsh/_bzr
-	dobashcompletion contrib/bash/bzr
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	use emacs && elisp-site-regen
-	bash-completion_pkg_postinst
-
-	einfo "If you just upgraded from a version of bzr older than 0.9"
-	einfo "you should rename your ~/.bazaar/branches.conf to locations.conf"
-	einfo "(see /usr/share/doc/${PF}/NEWS.gz)"
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	# regenerate site-gentoo if we are merged USE=emacs and unmerged
-	# USE=-emacs
-	has_version virtual/emacs && elisp-site-regen
-}
-
-src_test() {
-	"${python}" bzr --no-plugins selftest || die "bzr selftest failed"
-}
diff --git a/dev-util/bzr/bzr-0.10.ebuild b/dev-util/bzr/bzr-0.10.ebuild
deleted file mode 100644
index 6b8c96ccd076..000000000000
--- a/dev-util/bzr/bzr-0.10.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-0.10.ebuild,v 1.2 2006/09/24 20:59:17 marienz Exp $
-
-inherit distutils bash-completion elisp-common eutils
-
-DESCRIPTION="next generation distributed version control"
-HOMEPAGE="http://bazaar-vcs.org/"
-SRC_URI="http://bazaar-vcs.org/releases/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
-IUSE="emacs test"
-
-python_rdep="dev-python/celementtree >=dev-python/paramiko-1.5"
-DEPEND=">=dev-lang/python-2.4
-	emacs? ( virtual/emacs )
-	test? ( $python_rdep )"
-RDEPEND=">=dev-lang/python-2.4
-	$python_rdep"
-
-PYTHON_MODNAME="bzrlib"
-
-DOCS="HACKING NEWS NEWS.developers"
-
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Install the manpage in /usr/share/man instead of /usr/man
-	epatch "${FILESDIR}/${P}-fix-manpage-location.patch"
-}
-
-src_compile() {
-	distutils_src_compile
-	if use emacs; then
-		elisp-compile contrib/emacs/bzr-mode.el || die "Emacs modules failed!"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	if use emacs; then
-		insinto "${SITELISP}"
-		doins contrib/emacs/bzr-mode.el*
-		elisp-site-file-install "${FILESDIR}/70bzr-gentoo.el"
-	fi
-	insinto /usr/share/zsh/site-functions
-	doins contrib/zsh/_bzr
-	dobashcompletion contrib/bash/bzr
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	use emacs && elisp-site-regen
-	bash-completion_pkg_postinst
-
-	einfo "If you just upgraded from a version of bzr older than 0.9"
-	einfo "you should rename your ~/.bazaar/branches.conf to locations.conf"
-	einfo "(see /usr/share/doc/${PF}/NEWS.gz)"
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	# regenerate site-gentoo if we are merged USE=emacs and unmerged
-	# USE=-emacs
-	has_version virtual/emacs && elisp-site-regen
-}
-
-src_test() {
-	"${python}" bzr --no-plugins selftest || die "bzr selftest failed"
-}
diff --git a/dev-util/bzr/files/digest-bzr-0.10 b/dev-util/bzr/files/digest-bzr-0.10
deleted file mode 100644
index 7872ef24a2d2..000000000000
--- a/dev-util/bzr/files/digest-bzr-0.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8a21693efe9b06bed04fa4e8a74b7e83 bzr-0.10.tar.gz 950911
-RMD160 046dd9479e516b6e9b526df5f9baa2a7ec185a5b bzr-0.10.tar.gz 950911
-SHA256 4a9b5b2d0b2c33c91dabeb0831b3da660189eb38ad9c28c929ea64b79fecc20f bzr-0.10.tar.gz 950911
diff --git a/dev-util/bzr/files/digest-bzr-0.10-r1 b/dev-util/bzr/files/digest-bzr-0.10-r1
deleted file mode 100644
index 7872ef24a2d2..000000000000
--- a/dev-util/bzr/files/digest-bzr-0.10-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8a21693efe9b06bed04fa4e8a74b7e83 bzr-0.10.tar.gz 950911
-RMD160 046dd9479e516b6e9b526df5f9baa2a7ec185a5b bzr-0.10.tar.gz 950911
-SHA256 4a9b5b2d0b2c33c91dabeb0831b3da660189eb38ad9c28c929ea64b79fecc20f bzr-0.10.tar.gz 950911