dev-util/pkgconf: Remove pkg-config USE flag

Signed-off-by: Jakov Smolić <jsmolic@gentoo.org>

4 files changed, 21 insertions, 51 deletions

diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml
index 894f008349f2..e6cdc1e75d6c 100644
--- a/dev-util/pkgconf/metadata.xml
+++ b/dev-util/pkgconf/metadata.xml
@@ -15,9 +15,6 @@
 	<slots>
 		<subslots>SONAME version of libpkgconf</subslots>
 	</slots>
-	<use>
-		<flag name="pkg-config">Install as a replacement for dev-util/pkgconfig</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">pkgconf/pkgconf</remote-id>
 	</upstream>
diff --git a/dev-util/pkgconf/pkgconf-1.7.4.ebuild b/dev-util/pkgconf/pkgconf-1.7.4-r1.ebuild
index edfc4c30bd49..b174cb7572a4 100644
--- a/dev-util/pkgconf/pkgconf-1.7.4.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.7.4-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf"
 
 LICENSE="ISC"
 SLOT="0/3"
-IUSE="+pkg-config test"
+IUSE="test"
 
 # tests require 'kyua'
 RESTRICT="!test? ( test )"
@@ -30,7 +30,7 @@ BDEPEND="
 	)
 "
 RDEPEND="
-	pkg-config? ( !dev-util/pkgconfig )
+	!dev-util/pkgconfig
 "
 
 MULTILIB_CHOST_TOOLS=(
@@ -41,11 +41,9 @@ src_prepare() {
 	default
 
 	[[ ${PV} == "9999" ]] && eautoreconf
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config$(get_exeext)
-		)
-	fi
+	MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/pkg-config$(get_exeext)
+	)
 }
 
 multilib_src_configure() {
@@ -66,15 +64,8 @@ multilib_src_test() {
 multilib_src_install() {
 	default
 
-	if use pkg-config; then
-		dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
-		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
+	dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
+	dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
 }
 
 multilib_src_install_all() {
diff --git a/dev-util/pkgconf/pkgconf-1.8.0.ebuild b/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
index 29fd8c66589f..2e564e60bf9c 100644
--- a/dev-util/pkgconf/pkgconf-1.8.0.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf"
 
 LICENSE="ISC"
 SLOT="0/3"
-IUSE="+pkg-config test"
+IUSE="test"
 
 # tests require 'kyua'
 RESTRICT="!test? ( test )"
@@ -30,7 +30,7 @@ BDEPEND="
 	)
 "
 RDEPEND="
-	pkg-config? ( !dev-util/pkgconfig )
+	!dev-util/pkgconfig
 "
 
 MULTILIB_CHOST_TOOLS=(
@@ -41,11 +41,9 @@ src_prepare() {
 	default
 
 	[[ ${PV} == "9999" ]] && eautoreconf
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config$(get_exeext)
-		)
-	fi
+	MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/pkg-config$(get_exeext)
+	)
 }
 
 multilib_src_configure() {
@@ -66,15 +64,8 @@ multilib_src_test() {
 multilib_src_install() {
 	default
 
-	if use pkg-config; then
-		dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
-		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
+	dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
+	dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
 }
 
 multilib_src_install_all() {
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index 463b0b7e2311..8ac703ecfd4c 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf"
 
 LICENSE="ISC"
 SLOT="0/3"
-IUSE="+pkg-config test"
+IUSE="test"
 
 # tests require 'kyua'
 RESTRICT="!test? ( test )"
@@ -30,7 +30,7 @@ BDEPEND="
 	)
 "
 RDEPEND="
-	pkg-config? ( !dev-util/pkgconfig )
+	!dev-util/pkgconfig
 "
 
 MULTILIB_CHOST_TOOLS=(
@@ -41,11 +41,9 @@ src_prepare() {
 	default
 
 	[[ ${PV} == "9999" ]] && eautoreconf
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config$(get_exeext)
-		)
-	fi
+	MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/pkg-config$(get_exeext)
+	)
 }
 
 multilib_src_configure() {
@@ -66,15 +64,8 @@ multilib_src_test() {
 multilib_src_install() {
 	default
 
-	if use pkg-config; then
-		dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
-		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
+	dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
+	dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
 }
 
 multilib_src_install_all() {