add the latest on the conary 1.2.x and 2.0.x branches. fix minor syntax errors repoman was bitching about

Package-Manager: portage-2.1.3.19

8 files changed, 38 insertions, 38 deletions

diff --git a/app-admin/conary/Manifest b/app-admin/conary/Manifest
index 196da2e10970..e0288051e44d 100644
--- a/app-admin/conary/Manifest
+++ b/app-admin/conary/Manifest
@@ -1,18 +1,18 @@
-DIST conary-1.1.18.tar.bz2 747816 RMD160 decfa3734e12ed945e8504da50767975ce5a3458 SHA1 36684146260bc8e98becff83d11f53596169cbb7 SHA256 bca7abfccb536827d068f16d81670f72461ff2b09dd917dcb736f4bec82270f5
-DIST conary-1.1.22.tar.bz2 763851 RMD160 8ddecd6c7be827ea4ace949fcf48f20eb9c75e77 SHA1 0b31d8a49413e25b7bd193f7803fa96b6b8ce62c SHA256 a6b6d8ebbb50d35972b86e617c3139217a7c2a65c2b7c544385af5634b16bef8
 DIST conary-1.1.26.tar.bz2 824638 RMD160 c5b4c25badeb2cc4e683d59a31f083db8be68539 SHA1 307accd84d5b287d69d7de0b4989ada2d6dc8e10 SHA256 02405495ebc54dda1f925bf23effa778bfd3ba5f26e7bc491103d7d9cf48e926
-EBUILD conary-1.1.18.ebuild 792 RMD160 bd17bff96eef6ea753b0bccecda32ef523c14f9a SHA1 755bd409f4bb4f88d5693c286d258d7deed6600a SHA256 7ce060e868eeb64fbb539c15f3f0445aa05a2ee223df10390fc4d4658a3ecff6
-MD5 86cabcafaf1e047aaf2884e579335d38 conary-1.1.18.ebuild 792
-RMD160 bd17bff96eef6ea753b0bccecda32ef523c14f9a conary-1.1.18.ebuild 792
-SHA256 7ce060e868eeb64fbb539c15f3f0445aa05a2ee223df10390fc4d4658a3ecff6 conary-1.1.18.ebuild 792
-EBUILD conary-1.1.22.ebuild 792 RMD160 864fb3f5b55bf83797a22b06bbc87a79af4a9cc9 SHA1 6e9740beef77cdc3c3407e656aa43d458c6139a5 SHA256 a50b847a28f9c99e28f994fd3f0edc2d4e4eb8b442385a91c97ea8a0d8cbf84c
-MD5 5f7c39f73953456f80ba0722e65119ef conary-1.1.22.ebuild 792
-RMD160 864fb3f5b55bf83797a22b06bbc87a79af4a9cc9 conary-1.1.22.ebuild 792
-SHA256 a50b847a28f9c99e28f994fd3f0edc2d4e4eb8b442385a91c97ea8a0d8cbf84c conary-1.1.22.ebuild 792
-EBUILD conary-1.1.26.ebuild 792 RMD160 7201413c2effa6f25cf8bef35ee2496bdd6838d8 SHA1 ae82b093578ccfc1238bbad5607ee115798c5225 SHA256 46b3a8b6e40c4c8c6308b4b34f518466a3c92f33a56ac6f4e319d823f149beb6
-MD5 55ff4b12f9783717e165384c5c6ad6ab conary-1.1.26.ebuild 792
-RMD160 7201413c2effa6f25cf8bef35ee2496bdd6838d8 conary-1.1.26.ebuild 792
-SHA256 46b3a8b6e40c4c8c6308b4b34f518466a3c92f33a56ac6f4e319d823f149beb6 conary-1.1.26.ebuild 792
+DIST conary-1.2.15.tar.bz2 899745 RMD160 add8035ed7cfd4b87e2866c767a6ecfd88164a4d SHA1 5195e6d733fbf2c17ee00eacdff514205e0edc5f SHA256 b9bc0bcd7667a2c298e53f6d1e0cd50619933895527ce55c7fa1580de9673755
+DIST conary-2.0.4.tar.bz2 920044 RMD160 6b3e89c8cbbfad66adbcfa8c10e15ba7394dc38f SHA1 1490bee9a410deded7b2bb6cc72bcb4bc1902319 SHA256 0569b14f36b9b0b45f6d7a2a28e77589f54db342d98a1436caaf3ba0d287dd7c
+EBUILD conary-1.1.26.ebuild 776 RMD160 8a6624dd456b1a0aad283432695ad750a4d8d9e8 SHA1 1a09f6e6b1812e713dc29e8acab92e13a164bd34 SHA256 3bd8535f4a124553e6d5e7b738b5611d73a0abb9be9e3c9eef4b5cfc99c1978a
+MD5 fe13395d8d48e2d539b4811001416072 conary-1.1.26.ebuild 776
+RMD160 8a6624dd456b1a0aad283432695ad750a4d8d9e8 conary-1.1.26.ebuild 776
+SHA256 3bd8535f4a124553e6d5e7b738b5611d73a0abb9be9e3c9eef4b5cfc99c1978a conary-1.1.26.ebuild 776
+EBUILD conary-1.2.15.ebuild 776 RMD160 6cd828026f32502ebe703c2b0335d68dfe249e9f SHA1 3e1959db2b55d9bcc8befbeb3e1af0fbcbf246ee SHA256 73fba7ad6c22cb3f27fed6e42bf326e45711f6ee1770c97fffccc7eb225f72b8
+MD5 e1048ce0050c7d864d749037a1b97268 conary-1.2.15.ebuild 776
+RMD160 6cd828026f32502ebe703c2b0335d68dfe249e9f conary-1.2.15.ebuild 776
+SHA256 73fba7ad6c22cb3f27fed6e42bf326e45711f6ee1770c97fffccc7eb225f72b8 conary-1.2.15.ebuild 776
+EBUILD conary-2.0.4.ebuild 775 RMD160 28e1014d25798a5836d554677ffe40b14d7ecb64 SHA1 e618fae40ce3f7c9106c5c0c24be576536a83336 SHA256 4ab80f8c4272eeed85fb13db31a5f8e5521d1e24402d4caab260e879059edeb3
+MD5 6bba0f8217658432c2c3ff50902bbcd7 conary-2.0.4.ebuild 775
+RMD160 28e1014d25798a5836d554677ffe40b14d7ecb64 conary-2.0.4.ebuild 775
+SHA256 4ab80f8c4272eeed85fb13db31a5f8e5521d1e24402d4caab260e879059edeb3 conary-2.0.4.ebuild 775
 MISC ChangeLog 2391 RMD160 a31baf216a547955d11c62ffe770f5b6456d7a0a SHA1 2f8db4f42cd82c77e2a197c8f99e1580722ecf22 SHA256 c6b87ea07bbde78c9e9000c9c1c5997912f89075020f07dac68442f52de1f56f
 MD5 54dc6f773d2270b1328f7a7fb626deb2 ChangeLog 2391
 RMD160 a31baf216a547955d11c62ffe770f5b6456d7a0a ChangeLog 2391
