Revert "dev-util/pkgconfig: rename 'internal-glib' to 'build'"
authorMike Gilbert <floppym@gentoo.org>
Tue, 26 Sep 2017 21:33:42 +0000 (17:33 -0400)
committerMike Gilbert <floppym@gentoo.org>
Tue, 26 Sep 2017 21:34:45 +0000 (17:34 -0400)
This reverts commit 77d26beb3c333245f17f1d06848060a0978d003c.

BOOTSTRAP_USE already has internal-glib set, so this change was
pointless.

dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
dev-util/pkgconfig/pkgconfig-9999.ebuild

index 1a7d39ae83c30a53600415117a5455eb1bdac918..081de47109bcc9417b4a1fea7354879f4a018ed7 100644 (file)
@@ -25,9 +25,9 @@ HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="build elibc_FreeBSD elibc_glibc hardened"
+IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
 
-RDEPEND="!build? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
+RDEPEND="!internal-glib? ( >=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 build; then
+       if use internal-glib; 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
index cee5a59070d8fbddea12a58a302f7bccc8a1012d..31f6de36737e129170759b69c9859ad41961be86 100644 (file)
@@ -25,9 +25,9 @@ HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="build elibc_FreeBSD elibc_glibc hardened"
+IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
 
-RDEPEND="!build? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
+RDEPEND="!internal-glib? ( >=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 build; then
+       if use internal-glib; 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