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 C8CEF138334 for ; Fri, 26 Jul 2019 15:33:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64489E0848; Fri, 26 Jul 2019 15:33:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4AFB7E0848 for ; Fri, 26 Jul 2019 15:33:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 28A2F348BF4 for ; Fri, 26 Jul 2019 15:33:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6DBE31BA for ; Fri, 26 Jul 2019 15:33:06 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1564155183.a843600ac0b763f99dbfce3a47a7ea51642d142b.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/pkgconf/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/pkgconf/pkgconf-1.6.3.ebuild dev-util/pkgconf/pkgconf-9999.ebuild X-VCS-Directories: dev-util/pkgconf/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: a843600ac0b763f99dbfce3a47a7ea51642d142b X-VCS-Branch: master Date: Fri, 26 Jul 2019 15:33:06 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c67f6022-27c5-44e8-9be2-8bf8bc4d2861 X-Archives-Hash: be55bf88a4829c6f2bda0551646aa506 commit: a843600ac0b763f99dbfce3a47a7ea51642d142b Author: Mike Gilbert gentoo org> AuthorDate: Fri Jul 26 15:31:09 2019 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Fri Jul 26 15:33:03 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a843600a dev-util/pkgconf: move test deps to BDEPEND, misc tweaks Package-Manager: Portage-2.3.68, Repoman-2.3.16_p2 Signed-off-by: Mike Gilbert gentoo.org> dev-util/pkgconf/pkgconf-1.6.3.ebuild | 8 ++++++-- dev-util/pkgconf/pkgconf-9999.ebuild | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dev-util/pkgconf/pkgconf-1.6.3.ebuild b/dev-util/pkgconf/pkgconf-1.6.3.ebuild index 64b29db65e5..5f58337eda7 100644 --- a/dev-util/pkgconf/pkgconf-1.6.3.ebuild +++ b/dev-util/pkgconf/pkgconf-1.6.3.ebuild @@ -24,7 +24,7 @@ IUSE="+pkg-config test" # tests require 'kyua' RESTRICT="!test? ( test )" -DEPEND=" +BDEPEND=" test? ( dev-libs/atf dev-util/kyua @@ -54,7 +54,8 @@ src_prepare() { } multilib_src_configure() { - ECONF_SOURCE="${S}" econf + local ECONF_SOURCE="${S}" + econf } multilib_src_test() { @@ -70,6 +71,9 @@ multilib_src_install() { dosym pkgconf.1 /usr/share/man/man1/pkg-config.1 else rm "${ED}"/usr/share/aclocal/pkg.m4 || die + rmdir "${ED}"/usr/share/aclocal || die + rm "${ED}"/usr/share/man/man7/pkg.m4.7 || die + rmdir "${ED}"/usr/share/man/man7 || die fi } diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild index 64b29db65e5..5f58337eda7 100644 --- a/dev-util/pkgconf/pkgconf-9999.ebuild +++ b/dev-util/pkgconf/pkgconf-9999.ebuild @@ -24,7 +24,7 @@ IUSE="+pkg-config test" # tests require 'kyua' RESTRICT="!test? ( test )" -DEPEND=" +BDEPEND=" test? ( dev-libs/atf dev-util/kyua @@ -54,7 +54,8 @@ src_prepare() { } multilib_src_configure() { - ECONF_SOURCE="${S}" econf + local ECONF_SOURCE="${S}" + econf } multilib_src_test() { @@ -70,6 +71,9 @@ multilib_src_install() { dosym pkgconf.1 /usr/share/man/man1/pkg-config.1 else rm "${ED}"/usr/share/aclocal/pkg.m4 || die + rmdir "${ED}"/usr/share/aclocal || die + rm "${ED}"/usr/share/man/man7/pkg.m4.7 || die + rmdir "${ED}"/usr/share/man/man7 || die fi }