@@ -21,12 +21,12 @@ MISC metadata.xml 220 RMD160 cfa813a6c82c862e98387c45f3012fe36f8c9ed1 SHA1 2595c
 MD5 93e92735c196a837090a7e34740b68d8 metadata.xml 220
 RMD160 cfa813a6c82c862e98387c45f3012fe36f8c9ed1 metadata.xml 220
 SHA256 83157f032b557bf0087bc7745dce7735ddee44d4b691f24c77a7fcf64908392b metadata.xml 220
-MD5 e5090d57e5c8eb7190fecab5c01454ce files/digest-conary-1.1.18 244
-RMD160 4d08f01ab1780d40097d5cee4c89654ac8443d46 files/digest-conary-1.1.18 244
-SHA256 e4abb8ae4c28a8cd0720aef505cf296a1be0964a9c7fcd8a1ef53494fd4ad8a8 files/digest-conary-1.1.18 244
-MD5 e951567219c2dd79c29c251ad52ff039 files/digest-conary-1.1.22 244
-RMD160 4c0f8fb99689c93c770d5831c23323a0f967dd1d files/digest-conary-1.1.22 244
-SHA256 c9fcbfabcc8aca4d97a916c24e67b258ee80c0398429b518a05f87ea5915f0bd files/digest-conary-1.1.22 244
 MD5 8435358ae105884ac0de0699daf61cec files/digest-conary-1.1.26 244
 RMD160 9bab3e90fd0e46403d6facae1c163f0694739033 files/digest-conary-1.1.26 244
 SHA256 677e5a327735adfdef93322939bdddfa70329e0f324caba15f1dedd7d26bd49e files/digest-conary-1.1.26 244
+MD5 3d48e3df3c92c7e7e948635f89f4f08d files/digest-conary-1.2.15 244
+RMD160 03f0ce38800e29390c5962a94d3ba9b7b4af5420 files/digest-conary-1.2.15 244
+SHA256 5ce9cdf7bf8523cc0e2d8c6aa6a28df4b3752ca1f2ebb76877472f9a03b86b35 files/digest-conary-1.2.15 244
+MD5 e548f83829802bdbb9feed42c79ad0f4 files/digest-conary-2.0.4 241
+RMD160 88af4109f41817979a977b85d85dc98d1035241f files/digest-conary-2.0.4 241
+SHA256 8353060344f45d907a13c9561fbe338e841a8a4c164f2e3651f749c7a7858d6b files/digest-conary-2.0.4 241
diff --git a/app-admin/conary/conary-1.1.26.ebuild b/app-admin/conary/conary-1.1.26.ebuild
index 0edd47280c91..0ca30bffa8cd 100644
--- a/app-admin/conary/conary-1.1.26.ebuild
+++ b/app-admin/conary/conary-1.1.26.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2006-2007 Gentoo Foundation
+# 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.26.ebuild,v 1.1 2007/05/23 14:46:05 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/conary-1.1.26.ebuild,v 1.2 2008/01/23 20:47:53 smithj Exp $
 
 DESCRIPTION="repository-based system management and package-building tool"
 HOMEPAGE="http://wiki.rpath.com/wiki/Conary"
