commit: 2d576da91b9313fa2737f96a341225078528dba4
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 4 07:12:04 2021 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sat Sep 4 15:24:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d576da9
dev-util/pkgconf: Remove pkg-config USE flag
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-util/pkgconf/metadata.xml | 3 ---
...kgconf-1.7.4.ebuild => pkgconf-1.7.4-r1.ebuild} | 23 +++++++---------------
...kgconf-1.8.0.ebuild => pkgconf-1.8.0-r1.ebuild} | 23 +++++++---------------
dev-util/pkgconf/pkgconf-9999.ebuild | 23 +++++++---------------
4 files changed, 21 insertions(+), 51 deletions(-)
diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml
index 894f008349f..e6cdc1e75d6 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
similarity index 73%
rename from dev-util/pkgconf/pkgconf-1.7.4.ebuild
rename to dev-util/pkgconf/pkgconf-1.7.4-r1.ebuild
index edfc4c30bd4..b174cb7572a 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
similarity index 74%
rename from dev-util/pkgconf/pkgconf-1.8.0.ebuild
rename to dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
index 29fd8c66589..2e564e60bf9 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 463b0b7e231..8ac703ecfd4 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() {
