dev-python/sphinx: Version Bump

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

3 files changed, 22 insertions, 17 deletions

diff --git a/dev-python/sphinx/ChangeLog b/dev-python/sphinx/ChangeLog
index 8cc284abdcdb..8a23f7e7f201 100644
--- a/dev-python/sphinx/ChangeLog
+++ b/dev-python/sphinx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/sphinx
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.157 2013/09/05 18:46:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.158 2013/12/12 09:24:51 jlec Exp $
+
+*sphinx-1.2 (12 Dec 2013)
+
+  12 Dec 2013; Justin Lecher <jlec@gentoo.org> -sphinx-1.2_pre20130530.ebuild,
+  +sphinx-1.2.ebuild, metadata.xml:
+  Version Bump
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> sphinx-1.1.3-r5.ebuild,
   sphinx-1.1.3-r6.ebuild, sphinx-1.1.3-r7.ebuild, sphinx-1.2_pre20130530.ebuild:
diff --git a/dev-python/sphinx/metadata.xml b/dev-python/sphinx/metadata.xml
index 2026f11e2492..647e8ec840ab 100644
--- a/dev-python/sphinx/metadata.xml
+++ b/dev-python/sphinx/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<longdescription lang="en">Sphinx is a tool to create documentation for Python projects (or
+  <herd>python</herd>
+  <longdescription lang="en">Sphinx is a tool to create documentation for Python projects (or
     other documents consisting of multiple reStructuredText sources).</longdescription>
-	<upstream>
-		<remote-id type="pypi">Sphinx</remote-id>
-	</upstream>
+  <upstream>
+    <remote-id type="pypi">Sphinx</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinx/sphinx-1.2_pre20130530.ebuild b/dev-python/sphinx/sphinx-1.2.ebuild
index e32d25305bf1..aa15e813e3ee 100644
--- a/dev-python/sphinx/sphinx-1.2_pre20130530.ebuild
+++ b/dev-python/sphinx/sphinx-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.2_pre20130530.ebuild,v 1.2 2013/09/05 18:46:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.2.ebuild,v 1.1 2013/12/12 09:24:51 jlec Exp $
 
 EAPI=5
 
@@ -8,22 +8,21 @@ PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 eutils versionator
 
-MY_PN=Sphinx
-MY_P=${MY_PN}-${PV}
+MY_PN="Sphinx"
+MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Python documentation generator"
 HOMEPAGE="http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx"
-
-SRC_URI="http://dev.gentoo.org/~xarthisius/distfiles/${MY_P}.tar.xz"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc latex test"
 
 # Split the jinja dep to allow different slots to satisfy it
-RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/docutils-0.7[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.3[$(python_gen_usedep python{2_5,3_1,3_2})]
 	>=dev-python/jinja-2.3[$(python_gen_usedep python{2_6,2_7,3_3} 'pypy*')]
 	>=dev-python/pygments-1.2[${PYTHON_USEDEP}]
@@ -35,7 +34,7 @@ RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}]
 DEPEND="${DEPEND}
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 python_compile() {
 	distutils-r1_python_compile
@@ -56,11 +55,11 @@ python_compile_all() {
 python_test() {
 	cp -r -l tests "${BUILD_DIR}"/ || die
 
-	if [[ ${EPYTHON} == python3* ]]; then
+	if $(python_is_python3); then
 		2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
 	fi
 
-	nosetests -w "${BUILD_DIR}"/tests \
+	nosetests -w "${BUILD_DIR}"/tests -v \
 		|| die "Tests fail with ${EPYTHON}"
 }