Improved distutils-r1 conversion. Thanks to Michał Górny

Package-Manager: portage-2.2.0/cvs/Linux x86_64

3 files changed, 18 insertions, 17 deletions

diff --git a/kde-misc/synaptiks/ChangeLog b/kde-misc/synaptiks/ChangeLog
index 57448ec5e117..3734a48feb0d 100644
--- a/kde-misc/synaptiks/ChangeLog
+++ b/kde-misc/synaptiks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-misc/synaptiks
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/synaptiks/ChangeLog,v 1.42 2013/08/16 10:10:25 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/synaptiks/ChangeLog,v 1.43 2013/08/18 12:52:09 mrueg Exp $
+
+*synaptiks-0.8.1-r4 (18 Aug 2013)
+
+  18 Aug 2013; Manuel Rüger <mrueg@gentoo.org> +synaptiks-0.8.1-r4.ebuild,
+  -synaptiks-0.8.1-r3.ebuild:
+  Improved distutils-r1 conversion. Thanks to Michał Górny
 
   16 Aug 2013; Manuel Rüger <mrueg@gentoo.org> synaptiks-0.8.1-r3.ebuild:
   Fix the conversion. Committed to early.
diff --git a/kde-misc/synaptiks/Manifest b/kde-misc/synaptiks/Manifest
index 870ff34888ae..1089d1694aca 100644
--- a/kde-misc/synaptiks/Manifest
+++ b/kde-misc/synaptiks/Manifest
@@ -2,6 +2,6 @@ AUX synaptiks-0.8.1-removedfeatures.patch 7271 SHA256 1a5481512ed37f268d31c803de
 AUX synaptiks-0.8.1-templatesfix.patch 1705 SHA256 f7e670522de4ab56b1a3fcf1d3ce1f142db1d708b5fd99d32efc9d0d4c108dbe SHA512 767dace1dede65bd2913e4c14bbffba3ec40f2583cb73dc5fa7a761b573c1e5ca8fd6523c9cf6b7e660a1fd665ab8dfdc0e1320d8897b96161f9c47b6462a947 WHIRLPOOL 5857fe858734d220f4f868df81f308808d7421dc474c295da8d4b35871ae52f5de15faaeb886c5674b4b0df956bb20f48ecbdbfae28dc34fd04ca9018ac3d390
 DIST synaptiks-0.8.1.tar.bz2 463495 SHA256 39bbafa6abd63903ba6f9ffd020ec754250ab7800ea9efcdeeebd69c0fcd5707 SHA512 a01b9833b2fb7af699eba015517ac652e4d0df9f46154097a26e57f0c4dc4467db1ceeea52c5f5ee5794b821870356d1d16e9da6aeaa845fc3d7bde10b85d053 WHIRLPOOL da9891f1b29ab174759efae779f08dea31e9a6b266b0d10ee60fa460e588c8620e2fa91a7eafddbd4ead3f9db7e365580bd34db66ea611b2c448590d09c47efd
 EBUILD synaptiks-0.8.1-r2.ebuild 1559 SHA256 b1843a49959ddab22df4421f166ad469355f9df53efa700e0bb8308461c1b06e SHA512 e2d605b4eb325f56d2581a1e4e2ee9f70c64644ea8adb977caeb93f7afbaf4b5952d33f1f2e7c4514170126c22e7ec1750f790f6c06c60ba58ae2b35e9a11169 WHIRLPOOL c64c749980e44c36038e6203002cab5d83d3c9fc7dd2373f33413e478042cdc4e7a6daa7112c0d935fd85c0cd9e398b3653a4a7c3aac3f1b19a2ee05e5fb71a2
