update to 1.1.14, the most recent and spiffiest version

(Portage version: 2.1.1-r2)
 (Unsigned Manifest commit)

3 files changed, 12 insertions, 45 deletions

diff --git a/app-admin/conary/Manifest b/app-admin/conary/Manifest
index da0a05df906b..9a9e0ae34f55 100644
--- a/app-admin/conary/Manifest
+++ b/app-admin/conary/Manifest
@@ -1,24 +1,24 @@
-DIST conary-1.1.12.tar.bz2 694808 RMD160 1f6d3ff890b6ac8fe45f413c034b3fe775d0ec87 SHA1 cdefa4717f42ea36fd54441332d1e3c52231c119 SHA256 2b52c60e9a3f4fccaac2b8a3bab7be6a921db29b06cb8b82da41901d6b0659b4
 DIST conary-1.1.13.tar.bz2 696584 RMD160 1f3e4151ab6cf16c974071048385edb090b359e2 SHA1 c45c4724a54514d91f47e3fc13bad6609be63de4 SHA256 3a86dcf0ac8dc8488d8dad6004790edfd46060743a0c9bfb964e0d3295e3aeee
-EBUILD conary-1.1.12.ebuild 792 RMD160 3d0fa494c67fbb2653030207474c0aca491566e3 SHA1 2bef2c87a69d1b5c316439f0e59d52ea3656538e SHA256 e2f9e748ffc1d035003c3f3f9bd0b7ad37758ee9973e31b39b35b29503b04c3f
-MD5 e9c4143d1d746f1df7b6bb34dba50887 conary-1.1.12.ebuild 792
-RMD160 3d0fa494c67fbb2653030207474c0aca491566e3 conary-1.1.12.ebuild 792
-SHA256 e2f9e748ffc1d035003c3f3f9bd0b7ad37758ee9973e31b39b35b29503b04c3f conary-1.1.12.ebuild 792
+DIST conary-1.1.14.tar.bz2 706685 RMD160 81d427d809028007ca7f464f3c96b6aaa43a9596 SHA1 c578209756b9011be42bbd0696d0da048817bb6d SHA256 6e394f73e5e7010d1f7c6bcc7a170970e478a74199c5ea9210716b36a26a777b
 EBUILD conary-1.1.13.ebuild 792 RMD160 0eb6cf8f06b53dbe11d9f38887709a7822e1a7c5 SHA1 1ec76fcf4f1f4f95d6f0cad5410f532bbaec17cf SHA256 ae6a6e8f199f6d2ca67606022eb155078918daf97d6e5298423a4530aec04a25
 MD5 bfadba7cca4942171033d8b14726ce33 conary-1.1.13.ebuild 792
 RMD160 0eb6cf8f06b53dbe11d9f38887709a7822e1a7c5 conary-1.1.13.ebuild 792
 SHA256 ae6a6e8f199f6d2ca67606022eb155078918daf97d6e5298423a4530aec04a25 conary-1.1.13.ebuild 792
-MISC ChangeLog 1110 RMD160 b145788b352077e310e51a6f4c820a4f833e9075 SHA1 cc0cf57fb17da4d5da93e79d7d642324deab95eb SHA256 16e5f813a1f791d79a57b1a2b413573adad145e16c5ab451ebd94c5a2f88b7be
-MD5 89aea0cdbf834ca51de4f1c8232ab819 ChangeLog 1110
-RMD160 b145788b352077e310e51a6f4c820a4f833e9075 ChangeLog 1110
-SHA256 16e5f813a1f791d79a57b1a2b413573adad145e16c5ab451ebd94c5a2f88b7be ChangeLog 1110
+EBUILD conary-1.1.14.ebuild 792 RMD160 6b996a6cde02a19e2b091dc7547175fcdf4dc598 SHA1 348c00f24101eb7c915c70fc9c97c8f71d45fdd6 SHA256 9ddb0586e8def691527a962ffd14e173a6e04b71aa89694d8118bda37dbf6e69
+MD5 9179b029f1dd61bf1e9f56ee46d880ee conary-1.1.14.ebuild 792
+RMD160 6b996a6cde02a19e2b091dc7547175fcdf4dc598 conary-1.1.14.ebuild 792
+SHA256 9ddb0586e8def691527a962ffd14e173a6e04b71aa89694d8118bda37dbf6e69 conary-1.1.14.ebuild 792
+MISC ChangeLog 1282 RMD160 efe2db08e640633fa783af63d2b6aee7e59c6d79 SHA1 12659dccc634608d8f94d83d4af66f09ba4ebd70 SHA256 2c2d46f3ec4d7628aaf640c3096a80dfa2f727d05856ee20dd7f0cdfd90c7dfb
+MD5 3559cc45b3d5c4120b579e7f7cce9b13 ChangeLog 1282
+RMD160 efe2db08e640633fa783af63d2b6aee7e59c6d79 ChangeLog 1282
+SHA256 2c2d46f3ec4d7628aaf640c3096a80dfa2f727d05856ee20dd7f0cdfd90c7dfb ChangeLog 1282
 MISC metadata.xml 199 RMD160 aaee744c7db89193043ff000736a3c64d0447f62 SHA1 b8078e224df98edc318ce3750a0a5a29e066b23f SHA256 0e5372ed9ee3778180e9e7e7468d1330ba433304fd63c1566b3ed03cc28fe8b1
 MD5 d876cb2a6593b89e19e1110331203d39 metadata.xml 199
 RMD160 aaee744c7db89193043ff000736a3c64d0447f62 metadata.xml 199
 SHA256 0e5372ed9ee3778180e9e7e7468d1330ba433304fd63c1566b3ed03cc28fe8b1 metadata.xml 199
-MD5 7d053521e9813b2ecedf4a2aa892862e files/digest-conary-1.1.12 244
-RMD160 bbae16490d7b012f0910360bbb878c9784edb844 files/digest-conary-1.1.12 244
-SHA256 d42ecbba569236d9b8fb5e879c6b385f624751ddcda601f134a9f1aa31a0e57c files/digest-conary-1.1.12 244
 MD5 9cd1de052b0b8ad7c318af84b387fef2 files/digest-conary-1.1.13 244
 RMD160 f35e61eaa85677ce65a75ca9116e49b0a4efe53e files/digest-conary-1.1.13 244
 SHA256 13a55f2819196d8879878bc5b45a3ec10e070389c1a8b1844d9067a4dba556d5 files/digest-conary-1.1.13 244
+MD5 07a808d62c9cc4ba2c8f908c38928f92 files/digest-conary-1.1.14 244
+RMD160 92ed482616b0633284c469685dbaf43a57a78afe files/digest-conary-1.1.14 244
+SHA256 b8e1ae92fbbc825fcc222788f71a71f72ae87c4d0ced4337a0c67cb38574e3cd files/digest-conary-1.1.14 244
diff --git a/app-admin/conary/conary-1.1.12.ebuild b/app-admin/conary/conary-1.1.12.ebuild
deleted file mode 100644
index f66f8227b479..000000000000
--- a/app-admin/conary/conary-1.1.12.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2006-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/conary-1.1.12.ebuild,v 1.1 2006/11/21 17:32:39 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/files/digest-conary-1.1.12 b/app-admin/conary/files/digest-conary-1.1.12
deleted file mode 100644
index 3e7b31227abb..000000000000
--- a/app-admin/conary/files/digest-conary-1.1.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4b4688df8ec816d8aabb63c3ebbb0763 conary-1.1.12.tar.bz2 694808
-RMD160 1f6d3ff890b6ac8fe45f413c034b3fe775d0ec87 conary-1.1.12.tar.bz2 694808
-SHA256 2b52c60e9a3f4fccaac2b8a3bab7be6a921db29b06cb8b82da41901d6b0659b4 conary-1.1.12.tar.bz2 694808