@@ -25,6 +25,6 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install
-	dodoc LICENSE NEWS conary/ScanDeps/README conary/pysqlite3/{LICENSE,README}
+	make DESTDIR="${D}" install
+	dodoc NEWS conary/ScanDeps/README conary/pysqlite3/README
 }
diff --git a/app-admin/conary/conary-1.1.18.ebuild b/app-admin/conary/conary-1.2.15.ebuild
index 250a54b518f7..dc86f287cfcf 100644
--- a/app-admin/conary/conary-1.1.18.ebuild
+++ b/app-admin/conary/conary-1.2.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2006-2007 Gentoo Foundation
+# 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.18.ebuild,v 1.1 2007/03/13 19:05:10 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/conary-1.2.15.ebuild,v 1.1 2008/01/23 20:47:53 smithj Exp $
 
 DESCRIPTION="repository-based system management and package-building tool"
 HOMEPAGE="http://wiki.rpath.com/wiki/Conary"
@@ -25,6 +25,6 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install
-	dodoc LICENSE NEWS conary/ScanDeps/README conary/pysqlite3/{LICENSE,README}
+	make DESTDIR="${D}" install
+	dodoc NEWS conary/ScanDeps/README conary/pysqlite3/README
 }
diff --git a/app-admin/conary/conary-1.1.22.ebuild b/app-admin/conary/conary-2.0.4.ebuild
index 1238b60bafd6..47a6d3f95d46 100644
--- a/app-admin/conary/conary-1.1.22.ebuild
+++ b/app-admin/conary/conary-2.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2006-2007 Gentoo Foundation
+# 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.22.ebuild,v 1.1 2007/04/24 21:22:54 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/conary-2.0.4.ebuild,v 1.1 2008/01/23 20:47:53 smithj Exp $
 
 DESCRIPTION="repository-based system management and package-building tool"
 HOMEPAGE="http://wiki.rpath.com/wiki/Conary"
@@ -25,6 +25,6 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install
-	dodoc LICENSE NEWS conary/ScanDeps/README conary/pysqlite3/{LICENSE,README}
+	make DESTDIR="${D}" install
+	dodoc NEWS conary/ScanDeps/README conary/pysqlite3/README
 }
diff --git a/app-admin/conary/files/digest-conary-1.1.18 b/app-admin/conary/files/digest-conary-1.1.18
deleted file mode 100644
index e31007b5e815..000000000000
--- a/app-admin/conary/files/digest-conary-1.1.18
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1bdb8355fa488816531b8b666747fc49 conary-1.1.18.tar.bz2 747816
-RMD160 decfa3734e12ed945e8504da50767975ce5a3458 conary-1.1.18.tar.bz2 747816
-SHA256 bca7abfccb536827d068f16d81670f72461ff2b09dd917dcb736f4bec82270f5 conary-1.1.18.tar.bz2 747816
diff --git a/app-admin/conary/files/digest-conary-1.1.22 b/app-admin/conary/files/digest-conary-1.1.22
deleted file mode 100644
index 76001caaefab..000000000000
--- a/app-admin/conary/files/digest-conary-1.1.22
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c9cd71c6f54a69d226ae38d366b1a756 conary-1.1.22.tar.bz2 763851
-RMD160 8ddecd6c7be827ea4ace949fcf48f20eb9c75e77 conary-1.1.22.tar.bz2 763851
-SHA256 a6b6d8ebbb50d35972b86e617c3139217a7c2a65c2b7c544385af5634b16bef8 conary-1.1.22.tar.bz2 763851
diff --git a/app-admin/conary/files/digest-conary-1.2.15 b/app-admin/conary/files/digest-conary-1.2.15
new file mode 100644
index 000000000000..89a0f46d7c6b
--- /dev/null
+++ b/app-admin/conary/files/digest-conary-1.2.15
@@ -0,0 +1,3 @@
+MD5 2eb5eb57d2d68c92608286fcc0add8fd conary-1.2.15.tar.bz2 899745
+RMD160 add8035ed7cfd4b87e2866c767a6ecfd88164a4d conary-1.2.15.tar.bz2 899745
+SHA256 b9bc0bcd7667a2c298e53f6d1e0cd50619933895527ce55c7fa1580de9673755 conary-1.2.15.tar.bz2 899745
diff --git a/app-admin/conary/files/digest-conary-2.0.4 b/app-admin/conary/files/digest-conary-2.0.4
new file mode 100644
index 000000000000..382d2dcec07b
--- /dev/null
+++ b/app-admin/conary/files/digest-conary-2.0.4
@@ -0,0 +1,3 @@
+MD5 5f9c38282cc01545bd42cfa2ddc8f545 conary-2.0.4.tar.bz2 920044
+RMD160 6b3e89c8cbbfad66adbcfa8c10e15ba7394dc38f conary-2.0.4.tar.bz2 920044
+SHA256 0569b14f36b9b0b45f6d7a2a28e77589f54db342d98a1436caaf3ba0d287dd7c conary-2.0.4.tar.bz2 920044