update to the most recent, 2.0.12. remove non-2.0.x versions, as only 2.0.x is (as of a week or so ago) being maintained upstream

Package-Manager: portage-2.1.3.19

7 files changed, 24 insertions, 58 deletions

diff --git a/app-admin/conary/ChangeLog b/app-admin/conary/ChangeLog
index 3216f8275747..18c46b29c172 100644
--- a/app-admin/conary/ChangeLog
+++ b/app-admin/conary/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/conary
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/ChangeLog,v 1.18 2008/03/20 21:33:21 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/ChangeLog,v 1.19 2008/04/18 17:48:12 smithj Exp $
+
+*conary-2.0.12 (18 Apr 2008)
+
+  18 Apr 2008; <smithj@gentoo.org> -conary-1.1.31.12.ebuild,
+  -conary-1.2.20.ebuild, +conary-2.0.12.ebuild:
+  update to the most recent, 2.0.12. remove non-2.0.x versions, as only 2.0.x
+  is (as of a week or so ago) being maintained upstream
 
 *conary-2.0.9 (20 Mar 2008)
 *conary-1.2.20 (20 Mar 2008)
diff --git a/app-admin/conary/Manifest b/app-admin/conary/Manifest
index 952376f44ac4..482fe8570644 100644
--- a/app-admin/conary/Manifest
+++ b/app-admin/conary/Manifest
@@ -1,32 +1,24 @@
-DIST conary-1.1.31.12.tar.bz2 843836 RMD160 92ff9b50ce89a4112a4b09e0052d8fb411bd2fd7 SHA1 59a26ad7c172ed2fba29d48916a843c7b17bb28c SHA256 a4e8369d6d65db785e832e039d284e2d1eb7d8dc086643f190b6b4703ce91c14
-DIST conary-1.2.20.tar.bz2 920311 RMD160 5702d35ceafbade6ca4717589c9e3fdfb25c0d9c SHA1 be92d90df802b56b51907705fabec41e42907fcd SHA256 ab7858df0930c5e471e0718ddbfc8d362bcdad6b3305101e749a02a7eae3bf89
+DIST conary-2.0.12.tar.bz2 975963 RMD160 52badd421f4803753bb8e614c4b2ecca34d492b9 SHA1 7bfb44e2067088ee74678a21a263a1d0da301b00 SHA256 baede9bd60d07c71240632df43001e36d44fe39489dd36047abfd7003935ef7e
 DIST conary-2.0.9.tar.bz2 951464 RMD160 d0684f9eaabdef43015530d8ab10bd8b8eb3a02c SHA1 f6562479b93efdecb29e073ddf6f5d0fd1ea3d1d SHA256 80af73b7ac555ef730679abe27813402e14dc3c902074f544f5ef63ff94c593b
-EBUILD conary-1.1.31.12.ebuild 779 RMD160 64ab406030d7216ae7fc76cd46e9a0c937e8e6c9 SHA1 8749fd4697d3464f4cc51563d8c9e5fd4b6edbd4 SHA256 e0601e4b2fc768f7d892c32bc89a4f24bec00aeab3ab7bdd8d7b26b71426344f
-MD5 0d1103ddfcfacc49a4ee92b3b499ab7f conary-1.1.31.12.ebuild 779
-RMD160 64ab406030d7216ae7fc76cd46e9a0c937e8e6c9 conary-1.1.31.12.ebuild 779
-SHA256 e0601e4b2fc768f7d892c32bc89a4f24bec00aeab3ab7bdd8d7b26b71426344f conary-1.1.31.12.ebuild 779
-EBUILD conary-1.2.20.ebuild 776 RMD160 e7e15d10c372123ff717c56e6e2d593bdf873640 SHA1 29c39a8b186268b450db9cfbe4b902545c99de05 SHA256 54525c56b67c005b90c7d61fc062f614640d01cdb35d533e2218dbb8a0b0b09a
-MD5 82eb7bf39d3566d2b4cd03fc7008d5bf conary-1.2.20.ebuild 776
-RMD160 e7e15d10c372123ff717c56e6e2d593bdf873640 conary-1.2.20.ebuild 776
-SHA256 54525c56b67c005b90c7d61fc062f614640d01cdb35d533e2218dbb8a0b0b09a conary-1.2.20.ebuild 776
+EBUILD conary-2.0.12.ebuild 776 RMD160 b547a937fd56d84354e0c0e49b4c874859aad1e9 SHA1 1a2dfe09382a08321f309780e1ba92d692255b56 SHA256 bc6cfb7cd5203b8f97fc13a46aefa153416ec1914134fa4b376ffba398eaf1f3
+MD5 f167857ba1727d567710d5e2877b99cb conary-2.0.12.ebuild 776
+RMD160 b547a937fd56d84354e0c0e49b4c874859aad1e9 conary-2.0.12.ebuild 776
+SHA256 bc6cfb7cd5203b8f97fc13a46aefa153416ec1914134fa4b376ffba398eaf1f3 conary-2.0.12.ebuild 776
 EBUILD conary-2.0.9.ebuild 775 RMD160 fff5d71566d8be99c533b04c7583d8978d3f1bec SHA1 06e66cda0b8df6ae0b8c7047a88ad8d5f8d1f876 SHA256 6560e695675f321539b85ab4c75027f37fa28f3d30a8a7666e6f0529de7c80ea
 MD5 2336d743fecf073bb3c054eaeb257753 conary-2.0.9.ebuild 775
 RMD160 fff5d71566d8be99c533b04c7583d8978d3f1bec conary-2.0.9.ebuild 775
 SHA256 6560e695675f321539b85ab4c75027f37fa28f3d30a8a7666e6f0529de7c80ea conary-2.0.9.ebuild 775
