dev-python/wxpython: Call distutils-r1_python_install_all; don't use elog for empty lines

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

8 files changed, 78 insertions, 65 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index 0db64253b3bf..ea3736989a82 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/wxpython
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.193 2013/10/30 19:22:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.194 2013/12/12 12:57:30 jlec Exp $
+
+  12 Dec 2013; Justin Lecher <jlec@gentoo.org> wxpython-2.8.12.1.ebuild,
+  wxpython-2.8.12.1-r1.ebuild, wxpython-2.8.12.1-r2.ebuild,
+  wxpython-2.9.4.1-r1.ebuild, wxpython-2.9.4.1-r2.ebuild, metadata.xml:
+  Call distutils-r1_python_install_all; don't use elog for empty lines
 
   30 Oct 2013; Michał Górny <mgorny@gentoo.org> wxpython-2.8.12.1-r1.ebuild,
   wxpython-2.8.12.1-r2.ebuild, wxpython-2.9.4.1-r1.ebuild,
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 6b2811625d65..c30df71c32ee 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX wxpython-2.8-cache-writable.patch 538 SHA256 caf371fdd36ae60b36754f6fa66df3887c3ee2e1dd509f8cc8bc92525942f429 SHA512 e0232ff7bcb713358a2981b84b0eac3b3b0825d43b43dd6f19d3d21f9b45a9e63fbf39dc87c2fedc0342a88007ef43fcd9d890177dc38e15b4f89576fdf363a0 WHIRLPOOL c2c0488d0d5a840d1be68c95a2f53d3bce7d58798f0e09f2116f16655d73c8a5b525af7d7b836c7f820bd729acff441942510055b8f455a9b2f742361effd6c3
 AUX wxpython-2.8-no-preservatives-added.patch 525 SHA256 590ef2435f3bb24ce061213628467652509aa39992d9b0f94e1c784952d523b8 SHA512 83e066d6798aea833304004d7270e3b7698e51581e9ac9c934b96fb438bbafb16cea15cc73297961893fd73fd18f95cade22c134aea6556962025fc3c12bdedd WHIRLPOOL 218e72aa785c762f0171987c79cb7d998864252ebd259537e463f134caabca17d8f5d5d75f2ec7791cf5353edb8331d173eb6f08d4fbb7f7713d9ca14ad91831
@@ -21,30 +21,28 @@ DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e94
 DIST wxPython-src-2.9.3.1.tar.bz2 49131100 SHA256 7bae5bf45e98eba836472bdb358330f867c69de3a347860edd48fcb53690040d SHA512 16e5be3a2a98d64637866ecae7afb3a2835d21684077bb8a1b87d3c0cf37b75eb1169f3b8e16e38c5b85c04cce974dbfd5ba25d3d0a3016a47c005a05e5dbfc5 WHIRLPOOL ccae768ff87a95ee88d6259821be5e2073928278155743c0c16c75dd9b2262ac49ccb322dd4aa77ccfdac12d7de0e874a92b41171adacfa26ffb216f170751a7
 DIST wxPython-src-2.9.4.0.tar.bz2 50827671 SHA256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be SHA512 100dd4474bc2508e9a80aed6f08d295e2697926e29c5789e1f6aa7c303921e1c5de2574c3eddde568804da8fc670d0214ef225d46f34a3006d0a947423d01fbf WHIRLPOOL feff68600a40a8f02492e91049ecdd1a1865ee6db8024112aa3a85a7eff616f26653c418a8ffde77121e2bf7d2c7090c5b91896f9a2de8eb980573af2ca65507
 DIST wxPython-src-2.9.4.1.patch 3768 SHA256 075e3a7b1cf69dd2bb20010717505d2508c74bc81658540f3e6d8c4fbf0a6b85 SHA512 4a5254a5bb9c246b75095e3cc0b849073e3cc71ff15ab7fb1db6ecfe71359800b9e1a5493bc39ce5b1f338cdc1d142ce84641611d458a8da4315f3c8a6aef3ba WHIRLPOOL 9bec06da4824fe56c172f4f417966681d1ffbf173dcb54f1579e9a484377bc76c45b4f2389911bbb17eff2476cfca786d68d9524856b21accc64b4dffafb1811
