dev-util/pkgconfig: rename 'internal-glib' to 'build'

This avoids a circular dependency on dev-libs/glib during catalyst
stage1 builds.

Package-Manager: Portage-2.3.6_p39, Repoman-2.3.3_p17

diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
index b8a7cf7dace5eb41645be5e765353edaef7213eb..f82adcd840b9ab2132d5cfad839c8f563000fdad 100644 (file)
--- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
@@ -25,9 +25,9 @@ HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
+IUSE="build elibc_FreeBSD elibc_glibc hardened"
 
-RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
+RDEPEND="!build? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
        !dev-util/pkgconf[pkg-config]
        !dev-util/pkg-config-lite
        !dev-util/pkgconfig-openbsd[pkg-config]
@@ -61,7 +61,7 @@ src_prepare() {
 multilib_src_configure() {
        local myconf
 
-       if use internal-glib; then
+       if use build; then
                myconf+=' --with-internal-glib'
                # non-glibc platforms use GNU libiconv, but configure needs to
                # know about that not to get confused when it finds something

diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild
index 31f6de36737e129170759b69c9859ad41961be86..cee5a59070d8fbddea12a58a302f7bccc8a1012d 100644 (file)
--- a/dev-util/pkgconfig/pkgconfig-9999.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-9999.ebuild
@@ -25,9 +25,9 @@ HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
+IUSE="build elibc_FreeBSD elibc_glibc hardened"
 
-RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
+RDEPEND="!build? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
        !dev-util/pkgconf[pkg-config]
        !dev-util/pkg-config-lite
        !dev-util/pkgconfig-openbsd[pkg-config]
@@ -61,7 +61,7 @@ src_prepare() {
 multilib_src_configure() {
        local myconf
 
-       if use internal-glib; then
+       if use build; then
                myconf+=' --with-internal-glib'
                # non-glibc platforms use GNU libiconv, but configure needs to
                # know about that not to get confused when it finds something