From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 096181396D0 for ; Tue, 26 Sep 2017 21:34:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28E0BE0C03; Tue, 26 Sep 2017 21:34:52 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 05F7AE0C03 for ; Tue, 26 Sep 2017 21:34:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C9EC83416A4 for ; Tue, 26 Sep 2017 21:34:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D4788F83 for ; Tue, 26 Sep 2017 21:34:49 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1506461685.2b5220fd78fbfaff91e2ae061fd09840826e8b31.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/pkgconfig/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/pkgconfig/pkgconfig-0.29.2.ebuild dev-util/pkgconfig/pkgconfig-9999.ebuild X-VCS-Directories: dev-util/pkgconfig/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 2b5220fd78fbfaff91e2ae061fd09840826e8b31 X-VCS-Branch: master Date: Tue, 26 Sep 2017 21:34:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 930c037c-cf27-4b11-af0c-9ace6fb2263b X-Archives-Hash: 752a71d0e6902e9069d8870b28e05b33 commit: 2b5220fd78fbfaff91e2ae061fd09840826e8b31 Author: Mike Gilbert gentoo org> AuthorDate: Tue Sep 26 21:33:42 2017 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Sep 26 21:34:45 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b5220fd 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 1a7d39ae83c..081de47109b 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 cee5a59070d..31f6de36737 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