Be sure we block >=vim-core-7, fixes bug #131276.

Package-Manager: portage-2.1.2_pre1

9 files changed, 65 insertions, 49 deletions

diff --git a/app-vim/autoalign/ChangeLog b/app-vim/autoalign/ChangeLog
index 0ca40e3aee57..68d1dceaddc7 100644
--- a/app-vim/autoalign/ChangeLog
+++ b/app-vim/autoalign/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-vim/autoalign
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/autoalign/ChangeLog,v 1.19 2006/04/07 22:17:36 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/autoalign/ChangeLog,v 1.20 2006/09/19 13:42:04 pioto Exp $
+
+  19 Sep 2006; Mike Kelly <pioto@pioto.org> autoalign-4.ebuild,
+  autoalign-5.ebuild, autoalign-6.ebuild, autoalign-8.ebuild:
+  Be sure we block >=vim-core-7, fixes bug #131276.
 
   07 Apr 2006; Bryan Østergaard <kloeri@gentoo.org metadata.xml:
   Remove ciaranm from metadata.xml.
diff --git a/app-vim/autoalign/Manifest b/app-vim/autoalign/Manifest
index e4827f476a63..5faa6c13e852 100644
--- a/app-vim/autoalign/Manifest
+++ b/app-vim/autoalign/Manifest
@@ -1,46 +1,48 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c1a7d3f6ee9644bdc60389ab9ce77c91 ChangeLog 2022
-RMD160 ab64a60d49a9c78c891beff77ace143ca30012c3 ChangeLog 2022
-SHA256 88189d2949971bb70c4db96385cbf5fd015afdb8acfb2cb4dfa4b200e85b15d6 ChangeLog 2022
+DIST autoalign-11.tar.bz2 9482 RMD160 241dca1850d2e0d53916f4b0a44c6560b309edd5 SHA1 376a1f513b07d34e61592d48237906c64431346d SHA256 cd2b281329125a15321bfa6fd4e532d00706acf88ee8f6dc284cf6ea6217d870
+DIST autoalign-4.tar.bz2 4361 RMD160 2ceaef80a15decafe2ec5626caafe0eb6cd6e305 SHA1 414705cc580b73d4bd73cf1315509b921d8a925d SHA256 6d5178c6706ce12a484a6d0fcba7530931d40d9433bb9e7f4cfbc659d30aaf70
+DIST autoalign-5.tar.bz2 6021 RMD160 378bfc2c0465418b6a9e3ebb715af2437b5b6a25 SHA1 e94cb64daf6c2d152c75311ebc52d2d5c997cb8b SHA256 8c5985c4c5a8c7707160064b0774c0dcf2778055074c3880fb10cb9995e12410
+DIST autoalign-6.tar.bz2 5622 RMD160 1d99fe71321bb8dd7c0c4b6faa906710db7fb231 SHA1 209e2895326090e3a19e856d3994e7279459f5eb SHA256 abb086db1b3e87d42ec0d008874710e1c1143604f881b63c12a4985fda1c8ca0
+DIST autoalign-8.tar.bz2 8903 RMD160 c5bc4037b6adca62a76c335210a8e1e8af8a6060 SHA1 6bbf5b600123fba1d26e73eb0454094f43b0c3d3 SHA256 e675ccf03806e857632e67a146fa0d5294ac9733b4f6c29ec8bd05a1950c9ead
+EBUILD autoalign-11.ebuild 741 RMD160 525008e0073b57d5b46e4dbfa18ddd1c00cce08b SHA1 854c8e8389f3ac355bb61a2f311fea5e6f847604 SHA256 0fc91bed2c0128d7408fe470aba7e69089fc36004856193df52726b8519b5f6d
 MD5 190df5f27302affa9e321498b70d76f2 autoalign-11.ebuild 741
 RMD160 525008e0073b57d5b46e4dbfa18ddd1c00cce08b autoalign-11.ebuild 741
 SHA256 0fc91bed2c0128d7408fe470aba7e69089fc36004856193df52726b8519b5f6d autoalign-11.ebuild 741
