Make sure to always generate and install Grammar pickles. Work-around the older ebuild's postrm() removing it.

Package-Manager: portage-2.2.0_alpha152/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

3 files changed, 71 insertions, 10 deletions

diff --git a/dev-python/sphinx/ChangeLog b/dev-python/sphinx/ChangeLog
index 06e5af5412af..96043ae632a4 100644
--- a/dev-python/sphinx/ChangeLog
+++ b/dev-python/sphinx/ChangeLog
@@ -1,6 +1,13 @@
 # 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.122 2013/01/14 00:03:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.123 2013/01/15 21:31:21 mgorny Exp $
+
+*sphinx-1.1.3-r5 (15 Jan 2013)
+
+  15 Jan 2013; Michał Górny <mgorny@gentoo.org> +sphinx-1.1.3-r5.ebuild,
+  -sphinx-1.1.3-r4.ebuild:
+  Make sure to always generate and install Grammar pickles. Work-around the
+  older ebuild's postrm() removing it.
 
 *sphinx-1.1.3-r4 (14 Jan 2013)
 
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index d766135c4f08..c1b888804208 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -10,16 +10,16 @@ EBUILD sphinx-1.1.2.ebuild 2633 SHA256 5df6092ff1ef1fdc11efbb3252d08007a6e81112f
 EBUILD sphinx-1.1.3-r1.ebuild 2716 SHA256 cd454b3ff1fed2ee20d99a0522df341fc6265f85e1cf42ec45c9972ecd3af839 SHA512 ab921f7cf36ad8677f9a3bed349fcc1407a0e099289651b64d7201c0bf115f1cf8dbb72a775e6d4cc8ed3ac7eeb0a7fee9d609b4a44f68521fe47f04de3eb675 WHIRLPOOL 1c74f11e84b991350e7a5e2a30b7b37a4395a6f07482fd67b9cef326388b3cf1bf73e37a9ffd54f4937ce52800a684710f2a7fc00acd5123683a29f0512a7b14
 EBUILD sphinx-1.1.3-r2.ebuild 3525 SHA256 43b61ccc47e8ccc732546b3d051e5e4e7ff73e4e3b43f854cea6fe74c9c9949a SHA512 3a18b9e52909ab6e61a4a11993bd2c68e1a6f74585e6e548b1ab7eea8deec9b083c39f9e8f586ecd0a6f27c0aaa88996d17f1ef9a6353ea48de79bd7996ab202 WHIRLPOOL 09b6de529fc4743212c3b89c90e684a00499a372ed0f8da4c875adc6aef647fff7dc6b4223bf9c150fcc6363474217021817f2fae7377a6f71e2a2393f92e5d1
 EBUILD sphinx-1.1.3-r3.ebuild 3573 SHA256 86c4b9339c1f8e8456e39b59686ef264f743d386c3888d2202584f1793b6ce96 SHA512 0d42c768d620e2e2b76b3b769bd5961748c7dac865fb3a596028675136fa6f9d99ffa73701221b090d1c985f55c125ab270f61c319207358292dd8d02cb4e1e4 WHIRLPOOL ad7694e9c9ca90d7725b46f24b2caf649d65c6878d5dabc6211d0d206497c5c179af60c8f239a050d4bf2bf3b42a730ef2658e6e4e6cc09e461cd176539f8a87
-EBUILD sphinx-1.1.3-r4.ebuild 1647 SHA256 ddd5bb3399cbf37de9bea28cdcac7936fa2cc67533b93955f30864f64844c5f9 SHA512 761d8810be3c2dbe4168cc74e1bf43a495d9d28859e7308b7467b69fd9cd66a415b02ce382fca61ab461cbccf3c3e9a225d0ea758f6dec1c8031938c5b6988ea WHIRLPOOL 40d9a54370aa33e33e9295eeb84e5ca6f052aea0d06aea04438ae8b005f9f954abe3dfb6dd4bb5e8924ea36b388bc286150326c5f27b64fa4a3c145fc928cb3b
+EBUILD sphinx-1.1.3-r5.ebuild 2990 SHA256 fc7494126915ff5b32a8616a8d5fc542c802e592f2490d19cd9911a05a2f52b8 SHA512 536f864d39ca6aae51945d53182178b128977fa56aafc805afee1f6fe7c331d3876246c71a091722ca918515f369b02f0b1d73c1e2e5925715c7a7d29499426c WHIRLPOOL 45680e69f66ab06c2794232a38617678ca971e5e3db75136c4daabd5cbde903dfc13de4dec81e12ccae0bbc05472e74ca09f068ab1fa2367059509aa1d85a2bc
 EBUILD sphinx-1.1.3.ebuild 2639 SHA256 bf5676a31c413f535545d9ce812010ce333f11e3eb14b44375ca879df2d9f21d SHA512 6169300d20e0baec4ed566d615a9abaf285398f53f36c5fe93789ba12af7b0270fedda4026765643d817994c0700585697f9c9ac2baea4e5ac26c33d4207de4b WHIRLPOOL 7b9dd0e827ef426cf6fab61840e36f061b3ca37251560323cac84f720e045a128442e11a9521016792b327008aef1b17f03d0ac355b304ae5df4fa96676f9e35