-EBUILD wxpython-2.8.12.1-r1.ebuild 5764 SHA256 faf08993249c2bfde070fa6a74eeabf97119377b5889fd6b4dab4d698678ff1b SHA512 0b1ef7bc82cb4a869e1be7a7c57f8e1890f842025b1de4d4b918b1b160d46b728bdae052b55bcb688e6b99f8c92b8522979df4158e6bd57f0d70e897113a4469 WHIRLPOOL fe203e630c44089ca7b64118d6db9a0bd2a5d1a4b8d2e81f892fba7988eac3ec9c36dccedcde08e07553bc07878cf9134d4157a6b548ba55ec2ff1b36eee2ec6
-EBUILD wxpython-2.8.12.1-r2.ebuild 5685 SHA256 6bb2987627a3885ef8bc18e01b56157b6390382f76f3a1a37bff606a5c63386d SHA512 00663f36f45a6535bc036ef230a4f82df2f48134aa021f5c87773595383500854c2fd9cf35fef5548c40a79382c17cc4142df8ae6b78619d5def05e25678c779 WHIRLPOOL 05a848c21cb575442e77358744540e1030552c0b51c2527a2261005696ac247732ee7d7b03ef9215d3182f9958a6e917e958e1451db5b29540bab09f94eed993
-EBUILD wxpython-2.8.12.1.ebuild 5157 SHA256 b2d64ed37914ee90e1d2eb9c5ca4143368f0e6cfd2d9fb81b0a6b0310ee419a1 SHA512 3adb2fab2dd1b64ee7e9917cbfdaef37bdb41a62833d9b3ab3d080a5178bdf5f892dd5f5083c7d8959831f7e20ccbb7abda1df7fac9fffaa2b9611d563855f22 WHIRLPOOL 344277ba4c9c4c38ca412ebf2e341964370edd166afafe12a43c925572d5605576d9ef0f8f9c0bc320e5fe9e4fde64e3c854d8677c6de446d472ffa6b1bf8882
+EBUILD wxpython-2.8.12.1-r1.ebuild 5796 SHA256 38d8688b5f6c9dbb95ec3179c0a29f1331b5d18d8964ec390513650c8b023823 SHA512 52b63d46d2f2b593a153a7b08a860bc46243a311353a7e368e2881a3b376ca9e02946be28ebb95d12c0876a57b18ac146ae2c4d65abc8f2f20ccb6582616dc1f WHIRLPOOL da465f921826b1a5539ee623bd3c4ed5ec8a4460fd5520b4e7174793ff9c18472a4c707e65d1b01c58c0213e7dd31eadfd288abf5ef3434cee92b85c6b883e9f
+EBUILD wxpython-2.8.12.1-r2.ebuild 5717 SHA256 8118b8b44efb97afdcba977adb02cbc21a646ee2d123a2112ef99cd9afa3826e SHA512 dc9deacc76ccf5de65b38b5a60cccbc564f5edb4bd2637bb0f9feae6e847b22ffec9c639d6590a98d1e36762ecf91919f09e8e9401edbf018df5e3f24c5878a3 WHIRLPOOL 15608458198165573aa72a11eeaa573fd7a46753da4046a90ee2a62ef45f8c736d5d32334cfa8cfe50f046bcfe544149a9a994d6767ef0df53694ae5fa567e93
+EBUILD wxpython-2.8.12.1.ebuild 5147 SHA256 b52479fa70e5050e0e4d482067202783f3de62bd636120ff588a8787b53cdc4e SHA512 503705bedc000418249cf1269e6d9be95b48aa78a48121befad5e70c457f50e938fb284ad7a79cd2cc7b92fcf792c451026c1e8172728c38859fe5582fad1a61 WHIRLPOOL de9378daa01959e463f73f34e1a71369456872ed694b06c1bcd141e2b70bfd669ca5a5f372f7c666172f33ed386f4b91ca9e80b6ddd85d152c86fbcfc49998a7
 EBUILD wxpython-2.9.3.1.ebuild 4423 SHA256 d373c252954d78fe241755d6e43757cb6c4e465fc00212411d282c5d9d65ce9c SHA512 0f1d00e47641d00b1d912754124fc9f39e31f9aa658f9680012ecbc6706065f4fc6c9f0266e13f916033ce1bf91b9dbdddcc11d28c270577cff89c005699ba29 WHIRLPOOL 60c1a4906c209407126836e21e62c51dcc97e72b592725a6d299f960793139795e104e08068e79926a15c2db0b94f45129f1596b32d0bd59fd53a23a1a83ddc3
