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

(Portage version: 2.1.3.19)

6 files changed, 12 insertions, 38 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/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