From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D82D5139694 for ; Sat, 11 Mar 2017 12:57:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B227CE0C04; Sat, 11 Mar 2017 12:57:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8D80DE0C04 for ; Sat, 11 Mar 2017 12:57:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6F71B340F43 for ; Sat, 11 Mar 2017 12:57:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D4EE7647C for ; Sat, 11 Mar 2017 12:57:19 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1489237013.57504ef8a17e74bb3105459042fa94e172a080b5.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/asciidoc/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/asciidoc/asciidoc-8.6.9-r4.ebuild app-text/asciidoc/asciidoc-8.6.9-r5.ebuild X-VCS-Directories: app-text/asciidoc/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 57504ef8a17e74bb3105459042fa94e172a080b5 X-VCS-Branch: master Date: Sat, 11 Mar 2017 12:57:19 +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: fa5a9f98-5709-4d9f-b86d-14e013121d86 X-Archives-Hash: 668d79630abbbd20e9ecaf8944599e1f commit: 57504ef8a17e74bb3105459042fa94e172a080b5 Author: David Seifert gentoo org> AuthorDate: Sat Mar 11 12:56:01 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Mar 11 12:56:53 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57504ef8 app-text/asciidoc: Switch back to python-single-r1 Bug: https://bugs.gentoo.org/show_bug.cgi?id=612260 Package-Manager: Portage-2.3.4, Repoman-2.3.2 ...oc-8.6.9-r4.ebuild => asciidoc-8.6.9-r5.ebuild} | 31 +++++++--------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/app-text/asciidoc/asciidoc-8.6.9-r4.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r5.ebuild similarity index 79% rename from app-text/asciidoc/asciidoc-8.6.9-r4.ebuild rename to app-text/asciidoc/asciidoc-8.6.9-r5.ebuild index 1bee46377ac..15fa066ce2f 100644 --- a/app-text/asciidoc/asciidoc-8.6.9-r4.ebuild +++ b/app-text/asciidoc/asciidoc-8.6.9-r5.ebuild @@ -3,9 +3,9 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 pypy ) +PYTHON_COMPAT=( python2_7 ) -inherit python-r1 readme.gentoo-r1 +inherit python-single-r1 readme.gentoo-r1 DESCRIPTION="AsciiDoc is a plain text human readable/writable document format" HOMEPAGE="http://asciidoc.org/" @@ -25,9 +25,9 @@ RDEPEND=" graphviz? ( media-gfx/graphviz ) highlight? ( || ( - app-text/highlight - dev-python/pygments[${PYTHON_USEDEP}] dev-util/source-highlight + dev-python/pygments[${PYTHON_USEDEP}] + app-text/highlight ) )" DEPEND=" @@ -51,32 +51,21 @@ src_prepare() { # Only needed for prefix - harmless (does nothing) otherwise sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \ "${S}/asciidoc.py" || die - python_copy_sources } src_configure() { - myconfigure() { - econf --sysconfdir="${EPREFIX}"/usr/share - } - python_foreach_impl run_in_build_dir myconfigure -} - -src_compile() { - python_foreach_impl run_in_build_dir default + econf --sysconfdir="${EPREFIX}"/usr/share } src_test() { - mytest() { - local -x ASCIIDOC_PY=asciidoc.py - "${EPYTHON}" tests/test${PN}.py update || die - "${EPYTHON}" tests/test${PN}.py run || die - } - python_foreach_impl run_in_build_dir mytest + local -x ASCIIDOC_PY=asciidoc.py + "${EPYTHON}" tests/test${PN}.py update || die + "${EPYTHON}" tests/test${PN}.py run || die } src_install() { - python_foreach_impl run_in_build_dir default - python_replicate_script "${ED%/}"/usr/bin/*.py + default + python_fix_shebang "${ED%/}"/usr/bin/*.py readme.gentoo_create_doc dodoc CHANGELOG docbook-xsl/asciidoc-docbook-xsl.txt \