commit: 673ccb92d57ca308ed04825521b236b4f8cd3bb5
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 1 14:09:12 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Aug 1 14:23:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=673ccb92
app-i18n/ibus: drop deprecated USE flag
Gentoo-Bug: 552360
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/ibus/ibus-1.5.12.ebuild | 35 +++++++++++++++++++----------------
app-i18n/ibus/ibus-1.5.15.ebuild | 35 +++++++++++++++++++----------------
app-i18n/ibus/metadata.xml | 1 -
3 files changed, 38 insertions(+), 33 deletions(-)
diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index 4ec5bbf3ac6..e1dcecd1224 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -2,10 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
VALA_USE_DEPEND="vapigen"
-inherit autotools bash-completion-r1 gnome2-utils ltprune python-single-r1
vala virtualx
+inherit autotools bash-completion-r1 gnome2-utils ltprune python-r1 vala
virtualx
DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
HOMEPAGE="https://github.com/ibus/ibus/wiki";
@@ -14,12 +14,11 @@
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz";
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="deprecated gconf +gtk +gtk2 +introspection nls +python test vala wayland
+X"
-REQUIRED_USE="deprecated? ( python )
- python? (
+IUSE="gconf +gtk +gtk2 +introspection nls +python test vala wayland +X"
+REQUIRED_USE="python? (
${PYTHON_REQUIRED_USE}
- || ( deprecated gtk )
- gtk? ( introspection )
+ gtk
+ introspection
)
test? ( gtk )
vala? ( introspection )"
@@ -56,10 +55,6 @@ CDEPEND="app-text/iso-codes
)"
RDEPEND="${CDEPEND}
python? (
- deprecated? (
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- )
gtk? (
x11-libs/gtk+:3[introspection]
)
@@ -70,12 +65,10 @@ DEPEND="${CDEPEND}
nls? ( sys-devel/gettext )
vala? ( $(vala_depend) )"
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
src_prepare() {
use vala && vala_src_prepare
+ # for multiple Python implementations
+ sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
# fix for parallel install
sed -i \
-e "/^py2_compile/,/^$/d" \
@@ -97,8 +90,8 @@ src_prepare() {
src_configure() {
local python_conf=()
if use python; then
+ python_setup
python_conf+=(
- $(use_enable deprecated python-library)
$(use_enable gtk setup)
--with-python=${EPYTHON}
)
@@ -129,6 +122,16 @@ src_install() {
default
prune_libtool_files --modules
+ if use python; then
+ python_install() {
+ emake -C bindings/pygobject \
+ pyoverridesdir="$(${EPYTHON} -c 'import gi;
print(gi._overridesdir)')" \
+ DESTDIR="${D}" \
+ install
+ }
+ python_foreach_impl python_install
+ fi
+
keepdir /usr/share/ibus/engine
newbashcomp tools/${PN}.bash ${PN}
diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild
index 4537bd35350..16a914dc712 100644
--- a/app-i18n/ibus/ibus-1.5.15.ebuild
+++ b/app-i18n/ibus/ibus-1.5.15.ebuild
@@ -2,10 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
VALA_USE_DEPEND="vapigen"
-inherit autotools bash-completion-r1 gnome2-utils ltprune python-single-r1
vala virtualx
+inherit autotools bash-completion-r1 gnome2-utils ltprune python-r1 vala
virtualx
DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
HOMEPAGE="https://github.com/ibus/ibus/wiki";
@@ -14,12 +14,11 @@
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz";
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="deprecated gconf +gtk +gtk2 +introspection nls +python test vala wayland
+X"
-REQUIRED_USE="deprecated? ( python )
- python? (
+IUSE="gconf +gtk +gtk2 +introspection nls +python test vala wayland +X"
+REQUIRED_USE="python? (
${PYTHON_REQUIRED_USE}
- || ( deprecated gtk )
- gtk? ( introspection )
+ gtk
+ introspection
)
test? ( gtk )
vala? ( introspection )"
@@ -56,10 +55,6 @@ CDEPEND="app-text/iso-codes
)"
RDEPEND="${CDEPEND}
python? (
- deprecated? (
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- )
gtk? (
x11-libs/gtk+:3[introspection]
)
@@ -70,12 +65,10 @@ DEPEND="${CDEPEND}
nls? ( sys-devel/gettext )
vala? ( $(vala_depend) )"
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
src_prepare() {
use vala && vala_src_prepare
+ # for multiple Python implementations
+ sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
# fix for parallel install
sed -i \
-e "/^py2_compile/,/^$/d" \
@@ -93,8 +86,8 @@ src_prepare() {
src_configure() {
local python_conf=()
if use python; then
+ python_setup
python_conf+=(
- $(use_enable deprecated python-library)
$(use_enable gtk setup)
--with-python=${EPYTHON}
)
@@ -126,6 +119,16 @@ src_install() {
default
prune_libtool_files --modules
+ if use python; then
+ python_install() {
+ emake -C bindings/pygobject \
+ pyoverridesdir="$(${EPYTHON} -c 'import gi;
print(gi._overridesdir)')" \
+ DESTDIR="${D}" \
+ install
+ }
+ python_foreach_impl python_install
+ fi
+
keepdir /usr/share/ibus/engine
newbashcomp tools/${PN}.bash ${PN}
diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml
index 889bd876ab3..26fabe3ea17 100644
--- a/app-i18n/ibus/metadata.xml
+++ b/app-i18n/ibus/metadata.xml
@@ -11,7 +11,6 @@
also may help developers to develop input method easily.
</longdescription>
<use>
- <flag name="deprecated">Install the deprecated iBus Python library</flag>
<flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
<flag name="gtk2">Enable support for <pkg>x11-libs/gtk+</pkg>:2</flag>
</use>
