From 2b5220fd78fbfaff91e2ae061fd09840826e8b31 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Tue, 26 Sep 2017 17:33:42 -0400 Subject: [PATCH] Revert "dev-util/pkgconfig: rename 'internal-glib' to 'build'" This reverts commit 77d26beb3c333245f17f1d06848060a0978d003c. BOOTSTRAP_USE already has internal-glib set, so this change was pointless. --- dev-util/pkgconfig/pkgconfig-0.29.2.ebuild | 6 +++--- dev-util/pkgconfig/pkgconfig-9999.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild index 1a7d39ae83c3..081de47109bc 100644 --- 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="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 diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild index cee5a59070d8..31f6de36737e 100644 --- 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="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 -- 2.26.2