| 1 |
commit: fab5df2eef030ab7d815a82592a727fc78390710 |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 1 14:04:34 2017 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 1 14:23:15 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fab5df2e |
| 7 |
|
| 8 |
app-i18n/ibus: switch to gtk2 USE flag |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 11 |
|
| 12 |
app-i18n/ibus/ibus-1.5.12.ebuild | 34 +++++++++++++++++++--------------- |
| 13 |
app-i18n/ibus/ibus-1.5.15.ebuild | 34 +++++++++++++++++++--------------- |
| 14 |
app-i18n/ibus/metadata.xml | 2 +- |
| 15 |
3 files changed, 39 insertions(+), 31 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild |
| 18 |
index c6fc3724541..4ec5bbf3ac6 100644 |
| 19 |
--- a/app-i18n/ibus/ibus-1.5.12.ebuild |
| 20 |
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild |
| 21 |
@@ -14,14 +14,14 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" |
| 22 |
LICENSE="LGPL-2.1" |
| 23 |
SLOT="0" |
| 24 |
KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" |
| 25 |
-IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X" |
| 26 |
+IUSE="deprecated gconf +gtk +gtk2 +introspection nls +python test vala wayland +X" |
| 27 |
REQUIRED_USE="deprecated? ( python ) |
| 28 |
python? ( |
| 29 |
${PYTHON_REQUIRED_USE} |
| 30 |
- || ( deprecated gtk3 ) |
| 31 |
- gtk3? ( introspection ) |
| 32 |
+ || ( deprecated gtk ) |
| 33 |
+ gtk? ( introspection ) |
| 34 |
) |
| 35 |
- test? ( || ( gtk gtk3 ) ) |
| 36 |
+ test? ( gtk ) |
| 37 |
vala? ( introspection )" |
| 38 |
|
| 39 |
CDEPEND="app-text/iso-codes |
| 40 |
@@ -31,8 +31,12 @@ CDEPEND="app-text/iso-codes |
| 41 |
sys-apps/dbus[X?] |
| 42 |
x11-libs/libnotify |
| 43 |
gconf? ( gnome-base/gconf:2 ) |
| 44 |
- gtk? ( x11-libs/gtk+:2 ) |
| 45 |
- gtk3? ( x11-libs/gtk+:3 ) |
| 46 |
+ gtk? ( |
| 47 |
+ x11-libs/gtk+:3 |
| 48 |
+ x11-libs/libX11 |
| 49 |
+ x11-libs/libXi |
| 50 |
+ gtk2? ( x11-libs/gtk+:2 ) |
| 51 |
+ ) |
| 52 |
introspection? ( dev-libs/gobject-introspection ) |
| 53 |
nls? ( virtual/libintl ) |
| 54 |
python? ( |
| 55 |
@@ -56,7 +60,7 @@ RDEPEND="${CDEPEND} |
| 56 |
dev-python/dbus-python[${PYTHON_USEDEP}] |
| 57 |
dev-python/pygtk:2[${PYTHON_USEDEP}] |
| 58 |
) |
| 59 |
- gtk3? ( |
| 60 |
+ gtk? ( |
| 61 |
x11-libs/gtk+:3[introspection] |
| 62 |
) |
| 63 |
)" |
| 64 |
@@ -95,7 +99,7 @@ src_configure() { |
| 65 |
if use python; then |
| 66 |
python_conf+=( |
| 67 |
$(use_enable deprecated python-library) |
| 68 |
- $(use_enable gtk3 setup) |
| 69 |
+ $(use_enable gtk setup) |
| 70 |
--with-python=${EPYTHON} |
| 71 |
) |
| 72 |
else |
| 73 |
@@ -104,9 +108,9 @@ src_configure() { |
| 74 |
|
| 75 |
econf \ |
| 76 |
$(use_enable gconf) \ |
| 77 |
- $(use_enable gtk gtk2) \ |
| 78 |
- $(use_enable gtk3 ui) \ |
| 79 |
- $(use_enable gtk3) \ |
| 80 |
+ $(use_enable gtk gtk3) \ |
| 81 |
+ $(use_enable gtk ui) \ |
| 82 |
+ $(use_enable gtk2) \ |
| 83 |
$(use_enable introspection) \ |
| 84 |
$(use_enable nls) \ |
| 85 |
$(use_enable test tests) \ |
| 86 |
@@ -141,15 +145,15 @@ pkg_preinst() { |
| 87 |
|
| 88 |
pkg_postinst() { |
| 89 |
use gconf && gnome2_gconf_install |
| 90 |
- use gtk && gnome2_query_immodules_gtk2 |
| 91 |
- use gtk3 && gnome2_query_immodules_gtk3 |
| 92 |
+ use gtk && gnome2_query_immodules_gtk3 |
| 93 |
+ use gtk2 && gnome2_query_immodules_gtk2 |
| 94 |
gnome2_icon_cache_update |
| 95 |
gnome2_schemas_update |
| 96 |
} |
| 97 |
|
| 98 |
pkg_postrm() { |
| 99 |
- use gtk && gnome2_query_immodules_gtk2 |
| 100 |
- use gtk3 && gnome2_query_immodules_gtk3 |
| 101 |
+ use gtk && gnome2_query_immodules_gtk3 |
| 102 |
+ use gtk2 && gnome2_query_immodules_gtk2 |
| 103 |
gnome2_icon_cache_update |
| 104 |
gnome2_schemas_update |
| 105 |
} |
| 106 |
|
| 107 |
diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild |
| 108 |
index 4cf925979ad..4537bd35350 100644 |
| 109 |
--- a/app-i18n/ibus/ibus-1.5.15.ebuild |
| 110 |
+++ b/app-i18n/ibus/ibus-1.5.15.ebuild |
| 111 |
@@ -14,14 +14,14 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" |
| 112 |
LICENSE="LGPL-2.1" |
| 113 |
SLOT="0" |
| 114 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 115 |
-IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X" |
| 116 |
+IUSE="deprecated gconf +gtk +gtk2 +introspection nls +python test vala wayland +X" |
| 117 |
REQUIRED_USE="deprecated? ( python ) |
| 118 |
python? ( |
| 119 |
${PYTHON_REQUIRED_USE} |
| 120 |
- || ( deprecated gtk3 ) |
| 121 |
- gtk3? ( introspection ) |
| 122 |
+ || ( deprecated gtk ) |
| 123 |
+ gtk? ( introspection ) |
| 124 |
) |
| 125 |
- test? ( || ( gtk gtk3 ) ) |
| 126 |
+ test? ( gtk ) |
| 127 |
vala? ( introspection )" |
| 128 |
|
| 129 |
CDEPEND="app-text/iso-codes |
| 130 |
@@ -31,8 +31,12 @@ CDEPEND="app-text/iso-codes |
| 131 |
sys-apps/dbus[X?] |
| 132 |
x11-libs/libnotify |
| 133 |
gconf? ( gnome-base/gconf:2 ) |
| 134 |
- gtk? ( x11-libs/gtk+:2 ) |
| 135 |
- gtk3? ( x11-libs/gtk+:3 ) |
| 136 |
+ gtk? ( |
| 137 |
+ x11-libs/gtk+:3 |
| 138 |
+ x11-libs/libX11 |
| 139 |
+ x11-libs/libXi |
| 140 |
+ gtk2? ( x11-libs/gtk+:2 ) |
| 141 |
+ ) |
| 142 |
introspection? ( dev-libs/gobject-introspection ) |
| 143 |
nls? ( virtual/libintl ) |
| 144 |
python? ( |
| 145 |
@@ -56,7 +60,7 @@ RDEPEND="${CDEPEND} |
| 146 |
dev-python/dbus-python[${PYTHON_USEDEP}] |
| 147 |
dev-python/pygtk:2[${PYTHON_USEDEP}] |
| 148 |
) |
| 149 |
- gtk3? ( |
| 150 |
+ gtk? ( |
| 151 |
x11-libs/gtk+:3[introspection] |
| 152 |
) |
| 153 |
)" |
| 154 |
@@ -91,7 +95,7 @@ src_configure() { |
| 155 |
if use python; then |
| 156 |
python_conf+=( |
| 157 |
$(use_enable deprecated python-library) |
| 158 |
- $(use_enable gtk3 setup) |
| 159 |
+ $(use_enable gtk setup) |
| 160 |
--with-python=${EPYTHON} |
| 161 |
) |
| 162 |
else |
| 163 |
@@ -100,9 +104,9 @@ src_configure() { |
| 164 |
|
| 165 |
econf \ |
| 166 |
$(use_enable gconf) \ |
| 167 |
- $(use_enable gtk gtk2) \ |
| 168 |
- $(use_enable gtk3 ui) \ |
| 169 |
- $(use_enable gtk3) \ |
| 170 |
+ $(use_enable gtk gtk3) \ |
| 171 |
+ $(use_enable gtk ui) \ |
| 172 |
+ $(use_enable gtk2) \ |
| 173 |
$(use_enable introspection) \ |
| 174 |
$(use_enable nls) \ |
| 175 |
$(use_enable test tests) \ |
| 176 |
@@ -138,15 +142,15 @@ pkg_preinst() { |
| 177 |
|
| 178 |
pkg_postinst() { |
| 179 |
use gconf && gnome2_gconf_install |
| 180 |
- use gtk && gnome2_query_immodules_gtk2 |
| 181 |
- use gtk3 && gnome2_query_immodules_gtk3 |
| 182 |
+ use gtk && gnome2_query_immodules_gtk3 |
| 183 |
+ use gtk2 && gnome2_query_immodules_gtk2 |
| 184 |
gnome2_icon_cache_update |
| 185 |
gnome2_schemas_update |
| 186 |
} |
| 187 |
|
| 188 |
pkg_postrm() { |
| 189 |
- use gtk && gnome2_query_immodules_gtk2 |
| 190 |
- use gtk3 && gnome2_query_immodules_gtk3 |
| 191 |
+ use gtk && gnome2_query_immodules_gtk3 |
| 192 |
+ use gtk2 && gnome2_query_immodules_gtk2 |
| 193 |
gnome2_icon_cache_update |
| 194 |
gnome2_schemas_update |
| 195 |
} |
| 196 |
|
| 197 |
diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml |
| 198 |
index 9fc8f486d7d..889bd876ab3 100644 |
| 199 |
--- a/app-i18n/ibus/metadata.xml |
| 200 |
+++ b/app-i18n/ibus/metadata.xml |
| 201 |
@@ -13,7 +13,7 @@ |
| 202 |
<use> |
| 203 |
<flag name="deprecated">Install the deprecated iBus Python library</flag> |
| 204 |
<flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag> |
| 205 |
- <flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag> |
| 206 |
+ <flag name="gtk2">Enable support for <pkg>x11-libs/gtk+</pkg>:2</flag> |
| 207 |
</use> |
| 208 |
<upstream> |
| 209 |
<remote-id type="cpe">cpe:/a:ibus_project:ibus</remote-id> |
Archives