Synchronize with ebuild from Progress Overlay. Patch by Arfrever. Drop amd64-fbsd keyword due to dependency on dev-python/pygments.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

3 files changed, 22 insertions, 21 deletions

diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog
index 2be12e07495d..a5655351e47b 100644
--- a/dev-python/docutils/ChangeLog
+++ b/dev-python/docutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/docutils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.151 2012/05/08 21:48:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.152 2012/05/08 23:29:42 floppym Exp $
+
+  08 May 2012; Mike Gilbert <floppym@gentoo.org> docutils-0.9.ebuild:
+  Synchronize with ebuild from Progress Overlay. Patch by Arfrever. Drop
+  amd64-fbsd keyword due to dependency on dev-python/pygments.
 
   08 May 2012; Mike Gilbert <floppym@gentoo.org> docutils-0.9.ebuild:
   Remove obsolete comment.
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 9710174f6e4f..f9e2d5ec3f70 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -9,13 +9,13 @@ DIST docutils-0.8.1.tar.gz 1499832 RMD160 372abf9f47af11f0e63ae11f35f7db450097d9
 DIST docutils-0.9.tar.gz 1534138 RMD160 954e242a8d7bea889308bc4608126aa3e07f0dbb SHA1 6c5c949bc50073dc60536d54323cd94d9d3f2ed3 SHA256 ff49bf77e9135490a73740d884b418ab8b982ad16ee52cfe796d059c592ea245
 DIST glep-0.4-r1.tbz2 4667 RMD160 bea44f2fe567422fd42bedebdf04cb6d984478ae SHA1 123516118f8bb2c75296a125702f4bf8f3ff1959 SHA256 d0b421869fb3437e96484687fd57f34d4f5cdd5a1fbdb2314f1474b1f9afa058
 EBUILD docutils-0.8.1.ebuild 4480 RMD160 edccab31504d5f56d4809aa11244140998e87c23 SHA1 9b8865e195940a8290d4a902cb068331b9358db5 SHA256 8d1e170b9f201bad7e1e7095a49e0217175cdc296f73a31f0b4783f7fa6a20e8
-EBUILD docutils-0.9.ebuild 4345 RMD160 d522bb4a8b64532e1bb8bdf4d45aba8ffe87f320 SHA1 b2cd76eeba46927156927da245ce2938f1f8a385 SHA256 3ccbf8e779fdcff40e32d282cd1cfad06b6fa23e4b55f576622d28918930ba24
-MISC ChangeLog 21603 RMD160 9dced565febc1044a7dc0885ea4b9f33fd694c8e SHA1 11a9e0655cae9e9c91966394903c3ce683325162 SHA256 b76dc0f16d9665af63066f1a09aa602e2d4cde485ee556a6209b966424c1b264
+EBUILD docutils-0.9.ebuild 4089 RMD160 8ff34f3de71a542c71b5dca9499cffdbba587d88 SHA1 a698ad6682111287590956c2b3f8d850c901b102 SHA256 260b236e0ff8d28b5325dbf0422b881c75e1daaae91325d27a3ff9b28589cdb9
+MISC ChangeLog 21810 RMD160 cf12dd16daaa578b2700509ced24cc9d51d4926f SHA1 ae9202a6b6513b91a9d31bd6787299a5d47c99db SHA256 348acf189b46866ac06bf16b9d155456014d84a63fabf0bbd23d470af8c433ec
 MISC metadata.xml 224 RMD160 37a2cf5db0ab817c0e2a1127e9cc4278bf88c904 SHA1 e2c1b45b839624cbc4bd949c8458d50dec01e7cb SHA256 0bb6bfd1577f4800009497c7813935f712ae6a44dbbdec1a903e79eaa5f21755
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk+plKAACgkQC77qH+pIQ6RGOwEAkz6emaQ5AZ6Q5xCqmWmy/azS
-VB1h0iFOCs9U60CfDTgA/1pRY6VPiU7Cv4uBOoVEnBViDcVhmWWhfoJda2wSqg2U
-=nNGS
+iF4EAREIAAYFAk+prGwACgkQC77qH+pIQ6Q+NgEAocq70bsqBs0GnMPIJsCCnUrw
+WY0Q1VxVUS4XKZ8Cfg8BAJOB17MR6SPWIJTlycuVsjdMu1HujrtPNCp61EmM4Trw
+=fKXi
 -----END PGP SIGNATURE-----