-EBUILD wxpython-2.9.4.1-r1.ebuild 4936 SHA256 f0700c042583a3c427dceacc35273865418e6ca20f0ee32571457cd3516da827 SHA512 df6b655d5d574f7f11e4c0f558634317ed386339fb170bd1cc5e07e3faafa10628d27789b2e59c137cb11747ce3123769698ead559e7878c38deeecabe0de79d WHIRLPOOL cd3fba64981a02aa8c95a2b677f9b43cab86ba7abe5d45cec3a5ff9ca38d7bdbbec3b46490a0ffeda53d53edcd3a947d6e55479c12ee584e28443dbdc691c2c3
-EBUILD wxpython-2.9.4.1-r2.ebuild 4849 SHA256 b3c09e627a20401dd8d47b04f76a901363897de0d9111bf152b922d42948f244 SHA512 4501745f817904dc325c46180d72aa2c1673b24fb3bcb4dd9251b1915a673e1ff604f0e5072e201766f81eab17e4d2b8331ca0e2778868e9d946e58504f5295d WHIRLPOOL 94b6168b47465c25f7889ad3b90446a0416b536ba78215f25e392878dab27920c1a392d910a1efd0111234b0ada196f9f4685e66754b5befa01817daedb48ab0
-MISC ChangeLog 33940 SHA256 cf16dd54d2ec150738e0391a062741fa01f3e9d1260667b3a7a2ac050f14bb0b SHA512 ed54de5d873d924d26838942aad00a346980c322b753e910ef1597966458a054bef195b3711442c249a5c06c77a6965a391d2b1567e3fa6c353c7d1ff4bf1c44 WHIRLPOOL b6e079e7c440b49afed8bf6f7053fa4e96e5af8e3db3fc39ce41461d0c5a2e98b82ab9a2b166017fa4e0f082f9d4efe04cffa58420f34a8b75dd2efe0417324a
-MISC metadata.xml 366 SHA256 d90a8fa164deff1b8cfa28cf401483424addfceeca8cd35539b7f2bbb3280cff SHA512 260bafb8c2fba6a3d1b6c0dcb0fa4f1db5ccff7319395d9856997df816d3cfc69dc38859835eeafb693f22da6179e73227c87d820019793e639987085e596c6f WHIRLPOOL f8619bf36512bc3debe4fd4d810f5512485fe5f6041af2704898cef0123c9ba9512864763dc6fca78f400931a120b43f494e7384a567a79d42db507cd74b8062
+EBUILD wxpython-2.9.4.1-r1.ebuild 4967 SHA256 5318eecd6aefb3ecff2e0972a0f0bc9e7d684ffed9d75f0540d5b8fb00ea51fe SHA512 8b2d875fb867ba9ce57e2f8a813392c20c53904e1c709e8b2a73c5eee67066a274cfcfec209ad0b17027fd7349fdb6962fa20e9a6164d153ed23cd212b430f74 WHIRLPOOL afefcd26a8685f527ab00039c1d17d87a306d061ebfd8b2b96d04013576c32c770d75aa944f2d79b1f21a375b9aa39a20700ab9859c2393579ac72318a2fee53
+EBUILD wxpython-2.9.4.1-r2.ebuild 4882 SHA256 c9e93b5996caa02e9d5219b1f3358a5e1b9089646fecc335bddf2d1730838a26 SHA512 db43ab67839a5f1cbaf11ae0086a5a8246edf66bdff35fe6260dd4de959dba4801c4a8f5daf9bc040d3071442d54a461c4d0e0c665d12ea6015b65aaef29d390 WHIRLPOOL d5b8b74ef5edab244cfb7199184560bd1e586456464bd73105637d2e00e462f819e6cc32bc399a69c0ac327085494842deede429e0e487b583ba3f01608f4dd8
+MISC ChangeLog 34215 SHA256 91c5fd4cfbefc2d955489c4373197a30021c03317f4f1e2c5bebc5c26590b9db SHA512 eec12e7655fdf4e1ac22e10524118ff617aa9684fa8cd302fec15c6f5161214bb87ea05772038701a6661f608f1ed7797c192518db050f0f66ded6e6b9cf0fe6 WHIRLPOOL 0ac0b6ad5608c2635d8235fbda7ee9cc3ced5f0d526029ab072531d4b07261f54a3d3b87cebb4f3b0071b85f59cc1e7b911e1e7cb729bb7e8519dcb4c240885c
+MISC metadata.xml 380 SHA256 4f8e2237b4a7281039211900504d5e8d7004e87c120631f18dd078a01178dfa8 SHA512 8b742161313fb1b1b0db6d07f1665988b061dbf2dd44c1e49e2fab8d1aa1dfbb218207c5696bcd027199a1ae2fbcb4673106c09d5169a44863deb021840288a8 WHIRLPOOL dbce4f031c171464b3cda63ec2f9c7f2841e108d441a45bfe1d7ec2d6b35874d9b04ab364836bb3d7be7ff12ef60e029fce7a841e156994f04820254bad91e6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJScVyZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOS3cP/jpWeC7N0GrtAB+VY1qgyOme
-4gD1yLAmhjX9vMzcQxf/vRg0bDNxbeq7tLzmOENbdbIh5TsLAeIpcRg0Ak2ts5lG
-kCdU+3x1O0TCpsnCVeg77bS/D6wdWFfhGH26qbiesnonx16G3rJPOjb3csNS+KWJ
-J+3ZV0tzdeUI/gdnfuq/NRdgyZa+JJcWVSJGWpwBtnbuD5BozvxompEmKxOeuYi4
-9yGTC4omJOsAeU8etKgkTnvHFeMVh02mRRY5+A6muYJTT50nCoPLke/QODr0rDo1
-w120+UQbHF5GjGZYwbgmaIydM1ladAR3An62mjYHV6hqRbmyvEsNEMQ4mQFQMUTo
-tWwuCwCgKXpNuRAqRo77rO7YH9D1AbYmYkjuHOb+4LTWkZIeMy6/+OpdH59tJR8B
-phP3oWCXe5jMaxh+Wbbo5i9gLtnuN30fg9HyAj8I8vWv7VsZPQffwGq6OpoyK5oX
-qXZZO5eGB6gmFwZpAwYQZMiiwDvXXOh9/1o4ka4lIpk6F8rH5poDhYQPYpkasYqu
-I7yZ5lw4ZJkMx7czHwqWr9VCvVTAPHFcfv3npeBjtZZLDAmokXLd949S/mLws3yb
-9UN06WfXBLXi7trQ7Gh3SDsqsykExtjvZdy10+rgVtT/SgGyvJ6yPZTpWD3gedVj
-AbmXW4kvQ2bhX3hyo7Eg
-=Socz
+iQIcBAEBCgAGBQJSqbK7AAoJELnU8jG9FVir5ncP/2c/mRELJjVv9lzvQO1Np+YG
+dwZwZpnYyCOdfwcm/2vKm4u9gUYhDz/gxPInsyqlL1qup1gx0Go8Ks62fAysVJgN
+0JswHPdQVOx52U9wUDTq0X+7wK7MOjGiasOa6lzCD+blcLeT1vScuCtleJlzjEo4
+dChPy0PgDhGHZqGBlBCCZ0CuuK5+YI5sW2qdkXuhEvsP4QVvA6rhTywvCOSh8MCV
+DzMPe53XKl9mocK4srlJnJ5mxvg3NtAzeHglumNNNH8+SoA4x/Tv0y9qHZqYvE58
+dkjj2ec0IimS7n8joc3/DgAYs4N2X+5Y2DdekIdW3XArlZTqhR9RLGHL9XyW/Ps4
+JGZI0PKFYqN8AQqAuDOvMvqzYamQSfv5q4cENNRcaQw9LQzyLZaKRCEUkvsRPT4P
+5gF5VyTDRWPeLObZiFEDjeK/Pd9lgJc/FEI8YErPmTCu+O0MVlqe/drzT0UgH+DC
+cxYVLZnz9T2pg/DAZHyzELKJlAYBKFMz4TKQveUpAeuPbqJF2puz66m/PzXlyG8n
+X6U+8yX0Y66tNViP1tmMW6y2EovwL4RBH8gXBFeP+whbKK73ZSDMOtawncijR57F
+QUU8LN3YQw/JT3pSA9iGjuqg58OIlkNF4rKa5mSazLwOFw3UvZ7sMDEvvsJbfs5d
+HOkkNYQ4t9b1KFgMxs+c
+=eA0m
 -----END PGP SIGNATURE-----
