[gentoo-commits] repo/gentoo:master commit in: dev-util/pkgconfig/

["Mike Gilbert" <floppym@gentoo.org>]

commit:     77d26beb3c333245f17f1d06848060a0978d003c
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  5 16:10:52 2017 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Sep  5 21:04:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77d26beb

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

 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 b8a7cf7dace..f82adcd840b 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="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 31f6de36737..cee5a59070d 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="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