diff --git a/dev-python/docutils/docutils-0.9.ebuild b/dev-python/docutils/docutils-0.9.ebuild
index ce231497edb2..ee13a95d8ac9 100644
--- a/dev-python/docutils/docutils-0.9.ebuild
+++ b/dev-python/docutils/docutils-0.9.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.9.ebuild,v 1.2 2012/05/08 21:48:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.9.ebuild,v 1.3 2012/05/08 23:29:42 floppym Exp $
 
-EAPI="3"
+EAPI="4"
 SUPPORT_PYTHON_ABIS="1"
 PYTHON_TESTS_FAILURES_TOLERANT_ABIS="*-jython"
 
-inherit distutils eutils
+inherit distutils
 
 DESCRIPTION="Docutils - Python Documentation Utilities"
 HOMEPAGE="http://docutils.sourceforge.net/ http://pypi.python.org/pypi/docutils"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 SRC_URI+=" glep? ( mirror://gentoo/glep-0.4-r1.tbz2 )"
 
-LICENSE="BSD-2 GPL-3 PSF-2 public-domain"
+LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="glep"
 
 RDEPEND="dev-python/pygments"
@@ -23,11 +23,11 @@ DEPEND="dev-python/setuptools
 		${RDEPEND}"
 
 DOCS="*.txt"
-PYTHON_MODNAME="docutils roman.py"
 
 GLEP_SRC="${WORKDIR}/glep-0.4-r1"
 
 src_prepare() {
+	distutils_src_prepare
 	sed -e "s/from distutils.core/from setuptools/" -i setup.py || die "sed setup.py failed"
 }
 
@@ -36,9 +36,6 @@ src_compile() {
 
 	# Generate html docs from reStructured text sources.
 
-	# Make roman.py available for process of building of documentation.
-	ln -s extras/roman.py
-
 	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
 	cp docutils/writers/html4css1/html4css1.css .
 
@@ -50,7 +47,7 @@ src_compile() {
 	popd > /dev/null
 
 	# Clean up after building of documentation.
-	rm roman.py html4css1.css
+	rm html4css1.css
 }
 
 src_test() {
@@ -97,16 +94,16 @@ src_install() {
 
 	# Install Gentoo GLEP tools.
 	if use glep; then
-		dobin "${GLEP_SRC}/glep.py" || die "dobin failed"
+		dobin "${GLEP_SRC}/glep.py"
 
 		installation_of_glep_tools() {
 			insinto $(python_get_sitedir)/docutils/readers
-			newins "${GLEP_SRC}/glepread.py" glep.py || die "newins reader failed"
+			newins "${GLEP_SRC}/glepread.py" glep.py
 			insinto $(python_get_sitedir)/docutils/transforms
-			newins "${GLEP_SRC}/glepstrans.py" gleps.py || die "newins transform failed"
+			newins "${GLEP_SRC}/glepstrans.py" gleps.py
 			insinto $(python_get_sitedir)/docutils/writers
-			doins -r "${GLEP_SRC}/glep_html" || die "doins writer failed"
+			doins -r "${GLEP_SRC}/glep_html"
 		}
-		python_execute_function --action-message 'Installation of GLEP tools with $(python_get_implementation_and_version)...' installation_of_glep_tools
+		python_execute_function --action-message 'Installation of GLEP tools with $(python_get_implementation_and_version)' installation_of_glep_tools
 	fi
 }