diff --git a/dev-python/wxpython/metadata.xml b/dev-python/wxpython/metadata.xml
index ba15621fe582..b68c477bd686 100644
--- a/dev-python/wxpython/metadata.xml
+++ b/dev-python/wxpython/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>wxwidgets</herd>
-<herd>python</herd>
-<use>
-	<flag name="examples">Install interactive demo module browser and sample applets.</flag>
-	<flag name="doc">Install HTML wxWidgets docs and wxpython API reference.</flag>
-</use>
+  <herd>wxwidgets</herd>
+  <herd>python</herd>
+  <use>
+    <flag name="examples">Install interactive demo module browser and sample applets.</flag>
+    <flag name="doc">Install HTML wxWidgets docs and wxpython API reference.</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-python/wxpython/wxpython-2.8.12.1-r1.ebuild b/dev-python/wxpython/wxpython-2.8.12.1-r1.ebuild
index 25256d1e4f0b..72a38ed2bfde 100644
--- a/dev-python/wxpython/wxpython-2.8.12.1-r1.ebuild
+++ b/dev-python/wxpython/wxpython-2.8.12.1-r1.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/wxpython/wxpython-2.8.12.1-r1.ebuild,v 1.17 2013/10/30 19:22:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.1-r1.ebuild,v 1.18 2013/12/12 12:57:30 jlec Exp $
 
 EAPI=5
 
