Merge from Prefix

Package-Manager: portage-2.2.00.14552-prefix/cvs/Darwin powerpc
RepoMan-Options: --force

4 files changed, 12 insertions, 8 deletions

diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog
index 1bbfc311227a..1e87bdcf60b2 100644
--- a/dev-python/docutils/ChangeLog
+++ b/dev-python/docutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/docutils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.96 2009/10/07 18:10:12 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.97 2009/10/10 15:36:10 grobian Exp $
+
+  10 Oct 2009; Fabian Groffen <grobian@gentoo.org> docutils-0.5-r1.ebuild,
+  docutils-0.6_pre6148.ebuild:
+  Merge from Prefix
 
   07 Oct 2009; nixnut <nixnut@gentoo.org> docutils-0.5-r1.ebuild:
   ppc stable #287642
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 34da4b1d5a15..f4045271f4bd 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -4,8 +4,8 @@ AUX docutils-0.6-extra_modules.patch 828 RMD160 d17b6dec432f879e6d387c20f87a207e
 DIST docutils-0.5.tar.gz 1271981 RMD160 3e8dfd2923528bbeac0ca33ccfe6f576c74f1886 SHA1 70ca2dd94969ddf76217e5fe907b0b23f16cc199 SHA256 747cf984edfca0575addbb42453274a1bdd98ec7780bd37a883dc8b2a66a610e
 DIST docutils-0.6_pre6148.tar.bz2 1226155 RMD160 fbcd066dfba917f69a08a861a7eb0fdd8628688a SHA1 9b6b35482b9fa58ffc6f704e82565a23440b45f2 SHA256 1af80ead516a854142de29e5a49fae063aa83fdd5d8bb7d16c2f355c36f03709
 DIST glep-0.4-r1.tbz2 4667 RMD160 bea44f2fe567422fd42bedebdf04cb6d984478ae SHA1 123516118f8bb2c75296a125702f4bf8f3ff1959 SHA256 d0b421869fb3437e96484687fd57f34d4f5cdd5a1fbdb2314f1474b1f9afa058
-EBUILD docutils-0.5-r1.ebuild 3166 RMD160 bfe69f81706c0b78e34ebe56c2d12468bdf2633e SHA1 0cd01fa59e4cb5a7bd78b59f8b8fcf8f86e10827 SHA256 4c773c7ffc6d3f6d7e20c24b2a7c65f7f68512b8175ed7f5dd594f8618110c5b
+EBUILD docutils-0.5-r1.ebuild 3241 RMD160 49425732e811cbfd482554eddf6af0d26b5ab71b SHA1 f644827d4e897fff7178d0ad92534f38ecff7ebe SHA256 a14785d138fce55e7eff15e26edf218c62e3c63dcd9ad4ddbe17229e6901b038
 EBUILD docutils-0.5.ebuild 2874 RMD160 555494f496bc1138bdea9aa33af43f3062131fbf SHA1 3d7133f6f24e8c280208de5c7aa3fe62f1668fab SHA256 8ca2a5e9b4b30e51d970af183d945547dad4bd0b166766dd4a326bf2540c8bc7
-EBUILD docutils-0.6_pre6148.ebuild 3463 RMD160 060eb497acb55c61ed17a461976eb407cd14743b SHA1 870974a6bf7d8b4064811d1f60fce2f6b1ac5b15 SHA256 a788b2004c0bdcd5eac7074fd52e6c2be3acd1b57c525ae60589b728b440021b
-MISC ChangeLog 14382 RMD160 c8f9c782c36ed60d8e324f79e7e00938542acf93 SHA1 20507c0f7eada881c2a5622bdb699b40e2d4cbe3 SHA256 94d24fd6fdcc8b2db8033b4853ce8e0586a2b71bd5753bcd33e261e17ec01426
+EBUILD docutils-0.6_pre6148.ebuild 3536 RMD160 65c9a8493d163165a5902cbbe2516215c189fa17 SHA1 742e515385b716347bdc835ee86a7f1140ce74d1 SHA256 34e80f16b6b530d63a6cdf8e27c8843cbf6ca5fcc8c5b292d4f5c07efb787bb1
+MISC ChangeLog 14510 RMD160 448cbde00db369dd2fadbf74d9bf6ad11f71dcdd SHA1 17a8aaf22c679448d3258a0367535219d42637bb SHA256 60791daef86b477407feb7ca7d471b9603f04681b464704e6d9add2527e3672a
 MISC metadata.xml 224 RMD160 37a2cf5db0ab817c0e2a1127e9cc4278bf88c904 SHA1 e2c1b45b839624cbc4bd949c8458d50dec01e7cb SHA256 0bb6bfd1577f4800009497c7813935f712ae6a44dbbdec1a903e79eaa5f21755
diff --git a/dev-python/docutils/docutils-0.5-r1.ebuild b/dev-python/docutils/docutils-0.5-r1.ebuild
index 099316d08fad..80fe29f0d627 100644
--- a/dev-python/docutils/docutils-0.5-r1.ebuild
+++ b/dev-python/docutils/docutils-0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.5-r1.ebuild,v 1.3 2009/10/07 18:10:12 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.5-r1.ebuild,v 1.4 2009/10/10 15:36:10 grobian Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/docutils/${P}.tar.gz
 
 LICENSE="public-domain PYTHON BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="glep emacs"
 
 DEPEND="dev-python/setuptools"
diff --git a/dev-python/docutils/docutils-0.6_pre6148.ebuild b/dev-python/docutils/docutils-0.6_pre6148.ebuild
index 8b41034a2f97..9ff63cbec682 100644
--- a/dev-python/docutils/docutils-0.6_pre6148.ebuild
+++ b/dev-python/docutils/docutils-0.6_pre6148.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.6_pre6148.ebuild,v 1.1 2009/10/01 22:47:22 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.6_pre6148.ebuild,v 1.2 2009/10/10 15:36:10 grobian Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="public-domain PYTHON BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="glep emacs"
 
 DEPEND="dev-python/setuptools"