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 <[email protected]>
johu · Jul 26, 2019 · a843600 · a843600
1 parent 418b54f
commit a843600
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git 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
@@ -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
 }