@@ -13,9 +13,11 @@ MY_P="${P/wxpython-/wxPython-src-}"
 
 DESCRIPTION="A blending of the wxWindows C++ class library with Python"
 HOMEPAGE="http://www.wxpython.org/"
-SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.bz2
-	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2
-		   mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 )
+SRC_URI="
+	mirror://sourceforge/wxpython/${MY_P}.tar.bz2
+	doc? (
+		mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2
+		mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 )
 	examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )"
 
 LICENSE="wxWinLL-3"
@@ -148,6 +150,7 @@ python_install_all() {
 
 		docompress -x /usr/share/doc/${PF}/{demo,samples}
 	fi
+	distutils-r1_python_install_all
 }
 
 pkg_postinst() {
@@ -165,23 +168,23 @@ pkg_postinst() {
 	elog "2.6 or 2.8 with your apps:"
 	elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls"
 	if use doc; then
-		elog
+		echo
 		elog "To access the general wxWidgets documentation, run"
 		elog "/usr/share/doc/${PF}/docs/viewdocs.py"
-		elog
+		echo
 		elog "wxPython documentation is available by pointing a browser"
 		elog "at /usr/share/doc/${PF}/docs/api/index.html"
 	fi
 	if use examples; then
-		elog
+		echo
 		elog "The demo.py app which contains hundreds of demo modules"
 		elog "with documentation and source code has been installed at"
 		elog "/usr/share/doc/${PF}/demo/demo.py"
-		elog
+		echo
 		elog "Many more example apps and modules can be found in"
 		elog "/usr/share/doc/${PF}/samples/"
 	fi
-	elog
+	echo
 	elog "Editra is not packaged with wxpython in Gentoo."
 	elog "You can find it in the tree as app-editors/editra"
 }
diff --git a/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild b/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild
index 651aecfc6b89..9c6bfa31281a 100644
--- a/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild
+++ b/dev-python/wxpython/wxpython-2.8.12.1-r2.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/wxpython/wxpython-2.8.12.1-r2.ebuild,v 1.2 2013/10/30 19:22:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild,v 1.3 2013/12/12 12:57:30 jlec Exp $
 
 EAPI=5
 
@@ -13,9 +13,11 @@ MY_P="${P/wxpython-/wxPython-src-}"
 
 DESCRIPTION="A blending of the wxWindows C++ class library with Python"
 HOMEPAGE="http://www.wxpython.org/"
-SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.bz2
-	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2
-		   mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 )
+SRC_URI="
+	mirror://sourceforge/wxpython/${MY_P}.tar.bz2
+	doc? (
+		mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2
+		mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 )
 	examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )"
 
 LICENSE="wxWinLL-3"
