update to .21, the latest

(Portage version: 2.1.2.2)

6 files changed, 11 insertions, 38 deletions

diff --git a/app-admin/conary/ChangeLog b/app-admin/conary/ChangeLog
index 894aa3416217..9e3e233ff8d8 100644
--- a/app-admin/conary/ChangeLog
+++ b/app-admin/conary/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/conary
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/ChangeLog,v 1.13 2007/03/29 18:18:38 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/ChangeLog,v 1.14 2007/04/09 20:36:16 smithj Exp $
+
+*conary-1.1.21 (09 Apr 2007)
+
+  09 Apr 2007; <smithj@gentoo.org> -conary-1.1.17.ebuild,
+  -conary-1.1.19.ebuild, +conary-1.1.21.ebuild:
+  update to .21, the latest
 
 *conary-1.1.19 (29 Mar 2007)
 
diff --git a/app-admin/conary/conary-1.1.19.ebuild b/app-admin/conary/conary-1.1.19.ebuild
deleted file mode 100644
index 959ca5ec45ea..000000000000
--- a/app-admin/conary/conary-1.1.19.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2006-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/conary-1.1.19.ebuild,v 1.1 2007/03/29 18:18:38 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 LICENSE NEWS conary/ScanDeps/README conary/pysqlite3/{LICENSE,README}
-}
diff --git a/app-admin/conary/conary-1.1.17.ebuild b/app-admin/conary/conary-1.1.21.ebuild
index f0649c2f2b82..f1074e16c2e8 100644
--- a/app-admin/conary/conary-1.1.17.ebuild
+++ b/app-admin/conary/conary-1.1.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2006-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/conary-1.1.17.ebuild,v 1.1 2007/02/23 21:32:10 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/conary-1.1.21.ebuild,v 1.1 2007/04/09 20:36:16 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.17 b/app-admin/conary/files/digest-conary-1.1.17
deleted file mode 100644
index 5778d04b2f29..000000000000
--- a/app-admin/conary/files/digest-conary-1.1.17
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2d11b338d4d91ef156a9f6cae5e2880a conary-1.1.17.tar.bz2 725105
-RMD160 1495edb09793f0717d4521d14264bc46bdc9f7dd conary-1.1.17.tar.bz2 725105
-SHA256 44efeeb1600b36ff85228da292ef98424824fa9c3b9f7439095e9e43d0cbb4b5 conary-1.1.17.tar.bz2 725105
diff --git a/app-admin/conary/files/digest-conary-1.1.19 b/app-admin/conary/files/digest-conary-1.1.19
deleted file mode 100644
index d6a43788d887..000000000000
--- a/app-admin/conary/files/digest-conary-1.1.19
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a9de194ab7768cb4984e38cc99371f18 conary-1.1.19.tar.bz2 747850
-RMD160 028d7ce0218f5fa8bfb618c0689e5a2efd432054 conary-1.1.19.tar.bz2 747850
-SHA256 02a6a2ac6c0c105c81746395ef4d9281293c13566cd700fe407cc263b670a192 conary-1.1.19.tar.bz2 747850
diff --git a/app-admin/conary/files/digest-conary-1.1.21 b/app-admin/conary/files/digest-conary-1.1.21
new file mode 100644
index 000000000000..d3852688ccda
--- /dev/null
+++ b/app-admin/conary/files/digest-conary-1.1.21
@@ -0,0 +1,3 @@
+MD5 482d4e95379c0d51a9000bda84650e36 conary-1.1.21.tar.bz2 758649
+RMD160 2d259930bbe989e0ae71c6edaccb98d94a0f880d conary-1.1.21.tar.bz2 758649
+SHA256 049fc0365a057f8451bda122002f86a813f78cb85fcd993dcfc0eb92c5f92114 conary-1.1.21.tar.bz2 758649