[gentoo-commits] dev/mgorny:master commit in: app-portage/install-mask/, dev-python/pymountboot/, app-portage/eclean-kernel/, ...

[Michał Górny]

commit:     e6bf9736dc4587603656f03958fa7b2643bb352d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 11 07:27:24 2012 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May  2 14:21:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=e6bf9736

Migrate to python-distutils-ng.

---
 app-portage/diffmask/diffmask-9999.ebuild          |   13 +++++++------
 .../eclean-kernel/eclean-kernel-9999.ebuild        |   15 +++++++--------
 app-portage/flaggie/flaggie-9999.ebuild            |   16 +++++-----------
 app-portage/install-mask/install-mask-9999.ebuild  |   11 +++--------
 .../smart-live-rebuild-9999.ebuild                 |   20 +++++++++-----------
 dev-python/pymountboot/pymountboot-9999.ebuild     |    9 +++------
 6 files changed, 34 insertions(+), 50 deletions(-)

diff --git a/app-portage/diffmask/diffmask-9999.ebuild b/app-portage/diffmask/diffmask-9999.ebuild
index 7caee1a..ca74c1c 100644
--- a/app-portage/diffmask/diffmask-9999.ebuild
+++ b/app-portage/diffmask/diffmask-9999.ebuild
@@ -3,11 +3,9 @@
 # $Header: $
 
 EAPI=4
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
+PYTHON_COMPAT='python2_6 python2_7'
 
-inherit base distutils
+inherit base python-distutils-ng
 
 #if LIVE
 EGIT_REPO_URI="git://github.com/mgorny/${PN}.git
@@ -31,7 +29,10 @@ KEYWORDS=
 SRC_URI=
 #endif
 
-src_prepare() {
+python_prepare_all() {
 	base_src_prepare
-	distutils_src_prepare
+}
+
+python_install_all() {
+	dodoc README
 }

diff --git a/app-portage/eclean-kernel/eclean-kernel-9999.ebuild b/app-portage/eclean-kernel/eclean-kernel-9999.ebuild
index 3963f84..43863fb 100644
--- a/app-portage/eclean-kernel/eclean-kernel-9999.ebuild
+++ b/app-portage/eclean-kernel/eclean-kernel-9999.ebuild
@@ -3,11 +3,9 @@
 # $Header: $
 
 EAPI=4
-PYTHON_DEPEND='2:2.6'
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS='2.4 2.5 3.*'
 
-inherit base distutils
+PYTHON_COMPAT='python2_6 python2_7'
+inherit base python-distutils-ng
 
 #if LIVE
 EGIT_REPO_URI="git://github.com/mgorny/${PN}.git
@@ -26,14 +24,15 @@ IUSE=""
 
 PDEPEND="kernel_linux? ( dev-python/pymountboot )"
 
-PYTHON_MODNAME=ecleankernel
-
 #if LIVE
 KEYWORDS=
 SRC_URI=
 #endif
 
-src_prepare() {
+python_prepare_all() {
 	base_src_prepare
-	distutils_src_prepare
+}
+
+python_install_all() {
+	dodoc README
 }

diff --git a/app-portage/flaggie/flaggie-9999.ebuild b/app-portage/flaggie/flaggie-9999.ebuild
index 33a730e..1c3bc22 100644
--- a/app-portage/flaggie/flaggie-9999.ebuild
+++ b/app-portage/flaggie/flaggie-9999.ebuild
@@ -3,11 +3,9 @@
 # $Header: $
 
 EAPI=4
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
+PYTHON_COMPAT='python2_6 python2_7'
 
-inherit base bash-completion-r1 distutils
+inherit base bash-completion-r1 python-distutils-ng
 
 #if LIVE
 EGIT_REPO_URI="git://github.com/mgorny/${PN}.git
@@ -32,20 +30,16 @@ KEYWORDS=
 SRC_URI=
 #endif
 
-src_prepare() {
+python_prepare_all() {
 	base_src_prepare
-	distutils_src_prepare
 }
 
-src_install() {
-	distutils_src_install
-
+python_install_all() {
+	dodoc README
 	newbashcomp contrib/bash-completion/${PN}.bash-completion ${PN}
 }
 
 pkg_postinst() {
-	distutils_pkg_postinst
-
 	ewarn "Please denote that flaggie creates backups of your package.* files"
 	ewarn "before performing each change through appending a single '~'."
 	ewarn "If you'd like to keep your own backup of them, please use another"

diff --git a/app-portage/install-mask/install-mask-9999.ebuild b/app-portage/install-mask/install-mask-9999.ebuild
index d83d532..b176470 100644
--- a/app-portage/install-mask/install-mask-9999.ebuild
+++ b/app-portage/install-mask/install-mask-9999.ebuild
@@ -3,11 +3,9 @@
 # $Header: $
 
 EAPI=4
-PYTHON_DEPEND='2:2.6'
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS='2.4 2.5 3.*'
+PYTHON_COMPAT='python2_6 python2_7'
 
-inherit base distutils
+inherit base python-distutils-ng
 
 #if LIVE
 EGIT_REPO_URI="git://github.com/mgorny/${PN}.git
@@ -27,14 +25,11 @@ IUSE=""
 RDEPEND="app-portage/flaggie
 	dev-python/lxml"
 
-PYTHON_MODNAME=installmask
-
 #if LIVE
 KEYWORDS=
 SRC_URI=
 #endif
 
-src_prepare() {
+python_prepare_all() {
 	base_src_prepare
-	distutils_src_prepare
 }

diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
index 7f36166..972b549 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
@@ -4,12 +4,9 @@
 
 EAPI=4
 
-PYTHON_DEPEND='2:2.6'
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS='2.4 2.5 3.*'
-DISTUTILS_SRC_TEST=setup.py
+PYTHON_COMPAT='python2_6 python2_7'
 
-inherit base distutils
+inherit base python-distutils-ng
 
 #if LIVE
 EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
@@ -28,20 +25,21 @@ IUSE=""
 RDEPEND=">=app-portage/gentoopm-0.2.1
 	!sys-apps/portage[python3]"
 
-PYTHON_MODNAME=smartliverebuild
-
 #if LIVE
 KEYWORDS=
 SRC_URI=
 #endif
 
-src_prepare() {
+python_prepare_all() {
 	base_src_prepare
-	distutils_src_prepare
 }
 
-src_install() {
-	distutils_src_install
+python_test() {
+	"${PYTHON}" setup.py test || die
+}
+
+python_install_all() {
+	dodoc README
 
 	insinto /etc/portage
 	newins smart-live-rebuild.conf{.example,}

diff --git a/dev-python/pymountboot/pymountboot-9999.ebuild b/dev-python/pymountboot/pymountboot-9999.ebuild
index 593b23f..cbeecea 100644
--- a/dev-python/pymountboot/pymountboot-9999.ebuild
+++ b/dev-python/pymountboot/pymountboot-9999.ebuild
@@ -3,11 +3,9 @@
 # $Header: $
 
 EAPI=4
-PYTHON_DEPEND='2:2.6'
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS='2.4 2.5 3.*'
+PYTHON_COMPAT='python2_6 python2_7'
 
-inherit base distutils
+inherit base python-distutils-ng
 
 #if LIVE
 EGIT_REPO_URI="git://github.com/mgorny/${PN}.git
@@ -32,7 +30,6 @@ KEYWORDS=
 SRC_URI=
 #endif
 
-src_prepare() {
+python_prepare_all() {
 	base_src_prepare
-	distutils_src_prepare
 }