From a843600ac0b763f99dbfce3a47a7ea51642d142b Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Fri, 26 Jul 2019 11:31:09 -0400 Subject: [PATCH] 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 --- 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 64b29db65e5b..5f58337eda71 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 64b29db65e5b..5f58337eda71 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 } -- 2.26.2