-EBUILD synaptiks-0.8.1-r3.ebuild 1598 SHA256 3b315145f7c75fe58a5bea6496163861aced7fc8d3a758773f78e2c591f07083 SHA512 034e239ead8a6ef337c1e6dbb87a68d4743acaa8907a293b51283374aa63e64a0c3ace5056da1b9f59527d5b773d1c65f26aa9327d00f9075857e7797b4122c1 WHIRLPOOL 9efdfc206077e41ea067d09444830d6966823c7b989a49ceb68d30508a0cbf97ebd015eb9ff4dc518b8d047cd09fb377c3c94acfcffcd304fa42070a33949f1b
-MISC ChangeLog 6163 SHA256 cb1d63e1c3d1d3d4da254705117ca95d982a77340c0bc96931f921cab317e8ce SHA512 03c465691c6ecad20940f797cd754d76d0c4a0b0d405a964b69a9f28627c571edc9fe4a97f0428ac854b50609bbc8795a5eb64646ea59d7959a8fa16138e67a2 WHIRLPOOL fc0c0dd3d52182d35fcb851e508fe5c98ab3148073bfdc6a34dc320aa5b88ae2257fbbe094298e0c3e79cc1b795b578cd82221d1e37c4db3e5b9d21009d610aa
+EBUILD synaptiks-0.8.1-r4.ebuild 1581 SHA256 9f57152190b947ddad28d696d5bf3ff836e5ceb8ff41e4ba482e379a83cdfba1 SHA512 218a7b7c28d18866b76c3d82ef88a650407121fb9d56d0693b93ac4341826d7a9b35d043bc44de6491d810be89c157bd4539922f82f46c0eee9e6f456e7f5b64 WHIRLPOOL 6f7f57716c1528eec49d50a8bff0497bc8f61fa7266394ad6d936a8851f615f8382bf3bb733d70fdffa9d5bed2b48411ffacdfe881844bf1f21c778920de8aa0
+MISC ChangeLog 6366 SHA256 29a9c58bf222f8fdcc2fa1d68741c3e1c59d8268ec0e7d1f14823cf10a5ce942 SHA512 e5fcab5e085e3164682ae29788a4692a7fec334c8c280850b9dde272ea18e5d995dd61318e1809e466f3d563be78a3d58779f758bd4c4e6b9d823e05bb5614b2 WHIRLPOOL 7d8510fb953b84474aacb178fcf38db04a7097754a08cc7329338115b12abbedca638faddd5cac3bfb4ad7996a3b35acc12229c2d98bf93a4f537ddbe7618fbd
 MISC metadata.xml 342 SHA256 e299145a7bacfc5298a28de947c88ca1489ae100d4b24180a5de5e64e28205b1 SHA512 f9bc72588e162e145f8e6c487974ff5f4da28630e6e0a31c715432455a5c85afec5896f5faeddfb10d5d53d32e14c15037d2dcdbee09b8a66fe35d86cf9f4eb7 WHIRLPOOL 4d3b7d1a21b0c098774b3bb547785c5cc9f28bc18c9f5ef5ce3578978fa68691e5afd31114b1ada8b797e04e028a4f59f329e5c32b11463f337a2659e1fda4ff
diff --git a/kde-misc/synaptiks/synaptiks-0.8.1-r3.ebuild b/kde-misc/synaptiks/synaptiks-0.8.1-r4.ebuild
index 14493a3a85fb..6bdadbeba7fa 100644
--- a/kde-misc/synaptiks/synaptiks-0.8.1-r3.ebuild
+++ b/kde-misc/synaptiks/synaptiks-0.8.1-r4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/synaptiks/synaptiks-0.8.1-r3.ebuild,v 1.2 2013/08/16 10:08:41 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/synaptiks/synaptiks-0.8.1-r4.ebuild,v 1.1 2013/08/18 12:52:09 mrueg Exp $
 
 EAPI=5
 
 KDE_HANDBOOK=optional
-PYTHON_COMPAT=( python2_6 python2_7 )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit kde4-base distutils-r1
 
 DESCRIPTION="Touchpad configuration and management tool for KDE"
@@ -37,16 +37,13 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-issuetracker[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-issuetracker-0.11-r1[${PYTHON_USEDEP}]
 	)"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-templatesfix.patch"\
-		"${FILESDIR}/${PN}-0.8.1-removedfeatures.patch"
-}
+PATCHES=( "${FILESDIR}/${P}-templatesfix.patch"
+	"${FILESDIR}/${PN}-0.8.1-removedfeatures.patch" )
 
-src_compile() {
-	distutils-r1_src_compile
+python_compile_all() {
 	if use doc; then
 		einfo "Generation of documentation"
 		pushd doc > /dev/null
@@ -55,9 +52,7 @@ src_compile() {
 	fi
 }
 
-src_install() {
-	distutils-r1_src_install
-	if use doc; then
-		dohtml -r doc/_build/*
-	fi
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/. )
+	distutils-r1_python_install_all
 }