bump; tidy to deps

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 141 insertions, 20 deletions

diff --git a/dev-python/sphinx/ChangeLog b/dev-python/sphinx/ChangeLog
index 4ea55137145a..d4968181141d 100644
--- a/dev-python/sphinx/ChangeLog
+++ b/dev-python/sphinx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/sphinx
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.168 2014/10/09 08:17:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.169 2014/10/16 05:08:47 idella4 Exp $
+
+*sphinx-1.2.3 (16 Oct 2014)
+
+  16 Oct 2014; Ian Delaney <idella4@gentoo.org> +sphinx-1.2.3.ebuild,
+  sphinx-1.2.2.ebuild:
+  bump; tidy to deps
 
   09 Oct 2014; Agostino Sarubbo <ago@gentoo.org> sphinx-1.2.2.ebuild:
   Stable for amd64, wrt bug #524416
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index bedbd8a0ad28..0478a3c5f47b 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -6,25 +6,17 @@ AUX sphinx-1.1.3-python3.patch 1793 SHA256 f21f0f4f8b1f83660344b7b8c1512f853d579
 DIST Sphinx-1.1.3.tar.gz 2632059 SHA256 34dc95b70a2b07a61b5d61034c34b05f82514aab54ad27adedb49cee911bb8e9 SHA512 b8312140d752bf557c8e41728513812aff3e5d0a89af88dea9da0df21bf09c8315f13305d7a724a5596d0192b167d613065ea564c6d92e4ffb23f1f246dbf052 WHIRLPOOL a40c4d0f5c32cf1d4b9b662b0fb2b2b0956e0455abbc88d6b5f95c54f93cc2baae25e8b9196dd0b64090d30a1a796c336ca4b6866243be4198ccdf67a7e18b48
 DIST Sphinx-1.2.1.tar.gz 3135360 SHA256 182e5c81c3250e1752e744b6a35af4ef680bb6251276b49ef7d17f1d25e9ce70 SHA512 00feb7f842f1fe31ea83fb2978bf69f3c9b06a1c280a8911d282e36d5018691e6e3ba026c0a8275923b8ee6e89f4b01d5e95e26388f58d1b3b0ceac880c206b8 WHIRLPOOL 49f082984166e395e937178503caddf94aea2b235469548e46e51aef46f888af55e75af84250a723fc37cae03017cc7dea0c2b9d62fe96bb7e92a2f1a00ca0fb
 DIST Sphinx-1.2.2.tar.gz 3143671 SHA256 2d3415f5b3e6b7535877f4c84fe228bdb802a8993c239b2d02c23169d67349bd SHA512 44073c215f9d0e7f6c7bc91cb85b0508a96e5cfff5f940fef86e2fc6f11281d03b54e87e51e5a99a23e96b470a93f3af86a6a3ab7c317c747406c55b4c37791c WHIRLPOOL c5ed15b51682d3be9f8349ab838c6758cb4e25023b6ad13622d748b771594ed75f786709a25fb2d61ad245ecef0925e5bcc1aafb93fc355a0f0ea50df63efcd7
+DIST Sphinx-1.2.3.tar.gz 3200548 SHA256 94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04 SHA512 00346516e826a65145a3a7fd25ef7cee569ae7fdcc0c1bec3a7301fc08d5d8730d02eee792c3efedfcac17e712ea7e2ad70ea1fcdedc11720ad54f6bcb51ad05 WHIRLPOOL 0c0e2e21a52829893857939f977e8312c4eac11f5d2aec3b8e4f9c8ffdbf14c4aa46a6c26dac0ad4abfe92b3bdad72a3468e6d2ff2485df6efaf3fccd17ae69b
 EBUILD sphinx-1.1.3-r7.ebuild 3300 SHA256 96b66f182630ca6e169b43c357a67f1cb64568cdb5d06c20769bafa581d29e6d SHA512 8d38021941b6515e0a837675b555e6d38983b7a47abbb7efca37bbdc3293af54750d71735406c1eb128211fd3dc2c1e85536ee078f434c34fc428623906567a0 WHIRLPOOL 8709b0f108af3646878364456dab1e8fcd57b16f23adb8975e7d2cbb78d1f67d83e54b423ac0c16622ad64e1ac3b2c05c16b03e25b0c9e27656ff29e3e0ec16a
 EBUILD sphinx-1.2.1.ebuild 3204 SHA256 383d8bc96a73b0228c09a45a8031715345bcdd07ee4944ceea8dde26095b71fe SHA512 7a68fde2aa9d6d1e589f266b0a3cbb613639c7f08b3e62884e48755a93f4f2cc542af56863bd9f594fc09f24bc76659ced8c278ca47e72cf608264e586b7ed8a WHIRLPOOL d66605b891418987482b14644770554a60313a533ebeee1ac07011b09c5707208c3c533cc15a0efab71be4b6386568ce995ff5cfc3fb4e1d214a8380946da0d4
-EBUILD sphinx-1.2.2.ebuild 3259 SHA256 17a484e7b4b0f9de408949c32ca1ac18ca238ce0f524d385b66e484a5263c409 SHA512 94fa7133dd976cb659e479a9a382611ff40b152d0ce7fe45a4106d006cce484b0b09278ee3113ceb6e628fbb60de6634bcdc999324fe8de2cb24eb3b0e4827eb WHIRLPOOL 6e0c2a2d1eb0e889a8841db64cff1fe285cb95380582133d42f606bc24dc8d346b83e25fb473960c88085f86bf29350b3de91c4c69c0cc9f487944d82daa2f31
-MISC ChangeLog 20802 SHA256 cb4141df25feb392cd5dcec8b4455153a55075785fe23a31bb90c91202f7dbc1 SHA512 b9ae8ed81540b7d3860cb27e4f0344db7cfdaee54591860222844fdb6219fb52cf022662843daf06c94cff3c2d3f33feb908f5dc83d88686b1bcf9e3c18908f9 WHIRLPOOL 7b93828d2d87f5a5511bda5c9b0d4d9c92b90a627ee00c85d79de9411ca80980f92611db0598e3bb9ac85fc5b64363e743f5ddd214be4382383dd3c2c407f5a4
+EBUILD sphinx-1.2.2.ebuild 3200 SHA256 779c59da4acb17a4cbbfed509bd7627596d2a6cc0fcca1f92aca96923bf1b390 SHA512 c60fdde208c2fdc8a8a06e570ae01ffb5b4e194ea27080254406f50370eac0e80ddf5211781aea8f321f51aa68dc5bec6f0cb4bf079cf0daa3c94d085d6251f1 WHIRLPOOL 2244c9bba705a493596badbf095b2af3dd0eab127b826349ab3a0ba3b87f02f4fa7d7dacebc137e7215f1fc76c2398e5396dc52809ab44455b61ccf8dffa3e11
+EBUILD sphinx-1.2.3.ebuild 3166 SHA256 cccda96cab7817bc36fb528203c3bc2dc7e411180bec8fcd6ad0a0eb840f3c15 SHA512 59fd048f228a0d12d173d89a640b3883b769eef441f94bab1122ccfdd3af30938959f8a5fee12b0a8fdb04d5ddfb97365a5149b1038933b7aee04c9961d03db3 WHIRLPOOL cda62582c8df9f2b4b8751d65ee8a399fad3c9ccb0accee0f83e03310d2adbd0452133be32575ad3e2753cf057cd27e2b77a454c5bd931a881470ba29d126080
+MISC ChangeLog 20950 SHA256 0295587792a607f6f4a0c8072caf09fc89de9cac0b906489f77f01f1c3eb717a SHA512 31c5389e50d8cf650f4bf13f3125f77483129de16e378a92e265ae8a83a7d6b73fe470075157efebdc575f8b072dd0d65c44dfabcd807ea71e84d27f40648761 WHIRLPOOL bd8d9710ee097838a8d259bcde69f5fe75e5ddd43f3180b6b4708b1239581ad07b867eaa0b756dd05e8c4b6d06395de5405066c50561b948d91d0d74ec831b5c
 MISC metadata.xml 416 SHA256 9e9417fe86b8082263e371d1e92b98adf3ac73ed04ca0d97870423eee7110639 SHA512 68e3d7d3037dd4e2f36ff419507fe1cbe3822ab67d4e5ba9e76274d9db9ccac15d0f5479095d76758e2bc8d915493dd968742034d75ae9608ba6c88bb0db2a98 WHIRLPOOL cf811b4461bd1b39c249c82e0ce36ecdc721816fb10baca4f8f249b9bbac7908c1ec42be683850d34c099643d6d0e3a8e18969f2be12468993c8cd553177d6c2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJUNkSHAAoJELp701BxlEWfe7MP/1CFfT1ii0LyzSt0ZaNNh9HW
