* [gentoo-commits] dev/mgorny:master commit in: app-portage/install-mask/, app-portage/diffmask/, app-admin/eclean-kernel/, ...
@ 2012-10-14 11:01 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2012-10-14 11:01 UTC (permalink / raw
To: gentoo-commits
commit: c0c8c4ea9e2d8b54a8ee1e73938d52e829590dc6
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 5 07:38:35 2012 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 5 07:38:35 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=c0c8c4ea
Convert ebuilds to use distutils-r1.
---
app-admin/eclean-kernel/eclean-kernel-9999.ebuild | 12 +---------
app-portage/diffmask/diffmask-9999.ebuild | 12 +---------
app-portage/flaggie/flaggie-9999.ebuild | 10 ++------
app-portage/gentoopm/gentoopm-9999.ebuild | 21 +++++++------------
app-portage/install-mask/install-mask-9999.ebuild | 10 ++------
.../smart-live-rebuild-9999.ebuild | 13 +++--------
dev-python/pymountboot/pymountboot-9999.ebuild | 8 +-----
sci-libs/pyh2o/pyh2o-9999.ebuild | 8 +-----
8 files changed, 26 insertions(+), 68 deletions(-)
diff --git a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
index 6636175..8922744 100644
--- a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
@@ -4,8 +4,8 @@
EAPI=4
-PYTHON_COMPAT='python2_6 python2_7 python3_1 python3_2'
-inherit base python-distutils-ng
+PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
+inherit distutils-r1
#if LIVE
EGIT_REPO_URI="http://bitbucket.org/mgorny/${PN}.git"
@@ -27,11 +27,3 @@ PDEPEND="kernel_linux? ( dev-python/pymountboot )"
KEYWORDS=
SRC_URI=
#endif
-
-python_prepare_all() {
- base_src_prepare
-}
-
-python_install_all() {
- dodoc README
-}
diff --git a/app-portage/diffmask/diffmask-9999.ebuild b/app-portage/diffmask/diffmask-9999.ebuild
index 70c557e..1270a14 100644
--- a/app-portage/diffmask/diffmask-9999.ebuild
+++ b/app-portage/diffmask/diffmask-9999.ebuild
@@ -3,9 +3,9 @@
# $Header: $
EAPI=4
-PYTHON_COMPAT='python2_6 python2_7 python3_1 python3_2'
+PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
-inherit base python-distutils-ng
+inherit distutils-r1
#if LIVE
EGIT_REPO_URI="http://bitbucket.org/mgorny/${PN}.git"
@@ -27,11 +27,3 @@ RDEPEND=">=sys-apps/portage-2.1.8.3"
KEYWORDS=
SRC_URI=
#endif
-
-python_prepare_all() {
- base_src_prepare
-}
-
-python_install_all() {
- dodoc README
-}
diff --git a/app-portage/flaggie/flaggie-9999.ebuild b/app-portage/flaggie/flaggie-9999.ebuild
index 0473634..f285174 100644
--- a/app-portage/flaggie/flaggie-9999.ebuild
+++ b/app-portage/flaggie/flaggie-9999.ebuild
@@ -3,9 +3,9 @@
# $Header: $
EAPI=4
-PYTHON_COMPAT='python2_6 python2_7 python3_1 python3_2'
+PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
-inherit base bash-completion-r1 python-distutils-ng
+inherit bash-completion-r1 distutils-r1
#if LIVE
EGIT_REPO_URI="http://bitbucket.org/mgorny/${PN}.git"
@@ -29,13 +29,9 @@ KEYWORDS=
SRC_URI=
#endif
-python_prepare_all() {
- base_src_prepare
-}
-
python_install_all() {
- dodoc README
newbashcomp contrib/bash-completion/${PN}.bash-completion ${PN}
+ distutils-r1_python_install_all
}
pkg_postinst() {
diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
index 3ef7211..d473997 100644
--- a/app-portage/gentoopm/gentoopm-9999.ebuild
+++ b/app-portage/gentoopm/gentoopm-9999.ebuild
@@ -3,9 +3,9 @@
# $Header: $
EAPI=4
-PYTHON_COMPAT='python2_6 python2_7 python3_1 python3_2'
+PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
-inherit base python-distutils-ng
+inherit distutils-r1
#if LIVE
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
@@ -34,20 +34,15 @@ KEYWORDS=
SRC_URI=
#endif
-python_prepare_all() {
- base_src_prepare
-}
-
-src_compile() {
- python-distutils-ng_src_compile
-
+python_compile_all() {
if use doc; then
- "${PYTHON}" setup.py doc || die
+ # XXX: do we need any specific ${PYTHON} magic here?
+ python2 setup.py doc || die
fi
}
python_install_all() {
- if use doc; then
- dohtml -r doc/*
- fi
+ use doc && local HTML_DOCS=( doc/* )
+
+ distutils-r1_python_install_all
}
diff --git a/app-portage/install-mask/install-mask-9999.ebuild b/app-portage/install-mask/install-mask-9999.ebuild
index bd99f45..2503766 100644
--- a/app-portage/install-mask/install-mask-9999.ebuild
+++ b/app-portage/install-mask/install-mask-9999.ebuild
@@ -3,9 +3,9 @@
# $Header: $
EAPI=4
-PYTHON_COMPAT='python2_6 python2_7 python3_1 python3_2'
+PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
-inherit base python-distutils-ng
+inherit distutils-r1
#if LIVE
EGIT_REPO_URI="http://bitbucket.org/mgorny/${PN}.git"
@@ -21,14 +21,10 @@ SLOT="0"
KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
-RDEPEND="app-portage/flaggie
+RDEPEND="app-portage/flaggie[${PYTHON_USEDEP}]
dev-python/lxml"
#if LIVE
KEYWORDS=
SRC_URI=
#endif
-
-python_prepare_all() {
- base_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 dea6e20..e051a2c 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
@@ -3,10 +3,9 @@
# $Header: $
EAPI=4
+PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
-PYTHON_COMPAT='python2_6 python2_7 python3_1 python3_2'
-
-inherit base python-distutils-ng
+inherit distutils-r1
#if LIVE
EGIT_REPO_URI="http://bitbucket.org/mgorny/${PN}.git"
@@ -22,23 +21,19 @@ SLOT="0"
KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
IUSE=""
-RDEPEND=">=app-portage/gentoopm-0.2.1[python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?]"
+RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
#if LIVE
KEYWORDS=
SRC_URI=
#endif
-python_prepare_all() {
- base_src_prepare
-}
-
python_test() {
"${PYTHON}" setup.py test || die
}
python_install_all() {
- dodoc README
+ distutils-r1_python_install_all
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 861cc5c..17d5bc6 100644
--- a/dev-python/pymountboot/pymountboot-9999.ebuild
+++ b/dev-python/pymountboot/pymountboot-9999.ebuild
@@ -3,9 +3,9 @@
# $Header: $
EAPI=4
-PYTHON_COMPAT='python2_6 python2_7 python3_1 python3_2'
+PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
-inherit base python-distutils-ng
+inherit distutils-r1
#if LIVE
EGIT_REPO_URI="http://bitbucket.org/mgorny/${PN}.git"
@@ -28,7 +28,3 @@ DEPEND="${RDEPEND}"
KEYWORDS=
SRC_URI=
#endif
-
-python_prepare_all() {
- base_src_prepare
-}
diff --git a/sci-libs/pyh2o/pyh2o-9999.ebuild b/sci-libs/pyh2o/pyh2o-9999.ebuild
index 0489b13..43acdaa 100644
--- a/sci-libs/pyh2o/pyh2o-9999.ebuild
+++ b/sci-libs/pyh2o/pyh2o-9999.ebuild
@@ -3,9 +3,9 @@
# $Header: $
EAPI=4
-PYTHON_COMPAT='python2_6 python2_7 python3_1 python3_2'
+PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
-inherit base python-distutils-ng
+inherit distutils-r1
#if LIVE
AUTOTOOLS_AUTORECONF=yes
@@ -27,7 +27,3 @@ IUSE=""
KEYWORDS=
SRC_URI=
#endif
-
-python_prepare_all() {
- base_src_prepare
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] dev/mgorny:master commit in: app-portage/install-mask/, app-portage/diffmask/, app-admin/eclean-kernel/, ...
@ 2012-12-09 23:17 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2012-12-09 23:17 UTC (permalink / raw
To: gentoo-commits
commit: 16af07367d460160361cfa1b1927e60371259ba5
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 9 22:51:57 2012 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec 9 22:51:57 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=16af0736
Update PYTHON_COMPAT for my packages.
---
app-admin/eclean-kernel/eclean-kernel-9999.ebuild | 2 +-
app-portage/diffmask/diffmask-9999.ebuild | 2 +-
app-portage/flaggie/flaggie-9999.ebuild | 2 +-
app-portage/gentoopm/gentoopm-9999.ebuild | 2 +-
app-portage/install-mask/install-mask-9999.ebuild | 2 +-
.../smart-live-rebuild-9999.ebuild | 2 +-
dev-python/pymountboot/pymountboot-9999.ebuild | 2 +-
sci-libs/pyh2o/pyh2o-9999.ebuild | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
index 3fc1508..f201d31 100644
--- a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
@@ -3,8 +3,8 @@
# $Header: $
EAPI=4
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
-PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
inherit distutils-r1
#if LIVE
diff --git a/app-portage/diffmask/diffmask-9999.ebuild b/app-portage/diffmask/diffmask-9999.ebuild
index ca124a5..53c6eac 100644
--- a/app-portage/diffmask/diffmask-9999.ebuild
+++ b/app-portage/diffmask/diffmask-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=4
-PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} )
inherit distutils-r1
diff --git a/app-portage/flaggie/flaggie-9999.ebuild b/app-portage/flaggie/flaggie-9999.ebuild
index f285174..6e351ce 100644
--- a/app-portage/flaggie/flaggie-9999.ebuild
+++ b/app-portage/flaggie/flaggie-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=4
-PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} )
inherit bash-completion-r1 distutils-r1
diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
index 911607a..e24f70a 100644
--- a/app-portage/gentoopm/gentoopm-9999.ebuild
+++ b/app-portage/gentoopm/gentoopm-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=4
-PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
inherit distutils-r1
diff --git a/app-portage/install-mask/install-mask-9999.ebuild b/app-portage/install-mask/install-mask-9999.ebuild
index 326e9fa..e751b3d 100644
--- a/app-portage/install-mask/install-mask-9999.ebuild
+++ b/app-portage/install-mask/install-mask-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=4
-PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
inherit distutils-r1
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 e051a2c..736521c 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=4
-PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
inherit distutils-r1
diff --git a/dev-python/pymountboot/pymountboot-9999.ebuild b/dev-python/pymountboot/pymountboot-9999.ebuild
index 3a7610c..bdcbb20 100644
--- a/dev-python/pymountboot/pymountboot-9999.ebuild
+++ b/dev-python/pymountboot/pymountboot-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=4
-PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
inherit distutils-r1
diff --git a/sci-libs/pyh2o/pyh2o-9999.ebuild b/sci-libs/pyh2o/pyh2o-9999.ebuild
index 43acdaa..81684d0 100644
--- a/sci-libs/pyh2o/pyh2o-9999.ebuild
+++ b/sci-libs/pyh2o/pyh2o-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=4
-PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} )
inherit distutils-r1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-12-09 23:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-14 11:01 [gentoo-commits] dev/mgorny:master commit in: app-portage/install-mask/, app-portage/diffmask/, app-admin/eclean-kernel/, Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2012-12-09 23:17 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox