Recompile the emaint module with lower optimization than the distutils-r1 default, since emaint breaks when __doc__ is optimized away.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xFDE8EF85AE5719A3

3 files changed, 22 insertions, 14 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 09b1e19d6a29..07519f70cf0b 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1407 2014/09/16 23:45:31 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1408 2014/09/17 06:22:02 zmedico Exp $
+
+  17 Sep 2014; Zac Medico <zmedico@gentoo.org> portage-2.2.13.ebuild:
+  Recompile the emaint module with lower optimization than the distutils-r1
+  default, since emaint breaks when __doc__ is optimized away.
 
 *portage-2.2.13 (16 Sep 2014)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index dc240c11b8d3..757e10983351 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -21,23 +21,17 @@ EBUILD portage-2.2.10.ebuild 19399 SHA256 2f7eb7e1de38eddf47d149251b86798fdbc2ff
 EBUILD portage-2.2.11-r1.ebuild 19047 SHA256 3f00db65cef46585f18bfd9581c39534834c9f9b2b451c4b8434c44a0c4e1c9a SHA512 1f4ae99990f758d82b9b9d9fa988688b9cd3a2ea92bd516857e5ba7b0053d218aee3164fb8c25df0f4752969914fdb86f3d8241329e9d4f91ccdd571d808ce58 WHIRLPOOL a2ae2f5591b20661187c60c183846237ac566334560bcc4b7495b6163254362896fd2cb8a6c908df8a8e2e7b9efd4924f71730b300bbf6c1a51dee1f9a745b95
 EBUILD portage-2.2.12-r1.ebuild 19014 SHA256 d01f6248ad500adc91df1561c47589a954751c64537bcd6aea4e28e6482ae428 SHA512 f6ae0d6ccf8667533acb7d33ab0d8ffe60dc8b7a87c823e287da607aba082606944ea02a1f9bead1e1c58b1395cd65623f3f8055bf0228a91e84cb47807c02f1 WHIRLPOOL 841739c6ea205169a12ba00c24194987f7708fb829813f13c7c3b39b06bbb53fb069cff3a22b888420713c134bb3700c5a27e1dc9608d191ceac847b8858da49
 EBUILD portage-2.2.12.ebuild 19009 SHA256 820aed7f219c712121eb56211a620e4a7ec2c1b64c813dad18a5ec6e3cefc14c SHA512 86136d2e27f2ad6b7820d29f92bed86559638355c5560618c78fe2dcc9e25b98bc4a7d78f20c0dc601fd7f33b9bbd12be4a8b9ebf5ac099166ae8c480b56d7eb WHIRLPOOL 8284303e34766d2338884dfc328882f959747ce1fefd6436461298b48284703fb857333f76b29936b71f03e8362859c6e218631073b247b68d75da93e4cbcb2a
-EBUILD portage-2.2.13.ebuild 6783 SHA256 da6c698f21d2ebf79728544cf63046bc8da20098eba08048b9f1b2c2a4a8496a SHA512 99281ad299d4af9b0fcdc6e0c085ebcfcb91fa396eb950fae402411378a0bbc2ae5f0176c8f346d336c5258c5c8f490f7de50afc13d6f58f05126e5149c8cbb4 WHIRLPOOL 30eaa9a2e7771db24d241e1f20b8f04249e2f9cc4e5f8dc4cd526a2fde7257398e07d2ac61f940b504a8134dc589315da3371ae482cda56e8d4f22bcdc7810e5
+EBUILD portage-2.2.13.ebuild 7174 SHA256 26efb147276555170a225b27f1a75362600d1d9f887a9914570278b10d48446d SHA512 27430c514083269c4da3beee46bdb35afd25fa14f831c1e2869ae62b627aa0e5d3b4d510d56adcae7a3f98d17db52e35b18176e2cc49ba31d9f53b0a5c18280c WHIRLPOOL ed00ec9723bf0369b0573114706d1c8becf61f365f8c5c4971cce73b50a4be46f3ea3e0ee24c53f077b0b7024c796b707d564b5ba23990de53b27ee6e03cc178
 EBUILD portage-2.2.7.ebuild 19244 SHA256 f4f40a7da1d0312dcd3bc2f45e88092458f05e65c8ea3d5b08b86a8a06aa68f5 SHA512 db283aff6267f3990d3750ef6bd1e2e8e4bf3591225f5855f83e6662794b0f2dd58f65bec5d14e216e92ac81df7842d83ed3b56eb05f0f4ccd5466dee722817c WHIRLPOOL a152ba0faa2b853b8ed7244a6aa12971105cc90039adc76cd200d350b69f3ca97ff91613cdcf46e3f8a9157052d9f3161ba85a662b3c6c29a8b79d4b8aa2b9e6
 EBUILD portage-2.2.8-r1.ebuild 19344 SHA256 35ab2aa38ca4dd77373cebdfe04a47291601790dbef63be5bb2ec74866bf5f1e SHA512 4e6133e4792423bd426fba0fb951d08ba56866ac0942aa572892bbb6654853ab6ba10c22c209ebc4126af99aaf253aab7647342e984ac5cd41ed5e179e129add WHIRLPOOL 10cf3d7c4c5b4c3e19a0ab459d260779e7f82ce9fe81932b65da0f855450dbe83f0a9d87eb4bb1d735aab4d78a50d3df0c4e911bd19e054f5728cd2f2cc067a2
 EBUILD portage-9999.ebuild 6652 SHA256 e6a233092e0d187f9fbb359b410563b97b0b2f54bd18abb3e50b6bec36390557 SHA512 0a0375a6d40f298cd58760b043654dded5085aed59b940bd8eb70948a833b980fd9d6e4b6d1585628cb5a39b84fa357a9bf6fc0886c89cc88853a667a8c67cd5 WHIRLPOOL 5c29b53e8f736644bc23c2e8363d9264420cf4b5b6916974c79c4dbe68cfeccdc9f58ff146d75d9c8cccf5113fd49773d656915755e940714635a1caa0b3724b
-MISC ChangeLog 58511 SHA256 c9a555e004701db156e3396b4c94de924efbaa2404d9d7b1299e49197fe6e87e SHA512 49ee16addadb6fbdf7839c9dfff974dc2144162fc91c0c7e65b026d15ee3cbfb4a53e455293ad2bf23b5eb10b01fcc71c016fec22e5e78d5df15585f4ca110ca WHIRLPOOL 1ef8e011521604038eabe0f808b6455cc1e09511c69b47a12d8d45d29f9f1a003f4357ab1c5052c27de26d66fd37484d7fb55d3747471f773c110f8c63a0faf6
+MISC ChangeLog 58722 SHA256 4f2ccadacd48f523617f3238bcd39a969316537264d9abc31127db993c4f5f98 SHA512 746b6e6b80906e5caba8f1b98973e7778614fbf99a75ee8d4f60cf475700fc7facbdeb98506679d60cd0af694a38344c60bb31cab3f78824f3b7c0ad37736a9f WHIRLPOOL 9303b6f01b6b36c4fbfd48dafd4c3f6e13aebdc4c156f06647fbf371b0e0ca1b3c7a3c519223100cc1c5988fbb7bc04cde00cda78410dddb6eee55af82435018
 MISC ChangeLog-2012 133873 SHA256 157a7eb13d4cf2e2c94bfcb7e91f218af1ea88f5ff20c24a50546950a9839c94 SHA512 1241f4ccd7b31bdd340649417257b0e95202992feb66e0cd4d41fc2d35bf0baeac19680f34a831d2fefce0c0fec03aa6e7a191f783e59cf9b93aaf266f010a3f WHIRLPOOL b027bdba0f5ccc1b3a2dc18df92d82b473af5e55536816b7177071c1ae1a89e4d50d42c2093fa1bbe28b92a42014fbefbfc9e7daa4e6426ebecbd5bffc3d479f
 MISC metadata.xml 1170 SHA256 15c6872c40d2c334c6c7bb2d020f5486296e1727c02254257ed5bba0c58af955 SHA512 ca57a95360f6becef6c622d8a5c384d864bd6118776b43d88b7deb1b058dc46b47019813d7e2606b6d4665bd1bed113eae5445ddb948f939954172b5fe859d74 WHIRLPOOL 77e420267361675e733e8364d1fde83d7b2833d6e28823599078f1d771aeb592d0e9146019a45268696b05709e56880e7707e0240f843015e17a82930bac5cf2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQF8BAEBCABmBQJUGMuUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4Njg4RkQxQ0M3MUMxQzA0RUFFQTQyMzcy
-MjE0RDkwQTAxNEYxN0NCAAoJECIU2QoBTxfLj3YIAMWSK2RXPyd9RjGyIXTVZsKI
-q91TydJBgkUDzPLcj2Mu3H8qqCvB4wmRWgCPstoSUF4z302PhuigILv1BG59f7KP
-SAu/UscDX39SeJ7b6UlzRA1yX7pCigTZ0c8ujNvD6ZtF/NF3DmDaRgcPU3+ixSzM
-VFP0vujclXeIDUYT6Dp+QPtzQq/c9PjyP0atUdE5fifZaoJ05Fz7DNTZ2gvy/27i
-ss03+RlLyFi6ega48msK6KDbtYdI7yS5A2r09qLPAqG0WGQKt4S0QriYDZDNkum2
-1MbD6OYlBSgG6Qm51el3emgjdYOknjirl4uPflZkS3Nu44zcAF+DHBrkalLnoQk=
-=XvP4
+iEYEAREIAAYFAlQZKIsACgkQ/ejvha5XGaOzJgCgijfOLr/BSs3dPNI+Um5W11ef
+21MAoNZX29IBfOAP6t/2Gj6WsMp+bBh+
+=KfP8
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.2.13.ebuild b/sys-apps/portage/portage-2.2.13.ebuild
index 080b711890c7..96e62cf26f3e 100644
--- a/sys-apps/portage/portage-2.2.13.ebuild
+++ b/sys-apps/portage/portage-2.2.13.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/sys-apps/portage/portage-2.2.13.ebuild,v 1.1 2014/09/16 23:45:31 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.13.ebuild,v 1.2 2014/09/17 06:22:02 zmedico Exp $
 
 EAPI=5
 
@@ -172,6 +172,16 @@ python_install() {
 python_install_all() {
 	distutils-r1_python_install_all
 
+	# Recompile the emaint module with lower optimization than the
+	# distutils-r1 default, since emaint breaks when __doc__ is
+	# optimized away.
+	local python d
+	for python in "${PYTHON_COMPAT[@]}" ; do
+		python=${python/_/.}
+		d=${EPREFIX}/usr/$(get_libdir)/${python}/site-packages/portage/emaint
+		"${EPREFIX}/usr/bin/${python}" -O -m compileall -q -f -d "${d}" "${D%/}${d}" || die
+	done
+
 	local targets=()
 	use doc && targets+=( install_docbook )
 	use epydoc && targets+=( install_epydoc )