Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/mgorny:master commit in: app-portage/gentoopm/
Date: Wed, 02 May 2012 14:22:15
Message-Id: 1335968473.94ff87696472afcaa8738aba0461a85c0f6d1b13.mgorny@gentoo
1 commit: 94ff87696472afcaa8738aba0461a85c0f6d1b13
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 2 14:16:26 2012 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed May 2 14:21:13 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=94ff8769
7
8 app-portage/gentoopm: Convert gentoopm to python-distutils-ng.
9
10 (Portage version: 2.2.0_alpha101_p3/git/Linux x86_64, unsigned Manifest commit)
11
12 ---
13 app-portage/gentoopm/gentoopm-9999.ebuild | 19 ++++++-------------
14 1 files changed, 6 insertions(+), 13 deletions(-)
15
16 diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
17 index 585ca87..5198c74 100644
18 --- a/app-portage/gentoopm/gentoopm-9999.ebuild
19 +++ b/app-portage/gentoopm/gentoopm-9999.ebuild
20 @@ -3,13 +3,9 @@
21 # $Header: $
22
23 EAPI=4
24 +PYTHON_COMPAT='python2_6 python2_7'
25
26 -PYTHON_DEPEND='2:2.6'
27 -SUPPORT_PYTHON_ABIS=1
28 -RESTRICT_PYTHON_ABIS='2.4 2.5 3.*'
29 -DISTUTILS_SRC_TEST=setup.py
30 -
31 -inherit base distutils
32 +inherit base python-distutils-ng
33
34 #if LIVE
35 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
36 @@ -39,22 +35,19 @@ KEYWORDS=
37 SRC_URI=
38 #endif
39
40 -src_prepare() {
41 +python_prepare_all() {
42 base_src_prepare
43 - distutils_src_prepare
44 }
45
46 src_compile() {
47 - distutils_src_compile
48 + python-distutils-ng_src_compile
49
50 if use doc; then
51 - "$(PYTHON -2)" setup.py doc || die
52 + "${PYTHON}" setup.py doc || die
53 fi
54 }
55
56 -src_install() {
57 - distutils_src_install
58 -
59 +python_install_all() {
60 if use doc; then
61 dohtml -r doc/*
62 fi