-MISC ChangeLog 2709 RMD160 6362e4616c258b743fc5ea8c7f2e83b7b1fc527e SHA1 be9e97e3c576bc22076322e15223607f3cf282cf SHA256 e964e24b3b6ea041d937386497239d71358d7513fb5fbd62c0060f7bac447a10
-MD5 dd81feb02c459758e1d002f658dbd92b ChangeLog 2709
-RMD160 6362e4616c258b743fc5ea8c7f2e83b7b1fc527e ChangeLog 2709
-SHA256 e964e24b3b6ea041d937386497239d71358d7513fb5fbd62c0060f7bac447a10 ChangeLog 2709
+MISC ChangeLog 2983 RMD160 e3fffddc15f081ca17c4fa9cb88446902e179f24 SHA1 4fe9da3da00b352b93e577e167729a9dbb80c20b SHA256 53dbaaf2fb07dc99e562d7d818a9ee9418cd5962e3c808a37487dd08f6a61a1e
+MD5 cff0d5d2596bd29a91f629443388c996 ChangeLog 2983
+RMD160 e3fffddc15f081ca17c4fa9cb88446902e179f24 ChangeLog 2983
+SHA256 53dbaaf2fb07dc99e562d7d818a9ee9418cd5962e3c808a37487dd08f6a61a1e ChangeLog 2983
 MISC metadata.xml 220 RMD160 cfa813a6c82c862e98387c45f3012fe36f8c9ed1 SHA1 2595c14914df656fa3ff0650b807174706b9324a SHA256 83157f032b557bf0087bc7745dce7735ddee44d4b691f24c77a7fcf64908392b
 MD5 93e92735c196a837090a7e34740b68d8 metadata.xml 220
 RMD160 cfa813a6c82c862e98387c45f3012fe36f8c9ed1 metadata.xml 220
 SHA256 83157f032b557bf0087bc7745dce7735ddee44d4b691f24c77a7fcf64908392b metadata.xml 220
-MD5 822536cc0bc5a3616b3033f821007a08 files/digest-conary-1.1.31.12 253
-RMD160 36992838719dbea65edc331a650befeea6fe1683 files/digest-conary-1.1.31.12 253
-SHA256 9bdaa9c98f6f75958c3425af06e4c8aaaf17a48c2fc21f6c0970cb80cdd934cf files/digest-conary-1.1.31.12 253
-MD5 39b3fb388b882e7a742ee7556da48e3a files/digest-conary-1.2.20 244
-RMD160 67af9a4dc5f6c55bb5f10b67eaaa4349105070d6 files/digest-conary-1.2.20 244
-SHA256 98de1def2b1ee0c59d76ba9e4b2f793e177a597f278946efbb59208615a7a0d1 files/digest-conary-1.2.20 244
+MD5 45c0bfc3041cb182e6b30e8963fe9fd6 files/digest-conary-2.0.12 244
+RMD160 0258808b2739009de07b96b1a768bf90c519b5a8 files/digest-conary-2.0.12 244
+SHA256 65e49c4d6f4068b43a98e5e51606e61132b74a3f45379c0970c3d3f8976dc37f files/digest-conary-2.0.12 244
 MD5 90f52b16cd6407fd5117d787ff4868a1 files/digest-conary-2.0.9 241
 RMD160 3bc6f8750eae4debde7dd4d865472f7108d11f49 files/digest-conary-2.0.9 241
 SHA256 a00421eb1b4c717d34232b4fe62de324be6303aceccc4066ac84679b3596199c files/digest-conary-2.0.9 241