-MISC ChangeLog 14909 SHA256 d8c38f9f129cdd8202c30d15549665060b483925b2c2dec2365a4897d7f0d242 SHA512 37f9313a806dab39bb24c1942bb147cdadd94adf0954f6ac665eacb41574e7da849c78e9ebf38bae745ba0b24cd5f7e55aa3d0487de0f1d5809e8cc9eb8582ec WHIRLPOOL 2234b64cf3b073dbb1b90d739439ff09c38513f45cfb05634776da2842ac659a38caf8ce47ea12ce04122f53893010220a58014930795bdc38e9bebe15c45112
+MISC ChangeLog 15159 SHA256 8124515663ed1d6b53dd61aebd44774bdc45d63af880fb918777727b0ceb7ef5 SHA512 c716e27856e0ce6517db47799c689490bdf4f64b4ef49dd4c8ec3087c95ada9b2695b3e9265558a50f1aadb6c9a5fc221c00f8d84ec50d13cb33fd4fb578bde6 WHIRLPOOL cd9936e37db04783eb7169f0e377cde70c0ded3d44c027cb1f4ded0f0df6b101f72ef0a4c38e7f502c7ee72a80e87a405d4ac4db8b4ed038d13fc9bdec8a3c4f
 MISC metadata.xml 410 SHA256 ec32db3e710de4837b3b3f6077a1577fe318faf0b00976a972d4e269d7bd3367 SHA512 fd9b5eefde8b8f976e679f754281b4a5a07b62bba71820cde1b109ecc33c094ea08a6f904501b671bb309a6d23a1290a2e37e56f9b0902a3704a03ba4481b3dc WHIRLPOOL cae66b5efcefd9b3b8c61845fa1c77b38641eb16d63dfe888fb7eaeac713d6b4722727c2edf03330f1a4bb9144f4f4f26f886e3de509bbcd72b51acf94b46c95
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlDzS30ACgkQfXuS5UK5QB2xHwQAh2DaqMQ9wZTBAHR4vNWiiMhv
-X4tC+3EVVXtU4P1mS5m2oVNm7qlQ3o4KYBVwjNfG14yh1P3o57+N3UNSw3iJDc9l
-kNH2Mpg1CnVzIxThfD40iUsPyLH+g4oCEUsp6fvKWURfsWN2wyMg0gakWwTBZ5Br
-kvbThQR9HY+d5p9TIZ8=
-=tGEm
+iJwEAQEIAAYFAlD1ys0ACgkQfXuS5UK5QB0EqAQApQGUWojDbtl64fFjIqLePnFD
+UVy0jTXHyPoKXVUCygEXBeskCrUDg1bVn7NPQXkl23J7i9mWf3lgaQ91Z9g+iuGS
+8fpChCtY0Y4J2bozVWv1Ef0aYws2HGvPegiP7VkQ4A0Co4nafgGMzWOZ0wq5x8tH
+MrKbrhxdk+ZSkT4xxiw=
+=6GUm
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sphinx/sphinx-1.1.3-r4.ebuild b/dev-python/sphinx/sphinx-1.1.3-r5.ebuild
index 599b054cdde6..98c85d3e1e72 100644
--- a/dev-python/sphinx/sphinx-1.1.3-r4.ebuild
+++ b/dev-python/sphinx/sphinx-1.1.3-r5.ebuild
@@ -1,12 +1,12 @@
 # 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.1.3-r4.ebuild,v 1.1 2013/01/14 00:03:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r5.ebuild,v 1.1 2013/01/15 21:31:21 mgorny Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy1_9 )
 
-inherit distutils-r1
+inherit distutils-r1 versionator
 
 MY_PN="Sphinx"
 MY_P="${MY_PN}-${PV}"
@@ -47,6 +47,14 @@ python_compile() {
 			2to3 -w --no-diffs "${BUILD_DIR}"/lib/tests || die
 		fi
 	fi
+
+	# Generate the grammar. It will be catched 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() {
@@ -62,3 +70,49 @@ python_install_all() {
 
 	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
+
+			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
+		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
+	fi
+}