| 1 |
commit: 2b5220fd78fbfaff91e2ae061fd09840826e8b31 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 26 21:33:42 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 26 21:34:45 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b5220fd |
| 7 |
|
| 8 |
Revert "dev-util/pkgconfig: rename 'internal-glib' to 'build'" |
| 9 |
|
| 10 |
This reverts commit 77d26beb3c333245f17f1d06848060a0978d003c. |
| 11 |
|
| 12 |
BOOTSTRAP_USE already has internal-glib set, so this change was |
| 13 |
pointless. |
| 14 |
|
| 15 |
dev-util/pkgconfig/pkgconfig-0.29.2.ebuild | 6 +++--- |
| 16 |
dev-util/pkgconfig/pkgconfig-9999.ebuild | 6 +++--- |
| 17 |
2 files changed, 6 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild |
| 20 |
index 1a7d39ae83c..081de47109b 100644 |
| 21 |
--- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild |
| 22 |
+++ b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild |
| 23 |
@@ -25,9 +25,9 @@ HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/" |
| 24 |
|
| 25 |
LICENSE="GPL-2" |
| 26 |
SLOT="0" |
| 27 |
-IUSE="build elibc_FreeBSD elibc_glibc hardened" |
| 28 |
+IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib" |
| 29 |
|
| 30 |
-RDEPEND="!build? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) |
| 31 |
+RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) |
| 32 |
!dev-util/pkgconf[pkg-config] |
| 33 |
!dev-util/pkg-config-lite |
| 34 |
!dev-util/pkgconfig-openbsd[pkg-config] |
| 35 |
@@ -61,7 +61,7 @@ src_prepare() { |
| 36 |
multilib_src_configure() { |
| 37 |
local myconf |
| 38 |
|
| 39 |
- if use build; then |
| 40 |
+ if use internal-glib; then |
| 41 |
myconf+=' --with-internal-glib' |
| 42 |
# non-glibc platforms use GNU libiconv, but configure needs to |
| 43 |
# know about that not to get confused when it finds something |
| 44 |
|
| 45 |
diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild |
| 46 |
index cee5a59070d..31f6de36737 100644 |
| 47 |
--- a/dev-util/pkgconfig/pkgconfig-9999.ebuild |
| 48 |
+++ b/dev-util/pkgconfig/pkgconfig-9999.ebuild |
| 49 |
@@ -25,9 +25,9 @@ HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/" |
| 50 |
|
| 51 |
LICENSE="GPL-2" |
| 52 |
SLOT="0" |
| 53 |
-IUSE="build elibc_FreeBSD elibc_glibc hardened" |
| 54 |
+IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib" |
| 55 |
|
| 56 |
-RDEPEND="!build? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) |
| 57 |
+RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) |
| 58 |
!dev-util/pkgconf[pkg-config] |
| 59 |
!dev-util/pkg-config-lite |
| 60 |
!dev-util/pkgconfig-openbsd[pkg-config] |
| 61 |
@@ -61,7 +61,7 @@ src_prepare() { |
| 62 |
multilib_src_configure() { |
| 63 |
local myconf |
| 64 |
|
| 65 |
- if use build; then |
| 66 |
+ if use internal-glib; then |
| 67 |
myconf+=' --with-internal-glib' |
| 68 |
# non-glibc platforms use GNU libiconv, but configure needs to |
| 69 |
# know about that not to get confused when it finds something |
Archives