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 0824A138D03 for ; Sat, 11 Jul 2015 15:00:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28670E0908; Sat, 11 Jul 2015 15:00:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B4254E0908 for ; Sat, 11 Jul 2015 15:00:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4079A3408A0 for ; Sat, 11 Jul 2015 15:00:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DC00066A for ; Sat, 11 Jul 2015 15:00:03 +0000 (UTC) From: "Manuel Rüger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Manuel Rüger" Message-ID: <1436626795.8257273a38e0d26df95aa8f3e58e876b70c9fb2e.mrueg@gentoo> Subject: [gentoo-commits] dev/mrueg:master commit in: dev-python/pythondialog/ X-VCS-Repository: dev/mrueg X-VCS-Files: dev-python/pythondialog/pythondialog-3.3.0-r1.ebuild X-VCS-Directories: dev-python/pythondialog/ X-VCS-Committer: mrueg X-VCS-Committer-Name: Manuel Rüger X-VCS-Revision: 8257273a38e0d26df95aa8f3e58e876b70c9fb2e X-VCS-Branch: master Date: Sat, 11 Jul 2015 15:00:03 +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: 8cc584fc-1a36-4c1f-8b84-8a2758537b16 X-Archives-Hash: a1c50ce68b32846aea51df4c5d478916 commit: 8257273a38e0d26df95aa8f3e58e876b70c9fb2e Author: Manuel Rüger gentoo org> AuthorDate: Sat Jul 11 14:59:55 2015 +0000 Commit: Manuel Rüger gentoo org> CommitDate: Sat Jul 11 14:59:55 2015 +0000 URL: https://gitweb.gentoo.org/dev/mrueg.git/commit/?id=8257273a [dev-python/pythondialog] Improve ebuild style. Package-Manager: portage-2.2.20 .../pythondialog/pythondialog-3.3.0-r1.ebuild | 42 ++++++++-------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/dev-python/pythondialog/pythondialog-3.3.0-r1.ebuild b/dev-python/pythondialog/pythondialog-3.3.0-r1.ebuild index e1f49ce..5effae6 100644 --- a/dev-python/pythondialog/pythondialog-3.3.0-r1.ebuild +++ b/dev-python/pythondialog/pythondialog-3.3.0-r1.ebuild @@ -25,48 +25,36 @@ src_prepare() { preparation() { if python_is_python3; then cp -r -l "${WORKDIR}/${P}" "${BUILD_DIR}" || die - pushd "${BUILD_DIR}" > /dev/null else cp -r -l "${WORKDIR}/python2-${P}" "${BUILD_DIR}" || die - pushd "${BUILD_DIR}" > /dev/null fi + pushd "${BUILD_DIR}" > /dev/null sed -e "/^ 'sphinx.ext.intersphinx',/d" -i doc/conf.py || die popd > /dev/null - distutils-r1_python_prepare } python_foreach_impl preparation distutils-r1_python_prepare_all } -src_compile() { - compile () { +python_compile() { if [[ -z $DOC_BUILT ]]; then + pushd "${BUILD_DIR}" > /dev/null || die use doc && emake -C doc html - export DOC_BUILT=1 + DOC_BUILT=1 + popd > /dev/null || die fi - distutils-r1_python_compile - } - python_foreach_impl run_in_build_dir compile -} - -src_install() { - install () { - if [[ -z $EXAMPLES_INSTALLED ]]; then - use examples && local EXAMPLES=( examples/. ) - export EXAMPLES_INSTALLED=1 - fi - if [[ -z $DOCS_INSTALLED ]]; then - use doc && local HTML_DOCS=( doc/_build/html/. ) - export DOCS_INSTALLED=1 - fi - distutils-r1_python_install - distutils-r1_python_install_all - } - python_foreach_impl run_in_build_dir install } -run_in_build_dir() { +python_install() { pushd "${BUILD_DIR}" > /dev/null || die - "$@" + if [[ -z $EXAMPLES_INSTALLED ]]; then + use examples && local EXAMPLES=( examples/. ) + EXAMPLES_INSTALLED=1 + fi + if [[ -z $DOCS_INSTALLED ]]; then + use doc && local HTML_DOCS=( doc/_build/html/. ) + DOCS_INSTALLED=1 + fi + distutils-r1_python_install_all popd > /dev/null || die }