@@ -143,6 +145,7 @@ python_install_all() {
 
 		docompress -x /usr/share/doc/${PF}/{demo,samples}
 	fi
+	distutils-r1_python_install_all
 }
 
 pkg_postinst() {
@@ -160,23 +163,23 @@ pkg_postinst() {
 	elog "2.6 or 2.8 with your apps:"
 	elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls"
 	if use doc; then
-		elog
+		echo
 		elog "To access the general wxWidgets documentation, run"
 		elog "/usr/share/doc/${PF}/docs/viewdocs.py"
-		elog
+		echo
 		elog "wxPython documentation is available by pointing a browser"
 		elog "at /usr/share/doc/${PF}/docs/api/index.html"
 	fi
 	if use examples; then
-		elog
+		echo
 		elog "The demo.py app which contains hundreds of demo modules"
 		elog "with documentation and source code has been installed at"
 		elog "/usr/share/doc/${PF}/demo/demo.py"
-		elog
+		echo
 		elog "Many more example apps and modules can be found in"
 		elog "/usr/share/doc/${PF}/samples/"
 	fi
-	elog
+	echo
 	elog "Editra is not packaged with wxpython in Gentoo."
 	elog "You can find it in the tree as app-editors/editra"
 }
diff --git a/dev-python/wxpython/wxpython-2.8.12.1.ebuild b/dev-python/wxpython/wxpython-2.8.12.1.ebuild
index 3f1436dea5f6..b035c380b961 100644
--- a/dev-python/wxpython/wxpython-2.8.12.1.ebuild
+++ b/dev-python/wxpython/wxpython-2.8.12.1.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/wxpython/wxpython-2.8.12.1.ebuild,v 1.18 2013/10/06 09:01:39 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.1.ebuild,v 1.19 2013/12/12 12:57:30 jlec Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -14,9 +14,11 @@ MY_P="${P/wxpython-/wxPython-src-}"
 
 DESCRIPTION="A blending of the wxWindows C++ class library with Python"
 HOMEPAGE="http://www.wxpython.org/"
-SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.bz2
-	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2
-		   mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 )
+SRC_URI="
+	mirror://sourceforge/wxpython/${MY_P}.tar.bz2
+	doc? (
+		mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2
+		mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 )
 	examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )"
 
 LICENSE="wxWinLL-3"