-MD5 3fa04266c676725a3094c74398b33aac autoalign-4.ebuild 921
-RMD160 b05d71292a4bd2ca7dab6c70fdd4f7906dd8ed73 autoalign-4.ebuild 921
-SHA256 0bd6bf67a8a237d3a3bec48b9b86bca3d86375cba55e962f86fc5dbc8ef20245 autoalign-4.ebuild 921
-MD5 61076fac8d5812d5ba694ebabb6197b1 autoalign-5.ebuild 899
-RMD160 4015c16f689cbe8c61263529d76e579f0824664a autoalign-5.ebuild 899
-SHA256 7023ed0285b0d2dd17c19f62b9736a48870536735c3cc8e31bb226f52c7bcbd1 autoalign-5.ebuild 899
-MD5 6d2c9c69c5169a5990cd841475abc87f autoalign-6.ebuild 740
-RMD160 8c930956b46f26e57263fcb1bb71ce361cfc1cb4 autoalign-6.ebuild 740
-SHA256 b326b5da7aabd173e67b6a60c91d2769303436783c5919f1f531939e29409a72 autoalign-6.ebuild 740
-MD5 fce5547266bc48be9c73c7d755108c3d autoalign-8.ebuild 898
-RMD160 591ace84b3b857098fed7ef3db38a032f3523676 autoalign-8.ebuild 898
-SHA256 4b25753584b10375069a2f09ef33363da5688ce4fcc7c18a3abe13190de2b444 autoalign-8.ebuild 898
+EBUILD autoalign-4.ebuild 945 RMD160 353c1f3174578239652bfff0caed68b0c5a1484d SHA1 c03b24c1bcec38f07b6fec64a76542e367619747 SHA256 725e8a2f5197620d5d2b9cd066cb22455f59e2c3a4a433612b9be5ae03744c2e
+MD5 fda858e582df4abc07c06fd4923d1064 autoalign-4.ebuild 945
+RMD160 353c1f3174578239652bfff0caed68b0c5a1484d autoalign-4.ebuild 945
+SHA256 725e8a2f5197620d5d2b9cd066cb22455f59e2c3a4a433612b9be5ae03744c2e autoalign-4.ebuild 945
+EBUILD autoalign-5.ebuild 925 RMD160 9590808fd533b915489d3e8da6cedc7e8eda8c78 SHA1 ef7af88ce76f886db8d90e7450353f4f1b07e70f SHA256 2cd0a93e9afbc2d4d2ce01ef2eeffafeea5d865ea2a1c8e1505bb78af7a873a7
+MD5 616c8d0295f78a44a4e2acc07ee57670 autoalign-5.ebuild 925
+RMD160 9590808fd533b915489d3e8da6cedc7e8eda8c78 autoalign-5.ebuild 925
+SHA256 2cd0a93e9afbc2d4d2ce01ef2eeffafeea5d865ea2a1c8e1505bb78af7a873a7 autoalign-5.ebuild 925
+EBUILD autoalign-6.ebuild 765 RMD160 01b794fb9ca1b3ed68fac4c6de76544009ad8f09 SHA1 47e8075c0190615bb664a68e41c0e360a968401b SHA256 9a4e109f62fd528970cdd1e3d47d321e924391d8cedf4ac3e3650c9bee6fd0d3
+MD5 9292f960773caaf28660a12755dcb425 autoalign-6.ebuild 765
+RMD160 01b794fb9ca1b3ed68fac4c6de76544009ad8f09 autoalign-6.ebuild 765
+SHA256 9a4e109f62fd528970cdd1e3d47d321e924391d8cedf4ac3e3650c9bee6fd0d3 autoalign-6.ebuild 765
+EBUILD autoalign-8.ebuild 923 RMD160 d1531fa824513cd7b29e1e654e09a7fb31c49632 SHA1 3956c0a8d4e5af0f6ab884040ff4547fb392a20e SHA256 2a81f7001024f2d1ec37a2c0645c87bde512d8c7e17290c32d58b902aeca1b22
+MD5 c7f387a10b2562e49fac05d3d8b9d8f2 autoalign-8.ebuild 923
+RMD160 d1531fa824513cd7b29e1e654e09a7fb31c49632 autoalign-8.ebuild 923
+SHA256 2a81f7001024f2d1ec37a2c0645c87bde512d8c7e17290c32d58b902aeca1b22 autoalign-8.ebuild 923
+MISC ChangeLog 2200 RMD160 1237a178675164469e27ac73c04e709fdcc9057a SHA1 b0ac4ae45e101170e57b4420e6ad176d194bbc5a SHA256 30c0a69cbb4cc61687227f81d5c59af314baac8d4c09ab9021654c8519203f66
+MD5 0cc22e721d947abb44d7fe372fa5b629 ChangeLog 2200
+RMD160 1237a178675164469e27ac73c04e709fdcc9057a ChangeLog 2200
+SHA256 30c0a69cbb4cc61687227f81d5c59af314baac8d4c09ab9021654c8519203f66 ChangeLog 2200
+MISC metadata.xml 157 RMD160 adcd6494e1e562ab5e0bd090e114622782ac753a SHA1 22983b8e9ba3045d8ccbc2b14393423f7f05d2ee SHA256 106c8618581360c66c2b535fcb7a6cb9ff318f1bd8e6c8f40f2f2f2d54e6787a
+MD5 03408b23ff38d83b09d299387892f54d metadata.xml 157
+RMD160 adcd6494e1e562ab5e0bd090e114622782ac753a metadata.xml 157
+SHA256 106c8618581360c66c2b535fcb7a6cb9ff318f1bd8e6c8f40f2f2f2d54e6787a metadata.xml 157
 MD5 3ebdb6d138063120100259c74c19d5d7 files/digest-autoalign-11 235
 RMD160 5f0de6d9ab5bb53c14153845f91def0cd1ba49fa files/digest-autoalign-11 235
 SHA256 c5206c943448e8845c3f768c00b682b968f94d9a8bff9effd218172dd920f2c4 files/digest-autoalign-11 235