diff --git a/app-admin/conary/conary-1.1.31.12.ebuild b/app-admin/conary/conary-1.1.31.12.ebuild
deleted file mode 100644
index a8d81f918fdf..000000000000
--- a/app-admin/conary/conary-1.1.31.12.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2006-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/conary-1.1.31.12.ebuild,v 1.1 2008/03/20 21:33:21 smithj Exp $
-
-DESCRIPTION="repository-based system management and package-building tool"
-HOMEPAGE="http://wiki.rpath.com/wiki/Conary"
-SRC_URI="ftp://download.rpath.com/conary/${P}.tar.bz2"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="=dev-lang/python-2.4*
-		dev-python/kid
-		dev-python/elementtree
-		dev-db/sqlite
-		dev-python/pycrypto
-		dev-libs/elfutils"
-
-PDEPEND="app-admin/conary-policy"
-
-src_compile() {
-	emake || die "Make failure"
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-	dodoc NEWS conary/ScanDeps/README conary/pysqlite3/README
-}
diff --git a/app-admin/conary/conary-1.2.20.ebuild b/app-admin/conary/conary-2.0.12.ebuild
index 04a8e69d84c1..32dbaeb8c91a 100644
--- a/app-admin/conary/conary-1.2.20.ebuild
+++ b/app-admin/conary/conary-2.0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2006-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/conary-1.2.20.ebuild,v 1.1 2008/03/20 21:33:21 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/conary-2.0.12.ebuild,v 1.1 2008/04/18 17:48:12 smithj Exp $
 
 DESCRIPTION="repository-based system management and package-building tool"
 HOMEPAGE="http://wiki.rpath.com/wiki/Conary"
diff --git a/app-admin/conary/files/digest-conary-1.1.31.12 b/app-admin/conary/files/digest-conary-1.1.31.12
deleted file mode 100644
index 3f0e4ae389a0..000000000000
--- a/app-admin/conary/files/digest-conary-1.1.31.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eca7e965551d05ec3b6114ab8464b134 conary-1.1.31.12.tar.bz2 843836
-RMD160 92ff9b50ce89a4112a4b09e0052d8fb411bd2fd7 conary-1.1.31.12.tar.bz2 843836
-SHA256 a4e8369d6d65db785e832e039d284e2d1eb7d8dc086643f190b6b4703ce91c14 conary-1.1.31.12.tar.bz2 843836
diff --git a/app-admin/conary/files/digest-conary-1.2.20 b/app-admin/conary/files/digest-conary-1.2.20
deleted file mode 100644
index 5a15d3851bc7..000000000000
--- a/app-admin/conary/files/digest-conary-1.2.20
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a613775240fdf8cfecbb4e7586d58595 conary-1.2.20.tar.bz2 920311
-RMD160 5702d35ceafbade6ca4717589c9e3fdfb25c0d9c conary-1.2.20.tar.bz2 920311
-SHA256 ab7858df0930c5e471e0718ddbfc8d362bcdad6b3305101e749a02a7eae3bf89 conary-1.2.20.tar.bz2 920311
diff --git a/app-admin/conary/files/digest-conary-2.0.12 b/app-admin/conary/files/digest-conary-2.0.12
new file mode 100644
index 000000000000..b43c2e53335a
--- /dev/null
+++ b/app-admin/conary/files/digest-conary-2.0.12
@@ -0,0 +1,3 @@
+MD5 c579fd998672bdaffde52ac086908e00 conary-2.0.12.tar.bz2 975963
+RMD160 52badd421f4803753bb8e614c4b2ecca34d492b9 conary-2.0.12.tar.bz2 975963
+SHA256 baede9bd60d07c71240632df43001e36d44fe39489dd36047abfd7003935ef7e conary-2.0.12.tar.bz2 975963