-McTI6JtcOLFuaJhazM94h9PCNEemqZpL+C3gk0ZQ2+GyLVVEVu520yc170gfUA40
-9SmTjffHA18sqxphL5yTLc4dQKyBcULHug34y8lnBrL/ym9Lu+41zWk/NbCGDhUK
-CBVJOJRg8k5HHhWczscJr26Z4krSCbjGVve8OBxJNBKS0UTB3/K3+z92tPA9ptB9
-/5TeBHswbdxPtEpJdt2cxdf+4Lb4Xz9Bh6r5txv8SXe/X3OPmW440oUXeuPCFbkO
-J6eV7NvFZredQbA5JckzFI+q+brWCDiKtAEYokCVRZ0omW5raBRbZNcVyugnofxx
-IW2PjLENjjzgiMieG7RlHkhx4zF0WKHN4B9xzjTQVHUl4eam4ak2IKZ8c/bCMBkB
-YzA3kia75aeYuFDtBVvomsUDDKtCG3cmZc5pM/pkh3dRdy2VEHNN3XpGrphHOeLS
-1ei6/ltiNwQFSvI65xJAw7rL+dWeFWjuUdzTUekQ43FVc2eSXykQR2cFhzZPZchP
-OrP4Q6f0Wa3EOmpo5FCPXeJv/MclonmllSnYl33aF/Ua+mg2GhQKJR1z9Z/yaw1i
-rUUpHBfprRbyVBX6opFBgECf8OiAmIE1QuTmCjDlVt1RgfsZ5ou7x0nXqJ3y4qHE
-sJH/Nq9ychE+WMvNt2fx
-=SM4Y
+iEYEAREIAAYFAlQ/Uu4ACgkQso7CE7gHKw2GhwCfdnryngFv3XqOks+NMV5Xi4d5
+pjMAn0b05MuP0oeeDA0f7dIwubvYJZ0w
+=+h/s
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sphinx/sphinx-1.2.2.ebuild b/dev-python/sphinx/sphinx-1.2.2.ebuild
index 8eafa8a96a70..848740c0a123 100644
--- a/dev-python/sphinx/sphinx-1.2.2.ebuild
+++ b/dev-python/sphinx/sphinx-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.2.2.ebuild,v 1.8 2014/10/09 08:17:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.2.2.ebuild,v 1.9 2014/10/16 05:08:47 idella4 Exp $
 
 EAPI=5
 
@@ -24,8 +24,7 @@ IUSE="doc latex test"
 # Split the jinja dep to allow different slots to satisfy it
 RDEPEND="
 	>=dev-python/docutils-0.7[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[$(python_gen_usedep python3_2)]
-	>=dev-python/jinja-2.3[$(python_gen_usedep python{2_6,2_7,3_3,3_4} 'pypy*')]
+	>=dev-python/jinja-2.3[$(python_gen_usedep python{2_7,3_3,3_4} pypy)]
 	>=dev-python/pygments-1.2[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	latex? (
diff --git a/dev-python/sphinx/sphinx-1.2.3.ebuild b/dev-python/sphinx/sphinx-1.2.3.ebuild
new file mode 100644
index 000000000000..2337810ae037
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.2.3.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.2.3.ebuild,v 1.1 2014/10/16 05:08:47 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
+
+inherit distutils-r1 eutils versionator
+
+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="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"
+IUSE="doc latex test"
+
+# Portage has only >= minimum required versions of all rdeps making
+# setting of version borders unnecessary
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		app-text/dvipng
+	)"
+DEPEND="${DEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	cd "${BUILD_DIR}"/lib || die
+	"${PYTHON}" -m sphinx.pycode.__init__ \
+		|| die "Grammar generation failed."
+}
+
+python_compile_all() {
+	use doc && emake -C doc SPHINXBUILD='"${PYTHON}" "${S}/sphinx-build.py"' html
+}
+
+python_test() {
+	cp -r -l tests "${BUILD_DIR}"/ || die
+	# Would you believe?
+	if $(python_is_python3); then
+		2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
+	fi
+
+	nosetests -w "${BUILD_DIR}"/tests -v \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+}
+
+replacing_python_eclass() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.1.3-r4 ${pv}; then
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+pkg_preinst() {
+	if replacing_python_eclass; then
+		# the old python.eclass ebuild will want to remove our pickles...
+		backup_pickle() {
+			# array to enable filename expansion
+			local pickle_name=(
+				"${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle
+			)
+
+			local dest=${ROOT}${pickle_name[0]#${D}}.backup
+
+			eumask_push 022
+			mkdir -p "${dest%/*}" || die
+			eumask_pop
+
+			cp -p -v "${pickle_name[0]}" "${dest}" \
+				|| die "Unable to backup grammar pickle from overwriting"
+		}
+
+		python_foreach_impl backup_pickle
+	fi
+}
+
+pkg_postinst() {
+	if replacing_python_eclass; then
+		local warned
+
+		restore_pickle() {
+			local backup_name=(
+				"${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup
+			)
+			local dest=${backup_name[0]%.backup}
+
+			mv -v "${backup_name[0]}" "${dest}" \
+				|| die "Unable to restore grammar pickle backup"
+		}
+
+		python_foreach_impl restore_pickle
+
+		[[ ${warned} ]] && ewarn "Please try rebuilding the package."
+	fi
+}