| 1 |
commit: 673ccb92d57ca308ed04825521b236b4f8cd3bb5 |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 1 14:09:12 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=673ccb92 |
| 7 |
|
| 8 |
app-i18n/ibus: drop deprecated USE flag |
| 9 |
|
| 10 |
Gentoo-Bug: 552360 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 13 |
|
| 14 |
app-i18n/ibus/ibus-1.5.12.ebuild | 35 +++++++++++++++++++---------------- |
| 15 |
app-i18n/ibus/ibus-1.5.15.ebuild | 35 +++++++++++++++++++---------------- |
| 16 |
app-i18n/ibus/metadata.xml | 1 - |
| 17 |
3 files changed, 38 insertions(+), 33 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild |
| 20 |
index 4ec5bbf3ac6..e1dcecd1224 100644 |
| 21 |
--- a/app-i18n/ibus/ibus-1.5.12.ebuild |
| 22 |
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild |
| 23 |
@@ -2,10 +2,10 @@ |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI="6" |
| 27 |
-PYTHON_COMPAT=( python2_7 ) |
| 28 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
| 29 |
VALA_USE_DEPEND="vapigen" |
| 30 |
|
| 31 |
-inherit autotools bash-completion-r1 gnome2-utils ltprune python-single-r1 vala virtualx |
| 32 |
+inherit autotools bash-completion-r1 gnome2-utils ltprune python-r1 vala virtualx |
| 33 |
|
| 34 |
DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" |
| 35 |
HOMEPAGE="https://github.com/ibus/ibus/wiki" |
| 36 |
@@ -14,12 +14,11 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" |
| 37 |
LICENSE="LGPL-2.1" |
| 38 |
SLOT="0" |
| 39 |
KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" |
| 40 |
-IUSE="deprecated gconf +gtk +gtk2 +introspection nls +python test vala wayland +X" |
| 41 |
-REQUIRED_USE="deprecated? ( python ) |
| 42 |
- python? ( |
| 43 |
+IUSE="gconf +gtk +gtk2 +introspection nls +python test vala wayland +X" |
| 44 |
+REQUIRED_USE="python? ( |
| 45 |
${PYTHON_REQUIRED_USE} |
| 46 |
- || ( deprecated gtk ) |
| 47 |
- gtk? ( introspection ) |
| 48 |
+ gtk |
| 49 |
+ introspection |
| 50 |
) |
| 51 |
test? ( gtk ) |
| 52 |
vala? ( introspection )" |
| 53 |
@@ -56,10 +55,6 @@ CDEPEND="app-text/iso-codes |
| 54 |
)" |
| 55 |
RDEPEND="${CDEPEND} |
| 56 |
python? ( |
| 57 |
- deprecated? ( |
| 58 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
| 59 |
- dev-python/pygtk:2[${PYTHON_USEDEP}] |
| 60 |
- ) |
| 61 |
gtk? ( |
| 62 |
x11-libs/gtk+:3[introspection] |
| 63 |
) |
| 64 |
@@ -70,12 +65,10 @@ DEPEND="${CDEPEND} |
| 65 |
nls? ( sys-devel/gettext ) |
| 66 |
vala? ( $(vala_depend) )" |
| 67 |
|
| 68 |
-pkg_setup() { |
| 69 |
- use python && python-single-r1_pkg_setup |
| 70 |
-} |
| 71 |
- |
| 72 |
src_prepare() { |
| 73 |
use vala && vala_src_prepare |
| 74 |
+ # for multiple Python implementations |
| 75 |
+ sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am |
| 76 |
# fix for parallel install |
| 77 |
sed -i \ |
| 78 |
-e "/^py2_compile/,/^$/d" \ |
| 79 |
@@ -97,8 +90,8 @@ src_prepare() { |
| 80 |
src_configure() { |
| 81 |
local python_conf=() |
| 82 |
if use python; then |
| 83 |
+ python_setup |
| 84 |
python_conf+=( |
| 85 |
- $(use_enable deprecated python-library) |
| 86 |
$(use_enable gtk setup) |
| 87 |
--with-python=${EPYTHON} |
| 88 |
) |
| 89 |
@@ -129,6 +122,16 @@ src_install() { |
| 90 |
default |
| 91 |
prune_libtool_files --modules |
| 92 |
|
| 93 |
+ if use python; then |
| 94 |
+ python_install() { |
| 95 |
+ emake -C bindings/pygobject \ |
| 96 |
+ pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \ |
| 97 |
+ DESTDIR="${D}" \ |
| 98 |
+ install |
| 99 |
+ } |
| 100 |
+ python_foreach_impl python_install |
| 101 |
+ fi |
| 102 |
+ |
| 103 |
keepdir /usr/share/ibus/engine |
| 104 |
|
| 105 |
newbashcomp tools/${PN}.bash ${PN} |
| 106 |
|
| 107 |
diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild |
| 108 |
index 4537bd35350..16a914dc712 100644 |
| 109 |
--- a/app-i18n/ibus/ibus-1.5.15.ebuild |
| 110 |
+++ b/app-i18n/ibus/ibus-1.5.15.ebuild |
| 111 |
@@ -2,10 +2,10 @@ |
| 112 |
# Distributed under the terms of the GNU General Public License v2 |
| 113 |
|
| 114 |
EAPI="6" |
| 115 |
-PYTHON_COMPAT=( python2_7 ) |
| 116 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
| 117 |
VALA_USE_DEPEND="vapigen" |
| 118 |
|
| 119 |
-inherit autotools bash-completion-r1 gnome2-utils ltprune python-single-r1 vala virtualx |
| 120 |
+inherit autotools bash-completion-r1 gnome2-utils ltprune python-r1 vala virtualx |
| 121 |
|
| 122 |
DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" |
| 123 |
HOMEPAGE="https://github.com/ibus/ibus/wiki" |
| 124 |
@@ -14,12 +14,11 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" |
| 125 |
LICENSE="LGPL-2.1" |
| 126 |
SLOT="0" |
| 127 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 128 |
-IUSE="deprecated gconf +gtk +gtk2 +introspection nls +python test vala wayland +X" |
| 129 |
-REQUIRED_USE="deprecated? ( python ) |
| 130 |
- python? ( |
| 131 |
+IUSE="gconf +gtk +gtk2 +introspection nls +python test vala wayland +X" |
| 132 |
+REQUIRED_USE="python? ( |
| 133 |
${PYTHON_REQUIRED_USE} |
| 134 |
- || ( deprecated gtk ) |
| 135 |
- gtk? ( introspection ) |
| 136 |
+ gtk |
| 137 |
+ introspection |
| 138 |
) |
| 139 |
test? ( gtk ) |
| 140 |
vala? ( introspection )" |
| 141 |
@@ -56,10 +55,6 @@ CDEPEND="app-text/iso-codes |
| 142 |
)" |
| 143 |
RDEPEND="${CDEPEND} |
| 144 |
python? ( |
| 145 |
- deprecated? ( |
| 146 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
| 147 |
- dev-python/pygtk:2[${PYTHON_USEDEP}] |
| 148 |
- ) |
| 149 |
gtk? ( |
| 150 |
x11-libs/gtk+:3[introspection] |
| 151 |
) |
| 152 |
@@ -70,12 +65,10 @@ DEPEND="${CDEPEND} |
| 153 |
nls? ( sys-devel/gettext ) |
| 154 |
vala? ( $(vala_depend) )" |
| 155 |
|
| 156 |
-pkg_setup() { |
| 157 |
- use python && python-single-r1_pkg_setup |
| 158 |
-} |
| 159 |
- |
| 160 |
src_prepare() { |
| 161 |
use vala && vala_src_prepare |
| 162 |
+ # for multiple Python implementations |
| 163 |
+ sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am |
| 164 |
# fix for parallel install |
| 165 |
sed -i \ |
| 166 |
-e "/^py2_compile/,/^$/d" \ |
| 167 |
@@ -93,8 +86,8 @@ src_prepare() { |
| 168 |
src_configure() { |
| 169 |
local python_conf=() |
| 170 |
if use python; then |
| 171 |
+ python_setup |
| 172 |
python_conf+=( |
| 173 |
- $(use_enable deprecated python-library) |
| 174 |
$(use_enable gtk setup) |
| 175 |
--with-python=${EPYTHON} |
| 176 |
) |
| 177 |
@@ -126,6 +119,16 @@ src_install() { |
| 178 |
default |
| 179 |
prune_libtool_files --modules |
| 180 |
|
| 181 |
+ if use python; then |
| 182 |
+ python_install() { |
| 183 |
+ emake -C bindings/pygobject \ |
| 184 |
+ pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \ |
| 185 |
+ DESTDIR="${D}" \ |
| 186 |
+ install |
| 187 |
+ } |
| 188 |
+ python_foreach_impl python_install |
| 189 |
+ fi |
| 190 |
+ |
| 191 |
keepdir /usr/share/ibus/engine |
| 192 |
|
| 193 |
newbashcomp tools/${PN}.bash ${PN} |
| 194 |
|
| 195 |
diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml |
| 196 |
index 889bd876ab3..26fabe3ea17 100644 |
| 197 |
--- a/app-i18n/ibus/metadata.xml |
| 198 |
+++ b/app-i18n/ibus/metadata.xml |
| 199 |
@@ -11,7 +11,6 @@ |
| 200 |
also may help developers to develop input method easily. |
| 201 |
</longdescription> |
| 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="gtk2">Enable support for <pkg>x11-libs/gtk+</pkg>:2</flag> |
| 206 |
</use> |
Archives