@@ -143,27 +145,26 @@ pkg_postinst() {
 	elog "Developers, see this site for instructions on using"
 	elog "2.6 or 2.8 with your apps:"
 	elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls"
-	echo
 	if use doc; then
+		echo
 		elog "To access the general wxWidgets documentation, run"
 		elog "/usr/share/doc/${PF}/docs/viewdocs.py"
-		elog
+		echo
 		elog "wxPython documentation is available by pointing a browser"
 		elog "at /usr/share/doc/${PF}/docs/api/index.html"
 	fi
 	if use examples; then
-		elog
+		echo
 		elog "The demo.py app which contains hundreds of demo modules"
 		elog "with documentation and source code has been installed at"
 		elog "/usr/share/doc/${PF}/demo/demo.py"
-		elog
+		echo
 		elog "Many more example apps and modules can be found in"
 		elog "/usr/share/doc/${PF}/samples/"
-		echo
 	fi
+	echo
 	elog "Editra is not packaged with wxpython in Gentoo."
 	elog "You can find it in the tree as app-editors/editra"
-	echo
 }
 
 pkg_postrm() {
diff --git a/dev-python/wxpython/wxpython-2.9.4.1-r1.ebuild b/dev-python/wxpython/wxpython-2.9.4.1-r1.ebuild
index a58fe3ffd071..47949ee10730 100644
--- a/dev-python/wxpython/wxpython-2.9.4.1-r1.ebuild
+++ b/dev-python/wxpython/wxpython-2.9.4.1-r1.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/wxpython/wxpython-2.9.4.1-r1.ebuild,v 1.7 2013/10/30 19:22:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.4.1-r1.ebuild,v 1.8 2013/12/12 12:57:30 jlec Exp $
 
 EAPI=5
 
@@ -133,6 +133,7 @@ python_install_all() {
 
 		docompress -x /usr/share/doc/${PF}/{demo,samples}
 	fi
+	distutils-r1_python_install_all
 }
 
 pkg_postinst() {
@@ -150,11 +151,11 @@ pkg_postinst() {
 	elog "2.8 or 2.9 with your apps:"
 	elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls"
 	if use examples; then
-		elog
+		echo
 		elog "The demo.py app which contains demo modules with"
 		elog "documentation and source code has been installed at"
 		elog "/usr/share/doc/${PF}/demo/demo.py"
-		elog
+		echo
 		elog "More example apps and modules can be found in"
 		elog "/usr/share/doc/${PF}/samples/"
 	fi
diff --git a/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild b/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild
index b0753b8ae867..a2621cc3f053 100644
--- a/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild
+++ b/dev-python/wxpython/wxpython-2.9.4.1-r2.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/wxpython/wxpython-2.9.4.1-r2.ebuild,v 1.2 2013/10/30 19:22:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild,v 1.3 2013/12/12 12:57:30 jlec Exp $
 
 EAPI=5
 
@@ -13,7 +13,8 @@ MY_PN="wxPython-src"
 
 DESCRIPTION="A blending of the wxWindows C++ class library with Python"
 HOMEPAGE="http://www.wxpython.org/"
-SRC_URI="mirror://sourceforge/wxpython/${MY_PN}-2.9.4.0.tar.bz2
+SRC_URI="
+	mirror://sourceforge/wxpython/${MY_PN}-2.9.4.0.tar.bz2
 	examples? ( mirror://sourceforge/wxpython/wxPython-demo-2.9.4.0.tar.bz2 )
 	mirror://sourceforge/wxpython/${MY_PN}-2.9.4.1.patch"
 
@@ -128,6 +129,7 @@ python_install_all() {
 
 		docompress -x /usr/share/doc/${PF}/{demo,samples}
 	fi
+	distutils-r1_python_install_all
 }
 
 pkg_postinst() {
@@ -145,11 +147,11 @@ pkg_postinst() {
 	elog "2.8 or 2.9 with your apps:"
 	elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls"
 	if use examples; then
-		elog
+		echo
 		elog "The demo.py app which contains demo modules with"
 		elog "documentation and source code has been installed at"
 		elog "/usr/share/doc/${PF}/demo/demo.py"
-		elog
+		echo
 		elog "More example apps and modules can be found in"
 		elog "/usr/share/doc/${PF}/samples/"
 	fi