From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BA3D6138010 for ; Sun, 14 Oct 2012 11:01:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 474D1E056C; Sun, 14 Oct 2012 11:01:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6B5D0E056C for ; Sun, 14 Oct 2012 11:01:23 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 904BD33C1EE for ; Sun, 14 Oct 2012 11:01:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3E15CE5436 for ; Sun, 14 Oct 2012 11:01:21 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1349422715.c0c8c4ea9e2d8b54a8ee1e73938d52e829590dc6.mgorny@gentoo> Subject: [gentoo-commits] dev/mgorny:master commit in: app-portage/install-mask/, app-portage/diffmask/, app-admin/eclean-kernel/, ... X-VCS-Repository: dev/mgorny X-VCS-Files: app-admin/eclean-kernel/eclean-kernel-9999.ebuild app-portage/diffmask/diffmask-9999.ebuild app-portage/flaggie/flaggie-9999.ebuild app-portage/gentoopm/gentoopm-9999.ebuild app-portage/install-mask/install-mask-9999.ebuild app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild dev-python/pymountboot/pymountboot-9999.ebuild sci-libs/pyh2o/pyh2o-9999.ebuild X-VCS-Directories: app-portage/install-mask/ app-portage/diffmask/ dev-python/pymountboot/ app-admin/eclean-kernel/ sci-libs/pyh2o/ app-portage/gentoopm/ app-portage/flaggie/ app-portage/smart-live-rebuild/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c0c8c4ea9e2d8b54a8ee1e73938d52e829590dc6 X-VCS-Branch: master Date: Sun, 14 Oct 2012 11:01:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4926b368-ab07-4a1e-82d9-88de4215061a X-Archives-Hash: f2d9fc33c5494976c876c473ef310186 commit: c0c8c4ea9e2d8b54a8ee1e73938d52e829590dc6 Author: Michał Górny gentoo org> AuthorDate: Fri Oct 5 07:38:35 2012 +0000 Commit: Michał Górny gentoo 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 -}