-MD5 931c96309def683365ce69bb7cba0cf7 files/digest-autoalign-4 62
-RMD160 ffec5399982abd06416427746a7043ca628894a8 files/digest-autoalign-4 62
-SHA256 02ba3fadd0dc608cf24a7b1b26cd0d56a011221bea925071a213d1d529ad4576 files/digest-autoalign-4 62
-MD5 d41c0ff11e949099cc8200a23b68075e files/digest-autoalign-5 62
-RMD160 122edf646f233cd7120ca72315118e3b16237ba1 files/digest-autoalign-5 62
-SHA256 8c0800f9e4c9ba80ebe60ea2fdad16de61935806a8673d93e0205240ac455c83 files/digest-autoalign-5 62
-MD5 4f1b773c0c2ab59a20f6bfff02869705 files/digest-autoalign-6 62
-RMD160 f7aafc900242f2580e5cf2aeafe8c1d821ddea1f files/digest-autoalign-6 62
-SHA256 bc38ce769e90e920d8ad6017437144c53c8668ca8ac6d5ff8013c06160bf2f04 files/digest-autoalign-6 62
+MD5 912ef0f35224fd3699f9cfaf9bbac0d3 files/digest-autoalign-4 232
+RMD160 31d4edbcc683472d96d9bf0dfc3cc34ddce82826 files/digest-autoalign-4 232
+SHA256 e7111feb0c6e4f45ac292099224880ce0292bf3fa0d1f17b92113110ddb593e2 files/digest-autoalign-4 232
+MD5 5f752bb60bdcd86934c2a548e3910f50 files/digest-autoalign-5 232
+RMD160 4b80c72e2db5fb717c845887abddabdb745b2e40 files/digest-autoalign-5 232
+SHA256 095fbe78708e065b38ddcda8e3d271a4b5d81676cf2ac20ad7fd5170f942daf1 files/digest-autoalign-5 232
+MD5 9f9b45560a689947def052eff2c23ff4 files/digest-autoalign-6 232
+RMD160 f60c7b81b9e1fe39150cf664ed1a629c736584b8 files/digest-autoalign-6 232
+SHA256 d7dc77cd165a5b4ac3fe365c06944d55b6f2a29ff1ecf4ea4459d9a3dd453aa2 files/digest-autoalign-6 232
 MD5 ddb6b459a3667da57f48e896498b6097 files/digest-autoalign-8 232
 RMD160 56184697762dbdcebf84ce919b46073546b60b48 files/digest-autoalign-8 232
 SHA256 689a8fa0ac4c488613c603106c49b7d2885bc43a4db7211f2e8956f5e185316b files/digest-autoalign-8 232
-MD5 03408b23ff38d83b09d299387892f54d metadata.xml 157
-RMD160 adcd6494e1e562ab5e0bd090e114622782ac753a metadata.xml 157
-SHA256 106c8618581360c66c2b535fcb7a6cb9ff318f1bd8e6c8f40f2f2f2d54e6787a metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFENuUOugEuf3OQ0akRAk2sAKCetPfkPaWrYpQ4SmIb8yqkjEjqRwCgl0ja
-2C50SBQBvGp6tRu1Bzcr2fI=
-=aiVD
------END PGP SIGNATURE-----
diff --git a/app-vim/autoalign/autoalign-4.ebuild b/app-vim/autoalign/autoalign-4.ebuild
index 082b1b4a3f90..cc16170492ff 100644
--- a/app-vim/autoalign/autoalign-4.ebuild
+++ b/app-vim/autoalign/autoalign-4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/autoalign/autoalign-4.ebuild,v 1.8 2005/02/22 22:59:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/autoalign/autoalign-4.ebuild,v 1.9 2006/09/19 13:42:04 pioto Exp $
 
 inherit vim-plugin
 
@@ -11,7 +11,8 @@ KEYWORDS="x86 sparc mips ~ppc amd64 alpha ia64"
 IUSE=""
 
 RDEPEND=">=app-vim/align-28
-	>=app-vim/cecutil-3"
+	>=app-vim/cecutil-3
+	!>=app-editors/vim-core-7"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-vim/autoalign/autoalign-5.ebuild b/app-vim/autoalign/autoalign-5.ebuild
index 8f63389db1d6..922bc00c8ee9 100644
--- a/app-vim/autoalign/autoalign-5.ebuild
+++ b/app-vim/autoalign/autoalign-5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/autoalign/autoalign-5.ebuild,v 1.7 2005/06/05 12:10:38 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/autoalign/autoalign-5.ebuild,v 1.8 2006/09/19 13:42:04 pioto Exp $
 
 inherit vim-plugin
 
@@ -11,7 +11,8 @@ KEYWORDS="alpha amd64 ia64 mips ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=app-vim/align-30
-	>=app-vim/cecutil-4"
+	>=app-vim/cecutil-4
+	!>=app-editors/vim-core-7"
 
 VIM_PLUGIN_HELPFILES="autoalign"
 
diff --git a/app-vim/autoalign/autoalign-6.ebuild b/app-vim/autoalign/autoalign-6.ebuild
index 7b8b29dc8d93..96d640611913 100644
--- a/app-vim/autoalign/autoalign-6.ebuild
+++ b/app-vim/autoalign/autoalign-6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/autoalign/autoalign-6.ebuild,v 1.1 2005/10/20 16:58:20 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/autoalign/autoalign-6.ebuild,v 1.2 2006/09/19 13:42:04 pioto Exp $
 
 inherit vim-plugin
 
@@ -11,7 +11,8 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=app-vim/align-30
-	>=app-vim/cecutil-4"
+	>=app-vim/cecutil-4
+	!>=app-editors/vim-core-7"
 
 VIM_PLUGIN_HELPFILES="autoalign"
 VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/autoalign/autoalign-8.ebuild b/app-vim/autoalign/autoalign-8.ebuild
index e017f8a249c1..d9ce58a24858 100644
--- a/app-vim/autoalign/autoalign-8.ebuild
+++ b/app-vim/autoalign/autoalign-8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/autoalign/autoalign-8.ebuild,v 1.1 2006/02/11 03:08:19 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/autoalign/autoalign-8.ebuild,v 1.2 2006/09/19 13:42:04 pioto Exp $
 
 inherit vim-plugin
 
@@ -11,7 +11,8 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=app-vim/align-30
-	>=app-vim/cecutil-4"
+	>=app-vim/cecutil-4
+	!>=app-editors/vim-core-7"
 
 VIM_PLUGIN_HELPFILES="autoalign"
 VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/autoalign/files/digest-autoalign-4 b/app-vim/autoalign/files/digest-autoalign-4
index 030b122917fd..4c4c40f3f5d0 100644
--- a/app-vim/autoalign/files/digest-autoalign-4
+++ b/app-vim/autoalign/files/digest-autoalign-4
@@ -1 +1,3 @@
 MD5 0d2eb692a81f022176ed934083769486 autoalign-4.tar.bz2 4361
+RMD160 2ceaef80a15decafe2ec5626caafe0eb6cd6e305 autoalign-4.tar.bz2 4361
+SHA256 6d5178c6706ce12a484a6d0fcba7530931d40d9433bb9e7f4cfbc659d30aaf70 autoalign-4.tar.bz2 4361
diff --git a/app-vim/autoalign/files/digest-autoalign-5 b/app-vim/autoalign/files/digest-autoalign-5
index cc13273dfc4c..3f11d9bacef9 100644
--- a/app-vim/autoalign/files/digest-autoalign-5
+++ b/app-vim/autoalign/files/digest-autoalign-5
@@ -1 +1,3 @@
 MD5 48c6af34daf64975e5c0b830a1fe4f10 autoalign-5.tar.bz2 6021
+RMD160 378bfc2c0465418b6a9e3ebb715af2437b5b6a25 autoalign-5.tar.bz2 6021
+SHA256 8c5985c4c5a8c7707160064b0774c0dcf2778055074c3880fb10cb9995e12410 autoalign-5.tar.bz2 6021
diff --git a/app-vim/autoalign/files/digest-autoalign-6 b/app-vim/autoalign/files/digest-autoalign-6
index bdedd91d71dd..25ebd3e10482 100644
--- a/app-vim/autoalign/files/digest-autoalign-6
+++ b/app-vim/autoalign/files/digest-autoalign-6
@@ -1 +1,3 @@
 MD5 96946cacce7d8e30894a3086945b8de1 autoalign-6.tar.bz2 5622
+RMD160 1d99fe71321bb8dd7c0c4b6faa906710db7fb231 autoalign-6.tar.bz2 5622
+SHA256 abb086db1b3e87d42ec0d008874710e1c1143604f881b63c12a4985fda1c8ca0 autoalign-6.tar.bz2 5622