[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     0f571c3ea386f3416fee7a77bc986156249797b2
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 07:48:39 2024 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 08:55:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f571c3e

app-i18n/ibus: add 1.5.31

Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-i18n/ibus/Manifest           |   1 +
 app-i18n/ibus/ibus-1.5.31.ebuild | 231 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 232 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index c2505338fc33..cea6b2728eab 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,2 +1,3 @@
 DIST ibus-1.5.29-rc2.tar.gz 3991416 BLAKE2B c185c0cf8af79a80ee04f414e13c4b58bd2f18891851d2f018713848b3bc0fe0516c8c0cf8f64204040f10b6b4a5304c8be6305449d7290b5d08412246d3af40 SHA512 47dd39c9615783b6c157a25e8a2506dc2e1f440d56aa649ee8cb95a390cb4efab9c95e72ac84b5d042c25e350599b4d352ddc66f1385af6660d4a7a296e44ca7
 DIST ibus-1.5.30.tar.gz 4124084 BLAKE2B 47dbcfec309bda14273463bff875e283148c7aba872d8e9f7673dd18e703f7b2a0eab5d538bd29a36525ab667b57488f4dc046bc955c1cd34edaec5b538e2bdd SHA512 cbed37bf62e8d8593c838f8ef7fe0b22bf8f4a661b887fc7be2f2768dda912075abdf3070c22b9699def90e7002aaaf7394f5fc590e12ef6ebb2bb5161cc29a0
+DIST ibus-1.5.31.tar.gz 4108303 BLAKE2B 2fa895369f5326339b50da34777e2f34124000cff40a4bc871bb0c1cdac4a22cc327240b8338bc6c4fc85267a83ccc0bd5963abcf4763a373b1227bdb5753b76 SHA512 adfad740002662262981ddfcc3f6eb1e898433d3bd90b07535ceef367d496d3da3e0836e59133d0063caf2d3d55d0deb6cf18ae2807fdd1ce4afab84a7725ca5

diff --git a/app-i18n/ibus/ibus-1.5.31.ebuild b/app-i18n/ibus/ibus-1.5.31.ebuild
new file mode 100644
index 000000000000..374a7381c099
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.31.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+
+MY_PV=$(ver_rs 3 '-')
+GENTOO_VER=
+[[ -n ${GENTOO_VER} ]] && \
+	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.gz
+	${GENTOO_PATCHSET_URI}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	appindicator? ( gtk3 )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		introspection
+	)
+	test? ( gtk3 )
+	vala? ( introspection )
+	X? ( gtk3 )
+"
+REQUIRED_USE+=" gtk3? ( wayland? ( introspection ) )" # bug 915359
+DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.65.0:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		>=x11-libs/libXfixes-6.0.0
+	)
+	appindicator? ( dev-libs/libdbusmenu[gtk3?] )
+	gtk2? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	gtk4? ( gui-libs/gtk:4 )
+	gui? (
+		x11-libs/libX11
+		x11-libs/libXi
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${DEPEND}
+	python? (
+		gui? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+BDEPEND="
+	$(vala_depend)
+	dev-libs/glib:2
+	dev-util/glib-utils
+	virtual/pkgconfig
+	x11-misc/xkeyboard-config
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	test? ( x11-apps/setxkbmap )
+	unicode? ( app-i18n/unicode-data )"
+
+src_prepare() {
+	vala_setup --ignore-use
+	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
+		touch ui/gtk3/panelbinding.vala \
+			ui/gtk3/panel.vala \
+			ui/gtk3/emojierapp.vala || die
+	fi
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala || die
+	fi
+	if ! use appindicator; then
+		touch ui/gtk3/panel.vala || die
+	fi
+	if [[ -n ${GENTOO_VER} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		eapply "${WORKDIR}"/patches-gentoo/*.patch
+	fi
+
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am || die
+	# fix for parallel install
+	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am || die
+	# require user interaction
+	sed -i "/^TESTS_C += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am || die
+
+	sed -i "/^bash_completion/d" tools/Makefile.am || die
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gui setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	if tc-is-cross-compiler && { use emoji || use unicode; }; then
+		mkdir -p "${S}-build"
+		pushd "${S}-build" >/dev/null 2>&1 || die
+		ECONF_SOURCE=${S} econf_build --enable-static \
+			--disable-{dconf,gtk{2,3},python-library,shared,xim} \
+			ISOCODES_{CFLAG,LIB}S=-DSKIP \
+			$(use_enable emoji emoji-dict) \
+			$(use_enable unicode unicode-dict) \
+			$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
+		popd >/dev/null 2>&1 || die
+	fi
+
+	local myconf=(
+		$(use_enable X xim)
+		$(use_enable appindicator)
+		$(use_enable emoji emoji-dict)
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji)
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations)
+		$(use_enable gtk2)
+		$(use_enable gtk3)
+		$(use_enable gtk4)
+		$(use_enable gui ui)
+		$(use_enable introspection)
+		$(use_enable libnotify)
+		$(use_enable nls)
+		$(use_enable systemd systemd-services)
+		$(use_enable test tests)
+		$(use_enable unicode unicode-dict)
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
+		$(use_enable vala)
+		$(use_enable wayland)
+		"${python_conf[@]}"
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler && { use emoji || use unicode; }; then
+		emake -C "${S}-build/src" \
+			$(usex emoji emoji-parser '') \
+			$(usex unicode unicode-parser '')
+		emake -C src \
+			$(usex emoji emoji-parser '') \
+			$(usex unicode unicode-parser '')
+		cp \
+			$(usex emoji "${S}-build/src/emoji-parser" '') \
+			$(usex unicode "${S}-build/src/unicode-parser" '') \
+			src || die
+	fi
+	emake
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx dbus-run-session emake check
+}
+
+src_install() {
+	default
+	# Remove la files
+	find "${ED}" -name '*.la' -delete || die
+
+	# Remove stray python files generated by the build system
+	find "${ED}" -name '*.pyc' -exec rm -f {} \; || die
+	find "${ED}" -name '*.pyo' -exec rm -f {} \; || die
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+
+			python_optimize
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+}
+
+pkg_postinst() {
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	xdg_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sam James]

commit:     a15c372550c945420cc4036572a870e0b26328b5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 23:21:09 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 23:21:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a15c3725

app-i18n/ibus: build w/ -std=gnu17

Closes: https://bugs.gentoo.org/944071
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.31.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.31.ebuild b/app-i18n/ibus/ibus-1.5.31.ebuild
index 374a7381c099..0b57f53f19ea 100644
--- a/app-i18n/ibus/ibus-1.5.31.ebuild
+++ b/app-i18n/ibus/ibus-1.5.31.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx
+inherit autotools bash-completion-r1 gnome2-utils flag-o-matic python-r1 toolchain-funcs vala virtualx
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
@@ -117,6 +117,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug #944071
+	append-flags -std=gnu17
+
 	local unicodedir="${EPREFIX}"/usr/share/unicode
 	local python_conf=()
 	if use python; then

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     77abc00ed7ee83e7ebae20b80a71c0f41a2cbe4c
Author:     Sebastian Parborg <sebastian <AT> blender <DOT> org>
AuthorDate: Tue Oct 15 13:39:06 2024 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Thu Oct 17 11:39:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77abc00e

app-i18n/ibus: Bump to 1.5.30

Closes: https://github.com/gentoo/gentoo/pull/39000
Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-i18n/ibus/Manifest           |   1 +
 app-i18n/ibus/ibus-1.5.30.ebuild | 231 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 232 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index e500d99c3773..c2505338fc33 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1 +1,2 @@
 DIST ibus-1.5.29-rc2.tar.gz 3991416 BLAKE2B c185c0cf8af79a80ee04f414e13c4b58bd2f18891851d2f018713848b3bc0fe0516c8c0cf8f64204040f10b6b4a5304c8be6305449d7290b5d08412246d3af40 SHA512 47dd39c9615783b6c157a25e8a2506dc2e1f440d56aa649ee8cb95a390cb4efab9c95e72ac84b5d042c25e350599b4d352ddc66f1385af6660d4a7a296e44ca7
+DIST ibus-1.5.30.tar.gz 4124084 BLAKE2B 47dbcfec309bda14273463bff875e283148c7aba872d8e9f7673dd18e703f7b2a0eab5d538bd29a36525ab667b57488f4dc046bc955c1cd34edaec5b538e2bdd SHA512 cbed37bf62e8d8593c838f8ef7fe0b22bf8f4a661b887fc7be2f2768dda912075abdf3070c22b9699def90e7002aaaf7394f5fc590e12ef6ebb2bb5161cc29a0

diff --git a/app-i18n/ibus/ibus-1.5.30.ebuild b/app-i18n/ibus/ibus-1.5.30.ebuild
new file mode 100644
index 000000000000..374a7381c099
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.30.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+
+MY_PV=$(ver_rs 3 '-')
+GENTOO_VER=
+[[ -n ${GENTOO_VER} ]] && \
+	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.gz
+	${GENTOO_PATCHSET_URI}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	appindicator? ( gtk3 )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		introspection
+	)
+	test? ( gtk3 )
+	vala? ( introspection )
+	X? ( gtk3 )
+"
+REQUIRED_USE+=" gtk3? ( wayland? ( introspection ) )" # bug 915359
+DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.65.0:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		>=x11-libs/libXfixes-6.0.0
+	)
+	appindicator? ( dev-libs/libdbusmenu[gtk3?] )
+	gtk2? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	gtk4? ( gui-libs/gtk:4 )
+	gui? (
+		x11-libs/libX11
+		x11-libs/libXi
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${DEPEND}
+	python? (
+		gui? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+BDEPEND="
+	$(vala_depend)
+	dev-libs/glib:2
+	dev-util/glib-utils
+	virtual/pkgconfig
+	x11-misc/xkeyboard-config
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	test? ( x11-apps/setxkbmap )
+	unicode? ( app-i18n/unicode-data )"
+
+src_prepare() {
+	vala_setup --ignore-use
+	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
+		touch ui/gtk3/panelbinding.vala \
+			ui/gtk3/panel.vala \
+			ui/gtk3/emojierapp.vala || die
+	fi
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala || die
+	fi
+	if ! use appindicator; then
+		touch ui/gtk3/panel.vala || die
+	fi
+	if [[ -n ${GENTOO_VER} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		eapply "${WORKDIR}"/patches-gentoo/*.patch
+	fi
+
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am || die
+	# fix for parallel install
+	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am || die
+	# require user interaction
+	sed -i "/^TESTS_C += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am || die
+
+	sed -i "/^bash_completion/d" tools/Makefile.am || die
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gui setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	if tc-is-cross-compiler && { use emoji || use unicode; }; then
+		mkdir -p "${S}-build"
+		pushd "${S}-build" >/dev/null 2>&1 || die
+		ECONF_SOURCE=${S} econf_build --enable-static \
+			--disable-{dconf,gtk{2,3},python-library,shared,xim} \
+			ISOCODES_{CFLAG,LIB}S=-DSKIP \
+			$(use_enable emoji emoji-dict) \
+			$(use_enable unicode unicode-dict) \
+			$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
+		popd >/dev/null 2>&1 || die
+	fi
+
+	local myconf=(
+		$(use_enable X xim)
+		$(use_enable appindicator)
+		$(use_enable emoji emoji-dict)
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji)
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations)
+		$(use_enable gtk2)
+		$(use_enable gtk3)
+		$(use_enable gtk4)
+		$(use_enable gui ui)
+		$(use_enable introspection)
+		$(use_enable libnotify)
+		$(use_enable nls)
+		$(use_enable systemd systemd-services)
+		$(use_enable test tests)
+		$(use_enable unicode unicode-dict)
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
+		$(use_enable vala)
+		$(use_enable wayland)
+		"${python_conf[@]}"
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler && { use emoji || use unicode; }; then
+		emake -C "${S}-build/src" \
+			$(usex emoji emoji-parser '') \
+			$(usex unicode unicode-parser '')
+		emake -C src \
+			$(usex emoji emoji-parser '') \
+			$(usex unicode unicode-parser '')
+		cp \
+			$(usex emoji "${S}-build/src/emoji-parser" '') \
+			$(usex unicode "${S}-build/src/unicode-parser" '') \
+			src || die
+	fi
+	emake
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx dbus-run-session emake check
+}
+
+src_install() {
+	default
+	# Remove la files
+	find "${ED}" -name '*.la' -delete || die
+
+	# Remove stray python files generated by the build system
+	find "${ED}" -name '*.pyc' -exec rm -f {} \; || die
+	find "${ED}" -name '*.pyo' -exec rm -f {} \; || die
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+
+			python_optimize
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+}
+
+pkg_postinst() {
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	xdg_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     90a3f8556674d498403a7580abb50c42acde5858
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 18:47:51 2024 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 18:54:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90a3f855

app-i18n/ibus: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/Manifest               |   2 -
 app-i18n/ibus/ibus-1.5.27.ebuild     | 231 ----------------------------------
 app-i18n/ibus/ibus-1.5.29_rc1.ebuild | 232 -----------------------------------
 3 files changed, 465 deletions(-)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 3fd054db1f2c..e500d99c3773 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,3 +1 @@
-DIST ibus-1.5.27.tar.gz 3779541 BLAKE2B e98f775cd62036ae02dafd984933343e99390a6a1e77b672feb4bc00dd1d423126227bded2d22b8bc9fa214e572ea906c407658de8ee20e036f8753836d68f46 SHA512 b5f3ae555d19eb780a416383e6351ed2cd8834fcc2bc4ebe4f4a194fc934dd055c5e782f9ec382fb21e1e2103c5409804174a79d192b5494a9018ce9081305e4
-DIST ibus-1.5.29-rc1.tar.gz 3989492 BLAKE2B c99f42fcd18bed240bf5e9f5b406bc879b05b12f3d0c14713e21b8c99fbcde32cd880dead1374731914289c022b1f160d9961bdbd9e9a0a3ced86949c5beb811 SHA512 776a01bcfd730be67e0f7d730f7b4b0a586d39744deb605359330a1786542acae52efbc085c39b8417b20164e45c259b40b29725f53fb1b69e2b340778ff28dc
 DIST ibus-1.5.29-rc2.tar.gz 3991416 BLAKE2B c185c0cf8af79a80ee04f414e13c4b58bd2f18891851d2f018713848b3bc0fe0516c8c0cf8f64204040f10b6b4a5304c8be6305449d7290b5d08412246d3af40 SHA512 47dd39c9615783b6c157a25e8a2506dc2e1f440d56aa649ee8cb95a390cb4efab9c95e72ac84b5d042c25e350599b4d352ddc66f1385af6660d4a7a296e44ca7

diff --git a/app-i18n/ibus/ibus-1.5.27.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild
deleted file mode 100644
index 22c0f865df55..000000000000
--- a/app-i18n/ibus/ibus-1.5.27.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx xdg-utils
-
-GENTOO_VER=
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-
-[[ -n ${GENTOO_VER} ]] && \
-	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
-	${GENTOO_PATCHSET_URI}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	appindicator? ( gtk3 )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		introspection
-	)
-	test? ( gtk3 )
-	vala? ( introspection )
-	X? ( gtk3 )
-"
-DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.65.0:2
-	gnome-base/dconf
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	X? (
-		x11-libs/libX11
-		>=x11-libs/libXfixes-6.0.0
-	)
-	gtk2? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	gtk4? ( gui-libs/gtk:4 )
-	gui? (
-		x11-libs/libX11
-		x11-libs/libXi
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	libnotify? ( x11-libs/libnotify )
-	nls? ( virtual/libintl )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)"
-RDEPEND="${DEPEND}
-	python? (
-		gui? (
-			x11-libs/gtk+:3[introspection]
-		)
-	)"
-BDEPEND="
-	$(vala_depend)
-	dev-libs/glib:2
-	dev-util/glib-utils
-	virtual/pkgconfig
-	x11-misc/xkeyboard-config
-	emoji? (
-		app-i18n/unicode-cldr
-		app-i18n/unicode-emoji
-	)
-	nls? ( sys-devel/gettext )
-	test? ( x11-apps/setxkbmap )
-	unicode? ( app-i18n/unicode-data )"
-
-src_prepare() {
-	vala_src_prepare --ignore-use
-	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
-		touch ui/gtk3/panelbinding.vala \
-			ui/gtk3/panel.vala \
-			ui/gtk3/emojierapp.vala || die
-	fi
-	if ! use emoji; then
-		touch \
-			tools/main.vala \
-			ui/gtk3/panel.vala || die
-	fi
-	if ! use appindicator; then
-		touch ui/gtk3/panel.vala || die
-	fi
-	if [[ -n ${GENTOO_VER} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		eapply "${WORKDIR}"/patches-gentoo/*.patch
-	fi
-
-	# for multiple Python implementations
-	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am || die
-	# fix for parallel install
-	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am || die
-	# require user interaction
-	sed -i "/^TESTS_C += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am || die
-
-	sed -i "/^bash_completion/d" tools/Makefile.am || die
-
-	default
-	eautoreconf
-	xdg_environment_reset
-}
-
-src_configure() {
-	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local python_conf=()
-	if use python; then
-		python_setup
-		python_conf+=(
-			$(use_enable gui setup)
-			--with-python=${EPYTHON}
-		)
-	else
-		python_conf+=( --disable-setup )
-	fi
-
-	if tc-is-cross-compiler && { use emoji || use unicode; }; then
-		mkdir -p "${S}-build"
-		pushd "${S}-build" >/dev/null 2>&1 || die
-		ECONF_SOURCE=${S} econf_build --enable-static \
-			--disable-{dconf,gtk{2,3},python-library,shared,xim} \
-			ISOCODES_{CFLAG,LIB}S=-DSKIP \
-			$(use_enable emoji emoji-dict) \
-			$(use_enable unicode unicode-dict) \
-			$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
-		popd >/dev/null 2>&1 || die
-	fi
-
-	local myconf=(
-		$(use_enable X xim)
-		$(use_enable appindicator)
-		$(use_enable emoji emoji-dict)
-		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji)
-		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations)
-		$(use_enable gtk2)
-		$(use_enable gtk3)
-		$(use_enable gtk4)
-		$(use_enable gui ui)
-		$(use_enable introspection)
-		$(use_enable libnotify)
-		$(use_enable nls)
-		$(use_enable systemd systemd-services)
-		$(use_enable test tests)
-		$(use_enable unicode unicode-dict)
-		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
-		$(use_enable vala)
-		$(use_enable wayland)
-		"${python_conf[@]}"
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if tc-is-cross-compiler && { use emoji || use unicode; }; then
-		emake -C "${S}-build/src" \
-			$(usex emoji emoji-parser '') \
-			$(usex unicode unicode-parser '')
-		emake -C src \
-			$(usex emoji emoji-parser '') \
-			$(usex unicode unicode-parser '')
-		cp \
-			$(usex emoji "${S}-build/src/emoji-parser" '') \
-			$(usex unicode "${S}-build/src/unicode-parser" '') \
-			src || die
-	fi
-	emake
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	virtx emake -j1 check
-}
-
-src_install() {
-	default
-	# Remove la files
-	find "${ED}" -name '*.la' -delete || die
-
-	# Remove stray python files generated by the build system
-	find "${ED}" -name '*.pyc' -exec rm -f {} \; || die
-	find "${ED}" -name '*.pyo' -exec rm -f {} \; || die
-
-	if use python; then
-		python_install() {
-			emake -C bindings/pygobject \
-				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
-				DESTDIR="${D}" \
-				install
-
-			python_optimize
-		}
-		python_foreach_impl python_install
-	fi
-
-	keepdir /usr/share/ibus/engine
-
-	newbashcomp tools/${PN}.bash ${PN}
-
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-${PN} ${PN}.conf
-
-	# Undo compression of man page
-	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
-}
-
-pkg_postinst() {
-	use gtk2 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	xdg_icon_cache_update
-	gnome2_schemas_update
-	dconf update
-}
-
-pkg_postrm() {
-	use gtk2 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/app-i18n/ibus/ibus-1.5.29_rc1.ebuild b/app-i18n/ibus/ibus-1.5.29_rc1.ebuild
deleted file mode 100644
index 10fdab116676..000000000000
--- a/app-i18n/ibus/ibus-1.5.29_rc1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-
-MY_PV=$(ver_rs 3 '-')
-GENTOO_VER=
-[[ -n ${GENTOO_VER} ]] && \
-	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.gz
-	${GENTOO_PATCHSET_URI}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	appindicator? ( gtk3 )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		introspection
-	)
-	test? ( gtk3 )
-	vala? ( introspection )
-	X? ( gtk3 )
-"
-DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.65.0:2
-	gnome-base/dconf
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	X? (
-		x11-libs/libX11
-		>=x11-libs/libXfixes-6.0.0
-	)
-	appindicator? ( dev-libs/libdbusmenu[gtk3?] )
-	gtk2? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	gtk4? ( gui-libs/gtk:4 )
-	gui? (
-		x11-libs/libX11
-		x11-libs/libXi
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	libnotify? ( x11-libs/libnotify )
-	nls? ( virtual/libintl )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)"
-RDEPEND="${DEPEND}
-	python? (
-		gui? (
-			x11-libs/gtk+:3[introspection]
-		)
-	)"
-BDEPEND="
-	$(vala_depend)
-	dev-libs/glib:2
-	dev-util/glib-utils
-	virtual/pkgconfig
-	x11-misc/xkeyboard-config
-	emoji? (
-		app-i18n/unicode-cldr
-		app-i18n/unicode-emoji
-	)
-	nls? ( sys-devel/gettext )
-	test? ( x11-apps/setxkbmap )
-	unicode? ( app-i18n/unicode-data )"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-	vala_setup --ignore-use
-	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
-		touch ui/gtk3/panelbinding.vala \
-			ui/gtk3/panel.vala \
-			ui/gtk3/emojierapp.vala || die
-	fi
-	if ! use emoji; then
-		touch \
-			tools/main.vala \
-			ui/gtk3/panel.vala || die
-	fi
-	if ! use appindicator; then
-		touch ui/gtk3/panel.vala || die
-	fi
-	if [[ -n ${GENTOO_VER} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		eapply "${WORKDIR}"/patches-gentoo/*.patch
-	fi
-
-	# for multiple Python implementations
-	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am || die
-	# fix for parallel install
-	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am || die
-	# require user interaction
-	sed -i "/^TESTS_C += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am || die
-
-	sed -i "/^bash_completion/d" tools/Makefile.am || die
-
-	default
-	eautoreconf
-	xdg_environment_reset
-}
-
-src_configure() {
-	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local python_conf=()
-	if use python; then
-		python_setup
-		python_conf+=(
-			$(use_enable gui setup)
-			--with-python=${EPYTHON}
-		)
-	else
-		python_conf+=( --disable-setup )
-	fi
-
-	if tc-is-cross-compiler && { use emoji || use unicode; }; then
-		mkdir -p "${S}-build"
-		pushd "${S}-build" >/dev/null 2>&1 || die
-		ECONF_SOURCE=${S} econf_build --enable-static \
-			--disable-{dconf,gtk{2,3},python-library,shared,xim} \
-			ISOCODES_{CFLAG,LIB}S=-DSKIP \
-			$(use_enable emoji emoji-dict) \
-			$(use_enable unicode unicode-dict) \
-			$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
-		popd >/dev/null 2>&1 || die
-	fi
-
-	local myconf=(
-		$(use_enable X xim)
-		$(use_enable appindicator)
-		$(use_enable emoji emoji-dict)
-		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji)
-		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations)
-		$(use_enable gtk2)
-		$(use_enable gtk3)
-		$(use_enable gtk4)
-		$(use_enable gui ui)
-		$(use_enable introspection)
-		$(use_enable libnotify)
-		$(use_enable nls)
-		$(use_enable systemd systemd-services)
-		$(use_enable test tests)
-		$(use_enable unicode unicode-dict)
-		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
-		$(use_enable vala)
-		$(use_enable wayland)
-		"${python_conf[@]}"
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if tc-is-cross-compiler && { use emoji || use unicode; }; then
-		emake -C "${S}-build/src" \
-			$(usex emoji emoji-parser '') \
-			$(usex unicode unicode-parser '')
-		emake -C src \
-			$(usex emoji emoji-parser '') \
-			$(usex unicode unicode-parser '')
-		cp \
-			$(usex emoji "${S}-build/src/emoji-parser" '') \
-			$(usex unicode "${S}-build/src/unicode-parser" '') \
-			src || die
-	fi
-	emake
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	virtx dbus-run-session emake check
-}
-
-src_install() {
-	default
-	# Remove la files
-	find "${ED}" -name '*.la' -delete || die
-
-	# Remove stray python files generated by the build system
-	find "${ED}" -name '*.pyc' -exec rm -f {} \; || die
-	find "${ED}" -name '*.pyo' -exec rm -f {} \; || die
-
-	if use python; then
-		python_install() {
-			emake -C bindings/pygobject \
-				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
-				DESTDIR="${D}" \
-				install
-
-			python_optimize
-		}
-		python_foreach_impl python_install
-	fi
-
-	keepdir /usr/share/ibus/engine
-
-	newbashcomp tools/${PN}.bash ${PN}
-
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-${PN} ${PN}.conf
-}
-
-pkg_postinst() {
-	use gtk2 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	xdg_icon_cache_update
-	gnome2_schemas_update
-	dconf update
-}
-
-pkg_postrm() {
-	use gtk2 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Arthur Zamarin]

commit:     84055fdbf70a3437a1d027828bb6711b38fffa12
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 05:19:26 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 05:19:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84055fdb

app-i18n/ibus: Stabilize 1.5.29 x86, #913832

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.29.ebuild b/app-i18n/ibus/ibus-1.5.29.ebuild
index c19a1810619e..51a8dc2a0ec8 100644
--- a/app-i18n/ibus/ibus-1.5.29.ebuild
+++ b/app-i18n/ibus/ibus-1.5.29.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Arthur Zamarin]

commit:     dd4ce2adb6961087d9a6218a78dcc688d4afc960
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 05:19:25 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 05:19:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd4ce2ad

app-i18n/ibus: Stabilize 1.5.29 ppc, #913832

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.29.ebuild b/app-i18n/ibus/ibus-1.5.29.ebuild
index 3a7f4f8c1a08..c19a1810619e 100644
--- a/app-i18n/ibus/ibus-1.5.29.ebuild
+++ b/app-i18n/ibus/ibus-1.5.29.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sam James]

commit:     41a1cc47df62aae5301c933997f446a47a077c8f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 02:32:13 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 02:32:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41a1cc47

app-i18n/ibus: Stabilize 1.5.29 sparc, #913832

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.29.ebuild b/app-i18n/ibus/ibus-1.5.29.ebuild
index b2372fb38288..3a7f4f8c1a08 100644
--- a/app-i18n/ibus/ibus-1.5.29.ebuild
+++ b/app-i18n/ibus/ibus-1.5.29.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc ~x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sam James]

commit:     5e5ee4dac66f0d14be27b6467bffa75941d3e745
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 02:32:10 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 02:32:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e5ee4da

app-i18n/ibus: Stabilize 1.5.29 arm64, #913832

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.29.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.29.ebuild b/app-i18n/ibus/ibus-1.5.29.ebuild
index a55f974d026a..497d5c56cfc0 100644
--- a/app-i18n/ibus/ibus-1.5.29.ebuild
+++ b/app-i18n/ibus/ibus-1.5.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sam James]

commit:     b21aebf9228872d8c9dee15dc76f959a5a36ecb6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 02:32:11 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 02:32:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b21aebf9

app-i18n/ibus: Stabilize 1.5.29 arm, #913832

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.29.ebuild b/app-i18n/ibus/ibus-1.5.29.ebuild
index 497d5c56cfc0..c1a1b09fab58 100644
--- a/app-i18n/ibus/ibus-1.5.29.ebuild
+++ b/app-i18n/ibus/ibus-1.5.29.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sam James]

commit:     4dd48e3c33e5151b3e52c0fe4aa516c9d91924dc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 02:32:12 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 02:32:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dd48e3c

app-i18n/ibus: Stabilize 1.5.29 ppc64, #913832

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.29.ebuild b/app-i18n/ibus/ibus-1.5.29.ebuild
index c1a1b09fab58..b2372fb38288 100644
--- a/app-i18n/ibus/ibus-1.5.29.ebuild
+++ b/app-i18n/ibus/ibus-1.5.29.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sam James]

commit:     a1f508dfffacef6bb289d9c7781752ff46f7de21
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Thu Nov 23 19:49:45 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 09:30:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1f508df

app-i18n/ibus: Keyword 1.5.29 mips, #896130

Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.29.ebuild b/app-i18n/ibus/ibus-1.5.29.ebuild
index 6c46f5514b9c..a55f974d026a 100644
--- a/app-i18n/ibus/ibus-1.5.29.ebuild
+++ b/app-i18n/ibus/ibus-1.5.29.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     f20e527d7833b6f4466a2a03e7615507648f195f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 00:58:10 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 01:04:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f20e527d

app-i18n/ibus: Version bump to 1.5.29

* Add a REQUIRED_USE rule to avoid a build failure (bug #915359)

Closes: https://bugs.gentoo.org/915359
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/Manifest           |   1 +
 app-i18n/ibus/ibus-1.5.29.ebuild | 234 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 235 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 7ebe4dbade5d..60ec683629d8 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -3,3 +3,4 @@ DIST ibus-1.5.27.tar.gz 3779541 BLAKE2B e98f775cd62036ae02dafd984933343e99390a6a
 DIST ibus-1.5.28-upstream-patches-0.tar.xz 23820 BLAKE2B 773736257e166170060458ad66b99889d2e54ef480504fe86ee65bc41364243ddcb5c7625aaa66a3e266c735d024c4f6c51d559484214d1f1c04a30479ccba62 SHA512 5555162bcb129f9e07c135c921c778de080aeaec81d56bedcf62d3b568cf39515e41662790c5a3d34241586d58785b887bbbaa7a75f486338968e3a496aa6433
 DIST ibus-1.5.28.tar.gz 3871246 BLAKE2B 7117c09e708df8a08e6684cc1096f38873503eb2c7937e0e3b02aeff678c96b3e2fc59fa4dfc7a11275b2e1b3349ae136041f8f4730aadc66339914b77c577d3 SHA512 5bfb9158a5810d38af900775ed30406823872c431ef4772b476afa7b58c120ef508a51b961620ea6003549f1f49cf05484992beee8677b138f1162afc73ab247
 DIST ibus-1.5.29-rc1.tar.gz 3989492 BLAKE2B c99f42fcd18bed240bf5e9f5b406bc879b05b12f3d0c14713e21b8c99fbcde32cd880dead1374731914289c022b1f160d9961bdbd9e9a0a3ced86949c5beb811 SHA512 776a01bcfd730be67e0f7d730f7b4b0a586d39744deb605359330a1786542acae52efbc085c39b8417b20164e45c259b40b29725f53fb1b69e2b340778ff28dc
+DIST ibus-1.5.29-rc2.tar.gz 3991416 BLAKE2B c185c0cf8af79a80ee04f414e13c4b58bd2f18891851d2f018713848b3bc0fe0516c8c0cf8f64204040f10b6b4a5304c8be6305449d7290b5d08412246d3af40 SHA512 47dd39c9615783b6c157a25e8a2506dc2e1f440d56aa649ee8cb95a390cb4efab9c95e72ac84b5d042c25e350599b4d352ddc66f1385af6660d4a7a296e44ca7

diff --git a/app-i18n/ibus/ibus-1.5.29.ebuild b/app-i18n/ibus/ibus-1.5.29.ebuild
new file mode 100644
index 000000000000..6c46f5514b9c
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.29.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+
+MY_PV=$(ver_rs 3 '-')
+MY_PV_DERP="${MY_PV}-rc2" # Upstream retagged rc2 as the final release
+GENTOO_VER=
+[[ -n ${GENTOO_VER} ]] && \
+	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV_DERP}.tar.gz
+	${GENTOO_PATCHSET_URI}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	appindicator? ( gtk3 )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		introspection
+	)
+	test? ( gtk3 )
+	vala? ( introspection )
+	X? ( gtk3 )
+"
+REQUIRED_USE+=" gtk3? ( wayland? ( introspection ) )" # bug 915359
+DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.65.0:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		>=x11-libs/libXfixes-6.0.0
+	)
+	appindicator? ( dev-libs/libdbusmenu[gtk3?] )
+	gtk2? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	gtk4? ( gui-libs/gtk:4 )
+	gui? (
+		x11-libs/libX11
+		x11-libs/libXi
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${DEPEND}
+	python? (
+		gui? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+BDEPEND="
+	$(vala_depend)
+	dev-libs/glib:2
+	dev-util/glib-utils
+	virtual/pkgconfig
+	x11-misc/xkeyboard-config
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	test? ( x11-apps/setxkbmap )
+	unicode? ( app-i18n/unicode-data )"
+
+S=${WORKDIR}/${PN}-${MY_PV_DERP}
+
+src_prepare() {
+	vala_setup --ignore-use
+	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
+		touch ui/gtk3/panelbinding.vala \
+			ui/gtk3/panel.vala \
+			ui/gtk3/emojierapp.vala || die
+	fi
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala || die
+	fi
+	if ! use appindicator; then
+		touch ui/gtk3/panel.vala || die
+	fi
+	if [[ -n ${GENTOO_VER} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		eapply "${WORKDIR}"/patches-gentoo/*.patch
+	fi
+
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am || die
+	# fix for parallel install
+	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am || die
+	# require user interaction
+	sed -i "/^TESTS_C += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am || die
+
+	sed -i "/^bash_completion/d" tools/Makefile.am || die
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gui setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	if tc-is-cross-compiler && { use emoji || use unicode; }; then
+		mkdir -p "${S}-build"
+		pushd "${S}-build" >/dev/null 2>&1 || die
+		ECONF_SOURCE=${S} econf_build --enable-static \
+			--disable-{dconf,gtk{2,3},python-library,shared,xim} \
+			ISOCODES_{CFLAG,LIB}S=-DSKIP \
+			$(use_enable emoji emoji-dict) \
+			$(use_enable unicode unicode-dict) \
+			$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
+		popd >/dev/null 2>&1 || die
+	fi
+
+	local myconf=(
+		$(use_enable X xim)
+		$(use_enable appindicator)
+		$(use_enable emoji emoji-dict)
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji)
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations)
+		$(use_enable gtk2)
+		$(use_enable gtk3)
+		$(use_enable gtk4)
+		$(use_enable gui ui)
+		$(use_enable introspection)
+		$(use_enable libnotify)
+		$(use_enable nls)
+		$(use_enable systemd systemd-services)
+		$(use_enable test tests)
+		$(use_enable unicode unicode-dict)
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
+		$(use_enable vala)
+		$(use_enable wayland)
+		"${python_conf[@]}"
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler && { use emoji || use unicode; }; then
+		emake -C "${S}-build/src" \
+			$(usex emoji emoji-parser '') \
+			$(usex unicode unicode-parser '')
+		emake -C src \
+			$(usex emoji emoji-parser '') \
+			$(usex unicode unicode-parser '')
+		cp \
+			$(usex emoji "${S}-build/src/emoji-parser" '') \
+			$(usex unicode "${S}-build/src/unicode-parser" '') \
+			src || die
+	fi
+	emake
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx dbus-run-session emake check
+}
+
+src_install() {
+	default
+	# Remove la files
+	find "${ED}" -name '*.la' -delete || die
+
+	# Remove stray python files generated by the build system
+	find "${ED}" -name '*.pyc' -exec rm -f {} \; || die
+	find "${ED}" -name '*.pyo' -exec rm -f {} \; || die
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+
+			python_optimize
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+}
+
+pkg_postinst() {
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	xdg_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     9665995dd921d5d374bbc6812e000e9a42f23779
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 28 19:30:35 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Sep 12 02:54:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9665995d

app-i18n/ibus: Version bump to 1.5.29_rc1

Thanks to Paul Zander <negril.nx+gentoo <AT> gmail.com> for figuring out that
we can export PKG_CONFIG_PATH to avoid ibus building against the system
version of itself.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/Manifest               |   1 +
 app-i18n/ibus/ibus-1.5.29_rc1.ebuild | 232 +++++++++++++++++++++++++++++++++++
 2 files changed, 233 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 8e4ec4380347..7ebe4dbade5d 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -2,3 +2,4 @@ DIST ibus-1.5.26.tar.gz 3715263 BLAKE2B 80eb293b028d431b76c015c6d6d9fea92888554f
 DIST ibus-1.5.27.tar.gz 3779541 BLAKE2B e98f775cd62036ae02dafd984933343e99390a6a1e77b672feb4bc00dd1d423126227bded2d22b8bc9fa214e572ea906c407658de8ee20e036f8753836d68f46 SHA512 b5f3ae555d19eb780a416383e6351ed2cd8834fcc2bc4ebe4f4a194fc934dd055c5e782f9ec382fb21e1e2103c5409804174a79d192b5494a9018ce9081305e4
 DIST ibus-1.5.28-upstream-patches-0.tar.xz 23820 BLAKE2B 773736257e166170060458ad66b99889d2e54ef480504fe86ee65bc41364243ddcb5c7625aaa66a3e266c735d024c4f6c51d559484214d1f1c04a30479ccba62 SHA512 5555162bcb129f9e07c135c921c778de080aeaec81d56bedcf62d3b568cf39515e41662790c5a3d34241586d58785b887bbbaa7a75f486338968e3a496aa6433
 DIST ibus-1.5.28.tar.gz 3871246 BLAKE2B 7117c09e708df8a08e6684cc1096f38873503eb2c7937e0e3b02aeff678c96b3e2fc59fa4dfc7a11275b2e1b3349ae136041f8f4730aadc66339914b77c577d3 SHA512 5bfb9158a5810d38af900775ed30406823872c431ef4772b476afa7b58c120ef508a51b961620ea6003549f1f49cf05484992beee8677b138f1162afc73ab247
+DIST ibus-1.5.29-rc1.tar.gz 3989492 BLAKE2B c99f42fcd18bed240bf5e9f5b406bc879b05b12f3d0c14713e21b8c99fbcde32cd880dead1374731914289c022b1f160d9961bdbd9e9a0a3ced86949c5beb811 SHA512 776a01bcfd730be67e0f7d730f7b4b0a586d39744deb605359330a1786542acae52efbc085c39b8417b20164e45c259b40b29725f53fb1b69e2b340778ff28dc

diff --git a/app-i18n/ibus/ibus-1.5.29_rc1.ebuild b/app-i18n/ibus/ibus-1.5.29_rc1.ebuild
new file mode 100644
index 000000000000..10fdab116676
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.29_rc1.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+
+MY_PV=$(ver_rs 3 '-')
+GENTOO_VER=
+[[ -n ${GENTOO_VER} ]] && \
+	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.gz
+	${GENTOO_PATCHSET_URI}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	appindicator? ( gtk3 )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		introspection
+	)
+	test? ( gtk3 )
+	vala? ( introspection )
+	X? ( gtk3 )
+"
+DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.65.0:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		>=x11-libs/libXfixes-6.0.0
+	)
+	appindicator? ( dev-libs/libdbusmenu[gtk3?] )
+	gtk2? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	gtk4? ( gui-libs/gtk:4 )
+	gui? (
+		x11-libs/libX11
+		x11-libs/libXi
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${DEPEND}
+	python? (
+		gui? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+BDEPEND="
+	$(vala_depend)
+	dev-libs/glib:2
+	dev-util/glib-utils
+	virtual/pkgconfig
+	x11-misc/xkeyboard-config
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	test? ( x11-apps/setxkbmap )
+	unicode? ( app-i18n/unicode-data )"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+	vala_setup --ignore-use
+	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
+		touch ui/gtk3/panelbinding.vala \
+			ui/gtk3/panel.vala \
+			ui/gtk3/emojierapp.vala || die
+	fi
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala || die
+	fi
+	if ! use appindicator; then
+		touch ui/gtk3/panel.vala || die
+	fi
+	if [[ -n ${GENTOO_VER} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		eapply "${WORKDIR}"/patches-gentoo/*.patch
+	fi
+
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am || die
+	# fix for parallel install
+	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am || die
+	# require user interaction
+	sed -i "/^TESTS_C += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am || die
+
+	sed -i "/^bash_completion/d" tools/Makefile.am || die
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gui setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	if tc-is-cross-compiler && { use emoji || use unicode; }; then
+		mkdir -p "${S}-build"
+		pushd "${S}-build" >/dev/null 2>&1 || die
+		ECONF_SOURCE=${S} econf_build --enable-static \
+			--disable-{dconf,gtk{2,3},python-library,shared,xim} \
+			ISOCODES_{CFLAG,LIB}S=-DSKIP \
+			$(use_enable emoji emoji-dict) \
+			$(use_enable unicode unicode-dict) \
+			$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
+		popd >/dev/null 2>&1 || die
+	fi
+
+	local myconf=(
+		$(use_enable X xim)
+		$(use_enable appindicator)
+		$(use_enable emoji emoji-dict)
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji)
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations)
+		$(use_enable gtk2)
+		$(use_enable gtk3)
+		$(use_enable gtk4)
+		$(use_enable gui ui)
+		$(use_enable introspection)
+		$(use_enable libnotify)
+		$(use_enable nls)
+		$(use_enable systemd systemd-services)
+		$(use_enable test tests)
+		$(use_enable unicode unicode-dict)
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
+		$(use_enable vala)
+		$(use_enable wayland)
+		"${python_conf[@]}"
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler && { use emoji || use unicode; }; then
+		emake -C "${S}-build/src" \
+			$(usex emoji emoji-parser '') \
+			$(usex unicode unicode-parser '')
+		emake -C src \
+			$(usex emoji emoji-parser '') \
+			$(usex unicode unicode-parser '')
+		cp \
+			$(usex emoji "${S}-build/src/emoji-parser" '') \
+			$(usex unicode "${S}-build/src/unicode-parser" '') \
+			src || die
+	fi
+	emake
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx dbus-run-session emake check
+}
+
+src_install() {
+	default
+	# Remove la files
+	find "${ED}" -name '*.la' -delete || die
+
+	# Remove stray python files generated by the build system
+	find "${ED}" -name '*.pyc' -exec rm -f {} \; || die
+	find "${ED}" -name '*.pyo' -exec rm -f {} \; || die
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+
+			python_optimize
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+}
+
+pkg_postinst() {
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	xdg_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     d71592c5cc9495395b60b9c8a65316698b5e3110
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  9 03:01:06 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 03:01:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d71592c5

app-i18n/ibus: Keyword 1.5.28-r1 alpha, #863068

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.28-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.28-r1.ebuild b/app-i18n/ibus/ibus-1.5.28-r1.ebuild
index 2f78d41383db..7bec97c52d98 100644
--- a/app-i18n/ibus/ibus-1.5.28-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.28-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     1bb364aaa1e84cd78f193733806f97841e6a086c
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  5 00:28:04 2023 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Jun  5 00:36:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bb364aa

app-i18n/ibus: fix emoji input broken issue

Closes: https://bugs.gentoo.org/907764
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-i18n/ibus/Manifest              |   1 +
 app-i18n/ibus/ibus-1.5.28-r1.ebuild | 240 ++++++++++++++++++++++++++++++++++++
 2 files changed, 241 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 0fc6b9ca7f00..8e4ec4380347 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,3 +1,4 @@
 DIST ibus-1.5.26.tar.gz 3715263 BLAKE2B 80eb293b028d431b76c015c6d6d9fea92888554f6f34ec126853df189746d9976569ec2380146187d13337a011668b1f15fc57a95284658c8afc7824a67b5898 SHA512 923607c17114af673dcc36532fb44a278b61161ee1b7d4e01b2e0dcffc40c95eb91c6416acc9c0da0333e933863e15263e9a5ff1e467cfc02b71398d601b9714
 DIST ibus-1.5.27.tar.gz 3779541 BLAKE2B e98f775cd62036ae02dafd984933343e99390a6a1e77b672feb4bc00dd1d423126227bded2d22b8bc9fa214e572ea906c407658de8ee20e036f8753836d68f46 SHA512 b5f3ae555d19eb780a416383e6351ed2cd8834fcc2bc4ebe4f4a194fc934dd055c5e782f9ec382fb21e1e2103c5409804174a79d192b5494a9018ce9081305e4
+DIST ibus-1.5.28-upstream-patches-0.tar.xz 23820 BLAKE2B 773736257e166170060458ad66b99889d2e54ef480504fe86ee65bc41364243ddcb5c7625aaa66a3e266c735d024c4f6c51d559484214d1f1c04a30479ccba62 SHA512 5555162bcb129f9e07c135c921c778de080aeaec81d56bedcf62d3b568cf39515e41662790c5a3d34241586d58785b887bbbaa7a75f486338968e3a496aa6433
 DIST ibus-1.5.28.tar.gz 3871246 BLAKE2B 7117c09e708df8a08e6684cc1096f38873503eb2c7937e0e3b02aeff678c96b3e2fc59fa4dfc7a11275b2e1b3349ae136041f8f4730aadc66339914b77c577d3 SHA512 5bfb9158a5810d38af900775ed30406823872c431ef4772b476afa7b58c120ef508a51b961620ea6003549f1f49cf05484992beee8677b138f1162afc73ab247

diff --git a/app-i18n/ibus/ibus-1.5.28-r1.ebuild b/app-i18n/ibus/ibus-1.5.28-r1.ebuild
new file mode 100644
index 000000000000..2f78d41383db
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.28-r1.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx xdg-utils
+
+UPSTREAM_VER=0
+GENTOO_VER=
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+[[ -n ${GENTOO_VER} ]] && \
+	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
+	${UPSTREAM_PATCHSET_URI} ${GENTOO_PATCHSET_URI}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	appindicator? ( gtk3 )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		introspection
+	)
+	test? ( gtk3 )
+	vala? ( introspection )
+	X? ( gtk3 )
+"
+DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.65.0:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		>=x11-libs/libXfixes-6.0.0
+	)
+	gtk2? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	gtk4? ( gui-libs/gtk:4 )
+	gui? (
+		x11-libs/libX11
+		x11-libs/libXi
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${DEPEND}
+	python? (
+		gui? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+BDEPEND="
+	$(vala_depend)
+	dev-libs/glib:2
+	dev-util/glib-utils
+	virtual/pkgconfig
+	x11-misc/xkeyboard-config
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	test? ( x11-apps/setxkbmap )
+	unicode? ( app-i18n/unicode-data )"
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
+		touch ui/gtk3/panelbinding.vala \
+			ui/gtk3/panel.vala \
+			ui/gtk3/emojierapp.vala || die
+	fi
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala || die
+	fi
+	if ! use appindicator; then
+		touch ui/gtk3/panel.vala || die
+	fi
+
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Upstream specific patch set"
+		eapply "${WORKDIR}"/patches-upstream/*.patch
+	fi
+
+	if [[ -n ${GENTOO_VER} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		eapply "${WORKDIR}"/patches-gentoo/*.patch
+	fi
+
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am || die
+	# fix for parallel install
+	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am || die
+	# require user interaction
+	sed -i "/^TESTS_C += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am || die
+
+	sed -i "/^bash_completion/d" tools/Makefile.am || die
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gui setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	if tc-is-cross-compiler && { use emoji || use unicode; }; then
+		mkdir -p "${S}-build"
+		pushd "${S}-build" >/dev/null 2>&1 || die
+		ECONF_SOURCE=${S} econf_build --enable-static \
+			--disable-{dconf,gtk{2,3},python-library,shared,xim} \
+			ISOCODES_{CFLAG,LIB}S=-DSKIP \
+			$(use_enable emoji emoji-dict) \
+			$(use_enable unicode unicode-dict) \
+			$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
+		popd >/dev/null 2>&1 || die
+	fi
+
+	local myconf=(
+		$(use_enable X xim)
+		$(use_enable appindicator)
+		$(use_enable emoji emoji-dict)
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji)
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations)
+		$(use_enable gtk2)
+		$(use_enable gtk3)
+		$(use_enable gtk4)
+		$(use_enable gui ui)
+		$(use_enable introspection)
+		$(use_enable libnotify)
+		$(use_enable nls)
+		$(use_enable systemd systemd-services)
+		$(use_enable test tests)
+		$(use_enable unicode unicode-dict)
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
+		$(use_enable vala)
+		$(use_enable wayland)
+		"${python_conf[@]}"
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler && { use emoji || use unicode; }; then
+		emake -C "${S}-build/src" \
+			$(usex emoji emoji-parser '') \
+			$(usex unicode unicode-parser '')
+		emake -C src \
+			$(usex emoji emoji-parser '') \
+			$(usex unicode unicode-parser '')
+		cp \
+			$(usex emoji "${S}-build/src/emoji-parser" '') \
+			$(usex unicode "${S}-build/src/unicode-parser" '') \
+			src || die
+	fi
+	emake
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+src_install() {
+	default
+	# Remove la files
+	find "${ED}" -name '*.la' -delete || die
+
+	# Remove stray python files generated by the build system
+	find "${ED}" -name '*.pyc' -exec rm -f {} \; || die
+	find "${ED}" -name '*.pyo' -exec rm -f {} \; || die
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+
+			python_optimize
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+
+	# Undo compression of man page
+	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
+}
+
+pkg_postinst() {
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	xdg_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     c601a1b761b283f765292284577d1c9c6328adb6
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 00:26:03 2023 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 00:27:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c601a1b7

app-i18n/ibus: add 1.5.28

Closes: https://bugs.gentoo.org/901015
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-i18n/ibus/Manifest           |   1 +
 app-i18n/ibus/ibus-1.5.28.ebuild | 231 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 232 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index e1c5c22fad65..0fc6b9ca7f00 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,2 +1,3 @@
 DIST ibus-1.5.26.tar.gz 3715263 BLAKE2B 80eb293b028d431b76c015c6d6d9fea92888554f6f34ec126853df189746d9976569ec2380146187d13337a011668b1f15fc57a95284658c8afc7824a67b5898 SHA512 923607c17114af673dcc36532fb44a278b61161ee1b7d4e01b2e0dcffc40c95eb91c6416acc9c0da0333e933863e15263e9a5ff1e467cfc02b71398d601b9714
 DIST ibus-1.5.27.tar.gz 3779541 BLAKE2B e98f775cd62036ae02dafd984933343e99390a6a1e77b672feb4bc00dd1d423126227bded2d22b8bc9fa214e572ea906c407658de8ee20e036f8753836d68f46 SHA512 b5f3ae555d19eb780a416383e6351ed2cd8834fcc2bc4ebe4f4a194fc934dd055c5e782f9ec382fb21e1e2103c5409804174a79d192b5494a9018ce9081305e4
+DIST ibus-1.5.28.tar.gz 3871246 BLAKE2B 7117c09e708df8a08e6684cc1096f38873503eb2c7937e0e3b02aeff678c96b3e2fc59fa4dfc7a11275b2e1b3349ae136041f8f4730aadc66339914b77c577d3 SHA512 5bfb9158a5810d38af900775ed30406823872c431ef4772b476afa7b58c120ef508a51b961620ea6003549f1f49cf05484992beee8677b138f1162afc73ab247

diff --git a/app-i18n/ibus/ibus-1.5.28.ebuild b/app-i18n/ibus/ibus-1.5.28.ebuild
new file mode 100644
index 000000000000..41f883c5e2b9
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.28.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx xdg-utils
+
+GENTOO_VER=
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+
+[[ -n ${GENTOO_VER} ]] && \
+	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
+	${GENTOO_PATCHSET_URI}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	appindicator? ( gtk3 )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		introspection
+	)
+	test? ( gtk3 )
+	vala? ( introspection )
+	X? ( gtk3 )
+"
+DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.65.0:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		>=x11-libs/libXfixes-6.0.0
+	)
+	gtk2? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	gtk4? ( gui-libs/gtk:4 )
+	gui? (
+		x11-libs/libX11
+		x11-libs/libXi
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${DEPEND}
+	python? (
+		gui? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+BDEPEND="
+	$(vala_depend)
+	dev-libs/glib:2
+	dev-util/glib-utils
+	virtual/pkgconfig
+	x11-misc/xkeyboard-config
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	test? ( x11-apps/setxkbmap )
+	unicode? ( app-i18n/unicode-data )"
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
+		touch ui/gtk3/panelbinding.vala \
+			ui/gtk3/panel.vala \
+			ui/gtk3/emojierapp.vala || die
+	fi
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala || die
+	fi
+	if ! use appindicator; then
+		touch ui/gtk3/panel.vala || die
+	fi
+	if [[ -n ${GENTOO_VER} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		eapply "${WORKDIR}"/patches-gentoo/*.patch
+	fi
+
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am || die
+	# fix for parallel install
+	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am || die
+	# require user interaction
+	sed -i "/^TESTS_C += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am || die
+
+	sed -i "/^bash_completion/d" tools/Makefile.am || die
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gui setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	if tc-is-cross-compiler && { use emoji || use unicode; }; then
+		mkdir -p "${S}-build"
+		pushd "${S}-build" >/dev/null 2>&1 || die
+		ECONF_SOURCE=${S} econf_build --enable-static \
+			--disable-{dconf,gtk{2,3},python-library,shared,xim} \
+			ISOCODES_{CFLAG,LIB}S=-DSKIP \
+			$(use_enable emoji emoji-dict) \
+			$(use_enable unicode unicode-dict) \
+			$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
+		popd >/dev/null 2>&1 || die
+	fi
+
+	local myconf=(
+		$(use_enable X xim)
+		$(use_enable appindicator)
+		$(use_enable emoji emoji-dict)
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji)
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations)
+		$(use_enable gtk2)
+		$(use_enable gtk3)
+		$(use_enable gtk4)
+		$(use_enable gui ui)
+		$(use_enable introspection)
+		$(use_enable libnotify)
+		$(use_enable nls)
+		$(use_enable systemd systemd-services)
+		$(use_enable test tests)
+		$(use_enable unicode unicode-dict)
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
+		$(use_enable vala)
+		$(use_enable wayland)
+		"${python_conf[@]}"
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler && { use emoji || use unicode; }; then
+		emake -C "${S}-build/src" \
+			$(usex emoji emoji-parser '') \
+			$(usex unicode unicode-parser '')
+		emake -C src \
+			$(usex emoji emoji-parser '') \
+			$(usex unicode unicode-parser '')
+		cp \
+			$(usex emoji "${S}-build/src/emoji-parser" '') \
+			$(usex unicode "${S}-build/src/unicode-parser" '') \
+			src || die
+	fi
+	emake
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+src_install() {
+	default
+	# Remove la files
+	find "${ED}" -name '*.la' -delete || die
+
+	# Remove stray python files generated by the build system
+	find "${ED}" -name '*.pyc' -exec rm -f {} \; || die
+	find "${ED}" -name '*.pyo' -exec rm -f {} \; || die
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+
+			python_optimize
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+
+	# Undo compression of man page
+	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
+}
+
+pkg_postinst() {
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	xdg_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Joonas Niilola]

commit:     9cf8dff529ff02f41bc03f596846bd0467234c86
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 17:33:43 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 17:34:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cf8dff5

app-i18n/ibus: add missing test dep to 1.5.27

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.27.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-i18n/ibus/ibus-1.5.27.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild
index 6fd502ca7c05..22c0f865df55 100644
--- a/app-i18n/ibus/ibus-1.5.27.ebuild
+++ b/app-i18n/ibus/ibus-1.5.27.ebuild
@@ -76,6 +76,7 @@ BDEPEND="
 		app-i18n/unicode-emoji
 	)
 	nls? ( sys-devel/gettext )
+	test? ( x11-apps/setxkbmap )
 	unicode? ( app-i18n/unicode-data )"
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     082d23a82c70a381b53dc87e19dc39218fd47128
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 03:53:46 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 04:10:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=082d23a8

app-i18n/ibus: Fix sed that disables hanging tests

The sloppy 1.5.27 version bump didn't take into account this change.

Closes: https://bugs.gentoo.org/884029
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.27.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild
index 70a479536640..6475d45357a8 100644
--- a/app-i18n/ibus/ibus-1.5.27.ebuild
+++ b/app-i18n/ibus/ibus-1.5.27.ebuild
@@ -104,7 +104,7 @@ src_prepare() {
 	# fix for parallel install
 	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am || die
 	# require user interaction
-	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am || die
+	sed -i "/^TESTS_C += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am || die
 
 	sed -i "/^bash_completion/d" tools/Makefile.am || die
 

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     cd996c3d3c3c6e1ffbeb70995a50f734f2974e6c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 03:47:38 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 04:10:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd996c3d

app-i18n/ibus: Add Python 3.11 compatibility

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.27.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild
index 6a87963783c9..70a479536640 100644
--- a/app-i18n/ibus/ibus-1.5.27.ebuild
+++ b/app-i18n/ibus/ibus-1.5.27.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx xdg-utils
 

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     ff51a416f63a81beeadf61f5a5161cfba9acb079
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 03:58:36 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 04:10:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff51a416

app-i18n/ibus: Remove useless sed

The need for this sed was negated by upstream commit 5788be80 ("Fix ucd
directory override"), in v1.5.19.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.27.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.27.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild
index 6475d45357a8..6fd502ca7c05 100644
--- a/app-i18n/ibus/ibus-1.5.27.ebuild
+++ b/app-i18n/ibus/ibus-1.5.27.ebuild
@@ -80,7 +80,6 @@ BDEPEND="
 
 src_prepare() {
 	vala_src_prepare --ignore-use
-	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
 	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
 		touch ui/gtk3/panelbinding.vala \
 			ui/gtk3/panel.vala \

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     7c28fc98146b48b4cbbb314a04654693670feb2b
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  1 02:55:10 2023 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sun Jan  1 02:58:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c28fc98

app-i18n/ibus: fix mising gdk/gdkwayland.h issue

Closes: https://bugs.gentoo.org/873679
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.27.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-i18n/ibus/ibus-1.5.27.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild
index 21e2c080b256..1b3badff8b5f 100644
--- a/app-i18n/ibus/ibus-1.5.27.ebuild
+++ b/app-i18n/ibus/ibus-1.5.27.ebuild
@@ -83,6 +83,7 @@ src_prepare() {
 	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
 	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
 		touch ui/gtk3/panelbinding.vala \
+			ui/gtk3/panel.vala \
 			ui/gtk3/emojierapp.vala || die
 	fi
 	if ! use emoji; then

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Arthur Zamarin]

commit:     d7de190162dd9afe1c7761064d637315453580d5
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 20:00:49 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 20:00:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7de1901

app-i18n/ibus: Stabilize 1.5.27 x86, #883863

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.27.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild
index 3a949739bc2d..21e2c080b256 100644
--- a/app-i18n/ibus/ibus-1.5.27.ebuild
+++ b/app-i18n/ibus/ibus-1.5.27.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Arthur Zamarin]

commit:     85445de33adb3d79d17f5e611c168a3cda103f58
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 07:37:53 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 07:37:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85445de3

app-i18n/ibus: Stabilize 1.5.27 sparc, #883863

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.27.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild
index e9e91c87dfa9..3a949739bc2d 100644
--- a/app-i18n/ibus/ibus-1.5.27.ebuild
+++ b/app-i18n/ibus/ibus-1.5.27.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc ~x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Arthur Zamarin]

commit:     44d7d126f142d71fd06bda50c4eecdb14a8be7f2
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 07:37:40 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 07:37:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44d7d126

app-i18n/ibus: Stabilize 1.5.27 arm64, #883863

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.27.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild
index 4502c94d58b6..c0a561d610a0 100644
--- a/app-i18n/ibus/ibus-1.5.27.ebuild
+++ b/app-i18n/ibus/ibus-1.5.27.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Arthur Zamarin]

commit:     80f43f2a072158cc565e6ad1c6789411f151778a
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 07:37:50 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 07:37:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80f43f2a

app-i18n/ibus: Stabilize 1.5.27 ppc64, #883863

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.27.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild
index 44bb5b0f56c1..e9e91c87dfa9 100644
--- a/app-i18n/ibus/ibus-1.5.27.ebuild
+++ b/app-i18n/ibus/ibus-1.5.27.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Arthur Zamarin]

commit:     20bb731a11232a5c3ac5aa64df7204decb5a82e0
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 07:37:47 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 07:37:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20bb731a

app-i18n/ibus: Stabilize 1.5.27 ppc, #883863

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.27.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild
index c0a561d610a0..44bb5b0f56c1 100644
--- a/app-i18n/ibus/ibus-1.5.27.ebuild
+++ b/app-i18n/ibus/ibus-1.5.27.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Arthur Zamarin]

commit:     dccad7aab02659a80939ea92b39c83d14be757de
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 07:37:37 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 07:37:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dccad7aa

app-i18n/ibus: Stabilize 1.5.27 arm, #883863

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.27.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild
index a723bd6de987..4502c94d58b6 100644
--- a/app-i18n/ibus/ibus-1.5.27.ebuild
+++ b/app-i18n/ibus/ibus-1.5.27.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Arthur Zamarin]

commit:     f50b07fb4527f9e0b888369e7ad200bd19c229dd
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 07:30:42 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 07:30:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f50b07fb

app-i18n/ibus: Stabilize 1.5.27 amd64, #883863

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.27.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild
index 2118ad5f14ca..a723bd6de987 100644
--- a/app-i18n/ibus/ibus-1.5.27.ebuild
+++ b/app-i18n/ibus/ibus-1.5.27.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     f66ffa7a330895501c58e2451e7b16ce4e01b87b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 15:02:17 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 15:09:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f66ffa7a

app-i18n/ibus: Keyword 1.5.27 ppc, #863068

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.27.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild
index 57b8aa524735..2118ad5f14ca 100644
--- a/app-i18n/ibus/ibus-1.5.27.ebuild
+++ b/app-i18n/ibus/ibus-1.5.27.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     3b7db78d72fcbb65570b81143a8cb97caa078e87
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 15:05:33 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 15:09:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b7db78d

app-i18n/ibus: Stabilize ppc 1.5.26-r1

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.26-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.26-r1.ebuild b/app-i18n/ibus/ibus-1.5.26-r1.ebuild
index 9d2b86dc39c9..b7644b248a05 100644
--- a/app-i18n/ibus/ibus-1.5.26-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.26-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     f0cc83862f670ba1c6d166e346132c2aac279924
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 15:06:30 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 15:09:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0cc8386

app-i18n/ibus: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/Manifest              |   1 -
 app-i18n/ibus/ibus-1.5.25-r1.ebuild | 194 ------------------------------------
 2 files changed, 195 deletions(-)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 0ca9f820882f..e1c5c22fad65 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,3 +1,2 @@
-DIST ibus-1.5.25.tar.gz 3669787 BLAKE2B 0a568c77d29dfbe0c2c8cdbe8c8ae86b69c7a1a5fa692cf05e9ce13894fcee200c41de91ec0ad88ae9e745e3061b9c92b7fd18641bd297f5bf4a9bc308ace983 SHA512 4b8955a20a1e5a0daf61213817a9697874439866e235e6a7905f5994b145cd5a143e6cfc41f17204a828756baeb8edab70698596731ecebf7f1eea7cc5f36aa6
 DIST ibus-1.5.26.tar.gz 3715263 BLAKE2B 80eb293b028d431b76c015c6d6d9fea92888554f6f34ec126853df189746d9976569ec2380146187d13337a011668b1f15fc57a95284658c8afc7824a67b5898 SHA512 923607c17114af673dcc36532fb44a278b61161ee1b7d4e01b2e0dcffc40c95eb91c6416acc9c0da0333e933863e15263e9a5ff1e467cfc02b71398d601b9714
 DIST ibus-1.5.27.tar.gz 3779541 BLAKE2B e98f775cd62036ae02dafd984933343e99390a6a1e77b672feb4bc00dd1d423126227bded2d22b8bc9fa214e572ea906c407658de8ee20e036f8753836d68f46 SHA512 b5f3ae555d19eb780a416383e6351ed2cd8834fcc2bc4ebe4f4a194fc934dd055c5e782f9ec382fb21e1e2103c5409804174a79d192b5494a9018ce9081305e4

diff --git a/app-i18n/ibus/ibus-1.5.25-r1.ebuild b/app-i18n/ibus/ibus-1.5.25-r1.ebuild
deleted file mode 100644
index 44c67f7e9ccc..000000000000
--- a/app-i18n/ibus/ibus-1.5.25-r1.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_MIN_API_VERSION="0.34"
-VALA_MAX_API_VERSION="0.50"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
-
-GENTOO_VER=
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-
-[[ -n ${GENTOO_VER} ]] && \
-	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
-	${GENTOO_PATCHSET_URI}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="emoji? ( gtk )
-	gtk2? ( gtk )
-	kde? ( gtk )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		introspection
-	)
-	test? ( gtk )
-	vala? ( introspection )"
-
-CDEPEND="app-text/iso-codes
-	dev-libs/glib:2
-	gnome-base/dconf
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	X? (
-		x11-libs/libX11
-		>=x11-libs/libXfixes-6.0.0
-		!gtk? ( x11-libs/gtk+:2 )
-	)
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXi
-		gtk2? ( x11-libs/gtk+:2 )
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	kde? ( dev-qt/qtgui:5 )
-	nls? ( virtual/libintl )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)"
-RDEPEND="${CDEPEND}
-	python? (
-		gtk? (
-			x11-libs/gtk+:3[introspection]
-		)
-	)"
-DEPEND="${CDEPEND}
-	$(vala_depend)
-	dev-util/glib-utils
-	virtual/pkgconfig
-	x11-misc/xkeyboard-config
-	emoji? (
-		app-i18n/unicode-cldr
-		app-i18n/unicode-emoji
-	)
-	nls? ( sys-devel/gettext )
-	unicode? ( app-i18n/unicode-data )"
-
-PATCHES=( "${FILESDIR}"/${P}-ibusimcontext.patch )
-
-src_prepare() {
-	vala_src_prepare --ignore-use
-	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
-	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
-		touch ui/gtk3/panelbinding.vala
-	fi
-	if ! use emoji; then
-		touch \
-			tools/main.vala \
-			ui/gtk3/panel.vala
-	fi
-	if ! use kde; then
-		touch ui/gtk3/panel.vala
-	fi
-	if [[ -n ${GENTOO_VER} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		eapply "${WORKDIR}"/patches-gentoo/*.patch
-	fi
-
-	# for multiple Python implementations
-	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
-	# fix for parallel install
-	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am
-	# require user interaction
-	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am
-
-	sed -i "/^bash_completion/d" tools/Makefile.am
-
-	default
-	eautoreconf
-	xdg_environment_reset
-}
-
-src_configure() {
-	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local python_conf=()
-	if use python; then
-		python_setup
-		python_conf+=(
-			$(use_enable gtk setup)
-			--with-python=${EPYTHON}
-		)
-	else
-		python_conf+=( --disable-setup )
-	fi
-
-	econf \
-		$(use_enable X xim) \
-		$(use_enable emoji emoji-dict) \
-		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
-		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
-		$(use_enable gtk gtk3) \
-		$(use_enable gtk ui) \
-		$(use_enable gtk2) \
-		$(use_enable introspection) \
-		$(use_enable kde appindicator) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		"${python_conf[@]}"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	virtx emake -j1 check
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	if use python; then
-		python_install() {
-			emake -C bindings/pygobject \
-				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
-				DESTDIR="${D}" \
-				install
-
-			python_optimize
-		}
-		python_foreach_impl python_install
-	fi
-
-	keepdir /usr/share/ibus/engine
-
-	newbashcomp tools/${PN}.bash ${PN}
-
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-${PN} ${PN}.conf
-
-	# Undo compression of man page
-	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
-}
-
-pkg_postinst() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	xdg_icon_cache_update
-	gnome2_schemas_update
-	dconf update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     86d79201f3938a9669bfe56b8dd9f284c7280236
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 15:06:12 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 15:09:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86d79201

app-i18n/ibus: Stabilize sparc 1.5.26-r1

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.26-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.26-r1.ebuild b/app-i18n/ibus/ibus-1.5.26-r1.ebuild
index b7644b248a05..5d02fd8f921a 100644
--- a/app-i18n/ibus/ibus-1.5.26-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.26-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     c0a7889115890bfc1011568bc20381cd77f24e69
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  7 01:24:24 2022 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Wed Sep  7 01:24:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0a78891

app-i18n/ibus: fix not byte-compiled issue

Closes: https://bugs.gentoo.org/868699
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.27.ebuild | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.27.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild
index 65119041410e..57b8aa524735 100644
--- a/app-i18n/ibus/ibus-1.5.27.ebuild
+++ b/app-i18n/ibus/ibus-1.5.27.ebuild
@@ -184,6 +184,12 @@ src_test() {
 
 src_install() {
 	default
+	# Remove la files
+	find "${ED}" -name '*.la' -delete || die
+
+	# Remove stray python files generated by the build system
+	find "${ED}" -name '*.pyc' -exec rm -f {} \; || die
+	find "${ED}" -name '*.pyo' -exec rm -f {} \; || die
 
 	if use python; then
 		python_install() {
@@ -206,13 +212,6 @@ src_install() {
 
 	# Undo compression of man page
 	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
-
-	# Remove stray python files generated by the build system
-	find "${ED}" -name '*.pyc' -exec rm -f {} \; || die
-	find "${ED}" -name '*.pyo' -exec rm -f {} \; || die
-
-	# Remove la files
-	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     bea7f7e378e362228dbac0bf50fc77b04c75c1f3
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  6 09:28:56 2022 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Sep  6 09:30:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bea7f7e3

app-i18n/ibus: remove stray pyc/pyo files

Closes: https://bugs.gentoo.org/865753
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.27.ebuild | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.27.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild
index 935a3baa1a42..65119041410e 100644
--- a/app-i18n/ibus/ibus-1.5.27.ebuild
+++ b/app-i18n/ibus/ibus-1.5.27.ebuild
@@ -184,7 +184,6 @@ src_test() {
 
 src_install() {
 	default
-	find "${ED}" -name '*.la' -delete || die
 
 	if use python; then
 		python_install() {
@@ -207,6 +206,13 @@ src_install() {
 
 	# Undo compression of man page
 	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
+
+	# Remove stray python files generated by the build system
+	find "${ED}" -name '*.pyc' -exec rm -f {} \; || die
+	find "${ED}" -name '*.pyo' -exec rm -f {} \; || die
+
+	# Remove la files
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     6a8b69c2f6ca70fb9715eaad1cc54eee9b2c8190
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  6 03:29:45 2022 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Sep  6 03:43:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a8b69c2

app-i18n/ibus: add 1.5.27

Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-i18n/ibus/Manifest           |   1 +
 app-i18n/ibus/ibus-1.5.27.ebuild | 225 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 226 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 0408ab57270a..0ca9f820882f 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,2 +1,3 @@
 DIST ibus-1.5.25.tar.gz 3669787 BLAKE2B 0a568c77d29dfbe0c2c8cdbe8c8ae86b69c7a1a5fa692cf05e9ce13894fcee200c41de91ec0ad88ae9e745e3061b9c92b7fd18641bd297f5bf4a9bc308ace983 SHA512 4b8955a20a1e5a0daf61213817a9697874439866e235e6a7905f5994b145cd5a143e6cfc41f17204a828756baeb8edab70698596731ecebf7f1eea7cc5f36aa6
 DIST ibus-1.5.26.tar.gz 3715263 BLAKE2B 80eb293b028d431b76c015c6d6d9fea92888554f6f34ec126853df189746d9976569ec2380146187d13337a011668b1f15fc57a95284658c8afc7824a67b5898 SHA512 923607c17114af673dcc36532fb44a278b61161ee1b7d4e01b2e0dcffc40c95eb91c6416acc9c0da0333e933863e15263e9a5ff1e467cfc02b71398d601b9714
+DIST ibus-1.5.27.tar.gz 3779541 BLAKE2B e98f775cd62036ae02dafd984933343e99390a6a1e77b672feb4bc00dd1d423126227bded2d22b8bc9fa214e572ea906c407658de8ee20e036f8753836d68f46 SHA512 b5f3ae555d19eb780a416383e6351ed2cd8834fcc2bc4ebe4f4a194fc934dd055c5e782f9ec382fb21e1e2103c5409804174a79d192b5494a9018ce9081305e4

diff --git a/app-i18n/ibus/ibus-1.5.27.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild
new file mode 100644
index 000000000000..935a3baa1a42
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.27.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx xdg-utils
+
+GENTOO_VER=
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+
+[[ -n ${GENTOO_VER} ]] && \
+	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
+	${GENTOO_PATCHSET_URI}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	appindicator? ( gtk3 )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		introspection
+	)
+	test? ( gtk3 )
+	vala? ( introspection )
+	X? ( gtk3 )
+"
+DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.65.0:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		>=x11-libs/libXfixes-6.0.0
+	)
+	gtk2? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	gtk4? ( gui-libs/gtk:4 )
+	gui? (
+		x11-libs/libX11
+		x11-libs/libXi
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${DEPEND}
+	python? (
+		gui? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+BDEPEND="
+	$(vala_depend)
+	dev-libs/glib:2
+	dev-util/glib-utils
+	virtual/pkgconfig
+	x11-misc/xkeyboard-config
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	unicode? ( app-i18n/unicode-data )"
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
+	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
+		touch ui/gtk3/panelbinding.vala \
+			ui/gtk3/emojierapp.vala || die
+	fi
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala || die
+	fi
+	if ! use appindicator; then
+		touch ui/gtk3/panel.vala || die
+	fi
+	if [[ -n ${GENTOO_VER} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		eapply "${WORKDIR}"/patches-gentoo/*.patch
+	fi
+
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am || die
+	# fix for parallel install
+	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am || die
+	# require user interaction
+	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am || die
+
+	sed -i "/^bash_completion/d" tools/Makefile.am || die
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gui setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	if tc-is-cross-compiler && { use emoji || use unicode; }; then
+		mkdir -p "${S}-build"
+		pushd "${S}-build" >/dev/null 2>&1 || die
+		ECONF_SOURCE=${S} econf_build --enable-static \
+			--disable-{dconf,gtk{2,3},python-library,shared,xim} \
+			ISOCODES_{CFLAG,LIB}S=-DSKIP \
+			$(use_enable emoji emoji-dict) \
+			$(use_enable unicode unicode-dict) \
+			$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
+		popd >/dev/null 2>&1 || die
+	fi
+
+	local myconf=(
+		$(use_enable X xim)
+		$(use_enable appindicator)
+		$(use_enable emoji emoji-dict)
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji)
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations)
+		$(use_enable gtk2)
+		$(use_enable gtk3)
+		$(use_enable gtk4)
+		$(use_enable gui ui)
+		$(use_enable introspection)
+		$(use_enable libnotify)
+		$(use_enable nls)
+		$(use_enable systemd systemd-services)
+		$(use_enable test tests)
+		$(use_enable unicode unicode-dict)
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
+		$(use_enable vala)
+		$(use_enable wayland)
+		"${python_conf[@]}"
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler && { use emoji || use unicode; }; then
+		emake -C "${S}-build/src" \
+			$(usex emoji emoji-parser '') \
+			$(usex unicode unicode-parser '')
+		emake -C src \
+			$(usex emoji emoji-parser '') \
+			$(usex unicode unicode-parser '')
+		cp \
+			$(usex emoji "${S}-build/src/emoji-parser" '') \
+			$(usex unicode "${S}-build/src/unicode-parser" '') \
+			src || die
+	fi
+	emake
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+
+			python_optimize
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+
+	# Undo compression of man page
+	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
+}
+
+pkg_postinst() {
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	xdg_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[WANG Xuerui]

commit:     2af436eafa6d66d39db8fd89b2e5786b4affba75
Author:     matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sun Aug 14 03:52:49 2022 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Mon Aug 15 05:43:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2af436ea

app-i18n/ibus: Keyword 1.5.26-r1 sparc, #863068

Closes: https://github.com/gentoo/gentoo/pull/26852
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.26-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.26-r1.ebuild b/app-i18n/ibus/ibus-1.5.26-r1.ebuild
index d45d17b2ec42..9d2b86dc39c9 100644
--- a/app-i18n/ibus/ibus-1.5.26-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.26-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc64 ~riscv ~sparc x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[WANG Xuerui]

commit:     8793dfad391b84d9aa3eb08e3277640a7e559507
Author:     matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sat Aug  6 02:15:43 2022 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Sat Aug  6 12:05:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8793dfad

app-i18n/ibus: Keyword 1.5.26-r1 ia64, #863068

Signed-off-by: matoro <matoro <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/26753
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.26-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.26-r1.ebuild b/app-i18n/ibus/ibus-1.5.26-r1.ebuild
index 47f1c6bd63f4..d45d17b2ec42 100644
--- a/app-i18n/ibus/ibus-1.5.26-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.26-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc64 ~riscv x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Jakov Smolić]

commit:     c898c3992bdfe972de236b9fc238d6398883e25e
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 09:24:18 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue May 31 09:24:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c898c399

app-i18n/ibus: Stabilize 1.5.26-r1 arm, #843794

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.26-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.26-r1.ebuild b/app-i18n/ibus/ibus-1.5.26-r1.ebuild
index a0b753a5695d..47f1c6bd63f4 100644
--- a/app-i18n/ibus/ibus-1.5.26-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.26-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sam James]

commit:     e03950e711260e3c43a4a167ae4c3dbab15db54a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 28 05:04:51 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 28 05:04:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e03950e7

app-i18n/ibus: Stabilize 1.5.26-r1 ppc64, #843794

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.26-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.26-r1.ebuild b/app-i18n/ibus/ibus-1.5.26-r1.ebuild
index 7353c081eee5..9c2fb6208342 100644
--- a/app-i18n/ibus/ibus-1.5.26-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.26-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ppc64 ~riscv x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[WANG Xuerui]

commit:     a9b3c0d204fa1ae944be38da7d634196dc725367
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 05:05:07 2022 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Thu May 19 05:07:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b3c0d2

app-i18n/ibus: keyword 1.5.26-r1 for ~loong

Tests passed on real hardware.

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.26-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.26-r1.ebuild b/app-i18n/ibus/ibus-1.5.26-r1.ebuild
index 40de7864df87..5a8130de4b99 100644
--- a/app-i18n/ibus/ibus-1.5.26-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.26-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sam James]

commit:     19aaf5d7601502c477814c55c91a4bb1127ba24c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 08:30:27 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 08:30:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19aaf5d7

app-i18n/ibus: fix die typo

Reported-by: consolers
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.26.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.26.ebuild b/app-i18n/ibus/ibus-1.5.26.ebuild
index e8259b0ab2ef..93ead550b71b 100644
--- a/app-i18n/ibus/ibus-1.5.26.ebuild
+++ b/app-i18n/ibus/ibus-1.5.26.ebuild
@@ -87,7 +87,7 @@ src_prepare() {
 	if ! use emoji; then
 		touch \
 			tools/main.vala \
-			ui/gtk3/panel.vala || dile
+			ui/gtk3/panel.vala || die
 	fi
 	if ! use appindicator; then
 		touch ui/gtk3/panel.vala || die

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     6cd40cf76b7eb9dba218106c48c15219fb05fd58
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 04:48:36 2022 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 04:48:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cd40cf7

app-i18n/ibus: fix build failure without USE=wayland

regenerate emojierapp.vala if x11-libs/gtk+:3[wayland] not enabled

Closes: https://bugs.gentoo.org/838718
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.26.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-i18n/ibus/ibus-1.5.26.ebuild b/app-i18n/ibus/ibus-1.5.26.ebuild
index d7f083baeb20..02ebd8bfa1d0 100644
--- a/app-i18n/ibus/ibus-1.5.26.ebuild
+++ b/app-i18n/ibus/ibus-1.5.26.ebuild
@@ -82,6 +82,7 @@ src_prepare() {
 	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
 	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
 		touch ui/gtk3/panelbinding.vala
+		touch ui/gtk3/emojierapp.vala
 	fi
 	if ! use emoji; then
 		touch \

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     e3bdb3db6d83ff0953c5dd43b19b6f45b2f53a90
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 04:56:11 2022 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 04:56:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3bdb3db

app-i18n/ibus: need die while call external command

Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.26.ebuild | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.26.ebuild b/app-i18n/ibus/ibus-1.5.26.ebuild
index 02ebd8bfa1d0..e8259b0ab2ef 100644
--- a/app-i18n/ibus/ibus-1.5.26.ebuild
+++ b/app-i18n/ibus/ibus-1.5.26.ebuild
@@ -81,16 +81,16 @@ src_prepare() {
 	vala_src_prepare --ignore-use
 	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
 	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
-		touch ui/gtk3/panelbinding.vala
-		touch ui/gtk3/emojierapp.vala
+		touch ui/gtk3/panelbinding.vala \
+			ui/gtk3/emojierapp.vala || die
 	fi
 	if ! use emoji; then
 		touch \
 			tools/main.vala \
-			ui/gtk3/panel.vala
+			ui/gtk3/panel.vala || dile
 	fi
 	if ! use appindicator; then
-		touch ui/gtk3/panel.vala
+		touch ui/gtk3/panel.vala || die
 	fi
 	if [[ -n ${GENTOO_VER} ]]; then
 		einfo "Try to apply Gentoo specific patch set"
@@ -98,13 +98,13 @@ src_prepare() {
 	fi
 
 	# for multiple Python implementations
-	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am || die
 	# fix for parallel install
-	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am
+	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am || die
 	# require user interaction
-	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am
+	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am || die
 
-	sed -i "/^bash_completion/d" tools/Makefile.am
+	sed -i "/^bash_completion/d" tools/Makefile.am || die
 
 	default
 	eautoreconf

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     5f0dbe30b3d0a7f2d63aa0bbfac2ed11067fe3c9
Author:     David Michael <fedora.dm0 <AT> gmail <DOT> com>
AuthorDate: Fri Jan  1 04:41:47 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 19:24:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f0dbe30

app-i18n/ibus: use BDEPEND with EAPI 7, fix cross-compiling

It needs to build tools to execute when using unicode or emoji.

Closes: https://bugs.gentoo.org/762895
Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.26.ebuild | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.26.ebuild b/app-i18n/ibus/ibus-1.5.26.ebuild
index 3f54e2bdfad1..81c38c2f452f 100644
--- a/app-i18n/ibus/ibus-1.5.26.ebuild
+++ b/app-i18n/ibus/ibus-1.5.26.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
+inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx xdg-utils
 
 GENTOO_VER=
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
@@ -31,7 +31,8 @@ REQUIRED_USE="emoji? ( gtk )
 	test? ( gtk )
 	vala? ( introspection )"
 
-CDEPEND="app-text/iso-codes
+DEPEND="
+	app-text/iso-codes
 	>=dev-libs/glib-2.65.0:2
 	gnome-base/dconf
 	gnome-base/librsvg:2
@@ -58,14 +59,15 @@ CDEPEND="app-text/iso-codes
 		dev-libs/wayland
 		x11-libs/libxkbcommon
 	)"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	python? (
 		gtk? (
 			x11-libs/gtk+:3[introspection]
 		)
 	)"
-DEPEND="${CDEPEND}
+BDEPEND="
 	$(vala_depend)
+	dev-libs/glib:2
 	dev-util/glib-utils
 	virtual/pkgconfig
 	x11-misc/xkeyboard-config
@@ -122,6 +124,18 @@ src_configure() {
 		python_conf+=( --disable-setup )
 	fi
 
+	if tc-is-cross-compiler && { use emoji || use unicode; }; then
+		mkdir -p "${S}-build"
+		pushd "${S}-build" >/dev/null 2>&1 || die
+		ECONF_SOURCE=${S} econf_build --enable-static \
+			--disable-{dconf,gtk{2,3},python-library,shared,xim} \
+			ISOCODES_{CFLAG,LIB}S=-DSKIP \
+			$(use_enable emoji emoji-dict) \
+			$(use_enable unicode unicode-dict) \
+			$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
+		popd >/dev/null 2>&1 || die
+	fi
+
 	local myconf=(
 		$(use_enable X xim)
 		$(use_enable emoji emoji-dict)
@@ -144,6 +158,22 @@ src_configure() {
 	econf "${myconf[@]}"
 }
 
+src_compile() {
+	if tc-is-cross-compiler && { use emoji || use unicode; }; then
+		emake -C "${S}-build/src" \
+			$(usex emoji emoji-parser '') \
+			$(usex unicode unicode-parser '')
+		emake -C src \
+			$(usex emoji emoji-parser '') \
+			$(usex unicode unicode-parser '')
+		cp \
+			$(usex emoji "${S}-build/src/emoji-parser" '') \
+			$(usex unicode "${S}-build/src/unicode-parser" '') \
+			src || die
+	fi
+	emake
+}
+
 src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 	virtx emake -j1 check

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     648fb67294c4b900b0e97838e521f20914358409
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 05:08:35 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 19:24:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=648fb672

app-i18n/ibus: Split IUSE=+gtk3 from IUSE=+gtk

Before this commit, the USE=gtk flag did two things in one:
  1. enabled the GTK+3 UI
  2. enabled the GTK+3 IM module

The new IUSE=gtk3 flag will control case #2. A later commit will rename
IUSE=gtk (which controls case #1) to IUSE=gui to be more in line with
Gentoo policies.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.26.ebuild | 14 +++++++-------
 app-i18n/ibus/metadata.xml       |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.26.ebuild b/app-i18n/ibus/ibus-1.5.26.ebuild
index 6eef64481367..3bba87ebd2c2 100644
--- a/app-i18n/ibus/ibus-1.5.26.ebuild
+++ b/app-i18n/ibus/ibus-1.5.26.ebuild
@@ -19,16 +19,16 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+X appindicator +emoji +gtk +gtk2 +gtk4 +introspection nls +python systemd test +unicode vala wayland"
+IUSE="+X appindicator +emoji +gtk +gtk2 +gtk3 +gtk4 +introspection nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	gtk2? ( gtk )
-	appindicator? ( gtk )
+	appindicator? ( gtk3 )
 	python? (
 		${PYTHON_REQUIRED_USE}
 		introspection
 	)
-	test? ( gtk )
+	test? ( gtk3 )
 	vala? ( introspection )"
 
 DEPEND="
@@ -43,10 +43,10 @@ DEPEND="
 		!gtk? ( x11-libs/gtk+:2 )
 	)
 	gtk? (
-		x11-libs/gtk+:3
 		x11-libs/libX11
 		x11-libs/libXi
 		gtk2? ( x11-libs/gtk+:2 )
+		gtk3? ( x11-libs/gtk+:3 )
 		gtk4? ( gui-libs/gtk:4 )
 	)
 	introspection? ( dev-libs/gobject-introspection )
@@ -142,9 +142,9 @@ src_configure() {
 		$(use_enable emoji emoji-dict)
 		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji)
 		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations)
-		$(use_enable gtk gtk3)
 		$(use_enable gtk ui)
 		$(use_enable gtk2)
+		$(use_enable gtk3)
 		$(use_enable gtk4)
 		$(use_enable introspection)
 		$(use_enable nls)
@@ -208,16 +208,16 @@ src_install() {
 }
 
 pkg_postinst() {
-	use gtk && gnome2_query_immodules_gtk3
 	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	xdg_icon_cache_update
 	gnome2_schemas_update
 	dconf update
 }
 
 pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk3
 	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	xdg_icon_cache_update
 	gnome2_schemas_update
 }

diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml
index 940da8fb7bc4..b94c839a675b 100644
--- a/app-i18n/ibus/metadata.xml
+++ b/app-i18n/ibus/metadata.xml
@@ -13,6 +13,7 @@
   <use>
     <flag name="emoji">Enable support for Emoji</flag>
     <flag name="gtk2">Enable the GTK-2 input method module</flag>
+    <flag name="gtk3">Enable the GTK-3 input method module</flag>
     <flag name="gtk4">Enable the GTK-4 input method module</flag>
     <flag name="unicode">Enable support for Unicode choice</flag>
   </use>

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     81228f223f15bedbc48f98b71b5c9b8f47b19c7b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 02:16:51 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 19:24:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81228f22

app-i18n/ibus: Version bump to 1.5.26

- Raise required dev-libs/glib version to >=2.65.0
- Add IUSE=systemd to control --{enable,disable}-systemd-services
- Use array for econf arguments
- Remove vala version limitations

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/Manifest           |   1 +
 app-i18n/ibus/ibus-1.5.26.ebuild | 192 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 193 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 5f3a9b60195a..0408ab57270a 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1 +1,2 @@
 DIST ibus-1.5.25.tar.gz 3669787 BLAKE2B 0a568c77d29dfbe0c2c8cdbe8c8ae86b69c7a1a5fa692cf05e9ce13894fcee200c41de91ec0ad88ae9e745e3061b9c92b7fd18641bd297f5bf4a9bc308ace983 SHA512 4b8955a20a1e5a0daf61213817a9697874439866e235e6a7905f5994b145cd5a143e6cfc41f17204a828756baeb8edab70698596731ecebf7f1eea7cc5f36aa6
+DIST ibus-1.5.26.tar.gz 3715263 BLAKE2B 80eb293b028d431b76c015c6d6d9fea92888554f6f34ec126853df189746d9976569ec2380146187d13337a011668b1f15fc57a95284658c8afc7824a67b5898 SHA512 923607c17114af673dcc36532fb44a278b61161ee1b7d4e01b2e0dcffc40c95eb91c6416acc9c0da0333e933863e15263e9a5ff1e467cfc02b71398d601b9714

diff --git a/app-i18n/ibus/ibus-1.5.26.ebuild b/app-i18n/ibus/ibus-1.5.26.ebuild
new file mode 100644
index 000000000000..3f54e2bdfad1
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.26.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
+
+GENTOO_VER=
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+
+[[ -n ${GENTOO_VER} ]] && \
+	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
+	${GENTOO_PATCHSET_URI}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python systemd test +unicode vala wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="emoji? ( gtk )
+	gtk2? ( gtk )
+	kde? ( gtk )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		introspection
+	)
+	test? ( gtk )
+	vala? ( introspection )"
+
+CDEPEND="app-text/iso-codes
+	>=dev-libs/glib-2.65.0:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		>=x11-libs/libXfixes-6.0.0
+		!gtk? ( x11-libs/gtk+:2 )
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXi
+		gtk2? ( x11-libs/gtk+:2 )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	kde? ( dev-qt/qtgui:5 )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${CDEPEND}
+	python? (
+		gtk? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/glib-utils
+	virtual/pkgconfig
+	x11-misc/xkeyboard-config
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	unicode? ( app-i18n/unicode-data )"
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
+	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
+		touch ui/gtk3/panelbinding.vala
+	fi
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala
+	fi
+	if ! use kde; then
+		touch ui/gtk3/panel.vala
+	fi
+	if [[ -n ${GENTOO_VER} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		eapply "${WORKDIR}"/patches-gentoo/*.patch
+	fi
+
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
+	# fix for parallel install
+	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am
+	# require user interaction
+	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am
+
+	sed -i "/^bash_completion/d" tools/Makefile.am
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gtk setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	local myconf=(
+		$(use_enable X xim)
+		$(use_enable emoji emoji-dict)
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji)
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations)
+		$(use_enable gtk gtk3)
+		$(use_enable gtk ui)
+		$(use_enable gtk2)
+		$(use_enable introspection)
+		$(use_enable kde appindicator)
+		$(use_enable nls)
+		$(use_enable systemd systemd-services)
+		$(use_enable test tests)
+		$(use_enable unicode unicode-dict)
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
+		$(use_enable vala)
+		$(use_enable wayland)
+		"${python_conf[@]}"
+	)
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+
+			python_optimize
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+
+	# Undo compression of man page
+	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
+}
+
+pkg_postinst() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	xdg_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     4f09129ab34b17b021a9cfb4f2cef7d9892f14f7
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 19:47:13 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 19:24:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f09129a

app-i18n/ibus: Improve USE=gtk2 flag description

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml
index 38e7e2caecf6..12417c1e3007 100644
--- a/app-i18n/ibus/metadata.xml
+++ b/app-i18n/ibus/metadata.xml
@@ -12,7 +12,7 @@
   </longdescription>
   <use>
     <flag name="emoji">Enable support for Emoji</flag>
-    <flag name="gtk2">Enable support for <pkg>x11-libs/gtk+</pkg>:2</flag>
+    <flag name="gtk2">Enable the GTK-2 input method module</flag>
     <flag name="unicode">Enable support for Unicode choice</flag>
   </use>
   <upstream>

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     07a96c210de5fd735314c6af65764db5e3c16411
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 17:17:53 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 19:24:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07a96c21

app-i18n/ibus: Replace IUSE=+gtk with IUSE=+gui

Now that we have separated IUSE=gtk3 from IUSE=gtk, IUSE=gtk only
enables the UI, so we rename it to IUSE=gui to be more in line with
Gentoo policies.

Additionally, move the gtk dependencies out of the gui? ( ... ) block,
since the functionality they control (namely the IM modules) can be
enabled independently of the UI.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.26.ebuild | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.26.ebuild b/app-i18n/ibus/ibus-1.5.26.ebuild
index bcf13d3d4633..368857ac71b8 100644
--- a/app-i18n/ibus/ibus-1.5.26.ebuild
+++ b/app-i18n/ibus/ibus-1.5.26.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+X appindicator +emoji +gtk +gtk2 +gtk3 +gtk4 +introspection nls +python systemd test +unicode vala wayland"
+IUSE="+X appindicator +emoji +gtk2 +gtk3 +gtk4 +gui +introspection nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	appindicator? ( gtk3 )
@@ -41,12 +41,12 @@ DEPEND="
 		x11-libs/libX11
 		>=x11-libs/libXfixes-6.0.0
 	)
-	gtk? (
+	gtk2? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	gtk4? ( gui-libs/gtk:4 )
+	gui? (
 		x11-libs/libX11
 		x11-libs/libXi
-		gtk2? ( x11-libs/gtk+:2 )
-		gtk3? ( x11-libs/gtk+:3 )
-		gtk4? ( gui-libs/gtk:4 )
 	)
 	introspection? ( dev-libs/gobject-introspection )
 	nls? ( virtual/libintl )
@@ -60,7 +60,7 @@ DEPEND="
 	)"
 RDEPEND="${DEPEND}
 	python? (
-		gtk? (
+		gui? (
 			x11-libs/gtk+:3[introspection]
 		)
 	)"
@@ -116,7 +116,7 @@ src_configure() {
 	if use python; then
 		python_setup
 		python_conf+=(
-			$(use_enable gtk setup)
+			$(use_enable gui setup)
 			--with-python=${EPYTHON}
 		)
 	else
@@ -141,10 +141,10 @@ src_configure() {
 		$(use_enable emoji emoji-dict)
 		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji)
 		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations)
-		$(use_enable gtk ui)
 		$(use_enable gtk2)
 		$(use_enable gtk3)
 		$(use_enable gtk4)
+		$(use_enable gui ui)
 		$(use_enable introspection)
 		$(use_enable nls)
 		$(use_enable systemd systemd-services)

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     900033e824860f3ae8d103725196b379e919369f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 05:01:19 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 19:24:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=900033e8

app-i18n/ibus: Add IUSE=+gtk4

Builds the GTK4 IM module; see upstream commit c7928b15 ("Add GTK4 IM
module") first in v1.5.24.

Closes: https://bugs.gentoo.org/830109
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.26.ebuild | 6 ++++--
 app-i18n/ibus/metadata.xml       | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.26.ebuild b/app-i18n/ibus/ibus-1.5.26.ebuild
index 7adfebe47a7a..6eef64481367 100644
--- a/app-i18n/ibus/ibus-1.5.26.ebuild
+++ b/app-i18n/ibus/ibus-1.5.26.ebuild
@@ -18,8 +18,8 @@ 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 ~riscv ~sparc ~x86"
-IUSE="+X appindicator +emoji +gtk +gtk2 +introspection nls +python systemd test +unicode vala wayland"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+X appindicator +emoji +gtk +gtk2 +gtk4 +introspection nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	gtk2? ( gtk )
@@ -47,6 +47,7 @@ DEPEND="
 		x11-libs/libX11
 		x11-libs/libXi
 		gtk2? ( x11-libs/gtk+:2 )
+		gtk4? ( gui-libs/gtk:4 )
 	)
 	introspection? ( dev-libs/gobject-introspection )
 	nls? ( virtual/libintl )
@@ -144,6 +145,7 @@ src_configure() {
 		$(use_enable gtk gtk3)
 		$(use_enable gtk ui)
 		$(use_enable gtk2)
+		$(use_enable gtk4)
 		$(use_enable introspection)
 		$(use_enable nls)
 		$(use_enable systemd systemd-services)

diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml
index 12417c1e3007..940da8fb7bc4 100644
--- a/app-i18n/ibus/metadata.xml
+++ b/app-i18n/ibus/metadata.xml
@@ -13,6 +13,7 @@
   <use>
     <flag name="emoji">Enable support for Emoji</flag>
     <flag name="gtk2">Enable the GTK-2 input method module</flag>
+    <flag name="gtk4">Enable the GTK-4 input method module</flag>
     <flag name="unicode">Enable support for Unicode choice</flag>
   </use>
   <upstream>

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     abb69f3228b18af76d3adfaa86e627d1a2bcbc75
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 02:26:22 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 19:24:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abb69f32

app-i18n/ibus: Remove REQUIRED_USE="emoji? ( gtk )"

The emoji support is useful in KDE without gtk being enabled. IUSE=emoji
installs a bunch of dictionary files under /usr/share/ibus/dicts/
irrespective of the USE=gtk setting.

Closes: https://bugs.gentoo.org/709818
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.26.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.26.ebuild b/app-i18n/ibus/ibus-1.5.26.ebuild
index 889cbf087411..7adfebe47a7a 100644
--- a/app-i18n/ibus/ibus-1.5.26.ebuild
+++ b/app-i18n/ibus/ibus-1.5.26.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+X appindicator +emoji +gtk +gtk2 +introspection nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="emoji? ( gtk )
+REQUIRED_USE="
 	gtk2? ( gtk )
 	appindicator? ( gtk )
 	python? (

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     aec6e5b6cd8285b05259432c20368d46d667d663
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 05:13:01 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 19:24:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec6e5b6

app-i18n/ibus: Fix gtk-related REQUIRED_USE

IUSE=gtk2 only controls the GTK+2 IM module; there's no need for it to
depend on IUSE=gtk, which controls the UI.

However client/x11/Makefile.am contains:

  if ENABLE_GTK3
  GTK_CFLAGS = @GTK3_CFLAGS@
  GTK_LIBS = @GTK3_LIBS@
  else
  GTK_CFLAGS = @GTK2_CFLAGS@
  GTK_LIBS = @GTK2_LIBS@
  endif

and configure.ac contains:

  if test x"$enable_xim" = x"yes"; then
      [...]

      # if we don't have gtk3 yet, check for gtk2
      if test x"$enable_gtk3" != x"yes"; then
          # check for gtk2
          PKG_CHECK_MODULES(GTK2, [
              gtk+-2.0
          ])
      fi

      [...]
  fi

so we do want REQUIRED_USE="xim? ( gtk3 )" to prevent any accidental
gtk+2 usage.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.26.ebuild | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.26.ebuild b/app-i18n/ibus/ibus-1.5.26.ebuild
index 3bba87ebd2c2..bcf13d3d4633 100644
--- a/app-i18n/ibus/ibus-1.5.26.ebuild
+++ b/app-i18n/ibus/ibus-1.5.26.ebuild
@@ -22,15 +22,15 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+X appindicator +emoji +gtk +gtk2 +gtk3 +gtk4 +introspection nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
-	gtk2? ( gtk )
 	appindicator? ( gtk3 )
 	python? (
 		${PYTHON_REQUIRED_USE}
 		introspection
 	)
 	test? ( gtk3 )
-	vala? ( introspection )"
-
+	vala? ( introspection )
+	X? ( gtk3 )
+"
 DEPEND="
 	app-text/iso-codes
 	>=dev-libs/glib-2.65.0:2
@@ -40,7 +40,6 @@ DEPEND="
 	X? (
 		x11-libs/libX11
 		>=x11-libs/libXfixes-6.0.0
-		!gtk? ( x11-libs/gtk+:2 )
 	)
 	gtk? (
 		x11-libs/libX11

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     569bfe817147fdf3f0590291126d2898260e2fe3
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 05:07:01 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 19:24:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=569bfe81

app-i18n/ibus: Rename IUSE=kde to IUSE=appindicator

And remove dependence on dev-qt/qtgui, as it was removed in v1.5.23,
upstream commit aa3a9f05 ("ui/gtk3: Delete deprecated
ENABLE_APPINDICATOR_ENGINE_ICON check")

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.26.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.26.ebuild b/app-i18n/ibus/ibus-1.5.26.ebuild
index 81c38c2f452f..889cbf087411 100644
--- a/app-i18n/ibus/ibus-1.5.26.ebuild
+++ b/app-i18n/ibus/ibus-1.5.26.ebuild
@@ -19,11 +19,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 ~riscv ~sparc ~x86"
-IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python systemd test +unicode vala wayland"
+IUSE="+X appindicator +emoji +gtk +gtk2 +introspection nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )
-	kde? ( gtk )
+	appindicator? ( gtk )
 	python? (
 		${PYTHON_REQUIRED_USE}
 		introspection
@@ -49,7 +49,6 @@ DEPEND="
 		gtk2? ( x11-libs/gtk+:2 )
 	)
 	introspection? ( dev-libs/gobject-introspection )
-	kde? ( dev-qt/qtgui:5 )
 	nls? ( virtual/libintl )
 	python? (
 		${PYTHON_DEPS}
@@ -89,7 +88,7 @@ src_prepare() {
 			tools/main.vala \
 			ui/gtk3/panel.vala
 	fi
-	if ! use kde; then
+	if ! use appindicator; then
 		touch ui/gtk3/panel.vala
 	fi
 	if [[ -n ${GENTOO_VER} ]]; then
@@ -138,6 +137,7 @@ src_configure() {
 
 	local myconf=(
 		$(use_enable X xim)
+		$(use_enable appindicator)
 		$(use_enable emoji emoji-dict)
 		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji)
 		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations)
@@ -145,7 +145,6 @@ src_configure() {
 		$(use_enable gtk ui)
 		$(use_enable gtk2)
 		$(use_enable introspection)
-		$(use_enable kde appindicator)
 		$(use_enable nls)
 		$(use_enable systemd systemd-services)
 		$(use_enable test tests)

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     78c88cf9135c6d7aa9a885d4363c8f3f4083acfa
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 18:30:15 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 19:24:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78c88cf9

app-i18n/ibus: Don't enable IUSE=X or IUSE=gtk2 by default

X users will have USE=X set globally. gtk+2 is on the way out.

Bug: https://bugs.gentoo.org/769107
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.26.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.26.ebuild b/app-i18n/ibus/ibus-1.5.26.ebuild
index 368857ac71b8..d7f083baeb20 100644
--- a/app-i18n/ibus/ibus-1.5.26.ebuild
+++ b/app-i18n/ibus/ibus-1.5.26.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+X appindicator +emoji +gtk2 +gtk3 +gtk4 +gui +introspection nls +python systemd test +unicode vala wayland"
+IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	appindicator? ( gtk3 )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     7c5a82a4a81990f8fbf6d208caa6552b6e473a3e
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 31 01:11:14 2021 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Dec 31 01:23:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c5a82a4

app-i18n/ibus: drop old

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-i18n/ibus/Manifest           |   4 -
 app-i18n/ibus/ibus-1.5.22.ebuild | 180 ------------------------------------
 app-i18n/ibus/ibus-1.5.23.ebuild | 189 --------------------------------------
 app-i18n/ibus/ibus-1.5.24.ebuild | 190 --------------------------------------
 app-i18n/ibus/ibus-1.5.25.ebuild | 192 ---------------------------------------
 5 files changed, 755 deletions(-)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index f7c931369932..5f3a9b60195a 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,5 +1 @@
-DIST ibus-1.5.22.tar.gz 3578251 BLAKE2B 08ad72bd455d2841700b11a4ade88e2b9768433f86bac4baf20db882580b10a4705f545a845a03d3b4196a75c43d33c51ffd31a3516d71030f891ce48dce69c2 SHA512 0abe89acc6da8cea484a6b9f807c08e94869072f374f9e8f4541a426636f818f1c3cb8b9237f97245771f9e4bf19184983d8ac924177dc4824ca6e8b5304425d
-DIST ibus-1.5.23-gentoo-patches-1.tar.xz 1596 BLAKE2B 5a2c084cb25cb35d16eba8e6953c1ffc249875ab11485a675497f04a4366ea3fe216bab3407f390a0330f4f17cf5a70a43547160cc9c29a6b14890fcb7867456 SHA512 a1c2a77dbc4185c3658c36b998c9d925fff2bbeb9bc5fde5c74c62081056f134875d557ba0b4af7b06d56f004975889f453adea623541d3bfff2c391912efa05
-DIST ibus-1.5.23.tar.gz 3557661 BLAKE2B 4cfb3287c80d46e55090d4f361dd977f4be5988a8b7ffc24755954090dc25021ea6cbb6798769494e6cd70267aac6daa238fdc7cf4156296d93f79f325a18ac4 SHA512 4ea66d0a7203d665fb5c90e59ddf294614feeafc4f06b10e35989671a9bf39d5977e9061b9be224cd5a9439ac2f697a4326ff221ae868f5ebed46cbb09e9a205
-DIST ibus-1.5.24.tar.gz 3614372 BLAKE2B 4b851ed9dc8283bf58957adfd5dd4bf7da8b019f95055dbbf7fa157502b3dcc11d561881ff6afa5db0b83b4e7d82f3bd228cd0e21ff77cb81b1eaca246deb135 SHA512 25f34a51a5c85352e61699ca36bf7ddb9b486b28d71e15ce3a52b78bc9db2f8cb558049e0652fdc5431215a5f826fcb5a7d5e44f0de9a2ff746aaf60672e2f22
 DIST ibus-1.5.25.tar.gz 3669787 BLAKE2B 0a568c77d29dfbe0c2c8cdbe8c8ae86b69c7a1a5fa692cf05e9ce13894fcee200c41de91ec0ad88ae9e745e3061b9c92b7fd18641bd297f5bf4a9bc308ace983 SHA512 4b8955a20a1e5a0daf61213817a9697874439866e235e6a7905f5994b145cd5a143e6cfc41f17204a828756baeb8edab70698596731ecebf7f1eea7cc5f36aa6

diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
deleted file mode 100644
index 27e19d610f9f..000000000000
--- a/app-i18n/ibus/ibus-1.5.22.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-VALA_MIN_API_VERSION="0.34"
-VALA_MAX_API_VERSION="0.48"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-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"
-IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="emoji? ( gtk )
-	gtk2? ( gtk )
-	kde? ( gtk )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		introspection
-	)
-	test? ( gtk )
-	vala? ( introspection )"
-
-CDEPEND="app-text/iso-codes
-	dev-libs/glib:2
-	gnome-base/dconf
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	X? (
-		x11-libs/libX11
-		!gtk? ( x11-libs/gtk+:2 )
-	)
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXi
-		gtk2? ( x11-libs/gtk+:2 )
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	kde? ( dev-qt/qtgui:5 )
-	nls? ( virtual/libintl )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)"
-RDEPEND="${CDEPEND}
-	python? (
-		gtk? (
-			x11-libs/gtk+:3[introspection]
-		)
-	)"
-DEPEND="${CDEPEND}
-	$(vala_depend)
-	dev-util/glib-utils
-	virtual/pkgconfig
-	emoji? (
-		app-i18n/unicode-cldr
-		app-i18n/unicode-emoji
-	)
-	nls? ( sys-devel/gettext )
-	unicode? ( app-i18n/unicode-data )"
-
-src_prepare() {
-	vala_src_prepare --ignore-use
-	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
-	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
-		touch ui/gtk3/panelbinding.vala
-	fi
-	if ! use emoji; then
-		touch \
-			tools/main.vala \
-			ui/gtk3/panel.vala
-	fi
-	if ! use kde; then
-		touch ui/gtk3/panel.vala
-	fi
-
-	# for multiple Python implementations
-	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
-	# fix for parallel install
-	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am
-	# require user interaction
-	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am
-
-	sed -i "/^bash_completion/d" tools/Makefile.am
-
-	default
-	eautoreconf
-	xdg_environment_reset
-}
-
-src_configure() {
-	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local python_conf=()
-	if use python; then
-		python_setup
-		python_conf+=(
-			$(use_enable gtk setup)
-			--with-python=${EPYTHON}
-		)
-	else
-		python_conf+=( --disable-setup )
-	fi
-
-	econf \
-		$(use_enable X xim) \
-		$(use_enable emoji emoji-dict) \
-		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
-		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
-		$(use_enable gtk gtk3) \
-		$(use_enable gtk ui) \
-		$(use_enable gtk2) \
-		$(use_enable introspection) \
-		$(use_enable kde appindicator) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		"${python_conf[@]}"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	virtx emake -j1 check
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	if use python; then
-		python_install() {
-			emake -C bindings/pygobject \
-				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
-				DESTDIR="${D}" \
-				install
-
-			python_optimize
-		}
-		python_foreach_impl python_install
-	fi
-
-	keepdir /usr/share/ibus/engine
-
-	newbashcomp tools/${PN}.bash ${PN}
-
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-${PN} ${PN}.conf
-
-	# Undo compression of man page
-	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
-}
-
-pkg_postinst() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	xdg_icon_cache_update
-	gnome2_schemas_update
-	dconf update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/app-i18n/ibus/ibus-1.5.23.ebuild b/app-i18n/ibus/ibus-1.5.23.ebuild
deleted file mode 100644
index d53729503b59..000000000000
--- a/app-i18n/ibus/ibus-1.5.23.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-VALA_MIN_API_VERSION="0.34"
-VALA_MAX_API_VERSION="0.50"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
-
-GENTOO_VER=1
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-
-[[ -n ${GENTOO_VER} ]] && \
-	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
-	${GENTOO_PATCHSET_URI}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="emoji? ( gtk )
-	gtk2? ( gtk )
-	kde? ( gtk )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		introspection
-	)
-	test? ( gtk )
-	vala? ( introspection )"
-
-CDEPEND="app-text/iso-codes
-	dev-libs/glib:2
-	gnome-base/dconf
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	X? (
-		x11-libs/libX11
-		!gtk? ( x11-libs/gtk+:2 )
-	)
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXi
-		gtk2? ( x11-libs/gtk+:2 )
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	kde? ( dev-qt/qtgui:5 )
-	nls? ( virtual/libintl )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)"
-RDEPEND="${CDEPEND}
-	python? (
-		gtk? (
-			x11-libs/gtk+:3[introspection]
-		)
-	)"
-DEPEND="${CDEPEND}
-	$(vala_depend)
-	dev-util/glib-utils
-	virtual/pkgconfig
-	emoji? (
-		app-i18n/unicode-cldr
-		app-i18n/unicode-emoji
-	)
-	nls? ( sys-devel/gettext )
-	unicode? ( app-i18n/unicode-data )"
-
-src_prepare() {
-	vala_src_prepare --ignore-use
-	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
-	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
-		touch ui/gtk3/panelbinding.vala
-	fi
-	if ! use emoji; then
-		touch \
-			tools/main.vala \
-			ui/gtk3/panel.vala
-	fi
-	if ! use kde; then
-		touch ui/gtk3/panel.vala
-	fi
-	if [[ -n ${GENTOO_VER} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		eapply "${WORKDIR}"/patches-gentoo/*.patch
-	fi
-
-	# for multiple Python implementations
-	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
-	# fix for parallel install
-	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am
-	# require user interaction
-	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am
-
-	sed -i "/^bash_completion/d" tools/Makefile.am
-
-	default
-	eautoreconf
-	xdg_environment_reset
-}
-
-src_configure() {
-	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local python_conf=()
-	if use python; then
-		python_setup
-		python_conf+=(
-			$(use_enable gtk setup)
-			--with-python=${EPYTHON}
-		)
-	else
-		python_conf+=( --disable-setup )
-	fi
-
-	econf \
-		$(use_enable X xim) \
-		$(use_enable emoji emoji-dict) \
-		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
-		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
-		$(use_enable gtk gtk3) \
-		$(use_enable gtk ui) \
-		$(use_enable gtk2) \
-		$(use_enable introspection) \
-		$(use_enable kde appindicator) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		"${python_conf[@]}"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	virtx emake -j1 check
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	if use python; then
-		python_install() {
-			emake -C bindings/pygobject \
-				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
-				DESTDIR="${D}" \
-				install
-
-			python_optimize
-		}
-		python_foreach_impl python_install
-	fi
-
-	keepdir /usr/share/ibus/engine
-
-	newbashcomp tools/${PN}.bash ${PN}
-
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-${PN} ${PN}.conf
-
-	# Undo compression of man page
-	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
-}
-
-pkg_postinst() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	xdg_icon_cache_update
-	gnome2_schemas_update
-	dconf update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/app-i18n/ibus/ibus-1.5.24.ebuild b/app-i18n/ibus/ibus-1.5.24.ebuild
deleted file mode 100644
index ec02e75cce09..000000000000
--- a/app-i18n/ibus/ibus-1.5.24.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-VALA_MIN_API_VERSION="0.34"
-VALA_MAX_API_VERSION="0.50"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
-
-GENTOO_VER=
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-
-[[ -n ${GENTOO_VER} ]] && \
-	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
-	${GENTOO_PATCHSET_URI}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="emoji? ( gtk )
-	gtk2? ( gtk )
-	kde? ( gtk )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		introspection
-	)
-	test? ( gtk )
-	vala? ( introspection )"
-
-CDEPEND="app-text/iso-codes
-	dev-libs/glib:2
-	gnome-base/dconf
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	X? (
-		x11-libs/libX11
-		!gtk? ( x11-libs/gtk+:2 )
-	)
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXi
-		gtk2? ( x11-libs/gtk+:2 )
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	kde? ( dev-qt/qtgui:5 )
-	nls? ( virtual/libintl )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)"
-RDEPEND="${CDEPEND}
-	python? (
-		gtk? (
-			x11-libs/gtk+:3[introspection]
-		)
-	)"
-DEPEND="${CDEPEND}
-	$(vala_depend)
-	dev-util/glib-utils
-	virtual/pkgconfig
-	x11-misc/xkeyboard-config
-	emoji? (
-		app-i18n/unicode-cldr
-		app-i18n/unicode-emoji
-	)
-	nls? ( sys-devel/gettext )
-	unicode? ( app-i18n/unicode-data )"
-
-src_prepare() {
-	vala_src_prepare --ignore-use
-	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
-	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
-		touch ui/gtk3/panelbinding.vala
-	fi
-	if ! use emoji; then
-		touch \
-			tools/main.vala \
-			ui/gtk3/panel.vala
-	fi
-	if ! use kde; then
-		touch ui/gtk3/panel.vala
-	fi
-	if [[ -n ${GENTOO_VER} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		eapply "${WORKDIR}"/patches-gentoo/*.patch
-	fi
-
-	# for multiple Python implementations
-	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
-	# fix for parallel install
-	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am
-	# require user interaction
-	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am
-
-	sed -i "/^bash_completion/d" tools/Makefile.am
-
-	default
-	eautoreconf
-	xdg_environment_reset
-}
-
-src_configure() {
-	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local python_conf=()
-	if use python; then
-		python_setup
-		python_conf+=(
-			$(use_enable gtk setup)
-			--with-python=${EPYTHON}
-		)
-	else
-		python_conf+=( --disable-setup )
-	fi
-
-	econf \
-		$(use_enable X xim) \
-		$(use_enable emoji emoji-dict) \
-		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
-		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
-		$(use_enable gtk gtk3) \
-		$(use_enable gtk ui) \
-		$(use_enable gtk2) \
-		$(use_enable introspection) \
-		$(use_enable kde appindicator) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		"${python_conf[@]}"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	virtx emake -j1 check
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	if use python; then
-		python_install() {
-			emake -C bindings/pygobject \
-				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
-				DESTDIR="${D}" \
-				install
-
-			python_optimize
-		}
-		python_foreach_impl python_install
-	fi
-
-	keepdir /usr/share/ibus/engine
-
-	newbashcomp tools/${PN}.bash ${PN}
-
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-${PN} ${PN}.conf
-
-	# Undo compression of man page
-	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
-}
-
-pkg_postinst() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	xdg_icon_cache_update
-	gnome2_schemas_update
-	dconf update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/app-i18n/ibus/ibus-1.5.25.ebuild b/app-i18n/ibus/ibus-1.5.25.ebuild
deleted file mode 100644
index 1adc299fca10..000000000000
--- a/app-i18n/ibus/ibus-1.5.25.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_MIN_API_VERSION="0.34"
-VALA_MAX_API_VERSION="0.50"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
-
-GENTOO_VER=
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-
-[[ -n ${GENTOO_VER} ]] && \
-	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
-	${GENTOO_PATCHSET_URI}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="emoji? ( gtk )
-	gtk2? ( gtk )
-	kde? ( gtk )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		introspection
-	)
-	test? ( gtk )
-	vala? ( introspection )"
-
-CDEPEND="app-text/iso-codes
-	dev-libs/glib:2
-	gnome-base/dconf
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	X? (
-		x11-libs/libX11
-		>=x11-libs/libXfixes-6.0.0
-		!gtk? ( x11-libs/gtk+:2 )
-	)
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXi
-		gtk2? ( x11-libs/gtk+:2 )
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	kde? ( dev-qt/qtgui:5 )
-	nls? ( virtual/libintl )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)"
-RDEPEND="${CDEPEND}
-	python? (
-		gtk? (
-			x11-libs/gtk+:3[introspection]
-		)
-	)"
-DEPEND="${CDEPEND}
-	$(vala_depend)
-	dev-util/glib-utils
-	virtual/pkgconfig
-	x11-misc/xkeyboard-config
-	emoji? (
-		app-i18n/unicode-cldr
-		app-i18n/unicode-emoji
-	)
-	nls? ( sys-devel/gettext )
-	unicode? ( app-i18n/unicode-data )"
-
-src_prepare() {
-	vala_src_prepare --ignore-use
-	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
-	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
-		touch ui/gtk3/panelbinding.vala
-	fi
-	if ! use emoji; then
-		touch \
-			tools/main.vala \
-			ui/gtk3/panel.vala
-	fi
-	if ! use kde; then
-		touch ui/gtk3/panel.vala
-	fi
-	if [[ -n ${GENTOO_VER} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		eapply "${WORKDIR}"/patches-gentoo/*.patch
-	fi
-
-	# for multiple Python implementations
-	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
-	# fix for parallel install
-	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am
-	# require user interaction
-	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am
-
-	sed -i "/^bash_completion/d" tools/Makefile.am
-
-	default
-	eautoreconf
-	xdg_environment_reset
-}
-
-src_configure() {
-	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local python_conf=()
-	if use python; then
-		python_setup
-		python_conf+=(
-			$(use_enable gtk setup)
-			--with-python=${EPYTHON}
-		)
-	else
-		python_conf+=( --disable-setup )
-	fi
-
-	econf \
-		$(use_enable X xim) \
-		$(use_enable emoji emoji-dict) \
-		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
-		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
-		$(use_enable gtk gtk3) \
-		$(use_enable gtk ui) \
-		$(use_enable gtk2) \
-		$(use_enable introspection) \
-		$(use_enable kde appindicator) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		"${python_conf[@]}"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	virtx emake -j1 check
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	if use python; then
-		python_install() {
-			emake -C bindings/pygobject \
-				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
-				DESTDIR="${D}" \
-				install
-
-			python_optimize
-		}
-		python_foreach_impl python_install
-	fi
-
-	keepdir /usr/share/ibus/engine
-
-	newbashcomp tools/${PN}.bash ${PN}
-
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-${PN} ${PN}.conf
-
-	# Undo compression of man page
-	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
-}
-
-pkg_postinst() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	xdg_icon_cache_update
-	gnome2_schemas_update
-	dconf update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Arthur Zamarin]

commit:     d3660f40f6bdcc1774e229ce58fa81a67dbd31e1
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 13 19:17:19 2021 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 13 19:17:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3660f40

app-i18n/ibus: Stabilize 1.5.25-r1 arm, #828593

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.25-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.25-r1.ebuild b/app-i18n/ibus/ibus-1.5.25-r1.ebuild
index 02038269568f..44c67f7e9ccc 100644
--- a/app-i18n/ibus/ibus-1.5.25-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.25-r1.ebuild
@@ -21,7 +21,7 @@ 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 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sam James]

commit:     9a86b58c94fa4d6e5ecd1b5496a6005f4fbab4d4
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Fri Dec 10 23:39:16 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 12 01:48:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a86b58c

app-i18n/ibus: stable 1.5.25-r1 for sparc, bug #828593

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.25-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.25-r1.ebuild b/app-i18n/ibus/ibus-1.5.25-r1.ebuild
index b9e3bf3b7b25..02038269568f 100644
--- a/app-i18n/ibus/ibus-1.5.25-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.25-r1.ebuild
@@ -21,7 +21,7 @@ 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 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sam James]

commit:     39a21484056ab9506b58c0cd4559b622792a1bc5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 11 03:29:27 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 11 03:29:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a21484

app-i18n/ibus: Stabilize 1.5.25-r1 arm64, #828593

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.25-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.25-r1.ebuild b/app-i18n/ibus/ibus-1.5.25-r1.ebuild
index 05f083872170..b9e3bf3b7b25 100644
--- a/app-i18n/ibus/ibus-1.5.25-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.25-r1.ebuild
@@ -21,7 +21,7 @@ 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 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Agostino Sarubbo]

commit:     7110d29fec4626dfe292f6effafa83bf7aad0029
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  9 16:22:11 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Dec  9 16:22:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7110d29f

app-i18n/ibus: amd64 stable wrt bug #828593

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.25-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.25-r1.ebuild b/app-i18n/ibus/ibus-1.5.25-r1.ebuild
index a9cff72ffe2e..05f083872170 100644
--- a/app-i18n/ibus/ibus-1.5.25-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.25-r1.ebuild
@@ -21,7 +21,7 @@ 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 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sam James]

commit:     c2cdd5715802f0f71ed1982a0ec87b08fefae9a1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  9 06:39:05 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec  9 06:39:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2cdd571

app-i18n/ibus: Stabilize 1.5.25-r1 ppc, #828593

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.25-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.25-r1.ebuild b/app-i18n/ibus/ibus-1.5.25-r1.ebuild
index a6df568528f2..a9cff72ffe2e 100644
--- a/app-i18n/ibus/ibus-1.5.25-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.25-r1.ebuild
@@ -21,7 +21,7 @@ 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 ~riscv ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sam James]

commit:     4f7806a722583e50f605403a3dbd6a80e77b3855
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  9 06:39:01 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec  9 06:39:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f7806a7

app-i18n/ibus: Stabilize 1.5.25-r1 ppc64, #828593

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.25-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.25-r1.ebuild b/app-i18n/ibus/ibus-1.5.25-r1.ebuild
index 6c0e6a0c42c8..a6df568528f2 100644
--- a/app-i18n/ibus/ibus-1.5.25-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.25-r1.ebuild
@@ -21,7 +21,7 @@ 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 ~riscv ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sam James]

commit:     c96c35a294f0bda4d28a4cbd895c3ec8e534af7e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  9 06:38:58 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec  9 06:38:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c96c35a2

app-i18n/ibus: Stabilize 1.5.25-r1 x86, #828593

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.25-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.25-r1.ebuild b/app-i18n/ibus/ibus-1.5.25-r1.ebuild
index e4d24fa2a59a..6c0e6a0c42c8 100644
--- a/app-i18n/ibus/ibus-1.5.25-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.25-r1.ebuild
@@ -21,7 +21,7 @@ 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 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Arthur Zamarin]

commit:     b530acabbe7db70322f971a064d580d374394cb9
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 30 16:03:40 2021 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 06:26:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b530acab

app-i18n/ibus: enable py3.10

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.25.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.25.ebuild b/app-i18n/ibus/ibus-1.5.25.ebuild
index 9dc461da301..1adc299fca1 100644
--- a/app-i18n/ibus/ibus-1.5.25.ebuild
+++ b/app-i18n/ibus/ibus-1.5.25.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 VALA_MIN_API_VERSION="0.34"
 VALA_MAX_API_VERSION="0.50"
 VALA_USE_DEPEND="vapigen"

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sam James]

commit:     3e6f49373e7d18363dce85dac239a7971ee77bf0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 25 23:24:31 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 25 23:24:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e6f4937

Revert "app-i18n/ibus: reflect new data path of app-i18n/unicode-data"

This reverts commit 734c98e2aea8d8b92e09a623c44ff0eafad719e8.

Bug: https://bugs.gentoo.org/814860
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.22.ebuild | 12 ++----------
 app-i18n/ibus/ibus-1.5.23.ebuild | 12 ++----------
 app-i18n/ibus/ibus-1.5.24.ebuild | 10 +---------
 app-i18n/ibus/ibus-1.5.25.ebuild | 10 +---------
 4 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
index 3fecbfced78..27e19d610f9 100644
--- a/app-i18n/ibus/ibus-1.5.22.ebuild
+++ b/app-i18n/ibus/ibus-1.5.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -102,14 +102,6 @@ src_prepare() {
 
 src_configure() {
 	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local ucddir
-
-	if has_verson '<app-i18n/unicode-data-14.0.0-r1'; then
-		ucddir="${unicodedir}-data"
-	else
-		ucddir=${unicodedir}
-	fi
-
 	local python_conf=()
 	if use python; then
 		python_setup
@@ -134,7 +126,7 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable test tests) \
 		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${ucddir}") \
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
 		$(use_enable vala) \
 		$(use_enable wayland) \
 		"${python_conf[@]}"

diff --git a/app-i18n/ibus/ibus-1.5.23.ebuild b/app-i18n/ibus/ibus-1.5.23.ebuild
index c1770f770aa..d53729503b5 100644
--- a/app-i18n/ibus/ibus-1.5.23.ebuild
+++ b/app-i18n/ibus/ibus-1.5.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -111,14 +111,6 @@ src_prepare() {
 
 src_configure() {
 	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local ucddir
-
-	if has_verson '<app-i18n/unicode-data-14.0.0-r1'; then
-		ucddir="${unicodedir}-data"
-	else
-		ucddir=${unicodedir}
-	fi
-
 	local python_conf=()
 	if use python; then
 		python_setup
@@ -143,7 +135,7 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable test tests) \
 		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${ucddir}") \
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
 		$(use_enable vala) \
 		$(use_enable wayland) \
 		"${python_conf[@]}"

diff --git a/app-i18n/ibus/ibus-1.5.24.ebuild b/app-i18n/ibus/ibus-1.5.24.ebuild
index 2130464553d..ec02e75cce0 100644
--- a/app-i18n/ibus/ibus-1.5.24.ebuild
+++ b/app-i18n/ibus/ibus-1.5.24.ebuild
@@ -112,14 +112,6 @@ src_prepare() {
 
 src_configure() {
 	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local ucddir
-
-	if has_verson '<app-i18n/unicode-data-14.0.0-r1'; then
-		ucddir="${unicodedir}-data"
-	else
-		ucddir=${unicodedir}
-	fi
-
 	local python_conf=()
 	if use python; then
 		python_setup
@@ -144,7 +136,7 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable test tests) \
 		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${ucddir}") \
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
 		$(use_enable vala) \
 		$(use_enable wayland) \
 		"${python_conf[@]}"

diff --git a/app-i18n/ibus/ibus-1.5.25.ebuild b/app-i18n/ibus/ibus-1.5.25.ebuild
index 91604ca0e0a..9dc461da301 100644
--- a/app-i18n/ibus/ibus-1.5.25.ebuild
+++ b/app-i18n/ibus/ibus-1.5.25.ebuild
@@ -113,14 +113,6 @@ src_prepare() {
 
 src_configure() {
 	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local ucddir
-
-	if has_verson '<app-i18n/unicode-data-14.0.0-r1'; then
-		ucddir="${unicodedir}-data"
-	else
-		ucddir=${unicodedir}
-	fi
-
 	local python_conf=()
 	if use python; then
 		python_setup
@@ -145,7 +137,7 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable test tests) \
 		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${ucddir}") \
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
 		$(use_enable vala) \
 		$(use_enable wayland) \
 		"${python_conf[@]}"

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Vadim Misbakh-Soloviov]

commit:     734c98e2aea8d8b92e09a623c44ff0eafad719e8
Author:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 25 22:17:33 2021 +0000
Commit:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
CommitDate: Sat Sep 25 22:56:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=734c98e2

app-i18n/ibus: reflect new data path of app-i18n/unicode-data

Package-Manager: Portage-3.0.23, Repoman-3.0.1
Signed-off-by: Vadim Misbakh-Soloviov <mva <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.22.ebuild | 12 ++++++++++--
 app-i18n/ibus/ibus-1.5.23.ebuild | 12 ++++++++++--
 app-i18n/ibus/ibus-1.5.24.ebuild | 10 +++++++++-
 app-i18n/ibus/ibus-1.5.25.ebuild | 10 +++++++++-
 4 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
index 27e19d610f9..3fecbfced78 100644
--- a/app-i18n/ibus/ibus-1.5.22.ebuild
+++ b/app-i18n/ibus/ibus-1.5.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -102,6 +102,14 @@ src_prepare() {
 
 src_configure() {
 	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local ucddir
+
+	if has_verson '<app-i18n/unicode-data-14.0.0-r1'; then
+		ucddir="${unicodedir}-data"
+	else
+		ucddir=${unicodedir}
+	fi
+
 	local python_conf=()
 	if use python; then
 		python_setup
@@ -126,7 +134,7 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable test tests) \
 		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
+		$(use_with unicode ucd-dir "${ucddir}") \
 		$(use_enable vala) \
 		$(use_enable wayland) \
 		"${python_conf[@]}"

diff --git a/app-i18n/ibus/ibus-1.5.23.ebuild b/app-i18n/ibus/ibus-1.5.23.ebuild
index d53729503b5..c1770f770aa 100644
--- a/app-i18n/ibus/ibus-1.5.23.ebuild
+++ b/app-i18n/ibus/ibus-1.5.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -111,6 +111,14 @@ src_prepare() {
 
 src_configure() {
 	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local ucddir
+
+	if has_verson '<app-i18n/unicode-data-14.0.0-r1'; then
+		ucddir="${unicodedir}-data"
+	else
+		ucddir=${unicodedir}
+	fi
+
 	local python_conf=()
 	if use python; then
 		python_setup
@@ -135,7 +143,7 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable test tests) \
 		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
+		$(use_with unicode ucd-dir "${ucddir}") \
 		$(use_enable vala) \
 		$(use_enable wayland) \
 		"${python_conf[@]}"

diff --git a/app-i18n/ibus/ibus-1.5.24.ebuild b/app-i18n/ibus/ibus-1.5.24.ebuild
index ec02e75cce0..2130464553d 100644
--- a/app-i18n/ibus/ibus-1.5.24.ebuild
+++ b/app-i18n/ibus/ibus-1.5.24.ebuild
@@ -112,6 +112,14 @@ src_prepare() {
 
 src_configure() {
 	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local ucddir
+
+	if has_verson '<app-i18n/unicode-data-14.0.0-r1'; then
+		ucddir="${unicodedir}-data"
+	else
+		ucddir=${unicodedir}
+	fi
+
 	local python_conf=()
 	if use python; then
 		python_setup
@@ -136,7 +144,7 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable test tests) \
 		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
+		$(use_with unicode ucd-dir "${ucddir}") \
 		$(use_enable vala) \
 		$(use_enable wayland) \
 		"${python_conf[@]}"

diff --git a/app-i18n/ibus/ibus-1.5.25.ebuild b/app-i18n/ibus/ibus-1.5.25.ebuild
index 9dc461da301..91604ca0e0a 100644
--- a/app-i18n/ibus/ibus-1.5.25.ebuild
+++ b/app-i18n/ibus/ibus-1.5.25.ebuild
@@ -113,6 +113,14 @@ src_prepare() {
 
 src_configure() {
 	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local ucddir
+
+	if has_verson '<app-i18n/unicode-data-14.0.0-r1'; then
+		ucddir="${unicodedir}-data"
+	else
+		ucddir=${unicodedir}
+	fi
+
 	local python_conf=()
 	if use python; then
 		python_setup
@@ -137,7 +145,7 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable test tests) \
 		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
+		$(use_with unicode ucd-dir "${ucddir}") \
 		$(use_enable vala) \
 		$(use_enable wayland) \
 		"${python_conf[@]}"

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     fe2411ab19e1a300efcf1e4b7157da77939a7673
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  2 07:03:48 2021 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Thu Sep  2 07:04:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe2411ab

app-i18n/ibus: version bump, 1.5.25

Closes: https://bugs.gentoo.org/810331
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-i18n/ibus/Manifest           |   1 +
 app-i18n/ibus/ibus-1.5.25.ebuild | 191 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 192 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index d855d77a1a0..f7c93136993 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -2,3 +2,4 @@ DIST ibus-1.5.22.tar.gz 3578251 BLAKE2B 08ad72bd455d2841700b11a4ade88e2b9768433f
 DIST ibus-1.5.23-gentoo-patches-1.tar.xz 1596 BLAKE2B 5a2c084cb25cb35d16eba8e6953c1ffc249875ab11485a675497f04a4366ea3fe216bab3407f390a0330f4f17cf5a70a43547160cc9c29a6b14890fcb7867456 SHA512 a1c2a77dbc4185c3658c36b998c9d925fff2bbeb9bc5fde5c74c62081056f134875d557ba0b4af7b06d56f004975889f453adea623541d3bfff2c391912efa05
 DIST ibus-1.5.23.tar.gz 3557661 BLAKE2B 4cfb3287c80d46e55090d4f361dd977f4be5988a8b7ffc24755954090dc25021ea6cbb6798769494e6cd70267aac6daa238fdc7cf4156296d93f79f325a18ac4 SHA512 4ea66d0a7203d665fb5c90e59ddf294614feeafc4f06b10e35989671a9bf39d5977e9061b9be224cd5a9439ac2f697a4326ff221ae868f5ebed46cbb09e9a205
 DIST ibus-1.5.24.tar.gz 3614372 BLAKE2B 4b851ed9dc8283bf58957adfd5dd4bf7da8b019f95055dbbf7fa157502b3dcc11d561881ff6afa5db0b83b4e7d82f3bd228cd0e21ff77cb81b1eaca246deb135 SHA512 25f34a51a5c85352e61699ca36bf7ddb9b486b28d71e15ce3a52b78bc9db2f8cb558049e0652fdc5431215a5f826fcb5a7d5e44f0de9a2ff746aaf60672e2f22
+DIST ibus-1.5.25.tar.gz 3669787 BLAKE2B 0a568c77d29dfbe0c2c8cdbe8c8ae86b69c7a1a5fa692cf05e9ce13894fcee200c41de91ec0ad88ae9e745e3061b9c92b7fd18641bd297f5bf4a9bc308ace983 SHA512 4b8955a20a1e5a0daf61213817a9697874439866e235e6a7905f5994b145cd5a143e6cfc41f17204a828756baeb8edab70698596731ecebf7f1eea7cc5f36aa6

diff --git a/app-i18n/ibus/ibus-1.5.25.ebuild b/app-i18n/ibus/ibus-1.5.25.ebuild
new file mode 100644
index 00000000000..9dc461da301
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.25.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+VALA_MIN_API_VERSION="0.34"
+VALA_MAX_API_VERSION="0.50"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
+
+GENTOO_VER=
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+
+[[ -n ${GENTOO_VER} ]] && \
+	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
+	${GENTOO_PATCHSET_URI}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="emoji? ( gtk )
+	gtk2? ( gtk )
+	kde? ( gtk )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		introspection
+	)
+	test? ( gtk )
+	vala? ( introspection )"
+
+CDEPEND="app-text/iso-codes
+	dev-libs/glib:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		>=x11-libs/libXfixes-6.0.0
+		!gtk? ( x11-libs/gtk+:2 )
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXi
+		gtk2? ( x11-libs/gtk+:2 )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	kde? ( dev-qt/qtgui:5 )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${CDEPEND}
+	python? (
+		gtk? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/glib-utils
+	virtual/pkgconfig
+	x11-misc/xkeyboard-config
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	unicode? ( app-i18n/unicode-data )"
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
+	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
+		touch ui/gtk3/panelbinding.vala
+	fi
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala
+	fi
+	if ! use kde; then
+		touch ui/gtk3/panel.vala
+	fi
+	if [[ -n ${GENTOO_VER} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		eapply "${WORKDIR}"/patches-gentoo/*.patch
+	fi
+
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
+	# fix for parallel install
+	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am
+	# require user interaction
+	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am
+
+	sed -i "/^bash_completion/d" tools/Makefile.am
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gtk setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	econf \
+		$(use_enable X xim) \
+		$(use_enable emoji emoji-dict) \
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
+		$(use_enable gtk gtk3) \
+		$(use_enable gtk ui) \
+		$(use_enable gtk2) \
+		$(use_enable introspection) \
+		$(use_enable kde appindicator) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable unicode unicode-dict) \
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		"${python_conf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+
+			python_optimize
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+
+	# Undo compression of man page
+	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
+}
+
+pkg_postinst() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	xdg_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     b42beb916f038f09466c6cc8dca8830e9a041dfd
Author:     Alex Fan <alexfanqi <AT> yahoo <DOT> com>
AuthorDate: Fri Jul 23 03:43:08 2021 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sat Jul 24 23:40:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b42beb91

app-i18n/ibus: keyword 1.5.24 for ~riscv

Signed-off-by: Alex Fan <alexfanqi <AT> yahoo.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.24.ebuild b/app-i18n/ibus/ibus-1.5.24.ebuild
index 6d3e001df23..ec02e75cce0 100644
--- a/app-i18n/ibus/ibus-1.5.24.ebuild
+++ b/app-i18n/ibus/ibus-1.5.24.ebuild
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     956f0e49aa96845c0a6259f9c5f191aacfd8fe5e
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  9 13:49:15 2021 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Jul  9 13:50:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=956f0e49

app-i18n/ibus: version bump 1.5.24

Closes: https://bugs.gentoo.org/793698
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-i18n/ibus/Manifest           |   1 +
 app-i18n/ibus/ibus-1.5.24.ebuild | 190 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 191 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 95bd66e5e01..d855d77a1a0 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,3 +1,4 @@
 DIST ibus-1.5.22.tar.gz 3578251 BLAKE2B 08ad72bd455d2841700b11a4ade88e2b9768433f86bac4baf20db882580b10a4705f545a845a03d3b4196a75c43d33c51ffd31a3516d71030f891ce48dce69c2 SHA512 0abe89acc6da8cea484a6b9f807c08e94869072f374f9e8f4541a426636f818f1c3cb8b9237f97245771f9e4bf19184983d8ac924177dc4824ca6e8b5304425d
 DIST ibus-1.5.23-gentoo-patches-1.tar.xz 1596 BLAKE2B 5a2c084cb25cb35d16eba8e6953c1ffc249875ab11485a675497f04a4366ea3fe216bab3407f390a0330f4f17cf5a70a43547160cc9c29a6b14890fcb7867456 SHA512 a1c2a77dbc4185c3658c36b998c9d925fff2bbeb9bc5fde5c74c62081056f134875d557ba0b4af7b06d56f004975889f453adea623541d3bfff2c391912efa05
 DIST ibus-1.5.23.tar.gz 3557661 BLAKE2B 4cfb3287c80d46e55090d4f361dd977f4be5988a8b7ffc24755954090dc25021ea6cbb6798769494e6cd70267aac6daa238fdc7cf4156296d93f79f325a18ac4 SHA512 4ea66d0a7203d665fb5c90e59ddf294614feeafc4f06b10e35989671a9bf39d5977e9061b9be224cd5a9439ac2f697a4326ff221ae868f5ebed46cbb09e9a205
+DIST ibus-1.5.24.tar.gz 3614372 BLAKE2B 4b851ed9dc8283bf58957adfd5dd4bf7da8b019f95055dbbf7fa157502b3dcc11d561881ff6afa5db0b83b4e7d82f3bd228cd0e21ff77cb81b1eaca246deb135 SHA512 25f34a51a5c85352e61699ca36bf7ddb9b486b28d71e15ce3a52b78bc9db2f8cb558049e0652fdc5431215a5f826fcb5a7d5e44f0de9a2ff746aaf60672e2f22

diff --git a/app-i18n/ibus/ibus-1.5.24.ebuild b/app-i18n/ibus/ibus-1.5.24.ebuild
new file mode 100644
index 00000000000..6d3e001df23
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.24.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+VALA_MIN_API_VERSION="0.34"
+VALA_MAX_API_VERSION="0.50"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
+
+GENTOO_VER=
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+
+[[ -n ${GENTOO_VER} ]] && \
+	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
+	${GENTOO_PATCHSET_URI}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="emoji? ( gtk )
+	gtk2? ( gtk )
+	kde? ( gtk )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		introspection
+	)
+	test? ( gtk )
+	vala? ( introspection )"
+
+CDEPEND="app-text/iso-codes
+	dev-libs/glib:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		!gtk? ( x11-libs/gtk+:2 )
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXi
+		gtk2? ( x11-libs/gtk+:2 )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	kde? ( dev-qt/qtgui:5 )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${CDEPEND}
+	python? (
+		gtk? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/glib-utils
+	virtual/pkgconfig
+	x11-misc/xkeyboard-config
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	unicode? ( app-i18n/unicode-data )"
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
+	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
+		touch ui/gtk3/panelbinding.vala
+	fi
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala
+	fi
+	if ! use kde; then
+		touch ui/gtk3/panel.vala
+	fi
+	if [[ -n ${GENTOO_VER} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		eapply "${WORKDIR}"/patches-gentoo/*.patch
+	fi
+
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
+	# fix for parallel install
+	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am
+	# require user interaction
+	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am
+
+	sed -i "/^bash_completion/d" tools/Makefile.am
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gtk setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	econf \
+		$(use_enable X xim) \
+		$(use_enable emoji emoji-dict) \
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
+		$(use_enable gtk gtk3) \
+		$(use_enable gtk ui) \
+		$(use_enable gtk2) \
+		$(use_enable introspection) \
+		$(use_enable kde appindicator) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable unicode unicode-dict) \
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		"${python_conf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+
+			python_optimize
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+
+	# Undo compression of man page
+	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
+}
+
+pkg_postinst() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	xdg_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Mike Gilbert]

commit:     40579f80b01feb10da0ef0492c8a717e3edf542b
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Dec  7 02:00:00 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 18:14:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40579f80

app-i18n/ibus: Add support for Python 3.9.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.22.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
index f7c9f747cdd..59400fd498e 100644
--- a/app-i18n/ibus/ibus-1.5.22.ebuild
+++ b/app-i18n/ibus/ibus-1.5.22.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
 VALA_MIN_API_VERSION="0.34"
 VALA_MAX_API_VERSION="0.48"
 VALA_USE_DEPEND="vapigen"

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Mike Gilbert]

commit:     e573b8825130944a83d73fb81cc4c3442a6f6c53
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat Nov 14 22:00:00 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 19:51:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e573b882

app-i18n/ibus: Add support for Python 3.9.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.23.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.23.ebuild b/app-i18n/ibus/ibus-1.5.23.ebuild
index da88b79ed40..f3ee3b6f8a7 100644
--- a/app-i18n/ibus/ibus-1.5.23.ebuild
+++ b/app-i18n/ibus/ibus-1.5.23.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
 VALA_MIN_API_VERSION="0.34"
 VALA_MAX_API_VERSION="0.50"
 VALA_USE_DEPEND="vapigen"

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     44016326da581997120b1ec787c561a0b960a877
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  3 03:38:32 2020 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Nov  3 03:38:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44016326

app-i18n/ibus: version bump, 1.5.23

1) fix vala-0.50 err (from upsteam)
2) filter out root/sr_Cyrl emoji (failure)

Closes: https://bugs.gentoo.org/746551
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-i18n/ibus/Manifest           |   2 +
 app-i18n/ibus/ibus-1.5.23.ebuild | 189 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 191 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 31cbcd1a2d9..95bd66e5e01 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1 +1,3 @@
 DIST ibus-1.5.22.tar.gz 3578251 BLAKE2B 08ad72bd455d2841700b11a4ade88e2b9768433f86bac4baf20db882580b10a4705f545a845a03d3b4196a75c43d33c51ffd31a3516d71030f891ce48dce69c2 SHA512 0abe89acc6da8cea484a6b9f807c08e94869072f374f9e8f4541a426636f818f1c3cb8b9237f97245771f9e4bf19184983d8ac924177dc4824ca6e8b5304425d
+DIST ibus-1.5.23-gentoo-patches-1.tar.xz 1596 BLAKE2B 5a2c084cb25cb35d16eba8e6953c1ffc249875ab11485a675497f04a4366ea3fe216bab3407f390a0330f4f17cf5a70a43547160cc9c29a6b14890fcb7867456 SHA512 a1c2a77dbc4185c3658c36b998c9d925fff2bbeb9bc5fde5c74c62081056f134875d557ba0b4af7b06d56f004975889f453adea623541d3bfff2c391912efa05
+DIST ibus-1.5.23.tar.gz 3557661 BLAKE2B 4cfb3287c80d46e55090d4f361dd977f4be5988a8b7ffc24755954090dc25021ea6cbb6798769494e6cd70267aac6daa238fdc7cf4156296d93f79f325a18ac4 SHA512 4ea66d0a7203d665fb5c90e59ddf294614feeafc4f06b10e35989671a9bf39d5977e9061b9be224cd5a9439ac2f697a4326ff221ae868f5ebed46cbb09e9a205

diff --git a/app-i18n/ibus/ibus-1.5.23.ebuild b/app-i18n/ibus/ibus-1.5.23.ebuild
new file mode 100644
index 00000000000..da88b79ed40
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.23.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+VALA_MIN_API_VERSION="0.34"
+VALA_MAX_API_VERSION="0.50"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
+
+GENTOO_VER=1
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+
+[[ -n ${GENTOO_VER} ]] && \
+	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
+	${GENTOO_PATCHSET_URI}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="emoji? ( gtk )
+	gtk2? ( gtk )
+	kde? ( gtk )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		introspection
+	)
+	test? ( gtk )
+	vala? ( introspection )"
+
+CDEPEND="app-text/iso-codes
+	dev-libs/glib:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		!gtk? ( x11-libs/gtk+:2 )
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXi
+		gtk2? ( x11-libs/gtk+:2 )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	kde? ( dev-qt/qtgui:5 )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${CDEPEND}
+	python? (
+		gtk? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/glib-utils
+	virtual/pkgconfig
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	unicode? ( app-i18n/unicode-data )"
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
+	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
+		touch ui/gtk3/panelbinding.vala
+	fi
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala
+	fi
+	if ! use kde; then
+		touch ui/gtk3/panel.vala
+	fi
+	if [[ -n ${GENTOO_VER} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		eapply "${WORKDIR}"/patches-gentoo/*.patch
+	fi
+
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
+	# fix for parallel install
+	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am
+	# require user interaction
+	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am
+
+	sed -i "/^bash_completion/d" tools/Makefile.am
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gtk setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	econf \
+		$(use_enable X xim) \
+		$(use_enable emoji emoji-dict) \
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
+		$(use_enable gtk gtk3) \
+		$(use_enable gtk ui) \
+		$(use_enable gtk2) \
+		$(use_enable introspection) \
+		$(use_enable kde appindicator) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable unicode unicode-dict) \
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		"${python_conf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+
+			python_optimize
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+
+	# Undo compression of man page
+	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
+}
+
+pkg_postinst() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	xdg_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Mart Raudsepp]

commit:     f3e472222b1c2088d1254d2d98aa6be9e0d3af78
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 20:24:32 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 20:24:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3e47222

app-i18n/ibus-1.5.22: restrict max vala

Fails to compile with vala:0.50, should work with backported patch
or in upcoming 1.5.24 release:
https://github.com/ibus/ibus/issues/2265

Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.22.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
index 5eae573dbe9..f7c9f747cdd 100644
--- a/app-i18n/ibus/ibus-1.5.22.ebuild
+++ b/app-i18n/ibus/ibus-1.5.22.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 VALA_MIN_API_VERSION="0.34"
+VALA_MAX_API_VERSION="0.48"
 VALA_USE_DEPEND="vapigen"
 
 inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Mike Gilbert]

commit:     26603b84956778d9d927a233c69f3c3494ccfcee
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri Sep  4 03:00:00 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Sep  5 02:02:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26603b84

app-i18n/ibus: Drop support for Python 2.7.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.22.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
index 6bc65214c6d..5eae573dbe9 100644
--- a/app-i18n/ibus/ibus-1.5.22.ebuild
+++ b/app-i18n/ibus/ibus-1.5.22.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 VALA_MIN_API_VERSION="0.34"
 VALA_USE_DEPEND="vapigen"
 

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Mart Raudsepp]

commit:     4d06b9299feee109269b6a26a9fc79fc0c7ab0f4
Author:     Sam James (sam_c) <sam <AT> cmpct <DOT> info>
AuthorDate: Mon Jun  8 07:09:25 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Jun  9 04:22:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d06b929

app-i18n/ibus: arm64 stable (bug #726532)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c) <sam <AT> cmpct.info>
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.22.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
index 237386ecfc4..6bc65214c6d 100644
--- a/app-i18n/ibus/ibus-1.5.22.ebuild
+++ b/app-i18n/ibus/ibus-1.5.22.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Agostino Sarubbo]

commit:     465c9e2a03d4472c548c1c104065dbf517b03599
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  3 15:16:21 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jun  3 15:17:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=465c9e2a

app-i18n/ibus: ppc64 stable wrt bug #726532

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.22.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
index 002bc0a1a2a..237386ecfc4 100644
--- a/app-i18n/ibus/ibus-1.5.22.ebuild
+++ b/app-i18n/ibus/ibus-1.5.22.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Agostino Sarubbo]

commit:     affa602d012096e4467ec3de67287c9b558cb8a9
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  3 15:12:46 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jun  3 15:12:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=affa602d

app-i18n/ibus: arm stable wrt bug #726532

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.22.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
index cd2ed726061..002bc0a1a2a 100644
--- a/app-i18n/ibus/ibus-1.5.22.ebuild
+++ b/app-i18n/ibus/ibus-1.5.22.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 sparc x86"
 IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     4f6e0a6293b7c561bceb648a0b62e20691edc0e6
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  2 09:54:13 2020 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Jun  2 09:54:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f6e0a62

app-i18n/ibus: stable 1.5.22 for amd64

stable wrt bug #726532

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.22.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
index cd531b49791..cd2ed726061 100644
--- a/app-i18n/ibus/ibus-1.5.22.ebuild
+++ b/app-i18n/ibus/ibus-1.5.22.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 sparc x86"
 IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     bf87af8bcaa4aa50563736916bafcd16b77bfb61
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  2 05:45:53 2020 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Jun  2 05:46:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf87af8b

app-i18n/ibus:  stable 1.5.22 for x86

stable wrt bug #726532

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.22.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
index dc50412b9b3..cd531b49791 100644
--- a/app-i18n/ibus/ibus-1.5.22.ebuild
+++ b/app-i18n/ibus/ibus-1.5.22.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 sparc x86"
 IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sergei Trofimovich]

commit:     7cdba79663c27bbe9b31880c0c5014c772975965
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  1 20:43:45 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 20:51:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cdba796

app-i18n/ibus: stable 1.5.22 for ppc

stable wrt bug #726532

Package-Manager: Portage-2.3.100, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.22.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
index 2e9a05631a3..dc50412b9b3 100644
--- a/app-i18n/ibus/ibus-1.5.22.ebuild
+++ b/app-i18n/ibus/ibus-1.5.22.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 sparc ~x86"
 IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sergei Trofimovich]

commit:     4b2073dfcda3ee3cad90f43b434b0037579dc75d
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Mon Jun  1 17:45:59 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 19:52:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b2073df

app-i18n/ibus: stable 1.5.22 for sparc, bug #726532

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.22.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
index 5bd83c3fbbe..2e9a05631a3 100644
--- a/app-i18n/ibus/ibus-1.5.22.ebuild
+++ b/app-i18n/ibus/ibus-1.5.22.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Agostino Sarubbo]

commit:     3a71723f60bc13cda84b35224de464683bcd57a0
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 25 08:11:59 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 08:11:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a71723f

app-i18n/ibus: arm stable wrt bug #695526

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.21-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.21-r1.ebuild b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
index f9210d59c4d..e7dd6b2a193 100644
--- a/app-i18n/ibus/ibus-1.5.21-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Agostino Sarubbo]

commit:     63bcf96b968f11d8205df41959eea5290f71a2d2
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 22 10:33:10 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Mar 22 10:33:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63bcf96b

app-i18n/ibus: ppc stable wrt bug #695526

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.21-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.21-r1.ebuild b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
index e88d592b717..f9210d59c4d 100644
--- a/app-i18n/ibus/ibus-1.5.21-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Mart Raudsepp]

commit:     129a6536256ed65ef09cfc8cb1aeea0e2bdabc5f
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 22 07:47:02 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Mar 22 07:47:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=129a6536

app-i18n/ibus: arm64 stable (bug #695526)

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.21-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.21-r1.ebuild b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
index 0b4ab3f30b6..e88d592b717 100644
--- a/app-i18n/ibus/ibus-1.5.21-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm arm64 ia64 ~ppc ppc64 sparc x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Agostino Sarubbo]

commit:     f1bc75e29d5e76f32dde22255a2334fd0ad4b6d2
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 20 14:15:33 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Mar 20 14:15:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1bc75e2

app-i18n/ibus: ppc64 stable wrt bug #695526

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.21-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.21-r1.ebuild b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
index 443eea8d7b2..0b4ab3f30b6 100644
--- a/app-i18n/ibus/ibus-1.5.21-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Agostino Sarubbo]

commit:     467e8a6587e32961cecdb7090fd47fe79962a447
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 20 14:15:04 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Mar 20 14:15:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=467e8a65

app-i18n/ibus: ia64 stable wrt bug #695526

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.21-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.21-r1.ebuild b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
index 82686a5da95..443eea8d7b2 100644
--- a/app-i18n/ibus/ibus-1.5.21-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 sparc x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Agostino Sarubbo]

commit:     ba5b9c9168a354cdce9499e8c3b04566bdac078b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 20 09:03:03 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Mar 20 09:04:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba5b9c91

app-i18n/ibus: x86 stable wrt bug #695526

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.21-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.21-r1.ebuild b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
index c2e3d1cb0ac..82686a5da95 100644
--- a/app-i18n/ibus/ibus-1.5.21-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Agostino Sarubbo]

commit:     8ba6bcd804a06b87997205e4e7e7aeee7b16e8b6
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 20 08:56:13 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Mar 20 08:56:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ba6bcd8

app-i18n/ibus: amd64 stable wrt bug #695526

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.21-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.21-r1.ebuild b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
index 206883e60a7..c2e3d1cb0ac 100644
--- a/app-i18n/ibus/ibus-1.5.21-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sergei Trofimovich]

commit:     9a60a64049d96d32bd3c96dedee8900509240a4a
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Thu Mar 19 19:20:43 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Mar 19 21:30:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a60a640

app-i18n/ibus: stable 1.5.21-r1 for sparc, bug #700518

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.21-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.21-r1.ebuild b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
index 16b7862de4c..206883e60a7 100644
--- a/app-i18n/ibus/ibus-1.5.21-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Thomas Deutschmann]

commit:     aad7f73916c6a74d891b5b949138beed3accd9b8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 20:51:35 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 20:51:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aad7f739

app-i18n/ibus: bump to v1.5.22

Non-maintainer bump. Migrated to EAPI 7.

Bug: https://bugs.gentoo.org/695526
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-i18n/ibus/Manifest           |   1 +
 app-i18n/ibus/ibus-1.5.22.ebuild | 179 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 180 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index dcd86e01687..12c04718057 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -2,3 +2,4 @@ DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42
 DIST ibus-1.5.19.tar.gz 2842274 BLAKE2B a5aea4770c1c0a58a9e0b1aa26f47a8ab9eb5060a0c06179663984c5b531464ff4575a8ece2f2ee2122f777ca615296c1e46ad4833c68ba2da038f2b85dea374 SHA512 ddcd464c9afb6d081df1cfac65069506877eb4818c3ba5594bcf76f3c6795ef6c17177a778dc89b2ef69d10d87297aa12c8e04f156b750e500b51b32787bd9fc
 DIST ibus-1.5.20.tar.gz 3393487 BLAKE2B 0ed930cbadf7ecf9fa82ee2c0e2a8aa8cfb25a8dc1a2e2ffef0d4f894df31f879f08d7ed14508736836545cbc25b929707939c3b0ea53f2b44ba7489d6dc80ed SHA512 2bbcc19742882fa55d9c8704251f133c5be9f36a93cf52d70c460a4713419868deb634f965e67c1d5c45b615de388b92c0fbb863b118a546fbb89370a38eb77b
 DIST ibus-1.5.21.tar.gz 3463069 BLAKE2B 75b9e7cc4d84b69941d53321da1fe63ad911740a36ed51c7fceaa2a7bc30f6ae39d3f575b4b5fc4268d7c3b3e1c0bae11881dd7a8b7bd441ecf89c83c7279858 SHA512 c7c06e13e78fb4d4d26ce8975b6db4f7914efb325a903999a82197229e13d5ebb4afc876ef67e1d86db58f08c16350dc095aaea050b2f69c2bfc4c452adc5331
+DIST ibus-1.5.22.tar.gz 3578251 BLAKE2B 08ad72bd455d2841700b11a4ade88e2b9768433f86bac4baf20db882580b10a4705f545a845a03d3b4196a75c43d33c51ffd31a3516d71030f891ce48dce69c2 SHA512 0abe89acc6da8cea484a6b9f807c08e94869072f374f9e8f4541a426636f818f1c3cb8b9237f97245771f9e4bf19184983d8ac924177dc4824ca6e8b5304425d

diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
new file mode 100644
index 00000000000..5bd83c3fbbe
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.22.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+VALA_MIN_API_VERSION="0.34"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+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"
+IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="emoji? ( gtk )
+	gtk2? ( gtk )
+	kde? ( gtk )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		introspection
+	)
+	test? ( gtk )
+	vala? ( introspection )"
+
+CDEPEND="app-text/iso-codes
+	dev-libs/glib:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		!gtk? ( x11-libs/gtk+:2 )
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXi
+		gtk2? ( x11-libs/gtk+:2 )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	kde? ( dev-qt/qtgui:5 )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${CDEPEND}
+	python? (
+		gtk? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/glib-utils
+	virtual/pkgconfig
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	unicode? ( app-i18n/unicode-data )"
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
+	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
+		touch ui/gtk3/panelbinding.vala
+	fi
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala
+	fi
+	if ! use kde; then
+		touch ui/gtk3/panel.vala
+	fi
+
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
+	# fix for parallel install
+	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am
+	# require user interaction
+	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am
+
+	sed -i "/^bash_completion/d" tools/Makefile.am
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gtk setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	econf \
+		$(use_enable X xim) \
+		$(use_enable emoji emoji-dict) \
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
+		$(use_enable gtk gtk3) \
+		$(use_enable gtk ui) \
+		$(use_enable gtk2) \
+		$(use_enable introspection) \
+		$(use_enable kde appindicator) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable unicode unicode-dict) \
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		"${python_conf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+
+			python_optimize
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+
+	# Undo compression of man page
+	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
+}
+
+pkg_postinst() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	xdg_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Michał Górny]

commit:     90f9fa4ec1bde1338446d739402b5ec4cd63eb9e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 10 21:27:44 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 21:27:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90f9fa4e

app-i18n/ibus: Revert "Remove py2"

We still have py2-only plugins.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.18.ebuild | 2 +-
 app-i18n/ibus/ibus-1.5.19.ebuild | 2 +-
 app-i18n/ibus/ibus-1.5.20.ebuild | 2 +-
 app-i18n/ibus/ibus-1.5.21.ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index a715a0d502d..07657d25078 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python{2_7,3_6} )
 VALA_MIN_API_VERSION="0.34"
 VALA_MAX_API_VERSION="0.42"
 VALA_USE_DEPEND="vapigen"

diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild
index 1b6905e5884..368c0a122fc 100644
--- a/app-i18n/ibus/ibus-1.5.19.ebuild
+++ b/app-i18n/ibus/ibus-1.5.19.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 VALA_MIN_API_VERSION="0.34"
 VALA_MAX_API_VERSION="0.42"
 VALA_USE_DEPEND="vapigen"

diff --git a/app-i18n/ibus/ibus-1.5.20.ebuild b/app-i18n/ibus/ibus-1.5.20.ebuild
index 5934735b645..2ae5a95c9d4 100644
--- a/app-i18n/ibus/ibus-1.5.20.ebuild
+++ b/app-i18n/ibus/ibus-1.5.20.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 VALA_MIN_API_VERSION="0.34"
 VALA_USE_DEPEND="vapigen"
 

diff --git a/app-i18n/ibus/ibus-1.5.21.ebuild b/app-i18n/ibus/ibus-1.5.21.ebuild
index e9a8f12b134..7d58048b667 100644
--- a/app-i18n/ibus/ibus-1.5.21.ebuild
+++ b/app-i18n/ibus/ibus-1.5.21.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 VALA_MIN_API_VERSION="0.34"
 VALA_USE_DEPEND="vapigen"
 

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Michał Górny]

commit:     fc063bc8d17e89adc63c1bb5f5228e7fc1fd5015
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 10 20:20:43 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 20:32:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc063bc8

app-i18n/ibus: Remove py2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.18.ebuild | 2 +-
 app-i18n/ibus/ibus-1.5.19.ebuild | 2 +-
 app-i18n/ibus/ibus-1.5.20.ebuild | 2 +-
 app-i18n/ibus/ibus-1.5.21.ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index 07657d25078..a715a0d502d 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 VALA_MIN_API_VERSION="0.34"
 VALA_MAX_API_VERSION="0.42"
 VALA_USE_DEPEND="vapigen"

diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild
index 368c0a122fc..1b6905e5884 100644
--- a/app-i18n/ibus/ibus-1.5.19.ebuild
+++ b/app-i18n/ibus/ibus-1.5.19.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 VALA_MIN_API_VERSION="0.34"
 VALA_MAX_API_VERSION="0.42"
 VALA_USE_DEPEND="vapigen"

diff --git a/app-i18n/ibus/ibus-1.5.20.ebuild b/app-i18n/ibus/ibus-1.5.20.ebuild
index 2ae5a95c9d4..5934735b645 100644
--- a/app-i18n/ibus/ibus-1.5.20.ebuild
+++ b/app-i18n/ibus/ibus-1.5.20.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 VALA_MIN_API_VERSION="0.34"
 VALA_USE_DEPEND="vapigen"
 

diff --git a/app-i18n/ibus/ibus-1.5.21.ebuild b/app-i18n/ibus/ibus-1.5.21.ebuild
index 7d58048b667..e9a8f12b134 100644
--- a/app-i18n/ibus/ibus-1.5.21.ebuild
+++ b/app-i18n/ibus/ibus-1.5.21.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 VALA_MIN_API_VERSION="0.34"
 VALA_USE_DEPEND="vapigen"
 

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Mart Raudsepp]

commit:     9a5db6e9c9bb43ba8093fd1de9003b2df3329121
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 20:39:39 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Jan 11 20:39:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a5db6e9

app-i18n/ibus-1.5.19: drop to ~arm64 (1.5.20 is stable)

vala:0.42 being gone broke deptree here. Just drop stable
arm64 keyword for the old ibus version that wasn't
compatible with 0.44 yet.

Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild
index ddf293f52b3..c7617f71f01 100644
--- a/app-i18n/ibus/ibus-1.5.19.ebuild
+++ b/app-i18n/ibus/ibus-1.5.19.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     ca6c7f18d361f82e079366960c936c6066bfc8df
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 21 09:34:51 2019 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 09:36:18 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca6c7f18

app-i18n/ibus: version bump, 1.5.21

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-i18n/ibus/Manifest           |   1 +
 app-i18n/ibus/ibus-1.5.21.ebuild | 180 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 181 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 520c7aa1fae..dcd86e01687 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,3 +1,4 @@
 DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42e0e086ad7be18ccb6239868ed940d2c371d83c2e2706c7120702af0bcb0106da60889f0b3d5857b8929b9165 SHA512 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3
 DIST ibus-1.5.19.tar.gz 2842274 BLAKE2B a5aea4770c1c0a58a9e0b1aa26f47a8ab9eb5060a0c06179663984c5b531464ff4575a8ece2f2ee2122f777ca615296c1e46ad4833c68ba2da038f2b85dea374 SHA512 ddcd464c9afb6d081df1cfac65069506877eb4818c3ba5594bcf76f3c6795ef6c17177a778dc89b2ef69d10d87297aa12c8e04f156b750e500b51b32787bd9fc
 DIST ibus-1.5.20.tar.gz 3393487 BLAKE2B 0ed930cbadf7ecf9fa82ee2c0e2a8aa8cfb25a8dc1a2e2ffef0d4f894df31f879f08d7ed14508736836545cbc25b929707939c3b0ea53f2b44ba7489d6dc80ed SHA512 2bbcc19742882fa55d9c8704251f133c5be9f36a93cf52d70c460a4713419868deb634f965e67c1d5c45b615de388b92c0fbb863b118a546fbb89370a38eb77b
+DIST ibus-1.5.21.tar.gz 3463069 BLAKE2B 75b9e7cc4d84b69941d53321da1fe63ad911740a36ed51c7fceaa2a7bc30f6ae39d3f575b4b5fc4268d7c3b3e1c0bae11881dd7a8b7bd441ecf89c83c7279858 SHA512 c7c06e13e78fb4d4d26ce8975b6db4f7914efb325a903999a82197229e13d5ebb4afc876ef67e1d86db58f08c16350dc095aaea050b2f69c2bfc4c452adc5331

diff --git a/app-i18n/ibus/ibus-1.5.21.ebuild b/app-i18n/ibus/ibus-1.5.21.ebuild
new file mode 100644
index 00000000000..b078dba4143
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.21.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+VALA_MIN_API_VERSION="0.34"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+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"
+IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
+REQUIRED_USE="emoji? ( gtk )
+	gtk2? ( gtk )
+	kde? ( gtk )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		introspection
+	)
+	test? ( gtk )
+	vala? ( introspection )"
+
+CDEPEND="app-text/iso-codes
+	dev-libs/glib:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		!gtk? ( x11-libs/gtk+:2 )
+	)
+	gconf? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXi
+		gtk2? ( x11-libs/gtk+:2 )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	kde? ( dev-qt/qtgui:5 )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${CDEPEND}
+	python? (
+		gtk? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/glib-utils
+	virtual/pkgconfig
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	unicode? ( app-i18n/unicode-data )"
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
+	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
+		touch ui/gtk3/panelbinding.vala
+	fi
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala
+	fi
+	if ! use kde; then
+		touch ui/gtk3/panel.vala
+	fi
+
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
+	# fix for parallel install
+	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am
+	# require user interaction
+	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am
+
+	sed -i "/^bash_completion/d" tools/Makefile.am
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gtk setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	econf \
+		$(use_enable X xim) \
+		$(use_enable emoji emoji-dict) \
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk3) \
+		$(use_enable gtk ui) \
+		$(use_enable gtk2) \
+		$(use_enable introspection) \
+		$(use_enable kde appindicator) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable unicode unicode-dict) \
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		"${python_conf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	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}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     c0544c6ecdbec662f370d02ab43402be5f63b40b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 22 07:00:38 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Sep 22 07:00:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0544c6e

app-i18n/ibus-1.5.20: alpha stable, bug 691380

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.20.ebuild b/app-i18n/ibus/ibus-1.5.20.ebuild
index 17f6dc0d6ec..e1b091cd20b 100644
--- a/app-i18n/ibus/ibus-1.5.20.ebuild
+++ b/app-i18n/ibus/ibus-1.5.20.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Mikle Kolyada]

commit:     ef665bf0cf8b140dec29a7b9f2a7d27f76d53c7a
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 13 18:10:14 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Sep 13 18:10:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef665bf0

app-i18n/ibus: arm stable wrt bug #691380

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.20.ebuild b/app-i18n/ibus/ibus-1.5.20.ebuild
index 1f0bb386519..17f6dc0d6ec 100644
--- a/app-i18n/ibus/ibus-1.5.20.ebuild
+++ b/app-i18n/ibus/ibus-1.5.20.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Agostino Sarubbo]

commit:     b786f17302652f1782c76d22efcab9a7332b6923
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  9 06:01:58 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Sep  9 06:01:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b786f173

app-i18n/ibus: sparc stable wrt bug #691380

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.20.ebuild b/app-i18n/ibus/ibus-1.5.20.ebuild
index 1b5aa8eb88d..1f0bb386519 100644
--- a/app-i18n/ibus/ibus-1.5.20.ebuild
+++ b/app-i18n/ibus/ibus-1.5.20.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sergei Trofimovich]

commit:     185d55b761197a43e9bb34c8d13c64b4b5e120c5
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  8 18:28:30 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Sep  8 18:28:30 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=185d55b7

app-i18n/ibus: stable 1.5.20 for ppc64, bug #691380

Package-Manager: Portage-2.3.75, Repoman-2.3.17
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.20.ebuild b/app-i18n/ibus/ibus-1.5.20.ebuild
index 1ed62460003..1b5aa8eb88d 100644
--- a/app-i18n/ibus/ibus-1.5.20.ebuild
+++ b/app-i18n/ibus/ibus-1.5.20.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm arm64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sergei Trofimovich]

commit:     575852456d75a146c22d290db150740c805634ff
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  8 18:23:33 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Sep  8 18:23:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57585245

app-i18n/ibus: stable 1.5.20 for ppc, bug #691380

Package-Manager: Portage-2.3.75, Repoman-2.3.17
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.20.ebuild b/app-i18n/ibus/ibus-1.5.20.ebuild
index 67e89a72ba6..1ed62460003 100644
--- a/app-i18n/ibus/ibus-1.5.20.ebuild
+++ b/app-i18n/ibus/ibus-1.5.20.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm arm64 ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sergei Trofimovich]

commit:     56949990b96c83fe30821dea401f1be2bc11c316
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  8 18:20:19 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Sep  8 18:21:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56949990

app-i18n/ibus: stable 1.5.20 for ia64, bug #691380

Package-Manager: Portage-2.3.75, Repoman-2.3.17
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.20.ebuild b/app-i18n/ibus/ibus-1.5.20.ebuild
index 2023e8c219e..67e89a72ba6 100644
--- a/app-i18n/ibus/ibus-1.5.20.ebuild
+++ b/app-i18n/ibus/ibus-1.5.20.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm arm64 ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Agostino Sarubbo]

commit:     da1271377cb40d0510eb9d83c12b731f23e706f9
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  8 10:55:38 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Sep  8 10:55:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da127137

app-i18n/ibus: amd64 stable wrt bug #691380

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.20.ebuild b/app-i18n/ibus/ibus-1.5.20.ebuild
index 8009d581ee1..2023e8c219e 100644
--- a/app-i18n/ibus/ibus-1.5.20.ebuild
+++ b/app-i18n/ibus/ibus-1.5.20.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Thomas Deutschmann]

commit:     490acc2a7e503dc379616eb749bc60de4eef91b8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  7 18:18:30 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Sep  7 21:06:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=490acc2a

app-i18n/ibus: x86 stable (bug #691380)

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.20.ebuild b/app-i18n/ibus/ibus-1.5.20.ebuild
index e52f4b21706..8009d581ee1 100644
--- a/app-i18n/ibus/ibus-1.5.20.ebuild
+++ b/app-i18n/ibus/ibus-1.5.20.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Aaron Bauman]

commit:     f287ecb100ed83c6ffbb340e3298d8d24a15fd64
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  7 15:29:11 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Sep  7 15:29:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f287ecb1

app-i18n/ibus: arm64 stable (bug #691380)

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Package-Manager: Portage-2.3.75, Repoman-2.3.17
RepoMan-Options: --include-arches="arm64"

 app-i18n/ibus/ibus-1.5.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.20.ebuild b/app-i18n/ibus/ibus-1.5.20.ebuild
index 209dac1a129..e52f4b21706 100644
--- a/app-i18n/ibus/ibus-1.5.20.ebuild
+++ b/app-i18n/ibus/ibus-1.5.20.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Mart Raudsepp]

commit:     5f860cdb7599eb450e300e46f7a80f5d2714a204
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 05:40:43 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 06:42:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f860cdb

app-i18n/ibus-1.5.19: restrict max vala

Fails to compile with vala:0.44, upstream has it fixed for
1.5.20 already.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.19.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild
index 132efcba608..d69062d9918 100644
--- a/app-i18n/ibus/ibus-1.5.19.ebuild
+++ b/app-i18n/ibus/ibus-1.5.19.ebuild
@@ -4,6 +4,7 @@
 EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 VALA_MIN_API_VERSION="0.34"
+VALA_MAX_API_VERSION="0.42"
 VALA_USE_DEPEND="vapigen"
 
 inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Mike Gilbert]

commit:     a78cef02c5c0b1e93d4a25e20644221cff1dd69d
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri May 17 15:05:16 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri May 17 19:33:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a78cef02

app-i18n/ibus: Delete no longer needed dependency on dev-util/intltool.

https://github.com/ibus/ibus/commit/a6710817b3d29d6a522f108f96ffe64d2f5367fe

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.20.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.20.ebuild b/app-i18n/ibus/ibus-1.5.20.ebuild
index cd97fb2ba49..209dac1a129 100644
--- a/app-i18n/ibus/ibus-1.5.20.ebuild
+++ b/app-i18n/ibus/ibus-1.5.20.ebuild
@@ -62,7 +62,6 @@ RDEPEND="${CDEPEND}
 DEPEND="${CDEPEND}
 	$(vala_depend)
 	dev-util/glib-utils
-	dev-util/intltool
 	virtual/pkgconfig
 	emoji? (
 		app-i18n/unicode-cldr

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Mikle Kolyada]

commit:     1a4eae2438f0540490af3fddd1084bb6ceea4f12
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu May  2 21:03:45 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu May  2 21:03:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a4eae24

app-i18n/ibus: alpha stable wrt bug #676300

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="alpha"

 app-i18n/ibus/ibus-1.5.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild
index 5428129aab6..cf521786bea 100644
--- a/app-i18n/ibus/ibus-1.5.19.ebuild
+++ b/app-i18n/ibus/ibus-1.5.19.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     232cfaef3a48be79133f5944ff677677132e19d9
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 06:31:43 2019 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 06:34:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=232cfaef

app-i18n/ibus: version bump 1.5.20

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-i18n/ibus/Manifest           |   1 +
 app-i18n/ibus/ibus-1.5.20.ebuild | 181 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 182 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 5e89f5ede99..520c7aa1fae 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,2 +1,3 @@
 DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42e0e086ad7be18ccb6239868ed940d2c371d83c2e2706c7120702af0bcb0106da60889f0b3d5857b8929b9165 SHA512 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3
 DIST ibus-1.5.19.tar.gz 2842274 BLAKE2B a5aea4770c1c0a58a9e0b1aa26f47a8ab9eb5060a0c06179663984c5b531464ff4575a8ece2f2ee2122f777ca615296c1e46ad4833c68ba2da038f2b85dea374 SHA512 ddcd464c9afb6d081df1cfac65069506877eb4818c3ba5594bcf76f3c6795ef6c17177a778dc89b2ef69d10d87297aa12c8e04f156b750e500b51b32787bd9fc
+DIST ibus-1.5.20.tar.gz 3393487 BLAKE2B 0ed930cbadf7ecf9fa82ee2c0e2a8aa8cfb25a8dc1a2e2ffef0d4f894df31f879f08d7ed14508736836545cbc25b929707939c3b0ea53f2b44ba7489d6dc80ed SHA512 2bbcc19742882fa55d9c8704251f133c5be9f36a93cf52d70c460a4713419868deb634f965e67c1d5c45b615de388b92c0fbb863b118a546fbb89370a38eb77b

diff --git a/app-i18n/ibus/ibus-1.5.20.ebuild b/app-i18n/ibus/ibus-1.5.20.ebuild
new file mode 100644
index 00000000000..09b0683c5cb
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.20.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+VALA_MIN_API_VERSION="0.34"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+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="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
+REQUIRED_USE="emoji? ( gtk )
+	gtk2? ( gtk )
+	kde? ( gtk )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		introspection
+	)
+	test? ( gtk )
+	vala? ( introspection )"
+
+CDEPEND="app-text/iso-codes
+	dev-libs/glib:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		!gtk? ( x11-libs/gtk+:2 )
+	)
+	gconf? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXi
+		gtk2? ( x11-libs/gtk+:2 )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	kde? ( dev-qt/qtgui:5 )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${CDEPEND}
+	python? (
+		gtk? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/glib-utils
+	dev-util/intltool
+	virtual/pkgconfig
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	unicode? ( app-i18n/unicode-data )"
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
+	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
+		touch ui/gtk3/panelbinding.vala
+	fi
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala
+	fi
+	if ! use kde; then
+		touch ui/gtk3/panel.vala
+	fi
+
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
+	# fix for parallel install
+	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am
+	# require user interaction
+	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am
+
+	sed -i "/^bash_completion/d" tools/Makefile.am
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gtk setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	econf \
+		$(use_enable X xim) \
+		$(use_enable emoji emoji-dict) \
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk3) \
+		$(use_enable gtk ui) \
+		$(use_enable gtk2) \
+		$(use_enable introspection) \
+		$(use_enable kde appindicator) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable unicode unicode-dict) \
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		"${python_conf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	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}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sergei Trofimovich]

commit:     2a3ee29dce0385fecde2870f01b395c73b457757
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 13 22:27:24 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Mar 13 22:27:24 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a3ee29d

app-i18n/ibus: stable 1.5.19 for ppc64, bug #676300

Tested-by: ernsteiswuerfel
Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild
index 377a1ac401f..e1c15c434a0 100644
--- a/app-i18n/ibus/ibus-1.5.19.ebuild
+++ b/app-i18n/ibus/ibus-1.5.19.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Mikle Kolyada]

commit:     6dd5d55fc00790392a27f123434e49237f8de0d2
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 14:26:59 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 14:26:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dd5d55f

app-i18n/ibus: arm stable wrt bug #676300

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="arm"

 app-i18n/ibus/ibus-1.5.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild
index e7f27310165..377a1ac401f 100644
--- a/app-i18n/ibus/ibus-1.5.19.ebuild
+++ b/app-i18n/ibus/ibus-1.5.19.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sergei Trofimovich]

commit:     6d0ad3f08a576560eb343b9d24653b56eff0f15c
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sun Mar  3 13:22:17 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 16:07:21 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d0ad3f0

app-i18n/ibus: stable 1.5.19 for sparc, bug #676300

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild
index 3fbfb9f1be6..e7f27310165 100644
--- a/app-i18n/ibus/ibus-1.5.19.ebuild
+++ b/app-i18n/ibus/ibus-1.5.19.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Mikle Kolyada]

commit:     c088e67e531d55a1d536dc7b4134397d9d8b70a8
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  3 05:42:30 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 05:42:30 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c088e67e

app-i18n/ibus: amd64 stable wrt bug #676300

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 app-i18n/ibus/ibus-1.5.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild
index 97ba67c8cf8..3fbfb9f1be6 100644
--- a/app-i18n/ibus/ibus-1.5.19.ebuild
+++ b/app-i18n/ibus/ibus-1.5.19.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Thomas Deutschmann]

commit:     4da7334b77c468cf62c15e6bb69d86918ae6ad38
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  2 20:38:18 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar  2 20:49:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da7334b

app-i18n/ibus: x86 stable (bug #676300)

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild
index 3bdaaa22411..97ba67c8cf8 100644
--- a/app-i18n/ibus/ibus-1.5.19.ebuild
+++ b/app-i18n/ibus/ibus-1.5.19.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sergei Trofimovich]

commit:     b546fd651bb859d041677829754bc986d8841401
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  2 20:01:15 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Mar  2 20:02:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b546fd65

app-i18n/ibus: stable 1.5.19 for ppc, bug #676300

Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild
index eb622e498da..3bdaaa22411 100644
--- a/app-i18n/ibus/ibus-1.5.19.ebuild
+++ b/app-i18n/ibus/ibus-1.5.19.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sergei Trofimovich]

commit:     7c1d67f1d0caccab7ded218b42cf77e097fe6fe0
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  2 19:51:25 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Mar  2 19:52:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c1d67f1

app-i18n/ibus: stable 1.5.19 for ia64, bug #676300

Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild
index c04593084bc..eb622e498da 100644
--- a/app-i18n/ibus/ibus-1.5.19.ebuild
+++ b/app-i18n/ibus/ibus-1.5.19.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     bc567f091355a2bb2376b5b07d00680a9cbe42e1
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  2 12:29:22 2019 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Mar  2 12:29:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc567f09

app-i18n/ibus: restrict >=dev-lang/vala-0.44

Bug: https://bugs.gentoo.org/677972
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-i18n/ibus/ibus-1.5.18.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index 711a75dbc83..99eecac986f 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 VALA_MIN_API_VERSION="0.34"
+VALA_MAX_API_VERSION="0.42"
 VALA_USE_DEPEND="vapigen"
 
 inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     e8ee7ef76c120001316160854840c92a7d0980ea
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 25 12:53:12 2019 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Mon Feb 25 12:53:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8ee7ef7

app-i18n/ibus: drop old

Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-i18n/ibus/Manifest           |   2 -
 app-i18n/ibus/ibus-1.5.12.ebuild | 164 -----------------------------------
 app-i18n/ibus/ibus-1.5.16.ebuild | 180 ---------------------------------------
 3 files changed, 346 deletions(-)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 8d1ff04e919..5e89f5ede99 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,4 +1,2 @@
-DIST ibus-1.5.12.tar.gz 2190284 BLAKE2B 57ac7f9e8e8f0419bad1bf3aa629282ef3c0188d29e98bc872e594955f69e0863020d600c674cabed56db156a85210b5b3c1fe137b135395a27d2535e4938164 SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81
-DIST ibus-1.5.16.tar.gz 2375719 BLAKE2B cf4cbd4556e43403c73da3cd2cb9f6da8e0baf5f90b3bc74f6d12c1bad057198ed828053dcbb3ddfd28c37d9011b6166e834385720aa827a68f594dbd4cf9298 SHA512 494ead69cf9c0111fd25fd1de27e796d89db4f08443afa1ec469f638469b25d8b19a59ea7ab0db0f3a130b9a89b3f2819667099ba38fc973d6efc61b367ce237
 DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42e0e086ad7be18ccb6239868ed940d2c371d83c2e2706c7120702af0bcb0106da60889f0b3d5857b8929b9165 SHA512 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3
 DIST ibus-1.5.19.tar.gz 2842274 BLAKE2B a5aea4770c1c0a58a9e0b1aa26f47a8ab9eb5060a0c06179663984c5b531464ff4575a8ece2f2ee2122f777ca615296c1e46ad4833c68ba2da038f2b85dea374 SHA512 ddcd464c9afb6d081df1cfac65069506877eb4818c3ba5594bcf76f3c6795ef6c17177a778dc89b2ef69d10d87297aa12c8e04f156b750e500b51b32787bd9fc

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
deleted file mode 100644
index 5e7791469af..00000000000
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-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="+X gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland"
-REQUIRED_USE="gtk2? ( gtk )
-	libnotify? ( gtk )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		introspection
-	)
-	test? ( gtk )
-	vala? ( introspection )"
-
-CDEPEND="app-text/iso-codes
-	dev-libs/glib:2
-	gnome-base/dconf
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	X? (
-		x11-libs/libX11
-		!gtk? ( x11-libs/gtk+:2 )
-	)
-	gconf? ( gnome-base/gconf:2 )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXi
-		gtk2? ( x11-libs/gtk+:2 )
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	libnotify? ( x11-libs/libnotify )
-	nls? ( virtual/libintl )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)"
-RDEPEND="${CDEPEND}
-	python? (
-		gtk? (
-			x11-libs/gtk+:3[introspection]
-		)
-	)"
-DEPEND="${CDEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	vala_src_prepare --ignore-use
-	if ! use libnotify; then
-		touch ui/gtk3/panel.vala
-	fi
-	# for multiple Python implementations
-	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
-	# fix for parallel install
-	sed -i \
-		-e "/^py2_compile/,/^$/d" \
-		-e "/^install-data-hook/,/^$/d" \
-		bindings/pygobject/Makefile.am
-	# require user interaction
-	sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
-	# fixed in 1.5.14+
-	sed -i "/def test_keymap/a\        self.skipTest('')" bindings/pygobject/test-override-ibus.py
-	sed -i "/[[:space:]]test-stress[[:space:]]/d" bus/Makefile.am
-	sed -i "/^TESTS += ibus-engine-switch/d" src/tests/Makefile.am
-
-	sed -i "/^bash_completion/d" tools/Makefile.am
-
-	default
-	eautoreconf
-	xdg_environment_reset
-}
-
-src_configure() {
-	local python_conf=()
-	if use python; then
-		python_setup
-		python_conf+=(
-			$(use_enable gtk setup)
-			--with-python=${EPYTHON}
-		)
-	else
-		python_conf+=( --disable-setup )
-	fi
-
-	econf \
-		$(use_enable X xim) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk3) \
-		$(use_enable gtk ui) \
-		$(use_enable gtk2) \
-		$(use_enable introspection) \
-		$(use_enable libnotify) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		"${python_conf[@]}"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	virtx emake -j1 check
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	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}
-
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-${PN} ${PN}.conf
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	dconf update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
deleted file mode 100644
index e4ffeb871fa..00000000000
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-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="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
-REQUIRED_USE="emoji? ( gtk )
-	gtk2? ( gtk )
-	kde? ( gtk )
-	libnotify? ( gtk )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		introspection
-	)
-	test? ( gtk )
-	vala? ( introspection )"
-
-CDEPEND="app-text/iso-codes
-	dev-libs/glib:2
-	gnome-base/dconf
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	X? (
-		x11-libs/libX11
-		!gtk? ( x11-libs/gtk+:2 )
-	)
-	gconf? ( gnome-base/gconf:2 )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXi
-		gtk2? ( x11-libs/gtk+:2 )
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	kde? ( dev-qt/qtgui:5 )
-	libnotify? ( x11-libs/libnotify )
-	nls? ( virtual/libintl )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)"
-RDEPEND="${CDEPEND}
-	python? (
-		gtk? (
-			x11-libs/gtk+:3[introspection]
-		)
-	)"
-DEPEND="${CDEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	virtual/pkgconfig
-	emoji? (
-		app-i18n/unicode-cldr
-		app-i18n/unicode-emoji
-	)
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	vala_src_prepare --ignore-use
-	if ! use emoji; then
-		touch \
-			tools/main.vala \
-			ui/gtk3/panel.vala
-	fi
-	if ! use kde; then
-		touch ui/gtk3/panel.vala
-	fi
-	if ! use libnotify; then
-		touch ui/gtk3/panel.vala
-	fi
-	# for multiple Python implementations
-	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
-	# fix for parallel install
-	sed -i \
-		-e "/^py2_compile/,/^$/d" \
-		-e "/^install-data-hook/,/^$/d" \
-		bindings/pygobject/Makefile.am
-	# require user interaction
-	sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
-
-	sed -i "/^bash_completion/d" tools/Makefile.am
-
-	default
-	eautoreconf
-	xdg_environment_reset
-}
-
-src_configure() {
-	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local python_conf=()
-	if use python; then
-		python_setup
-		python_conf+=(
-			$(use_enable gtk setup)
-			--with-python=${EPYTHON}
-		)
-	else
-		python_conf+=( --disable-setup )
-	fi
-
-	econf \
-		$(use_enable X xim) \
-		$(use_enable emoji emoji-dict) \
-		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
-		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk3) \
-		$(use_enable gtk ui) \
-		$(use_enable gtk2) \
-		$(use_enable introspection) \
-		$(use_enable kde appindicator) \
-		$(use_enable libnotify) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		"${python_conf[@]}"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	virtx emake -j1 check
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	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}
-
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-${PN} ${PN}.conf
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	dconf update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     b0c9ca2ac13b429d571a52becd533b73f7035cab
Author:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 14 08:45:28 2019 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Feb 20 14:18:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0c9ca2a

app-i18n/ibus: limit max vala version, add python3.7

Closes: https://bugs.gentoo.org/677972
Closes: https://github.com/gentoo/gentoo/pull/11048
Signed-off-by: Mikhail Pukhlikov <cynede <AT> gentoo.org>
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
Package-Manager: Portage-2.3.60, Repoman-2.3.12

 app-i18n/ibus/ibus-1.5.19.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild
index 5b5724779a5..d39593776ec 100644
--- a/app-i18n/ibus/ibus-1.5.19.ebuild
+++ b/app-i18n/ibus/ibus-1.5.19.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 VALA_MIN_API_VERSION="0.34"
+VALA_MAX_API_VERSION="0.36"
 VALA_USE_DEPEND="vapigen"
 
 inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Pacho Ramos]

commit:     a134fe9dc82e0a61b876590d39318725b474c541
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 26 18:58:17 2019 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jan 26 18:58:29 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a134fe9d

app-i18n/ibus: Needs glib-utils

Closes: https://bugs.gentoo.org/668234
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.19.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild
index f318087a003..5b5724779a5 100644
--- a/app-i18n/ibus/ibus-1.5.19.ebuild
+++ b/app-i18n/ibus/ibus-1.5.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -63,6 +63,7 @@ RDEPEND="${CDEPEND}
 	)"
 DEPEND="${CDEPEND}
 	$(vala_depend)
+	dev-util/glib-utils
 	dev-util/intltool
 	virtual/pkgconfig
 	emoji? (

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sergei Trofimovich]

commit:     5d47a0237b22b32fb5292751b09e6fe363179d6a
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  6 19:09:39 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Oct  6 19:12:20 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d47a023

app-i18n/ibus: stable 1.5.18 for ppc, bug #664746

Tested-by: ernsteiswuerfel
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc"

 app-i18n/ibus/ibus-1.5.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index d966417a8ef..711a75dbc83 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Markus Meier]

commit:     596f943c7fb86c90f8e33096121611a17f49a669
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  5 04:49:02 2018 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Fri Oct  5 04:49:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=596f943c

app-i18n/ibus: arm stable, bug #664746

Signed-off-by: Markus Meier <maekke <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
RepoMan-Options: --include-arches="arm"

 app-i18n/ibus/ibus-1.5.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index 927ddd72824..4aff43a818d 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Tobias Klausmann]

commit:     b9aaa9f5700cddb250897c733d84c64092bc453f
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 14 10:17:39 2018 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Fri Sep 14 10:17:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9aaa9f5

app-i18n/ibus-1.5.18-r0: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/664746

 app-i18n/ibus/ibus-1.5.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index 1da9fda2462..927ddd72824 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Mikle Kolyada]

commit:     ca5e3920e8e0a3bb7f29f5d60cce534fdacfd411
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  4 18:22:16 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Sep  4 18:22:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca5e3920

app-i18n/ibus: amd64 stable wrt bug #664746

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-i18n/ibus/ibus-1.5.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index de814523ac9..1da9fda2462 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sergei Trofimovich]

commit:     c8980841e70ed1f19d2f55ff3c6850b6fafbb7ba
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  1 23:24:59 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Sep  1 23:24:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8980841

app-i18n/ibus: stable 1.5.18 for ppc64, bug #664746

Package-Manager: Portage-2.3.48, Repoman-2.3.10
RepoMan-Options: --include-arches="ppc64"

 app-i18n/ibus/ibus-1.5.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index c533c667028..de814523ac9 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sergei Trofimovich]

commit:     c013b9e741bc07ff463dd80b640805aebcf93134
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  1 23:16:49 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Sep  1 23:16:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c013b9e7

app-i18n/ibus: stable 1.5.18 for ia64, bug #664746

Package-Manager: Portage-2.3.48, Repoman-2.3.10
RepoMan-Options: --include-arches="ia64"

 app-i18n/ibus/ibus-1.5.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index 27774b1e2d2..c533c667028 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sergei Trofimovich]

commit:     2c878ef87dba8da1793363559670438bf08cdf9e
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Wed Aug 29 21:25:10 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 21:38:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c878ef8

app-i18n/ibus: stable 1.5.18 for sparc, bug #664746

Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="sparc"

 app-i18n/ibus/ibus-1.5.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index 8c9b39101dc..27774b1e2d2 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Thomas Deutschmann]

commit:     093ed40a48b2a314f4ffd20ba7e9edeeff0eec53
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 00:53:59 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 00:53:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=093ed40a

app-i18n/ibus: x86 stable (bug #664746)

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 app-i18n/ibus/ibus-1.5.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index 1981044fcf0..8c9b39101dc 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     8ebce8e261e615366d87518d7a0294780370f4be
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 28 12:50:07 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Aug 28 12:57:28 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ebce8e2

app-i18n/ibus: tidy

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-i18n/ibus/ibus-1.5.12.ebuild | 2 --
 app-i18n/ibus/ibus-1.5.16.ebuild | 2 --
 app-i18n/ibus/ibus-1.5.18.ebuild | 2 --
 3 files changed, 6 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index b3d6a397f2c..5e7791469af 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -145,8 +145,6 @@ src_install() {
 
 pkg_preinst() {
 	use gconf && gnome2_gconf_savelist
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
 }
 
 pkg_postinst() {

diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index b84815cfa14..e4ffeb871fa 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -161,8 +161,6 @@ src_install() {
 
 pkg_preinst() {
 	use gconf && gnome2_gconf_savelist
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
 }
 
 pkg_postinst() {

diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index d32b42660ca..1981044fcf0 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -166,8 +166,6 @@ src_install() {
 
 pkg_preinst() {
 	use gconf && gnome2_gconf_savelist
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     28a4c22898cf61bebadcbf6d32e7d512ef0a6bc5
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  4 13:55:59 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Aug  4 13:57:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28a4c228

app-i18n/ibus: drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-i18n/ibus/Manifest           |   1 -
 app-i18n/ibus/ibus-1.5.17.ebuild | 182 ---------------------------------------
 2 files changed, 183 deletions(-)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index ede5dd9ea81..1290bc19446 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,4 +1,3 @@
 DIST ibus-1.5.12.tar.gz 2190284 BLAKE2B 57ac7f9e8e8f0419bad1bf3aa629282ef3c0188d29e98bc872e594955f69e0863020d600c674cabed56db156a85210b5b3c1fe137b135395a27d2535e4938164 SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81
 DIST ibus-1.5.16.tar.gz 2375719 BLAKE2B cf4cbd4556e43403c73da3cd2cb9f6da8e0baf5f90b3bc74f6d12c1bad057198ed828053dcbb3ddfd28c37d9011b6166e834385720aa827a68f594dbd4cf9298 SHA512 494ead69cf9c0111fd25fd1de27e796d89db4f08443afa1ec469f638469b25d8b19a59ea7ab0db0f3a130b9a89b3f2819667099ba38fc973d6efc61b367ce237
-DIST ibus-1.5.17.tar.gz 2522960 BLAKE2B a0d19eaae809549d678b42394e76107b8869232c90932bfaa5072621598e83db0569084e931c51c15b7179d9d8e0a2ce144b726229dae81a009665a5de87afc4 SHA512 8a7e4fabbcb2096e647b1fb7487c92882bd320a4d777f2765817378abec2e60cafd63364c881fefc2805ff2baa6b28b15ee0710587662a3e65eeb60ead19496c
 DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42e0e086ad7be18ccb6239868ed940d2c371d83c2e2706c7120702af0bcb0106da60889f0b3d5857b8929b9165 SHA512 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3

diff --git a/app-i18n/ibus/ibus-1.5.17.ebuild b/app-i18n/ibus/ibus-1.5.17.ebuild
deleted file mode 100644
index 7c3f41cfe21..00000000000
--- a/app-i18n/ibus/ibus-1.5.17.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-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="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
-REQUIRED_USE="emoji? ( gtk )
-	gtk2? ( gtk )
-	kde? ( gtk )
-	libnotify? ( gtk )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		introspection
-	)
-	test? ( gtk )
-	vala? ( introspection )"
-
-CDEPEND="app-text/iso-codes
-	dev-libs/glib:2
-	gnome-base/dconf
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	X? (
-		x11-libs/libX11
-		!gtk? ( x11-libs/gtk+:2 )
-	)
-	gconf? ( gnome-base/gconf:2 )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXi
-		gtk2? ( x11-libs/gtk+:2 )
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	kde? ( dev-qt/qtgui:5 )
-	libnotify? ( x11-libs/libnotify )
-	nls? ( virtual/libintl )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)"
-RDEPEND="${CDEPEND}
-	python? (
-		gtk? (
-			x11-libs/gtk+:3[introspection]
-		)
-	)"
-DEPEND="${CDEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	virtual/pkgconfig
-	emoji? (
-		app-i18n/unicode-cldr
-		app-i18n/unicode-emoji
-	)
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	vala_src_prepare --ignore-use
-	if ! use emoji; then
-		touch \
-			tools/main.vala \
-			ui/gtk3/panel.vala
-	fi
-	if ! use kde; then
-		touch ui/gtk3/panel.vala
-	fi
-	if ! use libnotify; then
-		touch ui/gtk3/panel.vala
-	fi
-	# for multiple Python implementations
-	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
-	# fix for parallel install
-	sed -i \
-		-e "/^py2_compile/,/^$/d" \
-		-e "/^install-data-hook/,/^$/d" \
-		bindings/pygobject/Makefile.am
-	# require user interaction
-	sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
-
-	sed -i "/^bash_completion/d" tools/Makefile.am
-
-	default
-	eautoreconf
-	xdg_environment_reset
-}
-
-src_configure() {
-	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local python_conf=()
-	if use python; then
-		python_setup
-		python_conf+=(
-			$(use_enable gtk setup)
-			--with-python=${EPYTHON}
-		)
-	else
-		python_conf+=( --disable-setup )
-	fi
-
-	econf \
-		$(use_enable X xim) \
-		$(use_enable emoji emoji-dict) \
-		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
-		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk3) \
-		$(use_enable gtk ui) \
-		$(use_enable gtk2) \
-		$(use_enable introspection) \
-		$(use_enable kde appindicator) \
-		$(use_enable libnotify) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		"${python_conf[@]}"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	virtx emake -j1 check
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	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}
-
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-${PN} ${PN}.conf
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	dconf update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     5e5033e97723ea4c1eed676d8b62f6fb73a96b90
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  4 13:36:33 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Aug  4 13:57:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e5033e9

app-i18n/ibus: allow USE="python -gtk"

Closes: https://bugs.gentoo.org/662582
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-i18n/ibus/ibus-1.5.12.ebuild | 3 +--
 app-i18n/ibus/ibus-1.5.16.ebuild | 1 -
 app-i18n/ibus/ibus-1.5.17.ebuild | 1 -
 app-i18n/ibus/ibus-1.5.18.ebuild | 1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index a8413c59fff..ae04fedae73 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -19,7 +19,6 @@ REQUIRED_USE="gtk2? ( gtk )
 	libnotify? ( gtk )
 	python? (
 		${PYTHON_REQUIRED_USE}
-		gtk
 		introspection
 	)
 	test? ( gtk )

diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index 4dcb90a6263..e0a88f0bc6a 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -21,7 +21,6 @@ REQUIRED_USE="emoji? ( gtk )
 	libnotify? ( gtk )
 	python? (
 		${PYTHON_REQUIRED_USE}
-		gtk
 		introspection
 	)
 	test? ( gtk )

diff --git a/app-i18n/ibus/ibus-1.5.17.ebuild b/app-i18n/ibus/ibus-1.5.17.ebuild
index 10bd3f700de..d165c275183 100644
--- a/app-i18n/ibus/ibus-1.5.17.ebuild
+++ b/app-i18n/ibus/ibus-1.5.17.ebuild
@@ -21,7 +21,6 @@ REQUIRED_USE="emoji? ( gtk )
 	libnotify? ( gtk )
 	python? (
 		${PYTHON_REQUIRED_USE}
-		gtk
 		introspection
 	)
 	test? ( gtk )

diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index 077b31aa412..d32b42660ca 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -22,7 +22,6 @@ REQUIRED_USE="emoji? ( gtk )
 	libnotify? ( gtk )
 	python? (
 		${PYTHON_REQUIRED_USE}
-		gtk
 		introspection
 	)
 	test? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     f9f095d4d65e9621f5fa47f73e272bdbbc597e35
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  4 13:41:11 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Aug  4 13:57:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9f095d4

app-i18n/ibus: drop ltprune

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-i18n/ibus/ibus-1.5.12.ebuild | 4 ++--
 app-i18n/ibus/ibus-1.5.16.ebuild | 4 ++--
 app-i18n/ibus/ibus-1.5.17.ebuild | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index ae04fedae73..452f165b7d2 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools bash-completion-r1 gnome2-utils ltprune python-r1 vala virtualx
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
@@ -122,7 +122,7 @@ src_test() {
 
 src_install() {
 	default
-	prune_libtool_files --modules
+	find "${ED}" -name '*.la' -delete || die
 
 	if use python; then
 		python_install() {

diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index e0a88f0bc6a..9a0c01d902d 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools bash-completion-r1 gnome2-utils ltprune python-r1 vala virtualx
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
@@ -138,7 +138,7 @@ src_test() {
 
 src_install() {
 	default
-	prune_libtool_files --modules
+	find "${ED}" -name '*.la' -delete || die
 
 	if use python; then
 		python_install() {

diff --git a/app-i18n/ibus/ibus-1.5.17.ebuild b/app-i18n/ibus/ibus-1.5.17.ebuild
index d165c275183..7c3f41cfe21 100644
--- a/app-i18n/ibus/ibus-1.5.17.ebuild
+++ b/app-i18n/ibus/ibus-1.5.17.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools bash-completion-r1 gnome2-utils ltprune python-r1 vala virtualx xdg-utils
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
@@ -139,7 +139,7 @@ src_test() {
 
 src_install() {
 	default
-	prune_libtool_files --modules
+	find "${ED}" -name '*.la' -delete || die
 
 	if use python; then
 		python_install() {

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     c7ea9847cf0b52b6b83026da05154070e269262d
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  4 13:52:53 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Aug  4 13:57:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7ea9847

app-i18n/ibus: call xdg_environment_reset

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-i18n/ibus/ibus-1.5.12.ebuild | 3 ++-
 app-i18n/ibus/ibus-1.5.16.ebuild | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index 452f165b7d2..b3d6a397f2c 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
@@ -86,6 +86,7 @@ src_prepare() {
 
 	default
 	eautoreconf
+	xdg_environment_reset
 }
 
 src_configure() {

diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index 9a0c01d902d..b84815cfa14 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
@@ -97,6 +97,7 @@ src_prepare() {
 
 	default
 	eautoreconf
+	xdg_environment_reset
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     51795c8e430d2c706fd62dd1e403e28d22ce06db
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 30 02:23:29 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jun 30 02:25:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51795c8e

app-i18n/ibus: fix build

Closes: https://bugs.gentoo.org/658506
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-i18n/ibus/ibus-1.5.18.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index 0115a8275ea..077b31aa412 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -3,6 +3,7 @@
 
 EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+VALA_MIN_API_VERSION="0.34"
 VALA_USE_DEPEND="vapigen"
 
 inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     e7fd95d82616a5445a83e23573bc37220a539a5e
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Mon May  7 14:17:41 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Mon May  7 14:17:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7fd95d8

app-i18n/ibus: tidy

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-i18n/ibus/ibus-1.5.18.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index 25c34029d3f..0115a8275ea 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -130,10 +130,10 @@ src_configure() {
 		$(use_enable libnotify) \
 		$(use_enable nls) \
 		$(use_enable test tests) \
-		$(use_enable vala) \
-		$(use_enable wayland) \
 		$(use_enable unicode unicode-dict) \
 		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
+		$(use_enable vala) \
+		$(use_enable wayland) \
 		"${python_conf[@]}"
 }
 

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     02e875724cee4f20e4dc041e4435a11214a3092f
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Mon May  7 14:14:13 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Mon May  7 14:14:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02e87572

app-i18n/ibus: fix tests

Closes: https://bugs.gentoo.org/642964
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-i18n/ibus/ibus-1.5.17.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.17.ebuild b/app-i18n/ibus/ibus-1.5.17.ebuild
index 43eff2df2a0..10bd3f700de 100644
--- a/app-i18n/ibus/ibus-1.5.17.ebuild
+++ b/app-i18n/ibus/ibus-1.5.17.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools bash-completion-r1 gnome2-utils ltprune python-r1 vala virtualx
+inherit autotools bash-completion-r1 gnome2-utils ltprune python-r1 vala virtualx xdg-utils
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
@@ -98,6 +98,7 @@ src_prepare() {
 
 	default
 	eautoreconf
+	xdg_environment_reset
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     a5013d12f05af20b747cb249964053e71f77d80b
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Mon May  7 14:04:18 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Mon May  7 14:04:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5013d12

app-i18n/ibus: new upstream release

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-i18n/ibus/Manifest           |   1 +
 app-i18n/ibus/ibus-1.5.18.ebuild | 187 +++++++++++++++++++++++++++++++++++++++
 app-i18n/ibus/metadata.xml       |   1 +
 3 files changed, 189 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index c2bcc66ae37..0c987da8625 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -2,3 +2,4 @@ DIST ibus-1.5.12.tar.gz 2190284 BLAKE2B 57ac7f9e8e8f0419bad1bf3aa629282ef3c0188d
 DIST ibus-1.5.15.tar.gz 2259352 BLAKE2B 52a820b55573f034f60dc705e0c513515c0f128f861d2dd9a22be9bfafdd10f116a159b8d9a21a64f7b66225e7191a08b9c5ff873bbe29421c53fec2bee08b71 SHA512 4e588acf2ca0172b365630dcfe2d9062e7583e50a44d435ec05c8e3976c6caf54c4708733f1f7dce5ef7724254469ee5c7ab3b086f0cbea18775c894863b0c3e
 DIST ibus-1.5.16.tar.gz 2375719 BLAKE2B cf4cbd4556e43403c73da3cd2cb9f6da8e0baf5f90b3bc74f6d12c1bad057198ed828053dcbb3ddfd28c37d9011b6166e834385720aa827a68f594dbd4cf9298 SHA512 494ead69cf9c0111fd25fd1de27e796d89db4f08443afa1ec469f638469b25d8b19a59ea7ab0db0f3a130b9a89b3f2819667099ba38fc973d6efc61b367ce237
 DIST ibus-1.5.17.tar.gz 2522960 BLAKE2B a0d19eaae809549d678b42394e76107b8869232c90932bfaa5072621598e83db0569084e931c51c15b7179d9d8e0a2ce144b726229dae81a009665a5de87afc4 SHA512 8a7e4fabbcb2096e647b1fb7487c92882bd320a4d777f2765817378abec2e60cafd63364c881fefc2805ff2baa6b28b15ee0710587662a3e65eeb60ead19496c
+DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42e0e086ad7be18ccb6239868ed940d2c371d83c2e2706c7120702af0bcb0106da60889f0b3d5857b8929b9165 SHA512 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3

diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
new file mode 100644
index 00000000000..25c34029d3f
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+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="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
+REQUIRED_USE="emoji? ( gtk )
+	gtk2? ( gtk )
+	kde? ( gtk )
+	libnotify? ( gtk )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		gtk
+		introspection
+	)
+	test? ( gtk )
+	vala? ( introspection )"
+
+CDEPEND="app-text/iso-codes
+	dev-libs/glib:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		!gtk? ( x11-libs/gtk+:2 )
+	)
+	gconf? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXi
+		gtk2? ( x11-libs/gtk+:2 )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	kde? ( dev-qt/qtgui:5 )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${CDEPEND}
+	python? (
+		gtk? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	unicode? ( app-i18n/unicode-data )"
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala
+	fi
+	if ! use kde; then
+		touch ui/gtk3/panel.vala
+	fi
+	if ! use libnotify; then
+		touch ui/gtk3/panel.vala
+	fi
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
+	# fix for parallel install
+	sed -i \
+		-e "/^py2_compile/,/^$/d" \
+		-e "/^install-data-hook/,/^$/d" \
+		bindings/pygobject/Makefile.am
+	# require user interaction
+	sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
+
+	sed -i "/^bash_completion/d" tools/Makefile.am
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gtk setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	econf \
+		$(use_enable X xim) \
+		$(use_enable emoji emoji-dict) \
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk3) \
+		$(use_enable gtk ui) \
+		$(use_enable gtk2) \
+		$(use_enable introspection) \
+		$(use_enable kde appindicator) \
+		$(use_enable libnotify) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		$(use_enable unicode unicode-dict) \
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
+		"${python_conf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	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}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}

diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml
index 11716b82309..3e5476424e4 100644
--- a/app-i18n/ibus/metadata.xml
+++ b/app-i18n/ibus/metadata.xml
@@ -14,6 +14,7 @@
     <flag name="emoji">Enable support for Emoji</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>
+    <flag name="unicode">Enable support for Unicode choice</flag>
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:ibus_project:ibus</remote-id>

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     d23bbcb5735378dcd612e675ba82834547dd063d
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Mon May  7 14:07:12 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Mon May  7 14:07:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d23bbcb5

app-i18n/ibus: drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-i18n/ibus/Manifest           |   1 -
 app-i18n/ibus/ibus-1.5.15.ebuild | 167 ---------------------------------------
 2 files changed, 168 deletions(-)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 0c987da8625..ede5dd9ea81 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,5 +1,4 @@
 DIST ibus-1.5.12.tar.gz 2190284 BLAKE2B 57ac7f9e8e8f0419bad1bf3aa629282ef3c0188d29e98bc872e594955f69e0863020d600c674cabed56db156a85210b5b3c1fe137b135395a27d2535e4938164 SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81
-DIST ibus-1.5.15.tar.gz 2259352 BLAKE2B 52a820b55573f034f60dc705e0c513515c0f128f861d2dd9a22be9bfafdd10f116a159b8d9a21a64f7b66225e7191a08b9c5ff873bbe29421c53fec2bee08b71 SHA512 4e588acf2ca0172b365630dcfe2d9062e7583e50a44d435ec05c8e3976c6caf54c4708733f1f7dce5ef7724254469ee5c7ab3b086f0cbea18775c894863b0c3e
 DIST ibus-1.5.16.tar.gz 2375719 BLAKE2B cf4cbd4556e43403c73da3cd2cb9f6da8e0baf5f90b3bc74f6d12c1bad057198ed828053dcbb3ddfd28c37d9011b6166e834385720aa827a68f594dbd4cf9298 SHA512 494ead69cf9c0111fd25fd1de27e796d89db4f08443afa1ec469f638469b25d8b19a59ea7ab0db0f3a130b9a89b3f2819667099ba38fc973d6efc61b367ce237
 DIST ibus-1.5.17.tar.gz 2522960 BLAKE2B a0d19eaae809549d678b42394e76107b8869232c90932bfaa5072621598e83db0569084e931c51c15b7179d9d8e0a2ce144b726229dae81a009665a5de87afc4 SHA512 8a7e4fabbcb2096e647b1fb7487c92882bd320a4d777f2765817378abec2e60cafd63364c881fefc2805ff2baa6b28b15ee0710587662a3e65eeb60ead19496c
 DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42e0e086ad7be18ccb6239868ed940d2c371d83c2e2706c7120702af0bcb0106da60889f0b3d5857b8929b9165 SHA512 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3

diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild
deleted file mode 100644
index d98586b8db2..00000000000
--- a/app-i18n/ibus/ibus-1.5.15.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-VALA_USE_DEPEND="vapigen"
-
-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"
-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="+X gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland"
-REQUIRED_USE="gtk2? ( gtk )
-	libnotify? ( gtk )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		gtk
-		introspection
-	)
-	test? ( gtk )
-	vala? ( introspection )"
-
-CDEPEND="app-text/iso-codes
-	dev-libs/glib:2
-	gnome-base/dconf
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	X? (
-		x11-libs/libX11
-		!gtk? ( x11-libs/gtk+:2 )
-	)
-	gconf? ( gnome-base/gconf:2 )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXi
-		gtk2? ( x11-libs/gtk+:2 )
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	libnotify? ( x11-libs/libnotify )
-	nls? ( virtual/libintl )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)"
-RDEPEND="${CDEPEND}
-	python? (
-		gtk? (
-			x11-libs/gtk+:3[introspection]
-		)
-	)"
-DEPEND="${CDEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	vala_src_prepare --ignore-use
-	# disable emoji
-	touch \
-		tools/main.vala \
-		ui/gtk3/panel.vala
-	if ! use libnotify; then
-		touch ui/gtk3/panel.vala
-	fi
-	# for multiple Python implementations
-	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
-	# fix for parallel install
-	sed -i \
-		-e "/^py2_compile/,/^$/d" \
-		-e "/^install-data-hook/,/^$/d" \
-		bindings/pygobject/Makefile.am
-	# require user interaction
-	sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
-
-	sed -i "/^bash_completion/d" tools/Makefile.am
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local python_conf=()
-	if use python; then
-		python_setup
-		python_conf+=(
-			$(use_enable gtk setup)
-			--with-python=${EPYTHON}
-		)
-	else
-		python_conf+=( --disable-setup )
-	fi
-
-	econf \
-		$(use_enable X xim) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk3) \
-		$(use_enable gtk ui) \
-		$(use_enable gtk2) \
-		$(use_enable introspection) \
-		$(use_enable libnotify) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		--disable-emoji-dict \
-		"${python_conf[@]}"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	virtx emake -j1 check
-}
-
-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}
-
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-${PN} ${PN}.conf
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	dconf update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Mike Gilbert]

commit:     fe6a02abaff9abf6bb781e57392a90e7b1f045d6
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Apr 30 14:57:22 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 15:39:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe6a02ab

app-i18n/ibus: Restore ~x86-fbsd (bug #626804).

 app-i18n/ibus/ibus-1.5.16.ebuild | 2 +-
 app-i18n/ibus/ibus-1.5.17.ebuild | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index 25bed25d177..4dcb90a6263 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

diff --git a/app-i18n/ibus/ibus-1.5.17.ebuild b/app-i18n/ibus/ibus-1.5.17.ebuild
index f7900a15eef..43eff2df2a0 100644
--- a/app-i18n/ibus/ibus-1.5.17.ebuild
+++ b/app-i18n/ibus/ibus-1.5.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     b00157c8130a31f2398d42b4e4d42ebdafc94724
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 00:14:45 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 18 00:29:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b00157c8

app-i18n/ibus-1.5.16: added ~alpha, bug 626804

 app-i18n/ibus/ibus-1.5.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index bf065ab00f1..25bed25d177 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Matt Turner]

commit:     f3a0362e1ea721d1e8e6654945d30ac052b15a76
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 00:11:42 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 18 00:11:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3a0362e

app-i18n/ibus-1.5.17: added ~alpha, bug 626804

 app-i18n/ibus/ibus-1.5.17.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.17.ebuild b/app-i18n/ibus/ibus-1.5.17.ebuild
index f04a122889f..f7900a15eef 100644
--- a/app-i18n/ibus/ibus-1.5.17.ebuild
+++ b/app-i18n/ibus/ibus-1.5.17.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Markus Meier]

commit:     0bef1c49dc1cb1bd6cfc5db41277242cc4986cf1
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 28 21:49:24 2018 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 21:49:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bef1c49

app-i18n/ibus: arm stable, bug #641276

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="arm"

 app-i18n/ibus/ibus-1.5.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index 5550caecc20..bf065ab00f1 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Mikle Kolyada]

commit:     530666861ef1f89f028d667578d33d38f537e2ad
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 13:21:50 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 13:21:50 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53066686

app-i18n/ibus: amd64 stable wrt bug #641276

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 app-i18n/ibus/ibus-1.5.16.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index b92ea73eb2d..5550caecc20 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     3be037a16108dce2e445ef0b5cea0cb365f21355
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 31 14:10:53 2017 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 14:16:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3be037a1

app-i18n/ibus: version bump

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-i18n/ibus/Manifest           |   1 +
 app-i18n/ibus/ibus-1.5.17.ebuild | 182 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 183 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index a464130954e..c2bcc66ae37 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,3 +1,4 @@
 DIST ibus-1.5.12.tar.gz 2190284 BLAKE2B 57ac7f9e8e8f0419bad1bf3aa629282ef3c0188d29e98bc872e594955f69e0863020d600c674cabed56db156a85210b5b3c1fe137b135395a27d2535e4938164 SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81
 DIST ibus-1.5.15.tar.gz 2259352 BLAKE2B 52a820b55573f034f60dc705e0c513515c0f128f861d2dd9a22be9bfafdd10f116a159b8d9a21a64f7b66225e7191a08b9c5ff873bbe29421c53fec2bee08b71 SHA512 4e588acf2ca0172b365630dcfe2d9062e7583e50a44d435ec05c8e3976c6caf54c4708733f1f7dce5ef7724254469ee5c7ab3b086f0cbea18775c894863b0c3e
 DIST ibus-1.5.16.tar.gz 2375719 BLAKE2B cf4cbd4556e43403c73da3cd2cb9f6da8e0baf5f90b3bc74f6d12c1bad057198ed828053dcbb3ddfd28c37d9011b6166e834385720aa827a68f594dbd4cf9298 SHA512 494ead69cf9c0111fd25fd1de27e796d89db4f08443afa1ec469f638469b25d8b19a59ea7ab0db0f3a130b9a89b3f2819667099ba38fc973d6efc61b367ce237
+DIST ibus-1.5.17.tar.gz 2522960 BLAKE2B a0d19eaae809549d678b42394e76107b8869232c90932bfaa5072621598e83db0569084e931c51c15b7179d9d8e0a2ce144b726229dae81a009665a5de87afc4 SHA512 8a7e4fabbcb2096e647b1fb7487c92882bd320a4d777f2765817378abec2e60cafd63364c881fefc2805ff2baa6b28b15ee0710587662a3e65eeb60ead19496c

diff --git a/app-i18n/ibus/ibus-1.5.17.ebuild b/app-i18n/ibus/ibus-1.5.17.ebuild
new file mode 100644
index 00000000000..f04a122889f
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.17.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+VALA_USE_DEPEND="vapigen"
+
+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"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
+REQUIRED_USE="emoji? ( gtk )
+	gtk2? ( gtk )
+	kde? ( gtk )
+	libnotify? ( gtk )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		gtk
+		introspection
+	)
+	test? ( gtk )
+	vala? ( introspection )"
+
+CDEPEND="app-text/iso-codes
+	dev-libs/glib:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		!gtk? ( x11-libs/gtk+:2 )
+	)
+	gconf? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXi
+		gtk2? ( x11-libs/gtk+:2 )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	kde? ( dev-qt/qtgui:5 )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${CDEPEND}
+	python? (
+		gtk? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala
+	fi
+	if ! use kde; then
+		touch ui/gtk3/panel.vala
+	fi
+	if ! use libnotify; then
+		touch ui/gtk3/panel.vala
+	fi
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
+	# fix for parallel install
+	sed -i \
+		-e "/^py2_compile/,/^$/d" \
+		-e "/^install-data-hook/,/^$/d" \
+		bindings/pygobject/Makefile.am
+	# require user interaction
+	sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
+
+	sed -i "/^bash_completion/d" tools/Makefile.am
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gtk setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	econf \
+		$(use_enable X xim) \
+		$(use_enable emoji emoji-dict) \
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk3) \
+		$(use_enable gtk ui) \
+		$(use_enable gtk2) \
+		$(use_enable introspection) \
+		$(use_enable kde appindicator) \
+		$(use_enable libnotify) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		"${python_conf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+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}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sergei Trofimovich]

commit:     33507d377b8cececcfa566884ecfacdd9a264425
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 20:23:25 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 20:34:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33507d37

app-i18n/ibus: stable 1.5.16 for ia64/ppc/ppc64, bug #641276

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="ia64 ppc ppc64"

 app-i18n/ibus/ibus-1.5.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index ae4fee4c91c..b92ea73eb2d 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Thomas Deutschmann]

commit:     1be906ac72cfc70d1c10cbfb38a355b4008c14bd
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 18:38:08 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 18:38:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1be906ac

app-i18n/ibus: x86 stable (bug #641276)

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-i18n/ibus/ibus-1.5.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index f04a122889f..ae4fee4c91c 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sergei Trofimovich]

commit:     bc50281acb83ebbff6057187775dced4301ce421
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Thu Dec 21 21:45:58 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 21:54:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc50281a

app-i18n/ibus: keyworded 1.5.16 for sparc, bug #626804

Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --include-arches="sparc"

 app-i18n/ibus/ibus-1.5.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index 1840a7ca698..f04a122889f 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Markus Meier]

commit:     ae811b84b952e03df140a309c35a2daee052af90
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  8 20:09:35 2017 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Fri Sep  8 20:09:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae811b84

app-i18n/ibus: add ~arm, bug #626804

Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"

 app-i18n/ibus/ibus-1.5.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index d96066470c7..1840a7ca698 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Markus Meier]

commit:     c912b85e8f3b6255241f09a29e8bbc47e84f0500
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  7 19:26:30 2017 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Thu Sep  7 19:26:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c912b85e

app-i18n/ibus: add ~arm64, bug #626804

Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="arm64"

 app-i18n/ibus/ibus-1.5.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index a54a1d332c2..d96066470c7 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     92ddd1e3ded7a9fed5f7b5ea2b3bbc0fa910b886
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 14 14:45:07 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 14:45:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92ddd1e3

app-i18n/ibus: add missing REQUIRED_USE

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/ibus/ibus-1.5.12.ebuild | 18 ++++++++----------
 app-i18n/ibus/ibus-1.5.15.ebuild | 18 ++++++++----------
 app-i18n/ibus/ibus-1.5.16.ebuild | 16 +++++++---------
 3 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index ebad2ff67aa..a8413c59fff 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -14,8 +14,9 @@ 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="gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland +X"
-REQUIRED_USE="libnotify? ( gtk )
+IUSE="+X gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland"
+REQUIRED_USE="gtk2? ( gtk )
+	libnotify? ( gtk )
 	python? (
 		${PYTHON_REQUIRED_USE}
 		gtk
@@ -29,6 +30,10 @@ CDEPEND="app-text/iso-codes
 	gnome-base/dconf
 	gnome-base/librsvg:2
 	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		!gtk? ( x11-libs/gtk+:2 )
+	)
 	gconf? ( gnome-base/gconf:2 )
 	gtk? (
 		x11-libs/gtk+:3
@@ -46,13 +51,6 @@ CDEPEND="app-text/iso-codes
 	wayland? (
 		dev-libs/wayland
 		x11-libs/libxkbcommon
-	)
-	X? (
-		|| (
-			x11-libs/gtk+:3
-			x11-libs/gtk+:2
-		)
-		x11-libs/libX11
 	)"
 RDEPEND="${CDEPEND}
 	python? (
@@ -104,6 +102,7 @@ src_configure() {
 	fi
 
 	econf \
+		$(use_enable X xim) \
 		$(use_enable gconf) \
 		$(use_enable gtk gtk3) \
 		$(use_enable gtk ui) \
@@ -114,7 +113,6 @@ src_configure() {
 		$(use_enable test tests) \
 		$(use_enable vala) \
 		$(use_enable wayland) \
-		$(use_enable X xim) \
 		"${python_conf[@]}"
 }
 

diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild
index 439ccca56b0..d98586b8db2 100644
--- a/app-i18n/ibus/ibus-1.5.15.ebuild
+++ b/app-i18n/ibus/ibus-1.5.15.ebuild
@@ -14,8 +14,9 @@ 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="gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland +X"
-REQUIRED_USE="libnotify? ( gtk )
+IUSE="+X gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland"
+REQUIRED_USE="gtk2? ( gtk )
+	libnotify? ( gtk )
 	python? (
 		${PYTHON_REQUIRED_USE}
 		gtk
@@ -29,6 +30,10 @@ CDEPEND="app-text/iso-codes
 	gnome-base/dconf
 	gnome-base/librsvg:2
 	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		!gtk? ( x11-libs/gtk+:2 )
+	)
 	gconf? ( gnome-base/gconf:2 )
 	gtk? (
 		x11-libs/gtk+:3
@@ -46,13 +51,6 @@ CDEPEND="app-text/iso-codes
 	wayland? (
 		dev-libs/wayland
 		x11-libs/libxkbcommon
-	)
-	X? (
-		|| (
-			x11-libs/gtk+:3
-			x11-libs/gtk+:2
-		)
-		x11-libs/libX11
 	)"
 RDEPEND="${CDEPEND}
 	python? (
@@ -104,6 +102,7 @@ src_configure() {
 	fi
 
 	econf \
+		$(use_enable X xim) \
 		$(use_enable gconf) \
 		$(use_enable gtk gtk3) \
 		$(use_enable gtk ui) \
@@ -114,7 +113,6 @@ src_configure() {
 		$(use_enable test tests) \
 		$(use_enable vala) \
 		$(use_enable wayland) \
-		$(use_enable X xim) \
 		--disable-emoji-dict \
 		"${python_conf[@]}"
 }

diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index e948253cdf5..a54a1d332c2 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -14,8 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="+emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland +X"
+IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
 REQUIRED_USE="emoji? ( gtk )
+	gtk2? ( gtk )
 	kde? ( gtk )
 	libnotify? ( gtk )
 	python? (
@@ -31,6 +32,10 @@ CDEPEND="app-text/iso-codes
 	gnome-base/dconf
 	gnome-base/librsvg:2
 	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		!gtk? ( x11-libs/gtk+:2 )
+	)
 	gconf? ( gnome-base/gconf:2 )
 	gtk? (
 		x11-libs/gtk+:3
@@ -49,13 +54,6 @@ CDEPEND="app-text/iso-codes
 	wayland? (
 		dev-libs/wayland
 		x11-libs/libxkbcommon
-	)
-	X? (
-		|| (
-			x11-libs/gtk+:3
-			x11-libs/gtk+:2
-		)
-		x11-libs/libX11
 	)"
 RDEPEND="${CDEPEND}
 	python? (
@@ -116,6 +114,7 @@ src_configure() {
 	fi
 
 	econf \
+		$(use_enable X xim) \
 		$(use_enable emoji emoji-dict) \
 		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
 		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
@@ -130,7 +129,6 @@ src_configure() {
 		$(use_enable test tests) \
 		$(use_enable vala) \
 		$(use_enable wayland) \
-		$(use_enable X xim) \
 		"${python_conf[@]}"
 }
 

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sergei Trofimovich]

commit:     f9854fcae6f9d10cd1b7b7efa869e903dcec39f5
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  6 00:17:06 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Aug  6 00:17:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9854fca

app-i18n/ibus: keyworded 1.5.16 for ppc64, bug #626804

Package-Manager: Portage-2.3.6, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc64"

 app-i18n/ibus/ibus-1.5.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index 35bdb31b3b6..e948253cdf5 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="+emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland +X"
 REQUIRED_USE="emoji? ( gtk )
 	kde? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sergei Trofimovich]

commit:     1166b925779c852b05747642b9e4d71f81f0a896
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  6 00:06:18 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Aug  6 00:06:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1166b925

app-i18n/ibus: keyworded 1.5.16 for ppc, bug #626804

Package-Manager: Portage-2.3.6, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc"

 app-i18n/ibus/ibus-1.5.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index d26b649ce23..35bdb31b3b6 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 IUSE="+emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland +X"
 REQUIRED_USE="emoji? ( gtk )
 	kde? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Sergei Trofimovich]

commit:     cba974cefb6c545d58a98aba89abfd000dbbc327
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  5 21:17:47 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Aug  5 21:17:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cba974ce

app-i18n/ibus: keyworded 1.5.16 for ia64, bug #626804

Package-Manager: Portage-2.3.6, Repoman-2.3.3
RepoMan-Options: --include-arches="ia64"

 app-i18n/ibus/ibus-1.5.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index 8d1969cbf45..d26b649ce23 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~x86"
 IUSE="+emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland +X"
 REQUIRED_USE="emoji? ( gtk )
 	kde? ( gtk )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     88095a7c119befaa9f80b439c38787ec285c278c
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  1 14:48:02 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Aug  1 14:48:02 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88095a7c

app-i18n/ibus: new upstream release

Gentoo-Bug: 626768

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/ibus/Manifest           |   1 +
 app-i18n/ibus/ibus-1.5.16.ebuild | 184 +++++++++++++++++++++++++++++++++++++++
 app-i18n/ibus/metadata.xml       |   1 +
 3 files changed, 186 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index f12243f7cc1..8e79eb6aee5 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,2 +1,3 @@
 DIST ibus-1.5.12.tar.gz 2190284 SHA256 e24da95995f4aca5b96359eaba709487dc5ad4c732e9b01b9bcf9fb34be2442c SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81 WHIRLPOOL 82354fc5006a0abe4cb431dda90a67dc1b775f0bac521b481eaeb7acd167ba6179cad14045c5141c57618845589094613bc489357ee8bf550f131ecfb1bf8293
 DIST ibus-1.5.15.tar.gz 2259352 SHA256 41f7baad6f3aac0cdfaebef674a8731ae47950f140edfbeefebaeed78c93e385 SHA512 4e588acf2ca0172b365630dcfe2d9062e7583e50a44d435ec05c8e3976c6caf54c4708733f1f7dce5ef7724254469ee5c7ab3b086f0cbea18775c894863b0c3e WHIRLPOOL ba40cfe9f398963ce6122d4beabdccaa94c6ac7a7463fe3cea3dc967b19a4702996fd132372a167a02956e1340b4278c61ea19ed781203db33a4651ddd3824b1
+DIST ibus-1.5.16.tar.gz 2375719 SHA256 36b57bfbe4f92e3281fb535cae65794b6f25164b2a3288e73e6d06b4a409fe1e SHA512 494ead69cf9c0111fd25fd1de27e796d89db4f08443afa1ec469f638469b25d8b19a59ea7ab0db0f3a130b9a89b3f2819667099ba38fc973d6efc61b367ce237 WHIRLPOOL 08fdab9971f2723b5cbacd0a5f3c6ab6c13ff8111abe2bdceab26113f304b20af38403313fa9819838e37805473489d629d3530ba1fc9739f2db991a85b89de7

diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
new file mode 100644
index 00000000000..8d1969cbf45
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+VALA_USE_DEPEND="vapigen"
+
+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"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland +X"
+REQUIRED_USE="emoji? ( gtk )
+	kde? ( gtk )
+	libnotify? ( gtk )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		gtk
+		introspection
+	)
+	test? ( gtk )
+	vala? ( introspection )"
+
+CDEPEND="app-text/iso-codes
+	dev-libs/glib:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	gconf? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXi
+		gtk2? ( x11-libs/gtk+:2 )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	kde? ( dev-qt/qtgui:5 )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
+	X? (
+		|| (
+			x11-libs/gtk+:3
+			x11-libs/gtk+:2
+		)
+		x11-libs/libX11
+	)"
+RDEPEND="${CDEPEND}
+	python? (
+		gtk? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala
+	fi
+	if ! use kde; then
+		touch ui/gtk3/panel.vala
+	fi
+	if ! use libnotify; then
+		touch ui/gtk3/panel.vala
+	fi
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
+	# fix for parallel install
+	sed -i \
+		-e "/^py2_compile/,/^$/d" \
+		-e "/^install-data-hook/,/^$/d" \
+		bindings/pygobject/Makefile.am
+	# require user interaction
+	sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
+
+	sed -i "/^bash_completion/d" tools/Makefile.am
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gtk setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	econf \
+		$(use_enable emoji emoji-dict) \
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk3) \
+		$(use_enable gtk ui) \
+		$(use_enable gtk2) \
+		$(use_enable introspection) \
+		$(use_enable kde appindicator) \
+		$(use_enable libnotify) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		$(use_enable X xim) \
+		"${python_conf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+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}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}

diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml
index 26fabe3ea17..11716b82309 100644
--- a/app-i18n/ibus/metadata.xml
+++ b/app-i18n/ibus/metadata.xml
@@ -11,6 +11,7 @@
     also may help developers to develop input method easily.
   </longdescription>
   <use>
+    <flag name="emoji">Enable support for Emoji</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>

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     6ba4d6b62275049baa71d3fbc7ac408e8815fb4b
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  1 14:11:03 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Aug  1 14:23:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ba4d6b6

app-i18n/ibus: call dconf update

Gentoo-Bug: 582638

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/ibus/ibus-1.5.12.ebuild | 1 +
 app-i18n/ibus/ibus-1.5.15.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index e1dcecd1224..55ba530a056 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -152,6 +152,7 @@ pkg_postinst() {
 	use gtk2 && gnome2_query_immodules_gtk2
 	gnome2_icon_cache_update
 	gnome2_schemas_update
+	dconf update
 }
 
 pkg_postrm() {

diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild
index 16a914dc712..afed2d1f73d 100644
--- a/app-i18n/ibus/ibus-1.5.15.ebuild
+++ b/app-i18n/ibus/ibus-1.5.15.ebuild
@@ -149,6 +149,7 @@ pkg_postinst() {
 	use gtk2 && gnome2_query_immodules_gtk2
 	gnome2_icon_cache_update
 	gnome2_schemas_update
+	dconf update
 }
 
 pkg_postrm() {

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

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>

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     83c38692a9b02232107cff0cbaceee1fe5413256
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  1 14:18:20 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Aug  1 14:23:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83c38692

app-i18n/ibus: fix build

Gentoo-Bug: 612218

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/ibus/ibus-1.5.15.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild
index 7dc6dcd6bed..439ccca56b0 100644
--- a/app-i18n/ibus/ibus-1.5.15.ebuild
+++ b/app-i18n/ibus/ibus-1.5.15.ebuild
@@ -68,6 +68,10 @@ DEPEND="${CDEPEND}
 
 src_prepare() {
 	vala_src_prepare --ignore-use
+	# disable emoji
+	touch \
+		tools/main.vala \
+		ui/gtk3/panel.vala
 	if ! use libnotify; then
 		touch ui/gtk3/panel.vala
 	fi

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     6e4df795f84fc1a29621fad200fd193ba447e879
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  1 14:14:58 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Aug  1 14:23:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e4df795

app-i18n/ibus: add libnotify USE flag

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/ibus/ibus-1.5.12.ebuild | 17 +++++++++++------
 app-i18n/ibus/ibus-1.5.15.ebuild | 17 +++++++++++------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index 55ba530a056..ebad2ff67aa 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -14,8 +14,9 @@ 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="gconf +gtk +gtk2 +introspection nls +python test vala wayland +X"
-REQUIRED_USE="python? (
+IUSE="gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland +X"
+REQUIRED_USE="libnotify? ( gtk )
+	python? (
 		${PYTHON_REQUIRED_USE}
 		gtk
 		introspection
@@ -28,7 +29,6 @@ CDEPEND="app-text/iso-codes
 	gnome-base/dconf
 	gnome-base/librsvg:2
 	sys-apps/dbus[X?]
-	x11-libs/libnotify
 	gconf? ( gnome-base/gconf:2 )
 	gtk? (
 		x11-libs/gtk+:3
@@ -37,6 +37,7 @@ CDEPEND="app-text/iso-codes
 		gtk2? ( x11-libs/gtk+:2 )
 	)
 	introspection? ( dev-libs/gobject-introspection )
+	libnotify? ( x11-libs/libnotify )
 	nls? ( virtual/libintl )
 	python? (
 		${PYTHON_DEPS}
@@ -60,13 +61,16 @@ RDEPEND="${CDEPEND}
 		)
 	)"
 DEPEND="${CDEPEND}
+	$(vala_depend)
 	dev-util/intltool
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	vala? ( $(vala_depend) )"
+	nls? ( sys-devel/gettext )"
 
 src_prepare() {
-	use vala && vala_src_prepare
+	vala_src_prepare --ignore-use
+	if ! use libnotify; then
+		touch ui/gtk3/panel.vala
+	fi
 	# for multiple Python implementations
 	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
 	# fix for parallel install
@@ -105,6 +109,7 @@ src_configure() {
 		$(use_enable gtk ui) \
 		$(use_enable gtk2) \
 		$(use_enable introspection) \
+		$(use_enable libnotify) \
 		$(use_enable nls) \
 		$(use_enable test tests) \
 		$(use_enable vala) \

diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild
index afed2d1f73d..7dc6dcd6bed 100644
--- a/app-i18n/ibus/ibus-1.5.15.ebuild
+++ b/app-i18n/ibus/ibus-1.5.15.ebuild
@@ -14,8 +14,9 @@ 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="gconf +gtk +gtk2 +introspection nls +python test vala wayland +X"
-REQUIRED_USE="python? (
+IUSE="gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland +X"
+REQUIRED_USE="libnotify? ( gtk )
+	python? (
 		${PYTHON_REQUIRED_USE}
 		gtk
 		introspection
@@ -28,7 +29,6 @@ CDEPEND="app-text/iso-codes
 	gnome-base/dconf
 	gnome-base/librsvg:2
 	sys-apps/dbus[X?]
-	x11-libs/libnotify
 	gconf? ( gnome-base/gconf:2 )
 	gtk? (
 		x11-libs/gtk+:3
@@ -37,6 +37,7 @@ CDEPEND="app-text/iso-codes
 		gtk2? ( x11-libs/gtk+:2 )
 	)
 	introspection? ( dev-libs/gobject-introspection )
+	libnotify? ( x11-libs/libnotify )
 	nls? ( virtual/libintl )
 	python? (
 		${PYTHON_DEPS}
@@ -60,13 +61,16 @@ RDEPEND="${CDEPEND}
 		)
 	)"
 DEPEND="${CDEPEND}
+	$(vala_depend)
 	dev-util/intltool
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	vala? ( $(vala_depend) )"
+	nls? ( sys-devel/gettext )"
 
 src_prepare() {
-	use vala && vala_src_prepare
+	vala_src_prepare --ignore-use
+	if ! use libnotify; then
+		touch ui/gtk3/panel.vala
+	fi
 	# for multiple Python implementations
 	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
 	# fix for parallel install
@@ -101,6 +105,7 @@ src_configure() {
 		$(use_enable gtk ui) \
 		$(use_enable gtk2) \
 		$(use_enable introspection) \
+		$(use_enable libnotify) \
 		$(use_enable nls) \
 		$(use_enable test tests) \
 		$(use_enable vala) \

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     dbbd730dd7b0737f667a0488176eba9780014dfb
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  1 13:50:11 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Aug  1 14:23:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbbd730d

app-i18n/ibus: update to EAPI 6

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/ibus/ibus-1.5.12.ebuild | 155 ++++++++++++++------------------------
 app-i18n/ibus/ibus-1.5.15.ebuild | 157 ++++++++++++++-------------------------
 app-i18n/ibus/metadata.xml       |  12 +--
 3 files changed, 117 insertions(+), 207 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index 2cfa0156fa2..12aa72a0cdd 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -1,188 +1,143 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
+EAPI="6"
 PYTHON_COMPAT=( python2_7 )
 VALA_USE_DEPEND="vapigen"
-# Vapigen is needed for the vala binding
-# Valac is needed when building from git for the engine
-UPSTREAM_VER=
 
-inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo-r1 vala virtualx
+inherit autotools bash-completion-r1 gnome2-utils ltprune python-single-r1 vala virtualx
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
+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 +gtk3 +introspection nls +python test vala wayland +X"
-REQUIRED_USE="
-	|| ( gtk gtk3 X )
+RESTRICT="test"
+REQUIRED_USE="|| ( gtk gtk3 X )
 	deprecated? ( python )
 	vala? ( introspection )
 	python? (
 		${PYTHON_REQUIRED_USE}
 		|| ( deprecated ( gtk3 introspection ) ) )" #342903
 
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz
-	${UPSTRAM_PATCHSET_URI}"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
+CDEPEND="app-text/iso-codes
+	dev-libs/glib:2
+	gnome-base/dconf
 	gnome-base/librsvg:2
 	sys-apps/dbus[X?]
-	app-text/iso-codes
-	>=gnome-base/dconf-0.13.4
 	x11-libs/libnotify
-	gconf? ( >=gnome-base/gconf-2.12:2 )
+	gconf? ( gnome-base/gconf:2 )
 	gtk? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )
-	python? ( ${PYTHON_DEPS} )
+	introspection? ( dev-libs/gobject-introspection )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
 	X? (
+		|| (
+			x11-libs/gtk+:3
+			x11-libs/gtk+:2
+		)
 		x11-libs/libX11
-		x11-libs/gtk+:2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
-	nls? ( virtual/libintl )
-	wayland? ( dev-libs/wayland )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/setxkbmap
+	)"
+RDEPEND="${CDEPEND}
 	python? (
-		dev-python/pyxdg
 		deprecated? (
-			>=dev-python/dbus-python-0.83
-			dev-python/pygobject:2
-			dev-python/pygtk:2 )
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygtk:2[${PYTHON_USEDEP}]
+		)
 		gtk3? (
-			dev-python/pygobject:3
-			x11-libs/gdk-pixbuf:2[introspection]
-			x11-libs/pango[introspection]
-			x11-libs/gtk+:3[introspection] )
+			x11-libs/gtk+:3[introspection]
+		)
 	)"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5.8.1
-	dev-util/gtk-doc-am
+DEPEND="${CDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )
+	nls? ( sys-devel/gettext )
 	vala? ( $(vala_depend) )"
 
-# stress test in bus/ fails
-# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
-RESTRICT="test"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To use ibus, you should:
-1. Get input engines from sunrise overlay.
-Run \"emerge -s ibus-\" in your favorite terminal
-for a list of packages we already have.
-
-2. Setup ibus:
-$ ibus-setup
-
-3. Set the following in your user startup scripts
-such as .xinitrc, .xsession or .xprofile:
-
-export XMODIFIERS=\"@im=ibus\"
-export GTK_IM_MODULE=\"ibus\"
-export QT_IM_MODULE=\"xim\"
-ibus-daemon -d -x
-"
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
-	sed -e 's/dconf update/:/' \
-		-i data/dconf/Makefile.{am,in} || die
 	use vala && vala_src_prepare
 
+	sed -i "/^bash_completion/d" tools/Makefile.am
+
+	default
 	eautoreconf
 }
 
 src_configure() {
-	local python_conf
+	local python_conf=()
 	if use python; then
-		python_conf="PYTHON=${PYTHON}
+		python_conf+=(
 			$(use_enable deprecated python-library)
-			$(use_enable gtk3 setup)"
+			$(use_enable gtk3 setup)
+			--with-python=${EPYTHON}
+		)
 	else
-		python_conf="--disable-python-library --disable-setup"
+		python_conf+=( --disable-setup )
 	fi
+
 	econf \
-		--enable-dconf \
-		$(use_enable introspection) \
 		$(use_enable gconf) \
 		$(use_enable gtk gtk2) \
-		$(use_enable gtk xim) \
-		$(use_enable gtk3) \
 		$(use_enable gtk3 ui) \
+		$(use_enable gtk3) \
+		$(use_enable introspection) \
 		$(use_enable nls) \
 		$(use_enable test tests) \
-		$(use_enable X xim) \
 		$(use_enable vala) \
 		$(use_enable wayland) \
-		${python_conf}
+		$(use_enable X xim) \
+		"${python_conf[@]}"
 }
 
 src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die
+	virtx emake -j1 check
 }
 
 src_install() {
 	default
+	prune_libtool_files --modules
 
-	prune_libtool_files --all
+	keepdir /usr/share/ibus/engine
 
-	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
-	rm -rf "${ED}"/usr/share/bash-completion || die
-	newbashcomp "${T}"/ibus.bash ${PN}
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-ibus ibus.conf
+	newbashcomp tools/${PN}.bash ${PN}
 
-	keepdir /usr/share/ibus/{engine,icons} #289547
-
-	use deprecated && python_optimize
-	use python && use gtk3 && python_optimize
-
-	readme.gentoo_create_doc
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
 }
 
 pkg_preinst() {
 	use gconf && gnome2_gconf_savelist
-	gnome2_schemas_savelist
 	gnome2_icon_savelist
+	gnome2_schemas_savelist
 }
 
 pkg_postinst() {
 	use gconf && gnome2_gconf_install
 	use gtk && gnome2_query_immodules_gtk2
 	use gtk3 && gnome2_query_immodules_gtk3
-	gnome2_schemas_update
 	gnome2_icon_cache_update
-	readme.gentoo_print_elog
+	gnome2_schemas_update
 }
 
 pkg_postrm() {
 	use gtk && gnome2_query_immodules_gtk2
 	use gtk3 && gnome2_query_immodules_gtk3
-	use gconf && gnome2_schemas_update
 	gnome2_icon_cache_update
+	gnome2_schemas_update
 }

diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild
index 33b9e5be6dc..8900ff31aae 100644
--- a/app-i18n/ibus/ibus-1.5.15.ebuild
+++ b/app-i18n/ibus/ibus-1.5.15.ebuild
@@ -1,189 +1,144 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
+EAPI="6"
 PYTHON_COMPAT=( python2_7 )
 VALA_USE_DEPEND="vapigen"
-# Vapigen is needed for the vala binding
-# Valac is needed when building from git for the engine
-UPSTREAM_VER=
 
-inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo-r1 vala virtualx
+inherit autotools bash-completion-r1 gnome2-utils ltprune python-single-r1 vala virtualx
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
+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 +gtk3 +introspection nls +python test vala wayland +X"
-REQUIRED_USE="
-	|| ( gtk gtk3 X )
+RESTRICT="test"
+REQUIRED_USE="|| ( gtk gtk3 X )
 	deprecated? ( python )
 	vala? ( introspection )
 	python? (
 		${PYTHON_REQUIRED_USE}
 		|| ( deprecated ( gtk3 introspection ) ) )" #342903
 
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz
-	${UPSTRAM_PATCHSET_URI}"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
+CDEPEND="app-text/iso-codes
+	dev-libs/glib:2
+	gnome-base/dconf
 	gnome-base/librsvg:2
 	sys-apps/dbus[X?]
-	app-text/iso-codes
-	>=gnome-base/dconf-0.13.4
 	x11-libs/libnotify
-	gconf? ( >=gnome-base/gconf-2.12:2 )
+	gconf? ( gnome-base/gconf:2 )
 	gtk? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )
-	python? ( ${PYTHON_DEPS} )
+	introspection? ( dev-libs/gobject-introspection )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
 	X? (
+		|| (
+			x11-libs/gtk+:3
+			x11-libs/gtk+:2
+		)
 		x11-libs/libX11
-		x11-libs/gtk+:2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
-	nls? ( virtual/libintl )
-	wayland? ( dev-libs/wayland )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/setxkbmap
+	)"
+RDEPEND="${CDEPEND}
 	python? (
-		dev-python/pyxdg
 		deprecated? (
-			>=dev-python/dbus-python-0.83
-			dev-python/pygobject:2
-			dev-python/pygtk:2 )
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygtk:2[${PYTHON_USEDEP}]
+		)
 		gtk3? (
-			dev-python/pygobject:3
-			x11-libs/gdk-pixbuf:2[introspection]
-			x11-libs/pango[introspection]
-			x11-libs/gtk+:3[introspection] )
+			x11-libs/gtk+:3[introspection]
+		)
 	)"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5.8.1
-	dev-util/gtk-doc-am
+DEPEND="${CDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )
+	nls? ( sys-devel/gettext )
 	vala? ( $(vala_depend) )"
 
-# stress test in bus/ fails
-# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
-RESTRICT="test"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To use ibus, you should:
-1. Get input engines from sunrise overlay.
-Run \"emerge -s ibus-\" in your favorite terminal
-for a list of packages we already have.
-
-2. Setup ibus:
-$ ibus-setup
-
-3. Set the following in your user startup scripts
-such as .xinitrc, .xsession or .xprofile:
-
-export XMODIFIERS=\"@im=ibus\"
-export GTK_IM_MODULE=\"ibus\"
-export QT_IM_MODULE=\"xim\"
-ibus-daemon -d -x
-"
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
-	sed -e 's/dconf update/:/' \
-		-i data/dconf/Makefile.{am,in} || die
 	use vala && vala_src_prepare
 
+	sed -i "/^bash_completion/d" tools/Makefile.am
+
+	default
 	eautoreconf
 }
 
 src_configure() {
-	local python_conf
+	local python_conf=()
 	if use python; then
-		python_conf="PYTHON=${PYTHON}
+		python_conf+=(
 			$(use_enable deprecated python-library)
-			$(use_enable gtk3 setup)"
+			$(use_enable gtk3 setup)
+			--with-python=${EPYTHON}
+		)
 	else
-		python_conf="--disable-python-library --disable-setup"
+		python_conf+=( --disable-setup )
 	fi
+
 	econf \
-		--enable-dconf \
-		--disable-emoji-dict \
-		$(use_enable introspection) \
 		$(use_enable gconf) \
 		$(use_enable gtk gtk2) \
-		$(use_enable gtk xim) \
-		$(use_enable gtk3) \
 		$(use_enable gtk3 ui) \
+		$(use_enable gtk3) \
+		$(use_enable introspection) \
 		$(use_enable nls) \
 		$(use_enable test tests) \
-		$(use_enable X xim) \
 		$(use_enable vala) \
 		$(use_enable wayland) \
-		${python_conf}
+		$(use_enable X xim) \
+		--disable-emoji-dict \
+		"${python_conf[@]}"
 }
 
 src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die
+	virtx emake -j1 check
 }
 
 src_install() {
 	default
+	prune_libtool_files --modules
 
-	prune_libtool_files --all
+	keepdir /usr/share/ibus/engine
 
-	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
-	rm -rf "${ED}"/usr/share/bash-completion || die
-	newbashcomp "${T}"/ibus.bash ${PN}
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-ibus ibus.conf
-
-	keepdir /usr/share/ibus/{engine,icons} #289547
-
-	use deprecated && python_optimize
-	use python && use gtk3 && python_optimize
+	newbashcomp tools/${PN}.bash ${PN}
 
-	readme.gentoo_create_doc
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
 }
 
 pkg_preinst() {
 	use gconf && gnome2_gconf_savelist
-	gnome2_schemas_savelist
 	gnome2_icon_savelist
+	gnome2_schemas_savelist
 }
 
 pkg_postinst() {
 	use gconf && gnome2_gconf_install
 	use gtk && gnome2_query_immodules_gtk2
 	use gtk3 && gnome2_query_immodules_gtk3
-	gnome2_schemas_update
 	gnome2_icon_cache_update
-	readme.gentoo_print_elog
+	gnome2_schemas_update
 }
 
 pkg_postrm() {
 	use gtk && gnome2_query_immodules_gtk2
 	use gtk3 && gnome2_query_immodules_gtk3
-	use gconf && gnome2_schemas_update
 	gnome2_icon_cache_update
+	gnome2_schemas_update
 }

diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml
index f67071b7101..9fc8f486d7d 100644
--- a/app-i18n/ibus/metadata.xml
+++ b/app-i18n/ibus/metadata.xml
@@ -6,14 +6,14 @@
     <name>Cjk</name>
   </maintainer>
   <longdescription lang="en">
-IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It provides
-full featured and user friendly input method user interface. It also may help
-developers to develop input method easily.
-</longdescription>
+    IBus is a Intelligent Input Bus. It is a new input framework for Linux OS.
+    It provides full featured and user friendly input method user interface. It
+    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="gtk3">Enable support for gtk+3</flag>
-    <flag name="deprecated">install the deprecated ibus python library</flag>
+    <flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:ibus_project:ibus</remote-id>

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     900fe70d4c0eaa94c452c40db87138a9e3963262
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  1 13:37:43 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Aug  1 14:23:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=900fe70d

app-i18n/ibus: drop old

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/ibus/Manifest           |   2 -
 app-i18n/ibus/ibus-1.5.14.ebuild | 189 ---------------------------------------
 app-i18n/ibus/ibus-1.5.5.ebuild  | 173 -----------------------------------
 3 files changed, 364 deletions(-)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 3fe725d638f..f12243f7cc1 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,4 +1,2 @@
 DIST ibus-1.5.12.tar.gz 2190284 SHA256 e24da95995f4aca5b96359eaba709487dc5ad4c732e9b01b9bcf9fb34be2442c SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81 WHIRLPOOL 82354fc5006a0abe4cb431dda90a67dc1b775f0bac521b481eaeb7acd167ba6179cad14045c5141c57618845589094613bc489357ee8bf550f131ecfb1bf8293
-DIST ibus-1.5.14.tar.gz 2214350 SHA256 a42b40fe4642f36bf2a6f0b4649f54f4043812d6bfee4faca38117799a009d3c SHA512 2e86bc4e282265cfec6882fd132b36521bc2b64796e3d473668512d82ab8059c409ca1226d6b15d64ff4d46754cafa1585eddcc3aa89d58f9e9fdab0a825de0d WHIRLPOOL d2f7da33c73dded936ecf1c7f3edf1f5cdc70a8db70caec774246b1062d659fbb17495a1228cc7e126f99f52c068bc068d5ffb67d032dd6022c1f210eed0f230
 DIST ibus-1.5.15.tar.gz 2259352 SHA256 41f7baad6f3aac0cdfaebef674a8731ae47950f140edfbeefebaeed78c93e385 SHA512 4e588acf2ca0172b365630dcfe2d9062e7583e50a44d435ec05c8e3976c6caf54c4708733f1f7dce5ef7724254469ee5c7ab3b086f0cbea18775c894863b0c3e WHIRLPOOL ba40cfe9f398963ce6122d4beabdccaa94c6ac7a7463fe3cea3dc967b19a4702996fd132372a167a02956e1340b4278c61ea19ed781203db33a4651ddd3824b1
-DIST ibus-1.5.5.tar.gz 2063794 SHA256 02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec SHA512 8249d6ee4918b0e0fe030af736eed2260e1376b2fdaf0d819f289e0bd880a5e3874f1fb3d097fc74b9f359822ce16f4dae52a263aa28c2e2ce7bdf671cb2fea9 WHIRLPOOL 33ba90e5cdd54ecd7a03af8c5d2c1d2e8cfc88bfc53b65e5240eb4c60d6138007b754a60e8b1e79c98ce92e299d14f1a0cce445ad40b04e862adf3919401d77d

diff --git a/app-i18n/ibus/ibus-1.5.14.ebuild b/app-i18n/ibus/ibus-1.5.14.ebuild
deleted file mode 100644
index 33b9e5be6dc..00000000000
--- a/app-i18n/ibus/ibus-1.5.14.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-VALA_USE_DEPEND="vapigen"
-# Vapigen is needed for the vala binding
-# Valac is needed when building from git for the engine
-UPSTREAM_VER=
-
-inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo-r1 vala virtualx
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
-REQUIRED_USE="
-	|| ( gtk gtk3 X )
-	deprecated? ( python )
-	vala? ( introspection )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		|| ( deprecated ( gtk3 introspection ) ) )" #342903
-
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz
-	${UPSTRAM_PATCHSET_URI}"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	app-text/iso-codes
-	>=gnome-base/dconf-0.13.4
-	x11-libs/libnotify
-	gconf? ( >=gnome-base/gconf-2.12:2 )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	python? ( ${PYTHON_DEPS} )
-	X? (
-		x11-libs/libX11
-		x11-libs/gtk+:2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
-	nls? ( virtual/libintl )
-	wayland? ( dev-libs/wayland )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/setxkbmap
-	python? (
-		dev-python/pyxdg
-		deprecated? (
-			>=dev-python/dbus-python-0.83
-			dev-python/pygobject:2
-			dev-python/pygtk:2 )
-		gtk3? (
-			dev-python/pygobject:3
-			x11-libs/gdk-pixbuf:2[introspection]
-			x11-libs/pango[introspection]
-			x11-libs/gtk+:3[introspection] )
-	)"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5.8.1
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )
-	vala? ( $(vala_depend) )"
-
-# stress test in bus/ fails
-# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
-RESTRICT="test"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To use ibus, you should:
-1. Get input engines from sunrise overlay.
-Run \"emerge -s ibus-\" in your favorite terminal
-for a list of packages we already have.
-
-2. Setup ibus:
-$ ibus-setup
-
-3. Set the following in your user startup scripts
-such as .xinitrc, .xsession or .xprofile:
-
-export XMODIFIERS=\"@im=ibus\"
-export GTK_IM_MODULE=\"ibus\"
-export QT_IM_MODULE=\"xim\"
-ibus-daemon -d -x
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
-	sed -e 's/dconf update/:/' \
-		-i data/dconf/Makefile.{am,in} || die
-	use vala && vala_src_prepare
-
-	eautoreconf
-}
-
-src_configure() {
-	local python_conf
-	if use python; then
-		python_conf="PYTHON=${PYTHON}
-			$(use_enable deprecated python-library)
-			$(use_enable gtk3 setup)"
-	else
-		python_conf="--disable-python-library --disable-setup"
-	fi
-	econf \
-		--enable-dconf \
-		--disable-emoji-dict \
-		$(use_enable introspection) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk2) \
-		$(use_enable gtk xim) \
-		$(use_enable gtk3) \
-		$(use_enable gtk3 ui) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable X xim) \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		${python_conf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
-	rm -rf "${ED}"/usr/share/bash-completion || die
-	newbashcomp "${T}"/ibus.bash ${PN}
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-ibus ibus.conf
-
-	keepdir /usr/share/ibus/{engine,icons} #289547
-
-	use deprecated && python_optimize
-	use python && use gtk3 && python_optimize
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-	gnome2_schemas_savelist
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use gconf && gnome2_schemas_update
-	gnome2_icon_cache_update
-}

diff --git a/app-i18n/ibus/ibus-1.5.5.ebuild b/app-i18n/ibus/ibus-1.5.5.ebuild
deleted file mode 100644
index 8ad305083ac..00000000000
--- a/app-i18n/ibus/ibus-1.5.5.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.20"
-VALA_USE_DEPEND="vapigen"
-# Vapigen is needed for the vala binding
-# Valac is needed when building from git for the engine
-
-inherit bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://ibus.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
-REQUIRED_USE="|| ( gtk gtk3 X )
-	deprecated? ( python )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		|| ( deprecated ( gtk3 introspection ) ) )" #342903
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	app-text/iso-codes
-	>=gnome-base/dconf-0.13.4
-	x11-libs/libnotify
-
-	gconf? ( >=gnome-base/gconf-2.12:2 )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	python? ( ${PYTHON_DEPS} )
-	X? (
-		x11-libs/libX11
-		x11-libs/gtk+:2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
-	nls? ( virtual/libintl )
-	wayland? ( dev-libs/wayland )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/setxkbmap
-	python? (
-		dev-python/pyxdg
-		deprecated? (
-			>=dev-python/dbus-python-0.83
-			dev-python/pygobject:2
-			dev-python/pygtk:2 )
-		gtk3? (
-			dev-python/pygobject:3
-			x11-libs/gdk-pixbuf:2[introspection]
-			x11-libs/pango[introspection]
-			x11-libs/gtk+:3[introspection] )
-	)"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5.8.1
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )
-	vala? ( $(vala_depend) )
-	gnome-base/gconf"
-
-# stress test in bus/ fails
-# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
-RESTRICT="test"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To use ibus, you should:
-1. Get input engines from sunrise overlay.
-Run \"emerge -s ibus-\" in your favorite terminal
-for a list of packages we already have.
-
-2. Setup ibus:
-$ ibus-setup
-
-3. Set the following in your user startup scripts
-such as .xinitrc, .xsession or .xprofile:
-
-export XMODIFIERS=\"@im=ibus\"
-export GTK_IM_MODULE=\"ibus\"
-export QT_IM_MODULE=\"xim\"
-ibus-daemon -d -x
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
-	sed -e 's/dconf update/$(NULL)/' \
-		-i data/dconf/Makefile.{am,in} || die
-	use vala && vala_src_prepare
-	cp "${S}"/client/gtk2/ibusimcontext.c "${S}"/client/gtk3/ibusimcontext.c || die
-}
-
-src_configure() {
-	local python_conf
-	if use python; then
-		python_conf="PYTHON=${PYTHON}
-			$(use_enable deprecated python-library)
-			$(use_enable gtk3 setup)"
-	else
-		python_conf="--disable-python-library --disable-setup"
-	fi
-	econf \
-		--enable-dconf \
-		$(use_enable introspection) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk2) \
-		$(use_enable gtk xim) \
-		$(use_enable gtk3) \
-		$(use_enable gtk3 ui) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable X xim) \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		${python_conf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
-	rm -rf "${ED}"/usr/share/bash-completion || die
-	newbashcomp "${T}"/ibus.bash ${PN}
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-ibus ibus.conf
-
-	keepdir /usr/share/ibus/{engine,icons} #289547
-
-	use deprecated && python_optimize
-	use python && use gtk3 && python_optimize
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-	gnome2_schemas_savelist
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use gconf && gnome2_schemas_update
-	gnome2_icon_cache_update
-}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     3014eca313c18ef4ccb91bcf2824d9a7f4bdb795
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  1 13:53:46 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Aug  1 14:23:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3014eca3

app-i18n/ibus: fix for parallel install

Gentoo-Bug: 521172

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/ibus/ibus-1.5.12.ebuild | 5 +++++
 app-i18n/ibus/ibus-1.5.15.ebuild | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index 12aa72a0cdd..fe21830f185 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -71,6 +71,11 @@ pkg_setup() {
 
 src_prepare() {
 	use vala && vala_src_prepare
+	# fix for parallel install
+	sed -i \
+		-e "/^py2_compile/,/^$/d" \
+		-e "/^install-data-hook/,/^$/d" \
+		bindings/pygobject/Makefile.am
 
 	sed -i "/^bash_completion/d" tools/Makefile.am
 

diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild
index 8900ff31aae..f589e9b2d84 100644
--- a/app-i18n/ibus/ibus-1.5.15.ebuild
+++ b/app-i18n/ibus/ibus-1.5.15.ebuild
@@ -71,6 +71,11 @@ pkg_setup() {
 
 src_prepare() {
 	use vala && vala_src_prepare
+	# fix for parallel install
+	sed -i \
+		-e "/^py2_compile/,/^$/d" \
+		-e "/^install-data-hook/,/^$/d" \
+		bindings/pygobject/Makefile.am
 
 	sed -i "/^bash_completion/d" tools/Makefile.am
 

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     642f19aeb12bae067896af2116c79f0327ad037a
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  1 13:56:26 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Aug  1 14:23:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=642f19ae

app-i18n/ibus: fix REQUIRED_USE

Gentoo-Bug: 622404

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/ibus/ibus-1.5.12.ebuild | 9 +++++----
 app-i18n/ibus/ibus-1.5.15.ebuild | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index fe21830f185..da93deeb071 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -16,12 +16,13 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 RESTRICT="test"
-REQUIRED_USE="|| ( gtk gtk3 X )
-	deprecated? ( python )
-	vala? ( introspection )
+REQUIRED_USE="deprecated? ( python )
 	python? (
 		${PYTHON_REQUIRED_USE}
-		|| ( deprecated ( gtk3 introspection ) ) )" #342903
+		|| ( deprecated gtk3 )
+		gtk3? ( introspection )
+	)
+	vala? ( introspection )"
 
 CDEPEND="app-text/iso-codes
 	dev-libs/glib:2

diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild
index f589e9b2d84..bbacf8f471e 100644
--- a/app-i18n/ibus/ibus-1.5.15.ebuild
+++ b/app-i18n/ibus/ibus-1.5.15.ebuild
@@ -16,12 +16,13 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 RESTRICT="test"
-REQUIRED_USE="|| ( gtk gtk3 X )
-	deprecated? ( python )
-	vala? ( introspection )
+REQUIRED_USE="deprecated? ( python )
 	python? (
 		${PYTHON_REQUIRED_USE}
-		|| ( deprecated ( gtk3 introspection ) ) )" #342903
+		|| ( deprecated gtk3 )
+		gtk3? ( introspection )
+	)
+	vala? ( introspection )"
 
 CDEPEND="app-text/iso-codes
 	dev-libs/glib:2

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     fab5df2eef030ab7d815a82592a727fc78390710
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  1 14:04:34 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=fab5df2e

app-i18n/ibus: switch to gtk2 USE flag

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/ibus/ibus-1.5.12.ebuild | 34 +++++++++++++++++++---------------
 app-i18n/ibus/ibus-1.5.15.ebuild | 34 +++++++++++++++++++---------------
 app-i18n/ibus/metadata.xml       |  2 +-
 3 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index c6fc3724541..4ec5bbf3ac6 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -14,14 +14,14 @@ 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 +gtk3 +introspection nls +python test vala wayland +X"
+IUSE="deprecated gconf +gtk +gtk2 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="deprecated? ( python )
 	python? (
 		${PYTHON_REQUIRED_USE}
-		|| ( deprecated gtk3 )
-		gtk3? ( introspection )
+		|| ( deprecated gtk )
+		gtk? ( introspection )
 	)
-	test? ( || ( gtk gtk3 ) )
+	test? ( gtk )
 	vala? ( introspection )"
 
 CDEPEND="app-text/iso-codes
@@ -31,8 +31,12 @@ CDEPEND="app-text/iso-codes
 	sys-apps/dbus[X?]
 	x11-libs/libnotify
 	gconf? ( gnome-base/gconf:2 )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXi
+		gtk2? ( x11-libs/gtk+:2 )
+	)
 	introspection? ( dev-libs/gobject-introspection )
 	nls? ( virtual/libintl )
 	python? (
@@ -56,7 +60,7 @@ RDEPEND="${CDEPEND}
 			dev-python/dbus-python[${PYTHON_USEDEP}]
 			dev-python/pygtk:2[${PYTHON_USEDEP}]
 		)
-		gtk3? (
+		gtk? (
 			x11-libs/gtk+:3[introspection]
 		)
 	)"
@@ -95,7 +99,7 @@ src_configure() {
 	if use python; then
 		python_conf+=(
 			$(use_enable deprecated python-library)
-			$(use_enable gtk3 setup)
+			$(use_enable gtk setup)
 			--with-python=${EPYTHON}
 		)
 	else
@@ -104,9 +108,9 @@ src_configure() {
 
 	econf \
 		$(use_enable gconf) \
-		$(use_enable gtk gtk2) \
-		$(use_enable gtk3 ui) \
-		$(use_enable gtk3) \
+		$(use_enable gtk gtk3) \
+		$(use_enable gtk ui) \
+		$(use_enable gtk2) \
 		$(use_enable introspection) \
 		$(use_enable nls) \
 		$(use_enable test tests) \
@@ -141,15 +145,15 @@ pkg_preinst() {
 
 pkg_postinst() {
 	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
 	gnome2_icon_cache_update
 	gnome2_schemas_update
 }
 
 pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
 	gnome2_icon_cache_update
 	gnome2_schemas_update
 }

diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild
index 4cf925979ad..4537bd35350 100644
--- a/app-i18n/ibus/ibus-1.5.15.ebuild
+++ b/app-i18n/ibus/ibus-1.5.15.ebuild
@@ -14,14 +14,14 @@ 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 +gtk3 +introspection nls +python test vala wayland +X"
+IUSE="deprecated gconf +gtk +gtk2 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="deprecated? ( python )
 	python? (
 		${PYTHON_REQUIRED_USE}
-		|| ( deprecated gtk3 )
-		gtk3? ( introspection )
+		|| ( deprecated gtk )
+		gtk? ( introspection )
 	)
-	test? ( || ( gtk gtk3 ) )
+	test? ( gtk )
 	vala? ( introspection )"
 
 CDEPEND="app-text/iso-codes
@@ -31,8 +31,12 @@ CDEPEND="app-text/iso-codes
 	sys-apps/dbus[X?]
 	x11-libs/libnotify
 	gconf? ( gnome-base/gconf:2 )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXi
+		gtk2? ( x11-libs/gtk+:2 )
+	)
 	introspection? ( dev-libs/gobject-introspection )
 	nls? ( virtual/libintl )
 	python? (
@@ -56,7 +60,7 @@ RDEPEND="${CDEPEND}
 			dev-python/dbus-python[${PYTHON_USEDEP}]
 			dev-python/pygtk:2[${PYTHON_USEDEP}]
 		)
-		gtk3? (
+		gtk? (
 			x11-libs/gtk+:3[introspection]
 		)
 	)"
@@ -91,7 +95,7 @@ src_configure() {
 	if use python; then
 		python_conf+=(
 			$(use_enable deprecated python-library)
-			$(use_enable gtk3 setup)
+			$(use_enable gtk setup)
 			--with-python=${EPYTHON}
 		)
 	else
@@ -100,9 +104,9 @@ src_configure() {
 
 	econf \
 		$(use_enable gconf) \
-		$(use_enable gtk gtk2) \
-		$(use_enable gtk3 ui) \
-		$(use_enable gtk3) \
+		$(use_enable gtk gtk3) \
+		$(use_enable gtk ui) \
+		$(use_enable gtk2) \
 		$(use_enable introspection) \
 		$(use_enable nls) \
 		$(use_enable test tests) \
@@ -138,15 +142,15 @@ pkg_preinst() {
 
 pkg_postinst() {
 	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
 	gnome2_icon_cache_update
 	gnome2_schemas_update
 }
 
 pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
 	gnome2_icon_cache_update
 	gnome2_schemas_update
 }

diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml
index 9fc8f486d7d..889bd876ab3 100644
--- a/app-i18n/ibus/metadata.xml
+++ b/app-i18n/ibus/metadata.xml
@@ -13,7 +13,7 @@
   <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="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
+    <flag name="gtk2">Enable support for <pkg>x11-libs/gtk+</pkg>:2</flag>
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:ibus_project:ibus</remote-id>

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Akinori Hattori]

commit:     c2d591c2f9d5cfb3a4a84c90aeaaa733f2579c45
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  1 14:00:06 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Aug  1 14:23:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2d591c2

app-i18n/ibus: fix src_test

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/ibus/ibus-1.5.12.ebuild | 8 +++++++-
 app-i18n/ibus/ibus-1.5.15.ebuild | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index da93deeb071..c6fc3724541 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -15,13 +15,13 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
-RESTRICT="test"
 REQUIRED_USE="deprecated? ( python )
 	python? (
 		${PYTHON_REQUIRED_USE}
 		|| ( deprecated gtk3 )
 		gtk3? ( introspection )
 	)
+	test? ( || ( gtk gtk3 ) )
 	vala? ( introspection )"
 
 CDEPEND="app-text/iso-codes
@@ -77,6 +77,12 @@ src_prepare() {
 		-e "/^py2_compile/,/^$/d" \
 		-e "/^install-data-hook/,/^$/d" \
 		bindings/pygobject/Makefile.am
+	# require user interaction
+	sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
+	# fixed in 1.5.14+
+	sed -i "/def test_keymap/a\        self.skipTest('')" bindings/pygobject/test-override-ibus.py
+	sed -i "/[[:space:]]test-stress[[:space:]]/d" bus/Makefile.am
+	sed -i "/^TESTS += ibus-engine-switch/d" src/tests/Makefile.am
 
 	sed -i "/^bash_completion/d" tools/Makefile.am
 

diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild
index bbacf8f471e..4cf925979ad 100644
--- a/app-i18n/ibus/ibus-1.5.15.ebuild
+++ b/app-i18n/ibus/ibus-1.5.15.ebuild
@@ -15,13 +15,13 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
-RESTRICT="test"
 REQUIRED_USE="deprecated? ( python )
 	python? (
 		${PYTHON_REQUIRED_USE}
 		|| ( deprecated gtk3 )
 		gtk3? ( introspection )
 	)
+	test? ( || ( gtk gtk3 ) )
 	vala? ( introspection )"
 
 CDEPEND="app-text/iso-codes
@@ -77,6 +77,8 @@ src_prepare() {
 		-e "/^py2_compile/,/^$/d" \
 		-e "/^install-data-hook/,/^$/d" \
 		bindings/pygobject/Makefile.am
+	# require user interaction
+	sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
 
 	sed -i "/^bash_completion/d" tools/Makefile.am
 

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Alexis Ballier]

commit:     202a38041967baf851e48ad27d662cdc97df8acd
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 15:22:29 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 12:26:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=202a3804

app-i18n/ibus: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 app-i18n/ibus/ibus-1.5.14.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.14.ebuild b/app-i18n/ibus/ibus-1.5.14.ebuild
index dde79edbfa1..33b9e5be6dc 100644
--- a/app-i18n/ibus/ibus-1.5.14.ebuild
+++ b/app-i18n/ibus/ibus-1.5.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/ibus/ibus/wiki"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="
 	|| ( gtk gtk3 X )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Alexis Ballier]

commit:     92522dd481bf5697a781467a35a94a58c90d8db4
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 10:14:47 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 10:14:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92522dd4

app-i18n/ibus: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-i18n/ibus/ibus-1.5.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild
index 35d71d4d9a7..33b9e5be6dc 100644
--- a/app-i18n/ibus/ibus-1.5.15.ebuild
+++ b/app-i18n/ibus/ibus-1.5.15.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/ibus/ibus/wiki"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="
 	|| ( gtk gtk3 X )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     e7e810cb4b83b97040c7292aacbc576749bba81a
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 12:08:47 2017 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 12:11:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7e810cb

app-i18n/ibus: version bump, 1.5.15

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 app-i18n/ibus/Manifest           |   1 +
 app-i18n/ibus/ibus-1.5.15.ebuild | 189 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 190 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index f3afd72bb80..228c9d87414 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -3,6 +3,7 @@ DIST ibus-1.5.11.tar.gz 2177026 SHA256 49995a298a39a137e65c6ee77811b030850ff344b
 DIST ibus-1.5.12.tar.gz 2190284 SHA256 e24da95995f4aca5b96359eaba709487dc5ad4c732e9b01b9bcf9fb34be2442c SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81 WHIRLPOOL 82354fc5006a0abe4cb431dda90a67dc1b775f0bac521b481eaeb7acd167ba6179cad14045c5141c57618845589094613bc489357ee8bf550f131ecfb1bf8293
 DIST ibus-1.5.13.tar.gz 2194054 SHA256 ed73d80542dfdcca190b7958431048cd6830c2ce25c467384630b6a7e957a5f1 SHA512 bffb3cecf984ec6e383a111b4e62506390f083476f59404e2e9b90251e6e06853d7f1dc06194456ab5064b5d375820510be1ab12ebd29b966d6a7f5b8aca07ab WHIRLPOOL bf28cc0f20942e7e253b2ae49d3112acad313c15bbaf5697f8319c13c90fa17c569b5bdd2bf8d83895361ec99f06a05317ef752d4e5fa0e1de06267e1347c463
 DIST ibus-1.5.14.tar.gz 2214350 SHA256 a42b40fe4642f36bf2a6f0b4649f54f4043812d6bfee4faca38117799a009d3c SHA512 2e86bc4e282265cfec6882fd132b36521bc2b64796e3d473668512d82ab8059c409ca1226d6b15d64ff4d46754cafa1585eddcc3aa89d58f9e9fdab0a825de0d WHIRLPOOL d2f7da33c73dded936ecf1c7f3edf1f5cdc70a8db70caec774246b1062d659fbb17495a1228cc7e126f99f52c068bc068d5ffb67d032dd6022c1f210eed0f230
+DIST ibus-1.5.15.tar.gz 2259352 SHA256 41f7baad6f3aac0cdfaebef674a8731ae47950f140edfbeefebaeed78c93e385 SHA512 4e588acf2ca0172b365630dcfe2d9062e7583e50a44d435ec05c8e3976c6caf54c4708733f1f7dce5ef7724254469ee5c7ab3b086f0cbea18775c894863b0c3e WHIRLPOOL ba40cfe9f398963ce6122d4beabdccaa94c6ac7a7463fe3cea3dc967b19a4702996fd132372a167a02956e1340b4278c61ea19ed781203db33a4651ddd3824b1
 DIST ibus-1.5.5.tar.gz 2063794 SHA256 02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec SHA512 8249d6ee4918b0e0fe030af736eed2260e1376b2fdaf0d819f289e0bd880a5e3874f1fb3d097fc74b9f359822ce16f4dae52a263aa28c2e2ce7bdf671cb2fea9 WHIRLPOOL 33ba90e5cdd54ecd7a03af8c5d2c1d2e8cfc88bfc53b65e5240eb4c60d6138007b754a60e8b1e79c98ce92e299d14f1a0cce445ad40b04e862adf3919401d77d
 DIST ibus-1.5.8.tar.gz 2120220 SHA256 cfc562ae73de753dc8cb9ae30fe117286ddd94cd109002108f2eeb47e8101a29 SHA512 428e40be7ebea57832295e76b5c4350351c6d40c5178c57c61c8d6f31e524a315184c3d533ad88592e53ae7c6cb4beed67796ad61910f99f260fc9c243b2fc98 WHIRLPOOL 2fc0059a75b3f4b253770303a8c9c8ae02947153eaf7b9c220e2e10657275293a556b068ba4cad0d27f315b7374ffaedb53b20cd13f8408a3729cfaaea869d78
 DIST ibus-1.5.9-upstream-patches-0.tar.xz 30380 SHA256 9efe631008cfad1d59db01a83ae093149b2c827d480705836f0bf8a29706f1e0 SHA512 98c323de9793938d8c0bd646071d0ea7860212e3ae826e97ed0e0a092ec715084529b3a3cee3def63958dd3d56357b2e33e4e3d3946cca90bec3409469cf14d4 WHIRLPOOL 0aaf7aaba36de96525f0339a16df2c435e2f2c5cc6168c9b2da25bd7003af88f6d55ca53ae692c9c611b563ddfcb48a0e19e915f8361ba51a4aac813edc45f41

diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild
new file mode 100644
index 00000000000..35d71d4d9a7
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.15.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+VALA_USE_DEPEND="vapigen"
+# Vapigen is needed for the vala binding
+# Valac is needed when building from git for the engine
+UPSTREAM_VER=
+
+inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo-r1 vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
+REQUIRED_USE="
+	|| ( gtk gtk3 X )
+	deprecated? ( python )
+	vala? ( introspection )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		|| ( deprecated ( gtk3 introspection ) ) )" #342903
+
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz
+	${UPSTRAM_PATCHSET_URI}"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	app-text/iso-codes
+	>=gnome-base/dconf-0.13.4
+	x11-libs/libnotify
+	gconf? ( >=gnome-base/gconf-2.12:2 )
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	python? ( ${PYTHON_DEPS} )
+	X? (
+		x11-libs/libX11
+		x11-libs/gtk+:2 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+	nls? ( virtual/libintl )
+	wayland? ( dev-libs/wayland )"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/setxkbmap
+	python? (
+		dev-python/pyxdg
+		deprecated? (
+			>=dev-python/dbus-python-0.83
+			dev-python/pygobject:2
+			dev-python/pygtk:2 )
+		gtk3? (
+			dev-python/pygobject:3
+			x11-libs/gdk-pixbuf:2[introspection]
+			x11-libs/pango[introspection]
+			x11-libs/gtk+:3[introspection] )
+	)"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5.8.1
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.16.1 )
+	vala? ( $(vala_depend) )"
+
+# stress test in bus/ fails
+# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
+RESTRICT="test"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To use ibus, you should:
+1. Get input engines from sunrise overlay.
+Run \"emerge -s ibus-\" in your favorite terminal
+for a list of packages we already have.
+
+2. Setup ibus:
+$ ibus-setup
+
+3. Set the following in your user startup scripts
+such as .xinitrc, .xsession or .xprofile:
+
+export XMODIFIERS=\"@im=ibus\"
+export GTK_IM_MODULE=\"ibus\"
+export QT_IM_MODULE=\"xim\"
+ibus-daemon -d -x
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
+	sed -e 's/dconf update/:/' \
+		-i data/dconf/Makefile.{am,in} || die
+	use vala && vala_src_prepare
+
+	eautoreconf
+}
+
+src_configure() {
+	local python_conf
+	if use python; then
+		python_conf="PYTHON=${PYTHON}
+			$(use_enable deprecated python-library)
+			$(use_enable gtk3 setup)"
+	else
+		python_conf="--disable-python-library --disable-setup"
+	fi
+	econf \
+		--enable-dconf \
+		--disable-emoji-dict \
+		$(use_enable introspection) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk2) \
+		$(use_enable gtk xim) \
+		$(use_enable gtk3) \
+		$(use_enable gtk3 ui) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable X xim) \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		${python_conf}
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+
+	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
+	rm -rf "${ED}"/usr/share/bash-completion || die
+	newbashcomp "${T}"/ibus.bash ${PN}
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-ibus ibus.conf
+
+	keepdir /usr/share/ibus/{engine,icons} #289547
+
+	use deprecated && python_optimize
+	use python && use gtk3 && python_optimize
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_schemas_savelist
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	use gconf && gnome2_schemas_update
+	gnome2_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     fc2312eb82aa6d3eefae83e14e2bedde5f6a3322
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 12:10:48 2017 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 12:11:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc2312eb

app-i18n/ibus: drop old

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 app-i18n/ibus/Manifest             |   6 --
 app-i18n/ibus/ibus-1.5.10.ebuild   | 189 -------------------------------------
 app-i18n/ibus/ibus-1.5.11.ebuild   | 189 -------------------------------------
 app-i18n/ibus/ibus-1.5.13.ebuild   | 188 ------------------------------------
 app-i18n/ibus/ibus-1.5.8-r1.ebuild | 173 ---------------------------------
 app-i18n/ibus/ibus-1.5.9-r1.ebuild | 189 -------------------------------------
 6 files changed, 934 deletions(-)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 228c9d87414..3fe725d638f 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,10 +1,4 @@
-DIST ibus-1.5.10.tar.gz 2169299 SHA256 1d01b7806602875a1f3004f32e1000a39be01f59731d6baf36446498e26f5594 SHA512 2f7f07c20cac5f934f24c3bc99b29efe30aa5ced501ac442a9da16454cb889d946fa262b3495c1778f200c8f62a1fd8d67f47f43ae6ee214d3d392feb6e413c9 WHIRLPOOL 575d5bba84ed8afb608030260b5fbbd47bdfc4ff1368590e0c34b2fed1cf2878e71bdb7b6da286d0b0d5a27f7fcc9e2a02675a86bbc9417c1d060246b7a6acbd
-DIST ibus-1.5.11.tar.gz 2177026 SHA256 49995a298a39a137e65c6ee77811b030850ff344b875f29d4ed088f623a546bc SHA512 7745a06a4dc9502a957bdfa7faba3e6ff857ee102f34acfbc5d1c8ca5935eaf5660ebe6d837ee7bae584818c08a1769cf8a9daa012f87d43a1f10917c04615c2 WHIRLPOOL ae724b6609323e22f6fdff767484ec1259a6e3e4465b1a539cdfaa9178920d23d062d4eb6627fd3b45416d7fa9170a5bf467d6cddd4b1e80ae568a31e851be24
 DIST ibus-1.5.12.tar.gz 2190284 SHA256 e24da95995f4aca5b96359eaba709487dc5ad4c732e9b01b9bcf9fb34be2442c SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81 WHIRLPOOL 82354fc5006a0abe4cb431dda90a67dc1b775f0bac521b481eaeb7acd167ba6179cad14045c5141c57618845589094613bc489357ee8bf550f131ecfb1bf8293
-DIST ibus-1.5.13.tar.gz 2194054 SHA256 ed73d80542dfdcca190b7958431048cd6830c2ce25c467384630b6a7e957a5f1 SHA512 bffb3cecf984ec6e383a111b4e62506390f083476f59404e2e9b90251e6e06853d7f1dc06194456ab5064b5d375820510be1ab12ebd29b966d6a7f5b8aca07ab WHIRLPOOL bf28cc0f20942e7e253b2ae49d3112acad313c15bbaf5697f8319c13c90fa17c569b5bdd2bf8d83895361ec99f06a05317ef752d4e5fa0e1de06267e1347c463
 DIST ibus-1.5.14.tar.gz 2214350 SHA256 a42b40fe4642f36bf2a6f0b4649f54f4043812d6bfee4faca38117799a009d3c SHA512 2e86bc4e282265cfec6882fd132b36521bc2b64796e3d473668512d82ab8059c409ca1226d6b15d64ff4d46754cafa1585eddcc3aa89d58f9e9fdab0a825de0d WHIRLPOOL d2f7da33c73dded936ecf1c7f3edf1f5cdc70a8db70caec774246b1062d659fbb17495a1228cc7e126f99f52c068bc068d5ffb67d032dd6022c1f210eed0f230
 DIST ibus-1.5.15.tar.gz 2259352 SHA256 41f7baad6f3aac0cdfaebef674a8731ae47950f140edfbeefebaeed78c93e385 SHA512 4e588acf2ca0172b365630dcfe2d9062e7583e50a44d435ec05c8e3976c6caf54c4708733f1f7dce5ef7724254469ee5c7ab3b086f0cbea18775c894863b0c3e WHIRLPOOL ba40cfe9f398963ce6122d4beabdccaa94c6ac7a7463fe3cea3dc967b19a4702996fd132372a167a02956e1340b4278c61ea19ed781203db33a4651ddd3824b1
 DIST ibus-1.5.5.tar.gz 2063794 SHA256 02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec SHA512 8249d6ee4918b0e0fe030af736eed2260e1376b2fdaf0d819f289e0bd880a5e3874f1fb3d097fc74b9f359822ce16f4dae52a263aa28c2e2ce7bdf671cb2fea9 WHIRLPOOL 33ba90e5cdd54ecd7a03af8c5d2c1d2e8cfc88bfc53b65e5240eb4c60d6138007b754a60e8b1e79c98ce92e299d14f1a0cce445ad40b04e862adf3919401d77d
-DIST ibus-1.5.8.tar.gz 2120220 SHA256 cfc562ae73de753dc8cb9ae30fe117286ddd94cd109002108f2eeb47e8101a29 SHA512 428e40be7ebea57832295e76b5c4350351c6d40c5178c57c61c8d6f31e524a315184c3d533ad88592e53ae7c6cb4beed67796ad61910f99f260fc9c243b2fc98 WHIRLPOOL 2fc0059a75b3f4b253770303a8c9c8ae02947153eaf7b9c220e2e10657275293a556b068ba4cad0d27f315b7374ffaedb53b20cd13f8408a3729cfaaea869d78
-DIST ibus-1.5.9-upstream-patches-0.tar.xz 30380 SHA256 9efe631008cfad1d59db01a83ae093149b2c827d480705836f0bf8a29706f1e0 SHA512 98c323de9793938d8c0bd646071d0ea7860212e3ae826e97ed0e0a092ec715084529b3a3cee3def63958dd3d56357b2e33e4e3d3946cca90bec3409469cf14d4 WHIRLPOOL 0aaf7aaba36de96525f0339a16df2c435e2f2c5cc6168c9b2da25bd7003af88f6d55ca53ae692c9c611b563ddfcb48a0e19e915f8361ba51a4aac813edc45f41
-DIST ibus-1.5.9.tar.gz 2128459 SHA256 ad41014aa3cb961854ee0aa392a5abd7452fab2c6b77d8ff2d736b7405b48ac6 SHA512 8a21303abceb38f1e5903342590c229a243db1497503fa08d547e1029bc25b90a2031f0386e57ddfcb897a14819d202289fcac1e3c8bad059698b04501a7ede9 WHIRLPOOL 88135818669cb3c189ce02a7caba3ec262bd95ffa6d139e8f76113ca91fc778f5f7703cfbfb1f5d5dd3cbb6948ba14d9c326f318b0286381caec45db3b453221

diff --git a/app-i18n/ibus/ibus-1.5.10.ebuild b/app-i18n/ibus/ibus-1.5.10.ebuild
deleted file mode 100644
index d51a6d44031..00000000000
--- a/app-i18n/ibus/ibus-1.5.10.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.20"
-VALA_USE_DEPEND="vapigen"
-# Vapigen is needed for the vala binding
-# Valac is needed when building from git for the engine
-UPSTREAM_VER=
-
-inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
-REQUIRED_USE="
-	|| ( gtk gtk3 X )
-	deprecated? ( python )
-	vala? ( introspection )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		|| ( deprecated ( gtk3 introspection ) ) )" #342903
-
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTRAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz
-	${UPSTRAM_PATCHSET_URI}"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	app-text/iso-codes
-	>=gnome-base/dconf-0.13.4
-	x11-libs/libnotify
-	gconf? ( >=gnome-base/gconf-2.12:2 )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	python? ( ${PYTHON_DEPS} )
-	X? (
-		x11-libs/libX11
-		x11-libs/gtk+:2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
-	nls? ( virtual/libintl )
-	wayland? ( dev-libs/wayland )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/setxkbmap
-	python? (
-		dev-python/pyxdg
-		deprecated? (
-			>=dev-python/dbus-python-0.83
-			dev-python/pygobject:2
-			dev-python/pygtk:2 )
-		gtk3? (
-			dev-python/pygobject:3
-			x11-libs/gdk-pixbuf:2[introspection]
-			x11-libs/pango[introspection]
-			x11-libs/gtk+:3[introspection] )
-	)"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5.8.1
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )
-	vala? ( $(vala_depend) )"
-
-# stress test in bus/ fails
-# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
-RESTRICT="test"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To use ibus, you should:
-1. Get input engines from sunrise overlay.
-Run \"emerge -s ibus-\" in your favorite terminal
-for a list of packages we already have.
-
-2. Setup ibus:
-$ ibus-setup
-
-3. Set the following in your user startup scripts
-such as .xinitrc, .xsession or .xprofile:
-
-export XMODIFIERS=\"@im=ibus\"
-export GTK_IM_MODULE=\"ibus\"
-export QT_IM_MODULE=\"xim\"
-ibus-daemon -d -x
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
-	sed -e 's/dconf update/:/' \
-		-i data/dconf/Makefile.{am,in} || die
-	use vala && vala_src_prepare
-
-	eautoreconf
-}
-
-src_configure() {
-	local python_conf
-	if use python; then
-		python_conf="PYTHON=${PYTHON}
-			$(use_enable deprecated python-library)
-			$(use_enable gtk3 setup)"
-	else
-		python_conf="--disable-python-library --disable-setup"
-	fi
-	econf \
-		--enable-dconf \
-		$(use_enable introspection) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk2) \
-		$(use_enable gtk xim) \
-		$(use_enable gtk3) \
-		$(use_enable gtk3 ui) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable X xim) \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		${python_conf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
-	rm -rf "${ED}"/usr/share/bash-completion || die
-	newbashcomp "${T}"/ibus.bash ${PN}
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-ibus ibus.conf
-
-	keepdir /usr/share/ibus/{engine,icons} #289547
-
-	use deprecated && python_optimize
-	use python && use gtk3 && python_optimize
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-	gnome2_schemas_savelist
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use gconf && gnome2_schemas_update
-	gnome2_icon_cache_update
-}

diff --git a/app-i18n/ibus/ibus-1.5.11.ebuild b/app-i18n/ibus/ibus-1.5.11.ebuild
deleted file mode 100644
index a1cea6b4d9f..00000000000
--- a/app-i18n/ibus/ibus-1.5.11.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.20"
-VALA_USE_DEPEND="vapigen"
-# Vapigen is needed for the vala binding
-# Valac is needed when building from git for the engine
-UPSTREAM_VER=
-
-inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
-REQUIRED_USE="
-	|| ( gtk gtk3 X )
-	deprecated? ( python )
-	vala? ( introspection )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		|| ( deprecated ( gtk3 introspection ) ) )" #342903
-
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz
-	${UPSTRAM_PATCHSET_URI}"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	app-text/iso-codes
-	>=gnome-base/dconf-0.13.4
-	x11-libs/libnotify
-	gconf? ( >=gnome-base/gconf-2.12:2 )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	python? ( ${PYTHON_DEPS} )
-	X? (
-		x11-libs/libX11
-		x11-libs/gtk+:2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
-	nls? ( virtual/libintl )
-	wayland? ( dev-libs/wayland )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/setxkbmap
-	python? (
-		dev-python/pyxdg
-		deprecated? (
-			>=dev-python/dbus-python-0.83
-			dev-python/pygobject:2
-			dev-python/pygtk:2 )
-		gtk3? (
-			dev-python/pygobject:3
-			x11-libs/gdk-pixbuf:2[introspection]
-			x11-libs/pango[introspection]
-			x11-libs/gtk+:3[introspection] )
-	)"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5.8.1
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )
-	vala? ( $(vala_depend) )"
-
-# stress test in bus/ fails
-# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
-RESTRICT="test"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To use ibus, you should:
-1. Get input engines from sunrise overlay.
-Run \"emerge -s ibus-\" in your favorite terminal
-for a list of packages we already have.
-
-2. Setup ibus:
-$ ibus-setup
-
-3. Set the following in your user startup scripts
-such as .xinitrc, .xsession or .xprofile:
-
-export XMODIFIERS=\"@im=ibus\"
-export GTK_IM_MODULE=\"ibus\"
-export QT_IM_MODULE=\"xim\"
-ibus-daemon -d -x
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
-	sed -e 's/dconf update/:/' \
-		-i data/dconf/Makefile.{am,in} || die
-	use vala && vala_src_prepare
-
-	eautoreconf
-}
-
-src_configure() {
-	local python_conf
-	if use python; then
-		python_conf="PYTHON=${PYTHON}
-			$(use_enable deprecated python-library)
-			$(use_enable gtk3 setup)"
-	else
-		python_conf="--disable-python-library --disable-setup"
-	fi
-	econf \
-		--enable-dconf \
-		$(use_enable introspection) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk2) \
-		$(use_enable gtk xim) \
-		$(use_enable gtk3) \
-		$(use_enable gtk3 ui) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable X xim) \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		${python_conf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
-	rm -rf "${ED}"/usr/share/bash-completion || die
-	newbashcomp "${T}"/ibus.bash ${PN}
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-ibus ibus.conf
-
-	keepdir /usr/share/ibus/{engine,icons} #289547
-
-	use deprecated && python_optimize
-	use python && use gtk3 && python_optimize
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-	gnome2_schemas_savelist
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use gconf && gnome2_schemas_update
-	gnome2_icon_cache_update
-}

diff --git a/app-i18n/ibus/ibus-1.5.13.ebuild b/app-i18n/ibus/ibus-1.5.13.ebuild
deleted file mode 100644
index 0310a653b44..00000000000
--- a/app-i18n/ibus/ibus-1.5.13.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-VALA_USE_DEPEND="vapigen"
-# Vapigen is needed for the vala binding
-# Valac is needed when building from git for the engine
-UPSTREAM_VER=
-
-inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo-r1 vala virtualx
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
-REQUIRED_USE="
-	|| ( gtk gtk3 X )
-	deprecated? ( python )
-	vala? ( introspection )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		|| ( deprecated ( gtk3 introspection ) ) )" #342903
-
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz
-	${UPSTRAM_PATCHSET_URI}"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	app-text/iso-codes
-	>=gnome-base/dconf-0.13.4
-	x11-libs/libnotify
-	gconf? ( >=gnome-base/gconf-2.12:2 )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	python? ( ${PYTHON_DEPS} )
-	X? (
-		x11-libs/libX11
-		x11-libs/gtk+:2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
-	nls? ( virtual/libintl )
-	wayland? ( dev-libs/wayland )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/setxkbmap
-	python? (
-		dev-python/pyxdg
-		deprecated? (
-			>=dev-python/dbus-python-0.83
-			dev-python/pygobject:2
-			dev-python/pygtk:2 )
-		gtk3? (
-			dev-python/pygobject:3
-			x11-libs/gdk-pixbuf:2[introspection]
-			x11-libs/pango[introspection]
-			x11-libs/gtk+:3[introspection] )
-	)"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5.8.1
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )
-	vala? ( $(vala_depend) )"
-
-# stress test in bus/ fails
-# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
-RESTRICT="test"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To use ibus, you should:
-1. Get input engines from sunrise overlay.
-Run \"emerge -s ibus-\" in your favorite terminal
-for a list of packages we already have.
-
-2. Setup ibus:
-$ ibus-setup
-
-3. Set the following in your user startup scripts
-such as .xinitrc, .xsession or .xprofile:
-
-export XMODIFIERS=\"@im=ibus\"
-export GTK_IM_MODULE=\"ibus\"
-export QT_IM_MODULE=\"xim\"
-ibus-daemon -d -x
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
-	sed -e 's/dconf update/:/' \
-		-i data/dconf/Makefile.{am,in} || die
-	use vala && vala_src_prepare
-
-	eautoreconf
-}
-
-src_configure() {
-	local python_conf
-	if use python; then
-		python_conf="PYTHON=${PYTHON}
-			$(use_enable deprecated python-library)
-			$(use_enable gtk3 setup)"
-	else
-		python_conf="--disable-python-library --disable-setup"
-	fi
-	econf \
-		--enable-dconf \
-		$(use_enable introspection) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk2) \
-		$(use_enable gtk xim) \
-		$(use_enable gtk3) \
-		$(use_enable gtk3 ui) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable X xim) \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		${python_conf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
-	rm -rf "${ED}"/usr/share/bash-completion || die
-	newbashcomp "${T}"/ibus.bash ${PN}
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-ibus ibus.conf
-
-	keepdir /usr/share/ibus/{engine,icons} #289547
-
-	use deprecated && python_optimize
-	use python && use gtk3 && python_optimize
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-	gnome2_schemas_savelist
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use gconf && gnome2_schemas_update
-	gnome2_icon_cache_update
-}

diff --git a/app-i18n/ibus/ibus-1.5.8-r1.ebuild b/app-i18n/ibus/ibus-1.5.8-r1.ebuild
deleted file mode 100644
index b641c88de64..00000000000
--- a/app-i18n/ibus/ibus-1.5.8-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.20"
-VALA_USE_DEPEND="vapigen"
-# Vapigen is needed for the vala binding
-# Valac is needed when building from git for the engine
-
-inherit bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
-REQUIRED_USE="|| ( gtk gtk3 X )
-	deprecated? ( python )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		|| ( deprecated ( gtk3 introspection ) ) )" #342903
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	app-text/iso-codes
-	>=gnome-base/dconf-0.13.4
-	x11-libs/libnotify
-
-	gconf? ( >=gnome-base/gconf-2.12:2 )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	python? ( ${PYTHON_DEPS} )
-	X? (
-		x11-libs/libX11
-		x11-libs/gtk+:2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
-	nls? ( virtual/libintl )
-	wayland? ( dev-libs/wayland )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/setxkbmap
-	python? (
-		dev-python/pyxdg
-		deprecated? (
-			>=dev-python/dbus-python-0.83
-			dev-python/pygobject:2
-			dev-python/pygtk:2 )
-		gtk3? (
-			dev-python/pygobject:3
-			x11-libs/gdk-pixbuf:2[introspection]
-			x11-libs/pango[introspection]
-			x11-libs/gtk+:3[introspection] )
-	)"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5.8.1
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )
-	vala? ( $(vala_depend) )
-	gnome-base/gconf"
-
-# stress test in bus/ fails
-# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
-RESTRICT="test"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To use ibus, you should:
-1. Get input engines from sunrise overlay.
-Run \"emerge -s ibus-\" in your favorite terminal
-for a list of packages we already have.
-
-2. Setup ibus:
-$ ibus-setup
-
-3. Set the following in your user startup scripts
-such as .xinitrc, .xsession or .xprofile:
-
-export XMODIFIERS=\"@im=ibus\"
-export GTK_IM_MODULE=\"ibus\"
-export QT_IM_MODULE=\"xim\"
-ibus-daemon -d -x
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
-	sed -e 's/dconf update/:/' \
-		-i data/dconf/Makefile.{am,in} || die
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local python_conf
-	if use python; then
-		python_conf="PYTHON=${PYTHON}
-			$(use_enable deprecated python-library)
-			$(use_enable gtk3 setup)"
-	else
-		python_conf="--disable-python-library --disable-setup"
-	fi
-	econf \
-		--enable-dconf \
-		$(use_enable introspection) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk2) \
-		$(use_enable gtk xim) \
-		$(use_enable gtk3) \
-		$(use_enable gtk3 ui) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable X xim) \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		${python_conf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
-	rm -rf "${ED}"/usr/share/bash-completion || die
-	newbashcomp "${T}"/ibus.bash ${PN}
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-ibus ibus.conf
-
-	keepdir /usr/share/ibus/{engine,icons} #289547
-
-	use deprecated && python_optimize
-	use python && use gtk3 && python_optimize
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-	gnome2_schemas_savelist
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use gconf && gnome2_schemas_update
-	gnome2_icon_cache_update
-}

diff --git a/app-i18n/ibus/ibus-1.5.9-r1.ebuild b/app-i18n/ibus/ibus-1.5.9-r1.ebuild
deleted file mode 100644
index b21c62faf23..00000000000
--- a/app-i18n/ibus/ibus-1.5.9-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.20"
-VALA_USE_DEPEND="vapigen"
-# Vapigen is needed for the vala binding
-# Valac is needed when building from git for the engine
-UPSTREAM_VER=0
-
-inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test +vala wayland +X"
-REQUIRED_USE="
-	|| ( gtk gtk3 X )
-	deprecated? ( python )
-	vala? ( introspection )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		|| ( deprecated ( gtk3 introspection ) ) )" #342903
-
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTRAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz
-	${UPSTRAM_PATCHSET_URI}"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	app-text/iso-codes
-	>=gnome-base/dconf-0.13.4
-	x11-libs/libnotify
-	gconf? ( >=gnome-base/gconf-2.12:2 )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	python? ( ${PYTHON_DEPS} )
-	X? (
-		x11-libs/libX11
-		x11-libs/gtk+:2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
-	nls? ( virtual/libintl )
-	wayland? ( dev-libs/wayland )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/setxkbmap
-	python? (
-		dev-python/pyxdg
-		deprecated? (
-			>=dev-python/dbus-python-0.83
-			dev-python/pygobject:2
-			dev-python/pygtk:2 )
-		gtk3? (
-			dev-python/pygobject:3
-			x11-libs/gdk-pixbuf:2[introspection]
-			x11-libs/pango[introspection]
-			x11-libs/gtk+:3[introspection] )
-	)"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5.8.1
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )
-	vala? ( $(vala_depend) )"
-
-# stress test in bus/ fails
-# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
-RESTRICT="test"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To use ibus, you should:
-1. Get input engines from sunrise overlay.
-Run \"emerge -s ibus-\" in your favorite terminal
-for a list of packages we already have.
-
-2. Setup ibus:
-$ ibus-setup
-
-3. Set the following in your user startup scripts
-such as .xinitrc, .xsession or .xprofile:
-
-export XMODIFIERS=\"@im=ibus\"
-export GTK_IM_MODULE=\"ibus\"
-export QT_IM_MODULE=\"xim\"
-ibus-daemon -d -x
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
-	sed -e 's/dconf update/:/' \
-		-i data/dconf/Makefile.{am,in} || die
-	use vala && vala_src_prepare
-
-	eautoreconf
-}
-
-src_configure() {
-	local python_conf
-	if use python; then
-		python_conf="PYTHON=${PYTHON}
-			$(use_enable deprecated python-library)
-			$(use_enable gtk3 setup)"
-	else
-		python_conf="--disable-python-library --disable-setup"
-	fi
-	econf \
-		--enable-dconf \
-		$(use_enable introspection) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk2) \
-		$(use_enable gtk xim) \
-		$(use_enable gtk3) \
-		$(use_enable gtk3 ui) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable X xim) \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		${python_conf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
-	rm -rf "${ED}"/usr/share/bash-completion || die
-	newbashcomp "${T}"/ibus.bash ${PN}
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-ibus ibus.conf
-
-	keepdir /usr/share/ibus/{engine,icons} #289547
-
-	use deprecated && python_optimize
-	use python && use gtk3 && python_optimize
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-	gnome2_schemas_savelist
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use gconf && gnome2_schemas_update
-	gnome2_icon_cache_update
-}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Agostino Sarubbo]

commit:     4a087c5ad7bba5182ddb5543c6799b9b21ccf7b5
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 17 14:19:50 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 14:24:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a087c5a

app-i18n/ibus: ia64 stable wrt bug #565190

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index 73ad6b9..aa3f394 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/ibus/ibus/wiki"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="
 	|| ( gtk gtk3 X )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Agostino Sarubbo]

commit:     6d5c81662bfa558609fbd38453a7384fa170744c
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 10:33:28 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 10:33:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d5c8166

app-i18n/ibus: sparc stable wrt bug #565190

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index 717d233..73ad6b9 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/ibus/ibus/wiki"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="
 	|| ( gtk gtk3 X )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Agostino Sarubbo]

commit:     f26820dfb2d6631e87d0f7b57c9c13d0abe6f4b8
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 10:35:39 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 10:38:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f26820df

app-i18n/ibus: ppc64 stable wrt bug #565190

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index 3444651..717d233 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/ibus/ibus/wiki"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="
 	|| ( gtk gtk3 X )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Agostino Sarubbo]

commit:     7f30d78d88139509ceb9038c3b691882845eb0d3
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  1 12:40:48 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jan  1 12:40:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f30d78d

app-i18n/ibus: ppc stable wrt bug #565190

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.12.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index 1790d72..3444651 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/ibus/ibus/wiki"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="
 	|| ( gtk gtk3 X )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     75bc208a0d9ab8cfda6a7746b93e308cfe4dc7b2
Author:     Christophe Lermytte <gentoo <AT> lermytte <DOT> be>
AuthorDate: Wed Nov 23 21:46:45 2016 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Wed Dec  7 23:26:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75bc208a

app-i18n/ibus: fix failing pkg_postrm issue

Don't call gnome2_schemas_savelist() from pkg_postrm

See also bug #566956, which fixed this for newer ebuilds,
but 1.5.5 is latest stable on ia64 and sparc.

Gentoo-Bug: 600426, 566956
Closes: https://github.com/gentoo/gentoo/pull/2902

Package-Manager: portage-2.3.2

Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.5.ebuild    | 3 +--
 app-i18n/ibus/ibus-1.5.8-r1.ebuild | 3 +--
 app-i18n/ibus/ibus-1.5.9-r1.ebuild | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.5.ebuild b/app-i18n/ibus/ibus-1.5.5.ebuild
index 3fed965..9aa75bb 100644
--- a/app-i18n/ibus/ibus-1.5.5.ebuild
+++ b/app-i18n/ibus/ibus-1.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -170,6 +170,5 @@ pkg_postrm() {
 	use gtk && gnome2_query_immodules_gtk2
 	use gtk3 && gnome2_query_immodules_gtk3
 	use gconf && gnome2_schemas_update
-	gnome2_schemas_savelist
 	gnome2_icon_cache_update
 }

diff --git a/app-i18n/ibus/ibus-1.5.8-r1.ebuild b/app-i18n/ibus/ibus-1.5.8-r1.ebuild
index 57b1cf5..4a5afd2 100644
--- a/app-i18n/ibus/ibus-1.5.8-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -170,6 +170,5 @@ pkg_postrm() {
 	use gtk && gnome2_query_immodules_gtk2
 	use gtk3 && gnome2_query_immodules_gtk3
 	use gconf && gnome2_schemas_update
-	gnome2_schemas_savelist
 	gnome2_icon_cache_update
 }

diff --git a/app-i18n/ibus/ibus-1.5.9-r1.ebuild b/app-i18n/ibus/ibus-1.5.9-r1.ebuild
index 725ef8f..37c79d0 100644
--- a/app-i18n/ibus/ibus-1.5.9-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -186,6 +186,5 @@ pkg_postrm() {
 	use gtk && gnome2_query_immodules_gtk2
 	use gtk3 && gnome2_query_immodules_gtk3
 	use gconf && gnome2_schemas_update
-	gnome2_schemas_savelist
 	gnome2_icon_cache_update
 }

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     0f51b239a641d00e18269f840e98d72fe5ddfd5b
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 15 07:50:11 2016 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Aug 15 07:51:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f51b239

app-i18n/ibus:  version bump 1.5.14

but disable emoji-dist for now, since it require
nodejs (emojione) support

Package-Manager: portage-2.3.0

 app-i18n/ibus/Manifest           |   1 +
 app-i18n/ibus/ibus-1.5.14.ebuild | 190 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 191 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 53b87ac..f3afd72 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -2,6 +2,7 @@ DIST ibus-1.5.10.tar.gz 2169299 SHA256 1d01b7806602875a1f3004f32e1000a39be01f597
 DIST ibus-1.5.11.tar.gz 2177026 SHA256 49995a298a39a137e65c6ee77811b030850ff344b875f29d4ed088f623a546bc SHA512 7745a06a4dc9502a957bdfa7faba3e6ff857ee102f34acfbc5d1c8ca5935eaf5660ebe6d837ee7bae584818c08a1769cf8a9daa012f87d43a1f10917c04615c2 WHIRLPOOL ae724b6609323e22f6fdff767484ec1259a6e3e4465b1a539cdfaa9178920d23d062d4eb6627fd3b45416d7fa9170a5bf467d6cddd4b1e80ae568a31e851be24
 DIST ibus-1.5.12.tar.gz 2190284 SHA256 e24da95995f4aca5b96359eaba709487dc5ad4c732e9b01b9bcf9fb34be2442c SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81 WHIRLPOOL 82354fc5006a0abe4cb431dda90a67dc1b775f0bac521b481eaeb7acd167ba6179cad14045c5141c57618845589094613bc489357ee8bf550f131ecfb1bf8293
 DIST ibus-1.5.13.tar.gz 2194054 SHA256 ed73d80542dfdcca190b7958431048cd6830c2ce25c467384630b6a7e957a5f1 SHA512 bffb3cecf984ec6e383a111b4e62506390f083476f59404e2e9b90251e6e06853d7f1dc06194456ab5064b5d375820510be1ab12ebd29b966d6a7f5b8aca07ab WHIRLPOOL bf28cc0f20942e7e253b2ae49d3112acad313c15bbaf5697f8319c13c90fa17c569b5bdd2bf8d83895361ec99f06a05317ef752d4e5fa0e1de06267e1347c463
+DIST ibus-1.5.14.tar.gz 2214350 SHA256 a42b40fe4642f36bf2a6f0b4649f54f4043812d6bfee4faca38117799a009d3c SHA512 2e86bc4e282265cfec6882fd132b36521bc2b64796e3d473668512d82ab8059c409ca1226d6b15d64ff4d46754cafa1585eddcc3aa89d58f9e9fdab0a825de0d WHIRLPOOL d2f7da33c73dded936ecf1c7f3edf1f5cdc70a8db70caec774246b1062d659fbb17495a1228cc7e126f99f52c068bc068d5ffb67d032dd6022c1f210eed0f230
 DIST ibus-1.5.5.tar.gz 2063794 SHA256 02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec SHA512 8249d6ee4918b0e0fe030af736eed2260e1376b2fdaf0d819f289e0bd880a5e3874f1fb3d097fc74b9f359822ce16f4dae52a263aa28c2e2ce7bdf671cb2fea9 WHIRLPOOL 33ba90e5cdd54ecd7a03af8c5d2c1d2e8cfc88bfc53b65e5240eb4c60d6138007b754a60e8b1e79c98ce92e299d14f1a0cce445ad40b04e862adf3919401d77d
 DIST ibus-1.5.8.tar.gz 2120220 SHA256 cfc562ae73de753dc8cb9ae30fe117286ddd94cd109002108f2eeb47e8101a29 SHA512 428e40be7ebea57832295e76b5c4350351c6d40c5178c57c61c8d6f31e524a315184c3d533ad88592e53ae7c6cb4beed67796ad61910f99f260fc9c243b2fc98 WHIRLPOOL 2fc0059a75b3f4b253770303a8c9c8ae02947153eaf7b9c220e2e10657275293a556b068ba4cad0d27f315b7374ffaedb53b20cd13f8408a3729cfaaea869d78
 DIST ibus-1.5.9-upstream-patches-0.tar.xz 30380 SHA256 9efe631008cfad1d59db01a83ae093149b2c827d480705836f0bf8a29706f1e0 SHA512 98c323de9793938d8c0bd646071d0ea7860212e3ae826e97ed0e0a092ec715084529b3a3cee3def63958dd3d56357b2e33e4e3d3946cca90bec3409469cf14d4 WHIRLPOOL 0aaf7aaba36de96525f0339a16df2c435e2f2c5cc6168c9b2da25bd7003af88f6d55ca53ae692c9c611b563ddfcb48a0e19e915f8361ba51a4aac813edc45f41

diff --git a/app-i18n/ibus/ibus-1.5.14.ebuild b/app-i18n/ibus/ibus-1.5.14.ebuild
new file mode 100644
index 0000000..26df2a5
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.14.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+VALA_USE_DEPEND="vapigen"
+# Vapigen is needed for the vala binding
+# Valac is needed when building from git for the engine
+UPSTREAM_VER=
+
+inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo-r1 vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
+REQUIRED_USE="
+	|| ( gtk gtk3 X )
+	deprecated? ( python )
+	vala? ( introspection )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		|| ( deprecated ( gtk3 introspection ) ) )" #342903
+
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz
+	${UPSTRAM_PATCHSET_URI}"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	app-text/iso-codes
+	>=gnome-base/dconf-0.13.4
+	x11-libs/libnotify
+	gconf? ( >=gnome-base/gconf-2.12:2 )
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	python? ( ${PYTHON_DEPS} )
+	X? (
+		x11-libs/libX11
+		x11-libs/gtk+:2 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+	nls? ( virtual/libintl )
+	wayland? ( dev-libs/wayland )"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/setxkbmap
+	python? (
+		dev-python/pyxdg
+		deprecated? (
+			>=dev-python/dbus-python-0.83
+			dev-python/pygobject:2
+			dev-python/pygtk:2 )
+		gtk3? (
+			dev-python/pygobject:3
+			x11-libs/gdk-pixbuf:2[introspection]
+			x11-libs/pango[introspection]
+			x11-libs/gtk+:3[introspection] )
+	)"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5.8.1
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.16.1 )
+	vala? ( $(vala_depend) )"
+
+# stress test in bus/ fails
+# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
+RESTRICT="test"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To use ibus, you should:
+1. Get input engines from sunrise overlay.
+Run \"emerge -s ibus-\" in your favorite terminal
+for a list of packages we already have.
+
+2. Setup ibus:
+$ ibus-setup
+
+3. Set the following in your user startup scripts
+such as .xinitrc, .xsession or .xprofile:
+
+export XMODIFIERS=\"@im=ibus\"
+export GTK_IM_MODULE=\"ibus\"
+export QT_IM_MODULE=\"xim\"
+ibus-daemon -d -x
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
+	sed -e 's/dconf update/:/' \
+		-i data/dconf/Makefile.{am,in} || die
+	use vala && vala_src_prepare
+
+	eautoreconf
+}
+
+src_configure() {
+	local python_conf
+	if use python; then
+		python_conf="PYTHON=${PYTHON}
+			$(use_enable deprecated python-library)
+			$(use_enable gtk3 setup)"
+	else
+		python_conf="--disable-python-library --disable-setup"
+	fi
+	econf \
+		--enable-dconf \
+		--disable-emoji-dict \
+		$(use_enable introspection) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk2) \
+		$(use_enable gtk xim) \
+		$(use_enable gtk3) \
+		$(use_enable gtk3 ui) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable X xim) \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		${python_conf}
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+
+	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
+	rm -rf "${ED}"/usr/share/bash-completion || die
+	newbashcomp "${T}"/ibus.bash ${PN}
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-ibus ibus.conf
+
+	keepdir /usr/share/ibus/{engine,icons} #289547
+
+	use deprecated && python_optimize
+	use python && use gtk3 && python_optimize
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_schemas_savelist
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	use gconf && gnome2_schemas_update
+	gnome2_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Tobias Klausmann]

commit:     11d04137ae39bb9a6acd5dfbf045f7d8a5b09b83
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 11:26:07 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Tue May 24 11:27:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11d04137

app-i18n/ibus-1.5.12-r0: add alpha keyword

Gentoo-Bug: 565190

Package-Manager: portage-2.3.0_rc1

 app-i18n/ibus/ibus-1.5.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index 4e51c9a..1790d72 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/ibus/ibus/wiki"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="
 	|| ( gtk gtk3 X )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Markus Meier]

commit:     a6b2c2c6b0e453651d7b902e620ea27f80b61249
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 15:55:48 2016 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 15:55:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6b2c2c6

app-i18n/ibus: arm stable, bug #565190

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="arm"

 app-i18n/ibus/ibus-1.5.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index 902bc5c..4e51c9a 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/ibus/ibus/wiki"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="
 	|| ( gtk gtk3 X )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Stephen Klimaszewski]

commit:     22fa544968043b931a0ad57f7570b606b8f3fe38
Author:     Steev Klimaszewski <steev <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 20:53:01 2016 +0000
Commit:     Stephen Klimaszewski <steev <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 21:22:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22fa5449

app-i18n/ibus: Add ~arm64 keyword to 1.5.12

Package-Manager: portage-2.2.28

 app-i18n/ibus/ibus-1.5.12.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index f1a9778..902bc5c 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/ibus/ibus/wiki"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="
 	|| ( gtk gtk3 X )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Agostino Sarubbo]

commit:     6152c142f2c0386387b531d1adcc1f23c9db9fd9
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 10:59:55 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 10:59:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6152c142

app-i18n/ibus: x86 stable wrt bug #565190

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index 37d5118..f1a9778 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/ibus/ibus/wiki"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="
 	|| ( gtk gtk3 X )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Agostino Sarubbo]

commit:     2cab006d85e92b88f25e50a958e1d28e51ddcd44
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 10:58:03 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 10:58:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cab006d

app-i18n/ibus: amd64 stable wrt bug #565190

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-i18n/ibus/ibus-1.5.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index 2e909c1..37d5118 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/ibus/ibus/wiki"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="
 	|| ( gtk gtk3 X )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     1d819d5268c0a38f817c6ccd70904b93a484146e
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 02:52:50 2016 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 02:53:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d819d52

app-i18n/ibus: version bump 1.5.13

Package-Manager: portage-2.2.27

 app-i18n/ibus/Manifest           |   1 +
 app-i18n/ibus/ibus-1.5.13.ebuild | 189 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 190 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 91e92c8..53b87ac 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,6 +1,7 @@
 DIST ibus-1.5.10.tar.gz 2169299 SHA256 1d01b7806602875a1f3004f32e1000a39be01f59731d6baf36446498e26f5594 SHA512 2f7f07c20cac5f934f24c3bc99b29efe30aa5ced501ac442a9da16454cb889d946fa262b3495c1778f200c8f62a1fd8d67f47f43ae6ee214d3d392feb6e413c9 WHIRLPOOL 575d5bba84ed8afb608030260b5fbbd47bdfc4ff1368590e0c34b2fed1cf2878e71bdb7b6da286d0b0d5a27f7fcc9e2a02675a86bbc9417c1d060246b7a6acbd
 DIST ibus-1.5.11.tar.gz 2177026 SHA256 49995a298a39a137e65c6ee77811b030850ff344b875f29d4ed088f623a546bc SHA512 7745a06a4dc9502a957bdfa7faba3e6ff857ee102f34acfbc5d1c8ca5935eaf5660ebe6d837ee7bae584818c08a1769cf8a9daa012f87d43a1f10917c04615c2 WHIRLPOOL ae724b6609323e22f6fdff767484ec1259a6e3e4465b1a539cdfaa9178920d23d062d4eb6627fd3b45416d7fa9170a5bf467d6cddd4b1e80ae568a31e851be24
 DIST ibus-1.5.12.tar.gz 2190284 SHA256 e24da95995f4aca5b96359eaba709487dc5ad4c732e9b01b9bcf9fb34be2442c SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81 WHIRLPOOL 82354fc5006a0abe4cb431dda90a67dc1b775f0bac521b481eaeb7acd167ba6179cad14045c5141c57618845589094613bc489357ee8bf550f131ecfb1bf8293
+DIST ibus-1.5.13.tar.gz 2194054 SHA256 ed73d80542dfdcca190b7958431048cd6830c2ce25c467384630b6a7e957a5f1 SHA512 bffb3cecf984ec6e383a111b4e62506390f083476f59404e2e9b90251e6e06853d7f1dc06194456ab5064b5d375820510be1ab12ebd29b966d6a7f5b8aca07ab WHIRLPOOL bf28cc0f20942e7e253b2ae49d3112acad313c15bbaf5697f8319c13c90fa17c569b5bdd2bf8d83895361ec99f06a05317ef752d4e5fa0e1de06267e1347c463
 DIST ibus-1.5.5.tar.gz 2063794 SHA256 02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec SHA512 8249d6ee4918b0e0fe030af736eed2260e1376b2fdaf0d819f289e0bd880a5e3874f1fb3d097fc74b9f359822ce16f4dae52a263aa28c2e2ce7bdf671cb2fea9 WHIRLPOOL 33ba90e5cdd54ecd7a03af8c5d2c1d2e8cfc88bfc53b65e5240eb4c60d6138007b754a60e8b1e79c98ce92e299d14f1a0cce445ad40b04e862adf3919401d77d
 DIST ibus-1.5.8.tar.gz 2120220 SHA256 cfc562ae73de753dc8cb9ae30fe117286ddd94cd109002108f2eeb47e8101a29 SHA512 428e40be7ebea57832295e76b5c4350351c6d40c5178c57c61c8d6f31e524a315184c3d533ad88592e53ae7c6cb4beed67796ad61910f99f260fc9c243b2fc98 WHIRLPOOL 2fc0059a75b3f4b253770303a8c9c8ae02947153eaf7b9c220e2e10657275293a556b068ba4cad0d27f315b7374ffaedb53b20cd13f8408a3729cfaaea869d78
 DIST ibus-1.5.9-upstream-patches-0.tar.xz 30380 SHA256 9efe631008cfad1d59db01a83ae093149b2c827d480705836f0bf8a29706f1e0 SHA512 98c323de9793938d8c0bd646071d0ea7860212e3ae826e97ed0e0a092ec715084529b3a3cee3def63958dd3d56357b2e33e4e3d3946cca90bec3409469cf14d4 WHIRLPOOL 0aaf7aaba36de96525f0339a16df2c435e2f2c5cc6168c9b2da25bd7003af88f6d55ca53ae692c9c611b563ddfcb48a0e19e915f8361ba51a4aac813edc45f41

diff --git a/app-i18n/ibus/ibus-1.5.13.ebuild b/app-i18n/ibus/ibus-1.5.13.ebuild
new file mode 100644
index 0000000..7a5d4fc
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.13.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+VALA_USE_DEPEND="vapigen"
+# Vapigen is needed for the vala binding
+# Valac is needed when building from git for the engine
+UPSTREAM_VER=
+
+inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo-r1 vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
+REQUIRED_USE="
+	|| ( gtk gtk3 X )
+	deprecated? ( python )
+	vala? ( introspection )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		|| ( deprecated ( gtk3 introspection ) ) )" #342903
+
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz
+	${UPSTRAM_PATCHSET_URI}"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	app-text/iso-codes
+	>=gnome-base/dconf-0.13.4
+	x11-libs/libnotify
+	gconf? ( >=gnome-base/gconf-2.12:2 )
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	python? ( ${PYTHON_DEPS} )
+	X? (
+		x11-libs/libX11
+		x11-libs/gtk+:2 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+	nls? ( virtual/libintl )
+	wayland? ( dev-libs/wayland )"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/setxkbmap
+	python? (
+		dev-python/pyxdg
+		deprecated? (
+			>=dev-python/dbus-python-0.83
+			dev-python/pygobject:2
+			dev-python/pygtk:2 )
+		gtk3? (
+			dev-python/pygobject:3
+			x11-libs/gdk-pixbuf:2[introspection]
+			x11-libs/pango[introspection]
+			x11-libs/gtk+:3[introspection] )
+	)"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5.8.1
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.16.1 )
+	vala? ( $(vala_depend) )"
+
+# stress test in bus/ fails
+# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
+RESTRICT="test"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To use ibus, you should:
+1. Get input engines from sunrise overlay.
+Run \"emerge -s ibus-\" in your favorite terminal
+for a list of packages we already have.
+
+2. Setup ibus:
+$ ibus-setup
+
+3. Set the following in your user startup scripts
+such as .xinitrc, .xsession or .xprofile:
+
+export XMODIFIERS=\"@im=ibus\"
+export GTK_IM_MODULE=\"ibus\"
+export QT_IM_MODULE=\"xim\"
+ibus-daemon -d -x
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
+	sed -e 's/dconf update/:/' \
+		-i data/dconf/Makefile.{am,in} || die
+	use vala && vala_src_prepare
+
+	eautoreconf
+}
+
+src_configure() {
+	local python_conf
+	if use python; then
+		python_conf="PYTHON=${PYTHON}
+			$(use_enable deprecated python-library)
+			$(use_enable gtk3 setup)"
+	else
+		python_conf="--disable-python-library --disable-setup"
+	fi
+	econf \
+		--enable-dconf \
+		$(use_enable introspection) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk2) \
+		$(use_enable gtk xim) \
+		$(use_enable gtk3) \
+		$(use_enable gtk3 ui) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable X xim) \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		${python_conf}
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+
+	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
+	rm -rf "${ED}"/usr/share/bash-completion || die
+	newbashcomp "${T}"/ibus.bash ${PN}
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-ibus ibus.conf
+
+	keepdir /usr/share/ibus/{engine,icons} #289547
+
+	use deprecated && python_optimize
+	use python && use gtk3 && python_optimize
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_schemas_savelist
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	use gconf && gnome2_schemas_update
+	gnome2_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Pacho Ramos]

commit:     54e35c0b82a0009e3628aaedc2cc0b3f1b1fd1a9
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  7 19:14:23 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Feb  7 19:14:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54e35c0b

app-i18n/ibus: Use readme.gentoo-r1.eclass

Package-Manager: portage-2.2.27

 app-i18n/ibus/ibus-1.5.12.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index 4cb34fd..2e909c1 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -5,13 +5,12 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.20"
 VALA_USE_DEPEND="vapigen"
 # Vapigen is needed for the vala binding
 # Valac is needed when building from git for the engine
 UPSTREAM_VER=
 
-inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
+inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo-r1 vala virtualx
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Andreas Hüttel]

commit:     ffb9b3758e66b578c6015cff756c7356f3361f1d
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  1 21:14:12 2016 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Feb  1 21:15:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffb9b375

Revert "app-i18n/ibus: cleanup old versions"; this broke the deptree

This reverts commit 97a6aec8268998c24e7485281fd4ddf59c7d4da3.

 app-i18n/ibus/Manifest             |   4 +
 app-i18n/ibus/ibus-1.5.5.ebuild    | 175 +++++++++++++++++++++++++++++++++
 app-i18n/ibus/ibus-1.5.8-r1.ebuild | 175 +++++++++++++++++++++++++++++++++
 app-i18n/ibus/ibus-1.5.9-r1.ebuild | 191 +++++++++++++++++++++++++++++++++++++
 4 files changed, 545 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 63f546c..91e92c8 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,3 +1,7 @@
 DIST ibus-1.5.10.tar.gz 2169299 SHA256 1d01b7806602875a1f3004f32e1000a39be01f59731d6baf36446498e26f5594 SHA512 2f7f07c20cac5f934f24c3bc99b29efe30aa5ced501ac442a9da16454cb889d946fa262b3495c1778f200c8f62a1fd8d67f47f43ae6ee214d3d392feb6e413c9 WHIRLPOOL 575d5bba84ed8afb608030260b5fbbd47bdfc4ff1368590e0c34b2fed1cf2878e71bdb7b6da286d0b0d5a27f7fcc9e2a02675a86bbc9417c1d060246b7a6acbd
 DIST ibus-1.5.11.tar.gz 2177026 SHA256 49995a298a39a137e65c6ee77811b030850ff344b875f29d4ed088f623a546bc SHA512 7745a06a4dc9502a957bdfa7faba3e6ff857ee102f34acfbc5d1c8ca5935eaf5660ebe6d837ee7bae584818c08a1769cf8a9daa012f87d43a1f10917c04615c2 WHIRLPOOL ae724b6609323e22f6fdff767484ec1259a6e3e4465b1a539cdfaa9178920d23d062d4eb6627fd3b45416d7fa9170a5bf467d6cddd4b1e80ae568a31e851be24
 DIST ibus-1.5.12.tar.gz 2190284 SHA256 e24da95995f4aca5b96359eaba709487dc5ad4c732e9b01b9bcf9fb34be2442c SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81 WHIRLPOOL 82354fc5006a0abe4cb431dda90a67dc1b775f0bac521b481eaeb7acd167ba6179cad14045c5141c57618845589094613bc489357ee8bf550f131ecfb1bf8293
+DIST ibus-1.5.5.tar.gz 2063794 SHA256 02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec SHA512 8249d6ee4918b0e0fe030af736eed2260e1376b2fdaf0d819f289e0bd880a5e3874f1fb3d097fc74b9f359822ce16f4dae52a263aa28c2e2ce7bdf671cb2fea9 WHIRLPOOL 33ba90e5cdd54ecd7a03af8c5d2c1d2e8cfc88bfc53b65e5240eb4c60d6138007b754a60e8b1e79c98ce92e299d14f1a0cce445ad40b04e862adf3919401d77d
+DIST ibus-1.5.8.tar.gz 2120220 SHA256 cfc562ae73de753dc8cb9ae30fe117286ddd94cd109002108f2eeb47e8101a29 SHA512 428e40be7ebea57832295e76b5c4350351c6d40c5178c57c61c8d6f31e524a315184c3d533ad88592e53ae7c6cb4beed67796ad61910f99f260fc9c243b2fc98 WHIRLPOOL 2fc0059a75b3f4b253770303a8c9c8ae02947153eaf7b9c220e2e10657275293a556b068ba4cad0d27f315b7374ffaedb53b20cd13f8408a3729cfaaea869d78
+DIST ibus-1.5.9-upstream-patches-0.tar.xz 30380 SHA256 9efe631008cfad1d59db01a83ae093149b2c827d480705836f0bf8a29706f1e0 SHA512 98c323de9793938d8c0bd646071d0ea7860212e3ae826e97ed0e0a092ec715084529b3a3cee3def63958dd3d56357b2e33e4e3d3946cca90bec3409469cf14d4 WHIRLPOOL 0aaf7aaba36de96525f0339a16df2c435e2f2c5cc6168c9b2da25bd7003af88f6d55ca53ae692c9c611b563ddfcb48a0e19e915f8361ba51a4aac813edc45f41
+DIST ibus-1.5.9.tar.gz 2128459 SHA256 ad41014aa3cb961854ee0aa392a5abd7452fab2c6b77d8ff2d736b7405b48ac6 SHA512 8a21303abceb38f1e5903342590c229a243db1497503fa08d547e1029bc25b90a2031f0386e57ddfcb897a14819d202289fcac1e3c8bad059698b04501a7ede9 WHIRLPOOL 88135818669cb3c189ce02a7caba3ec262bd95ffa6d139e8f76113ca91fc778f5f7703cfbfb1f5d5dd3cbb6948ba14d9c326f318b0286381caec45db3b453221

diff --git a/app-i18n/ibus/ibus-1.5.5.ebuild b/app-i18n/ibus/ibus-1.5.5.ebuild
new file mode 100644
index 0000000..3fed965
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.5.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION="0.20"
+VALA_USE_DEPEND="vapigen"
+# Vapigen is needed for the vala binding
+# Valac is needed when building from git for the engine
+
+inherit bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://ibus.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
+REQUIRED_USE="|| ( gtk gtk3 X )
+	deprecated? ( python )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		|| ( deprecated ( gtk3 introspection ) ) )" #342903
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	app-text/iso-codes
+	>=gnome-base/dconf-0.13.4
+	x11-libs/libnotify
+
+	gconf? ( >=gnome-base/gconf-2.12:2 )
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	python? ( ${PYTHON_DEPS} )
+	X? (
+		x11-libs/libX11
+		x11-libs/gtk+:2 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+	nls? ( virtual/libintl )
+	wayland? ( dev-libs/wayland )"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/setxkbmap
+	python? (
+		dev-python/pyxdg
+		deprecated? (
+			>=dev-python/dbus-python-0.83
+			dev-python/pygobject:2
+			dev-python/pygtk:2 )
+		gtk3? (
+			dev-python/pygobject:3
+			x11-libs/gdk-pixbuf:2[introspection]
+			x11-libs/pango[introspection]
+			x11-libs/gtk+:3[introspection] )
+	)"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5.8.1
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.16.1 )
+	vala? ( $(vala_depend) )
+	gnome-base/gconf"
+
+# stress test in bus/ fails
+# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
+RESTRICT="test"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To use ibus, you should:
+1. Get input engines from sunrise overlay.
+Run \"emerge -s ibus-\" in your favorite terminal
+for a list of packages we already have.
+
+2. Setup ibus:
+$ ibus-setup
+
+3. Set the following in your user startup scripts
+such as .xinitrc, .xsession or .xprofile:
+
+export XMODIFIERS=\"@im=ibus\"
+export GTK_IM_MODULE=\"ibus\"
+export QT_IM_MODULE=\"xim\"
+ibus-daemon -d -x
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
+	sed -e 's/dconf update/$(NULL)/' \
+		-i data/dconf/Makefile.{am,in} || die
+	use vala && vala_src_prepare
+	cp "${S}"/client/gtk2/ibusimcontext.c "${S}"/client/gtk3/ibusimcontext.c || die
+}
+
+src_configure() {
+	local python_conf
+	if use python; then
+		python_conf="PYTHON=${PYTHON}
+			$(use_enable deprecated python-library)
+			$(use_enable gtk3 setup)"
+	else
+		python_conf="--disable-python-library --disable-setup"
+	fi
+	econf \
+		--enable-dconf \
+		$(use_enable introspection) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk2) \
+		$(use_enable gtk xim) \
+		$(use_enable gtk3) \
+		$(use_enable gtk3 ui) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable X xim) \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		${python_conf}
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+
+	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
+	rm -rf "${ED}"/usr/share/bash-completion || die
+	newbashcomp "${T}"/ibus.bash ${PN}
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-ibus ibus.conf
+
+	keepdir /usr/share/ibus/{engine,icons} #289547
+
+	use deprecated && python_optimize
+	use python && use gtk3 && python_optimize
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_schemas_savelist
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	use gconf && gnome2_schemas_update
+	gnome2_schemas_savelist
+	gnome2_icon_cache_update
+}

diff --git a/app-i18n/ibus/ibus-1.5.8-r1.ebuild b/app-i18n/ibus/ibus-1.5.8-r1.ebuild
new file mode 100644
index 0000000..57b1cf5
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.8-r1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION="0.20"
+VALA_USE_DEPEND="vapigen"
+# Vapigen is needed for the vala binding
+# Valac is needed when building from git for the engine
+
+inherit bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
+REQUIRED_USE="|| ( gtk gtk3 X )
+	deprecated? ( python )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		|| ( deprecated ( gtk3 introspection ) ) )" #342903
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	app-text/iso-codes
+	>=gnome-base/dconf-0.13.4
+	x11-libs/libnotify
+
+	gconf? ( >=gnome-base/gconf-2.12:2 )
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	python? ( ${PYTHON_DEPS} )
+	X? (
+		x11-libs/libX11
+		x11-libs/gtk+:2 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+	nls? ( virtual/libintl )
+	wayland? ( dev-libs/wayland )"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/setxkbmap
+	python? (
+		dev-python/pyxdg
+		deprecated? (
+			>=dev-python/dbus-python-0.83
+			dev-python/pygobject:2
+			dev-python/pygtk:2 )
+		gtk3? (
+			dev-python/pygobject:3
+			x11-libs/gdk-pixbuf:2[introspection]
+			x11-libs/pango[introspection]
+			x11-libs/gtk+:3[introspection] )
+	)"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5.8.1
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.16.1 )
+	vala? ( $(vala_depend) )
+	gnome-base/gconf"
+
+# stress test in bus/ fails
+# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
+RESTRICT="test"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To use ibus, you should:
+1. Get input engines from sunrise overlay.
+Run \"emerge -s ibus-\" in your favorite terminal
+for a list of packages we already have.
+
+2. Setup ibus:
+$ ibus-setup
+
+3. Set the following in your user startup scripts
+such as .xinitrc, .xsession or .xprofile:
+
+export XMODIFIERS=\"@im=ibus\"
+export GTK_IM_MODULE=\"ibus\"
+export QT_IM_MODULE=\"xim\"
+ibus-daemon -d -x
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
+	sed -e 's/dconf update/:/' \
+		-i data/dconf/Makefile.{am,in} || die
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local python_conf
+	if use python; then
+		python_conf="PYTHON=${PYTHON}
+			$(use_enable deprecated python-library)
+			$(use_enable gtk3 setup)"
+	else
+		python_conf="--disable-python-library --disable-setup"
+	fi
+	econf \
+		--enable-dconf \
+		$(use_enable introspection) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk2) \
+		$(use_enable gtk xim) \
+		$(use_enable gtk3) \
+		$(use_enable gtk3 ui) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable X xim) \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		${python_conf}
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+
+	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
+	rm -rf "${ED}"/usr/share/bash-completion || die
+	newbashcomp "${T}"/ibus.bash ${PN}
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-ibus ibus.conf
+
+	keepdir /usr/share/ibus/{engine,icons} #289547
+
+	use deprecated && python_optimize
+	use python && use gtk3 && python_optimize
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_schemas_savelist
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	use gconf && gnome2_schemas_update
+	gnome2_schemas_savelist
+	gnome2_icon_cache_update
+}

diff --git a/app-i18n/ibus/ibus-1.5.9-r1.ebuild b/app-i18n/ibus/ibus-1.5.9-r1.ebuild
new file mode 100644
index 0000000..725ef8f
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.9-r1.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION="0.20"
+VALA_USE_DEPEND="vapigen"
+# Vapigen is needed for the vala binding
+# Valac is needed when building from git for the engine
+UPSTREAM_VER=0
+
+inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test +vala wayland +X"
+REQUIRED_USE="
+	|| ( gtk gtk3 X )
+	deprecated? ( python )
+	vala? ( introspection )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		|| ( deprecated ( gtk3 introspection ) ) )" #342903
+
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTRAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz
+	${UPSTRAM_PATCHSET_URI}"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	app-text/iso-codes
+	>=gnome-base/dconf-0.13.4
+	x11-libs/libnotify
+	gconf? ( >=gnome-base/gconf-2.12:2 )
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	python? ( ${PYTHON_DEPS} )
+	X? (
+		x11-libs/libX11
+		x11-libs/gtk+:2 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+	nls? ( virtual/libintl )
+	wayland? ( dev-libs/wayland )"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/setxkbmap
+	python? (
+		dev-python/pyxdg
+		deprecated? (
+			>=dev-python/dbus-python-0.83
+			dev-python/pygobject:2
+			dev-python/pygtk:2 )
+		gtk3? (
+			dev-python/pygobject:3
+			x11-libs/gdk-pixbuf:2[introspection]
+			x11-libs/pango[introspection]
+			x11-libs/gtk+:3[introspection] )
+	)"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5.8.1
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.16.1 )
+	vala? ( $(vala_depend) )"
+
+# stress test in bus/ fails
+# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
+RESTRICT="test"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To use ibus, you should:
+1. Get input engines from sunrise overlay.
+Run \"emerge -s ibus-\" in your favorite terminal
+for a list of packages we already have.
+
+2. Setup ibus:
+$ ibus-setup
+
+3. Set the following in your user startup scripts
+such as .xinitrc, .xsession or .xprofile:
+
+export XMODIFIERS=\"@im=ibus\"
+export GTK_IM_MODULE=\"ibus\"
+export QT_IM_MODULE=\"xim\"
+ibus-daemon -d -x
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
+	sed -e 's/dconf update/:/' \
+		-i data/dconf/Makefile.{am,in} || die
+	use vala && vala_src_prepare
+
+	eautoreconf
+}
+
+src_configure() {
+	local python_conf
+	if use python; then
+		python_conf="PYTHON=${PYTHON}
+			$(use_enable deprecated python-library)
+			$(use_enable gtk3 setup)"
+	else
+		python_conf="--disable-python-library --disable-setup"
+	fi
+	econf \
+		--enable-dconf \
+		$(use_enable introspection) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk2) \
+		$(use_enable gtk xim) \
+		$(use_enable gtk3) \
+		$(use_enable gtk3 ui) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable X xim) \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		${python_conf}
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+
+	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
+	rm -rf "${ED}"/usr/share/bash-completion || die
+	newbashcomp "${T}"/ibus.bash ${PN}
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-ibus ibus.conf
+
+	keepdir /usr/share/ibus/{engine,icons} #289547
+
+	use deprecated && python_optimize
+	use python && use gtk3 && python_optimize
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_schemas_savelist
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	use gconf && gnome2_schemas_update
+	gnome2_schemas_savelist
+	gnome2_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     30b91c170795f62b906dabc67f63b1bb738eefc6
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  1 02:59:01 2016 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Feb  1 02:59:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30b91c17

app-i18n/ibus: version bump 1.5.12

Package-Manager: portage-2.2.26

 app-i18n/ibus/Manifest           |   1 +
 app-i18n/ibus/ibus-1.5.12.ebuild | 190 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 191 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 2b448d9..91e92c8 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,5 +1,6 @@
 DIST ibus-1.5.10.tar.gz 2169299 SHA256 1d01b7806602875a1f3004f32e1000a39be01f59731d6baf36446498e26f5594 SHA512 2f7f07c20cac5f934f24c3bc99b29efe30aa5ced501ac442a9da16454cb889d946fa262b3495c1778f200c8f62a1fd8d67f47f43ae6ee214d3d392feb6e413c9 WHIRLPOOL 575d5bba84ed8afb608030260b5fbbd47bdfc4ff1368590e0c34b2fed1cf2878e71bdb7b6da286d0b0d5a27f7fcc9e2a02675a86bbc9417c1d060246b7a6acbd
 DIST ibus-1.5.11.tar.gz 2177026 SHA256 49995a298a39a137e65c6ee77811b030850ff344b875f29d4ed088f623a546bc SHA512 7745a06a4dc9502a957bdfa7faba3e6ff857ee102f34acfbc5d1c8ca5935eaf5660ebe6d837ee7bae584818c08a1769cf8a9daa012f87d43a1f10917c04615c2 WHIRLPOOL ae724b6609323e22f6fdff767484ec1259a6e3e4465b1a539cdfaa9178920d23d062d4eb6627fd3b45416d7fa9170a5bf467d6cddd4b1e80ae568a31e851be24
+DIST ibus-1.5.12.tar.gz 2190284 SHA256 e24da95995f4aca5b96359eaba709487dc5ad4c732e9b01b9bcf9fb34be2442c SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81 WHIRLPOOL 82354fc5006a0abe4cb431dda90a67dc1b775f0bac521b481eaeb7acd167ba6179cad14045c5141c57618845589094613bc489357ee8bf550f131ecfb1bf8293
 DIST ibus-1.5.5.tar.gz 2063794 SHA256 02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec SHA512 8249d6ee4918b0e0fe030af736eed2260e1376b2fdaf0d819f289e0bd880a5e3874f1fb3d097fc74b9f359822ce16f4dae52a263aa28c2e2ce7bdf671cb2fea9 WHIRLPOOL 33ba90e5cdd54ecd7a03af8c5d2c1d2e8cfc88bfc53b65e5240eb4c60d6138007b754a60e8b1e79c98ce92e299d14f1a0cce445ad40b04e862adf3919401d77d
 DIST ibus-1.5.8.tar.gz 2120220 SHA256 cfc562ae73de753dc8cb9ae30fe117286ddd94cd109002108f2eeb47e8101a29 SHA512 428e40be7ebea57832295e76b5c4350351c6d40c5178c57c61c8d6f31e524a315184c3d533ad88592e53ae7c6cb4beed67796ad61910f99f260fc9c243b2fc98 WHIRLPOOL 2fc0059a75b3f4b253770303a8c9c8ae02947153eaf7b9c220e2e10657275293a556b068ba4cad0d27f315b7374ffaedb53b20cd13f8408a3729cfaaea869d78
 DIST ibus-1.5.9-upstream-patches-0.tar.xz 30380 SHA256 9efe631008cfad1d59db01a83ae093149b2c827d480705836f0bf8a29706f1e0 SHA512 98c323de9793938d8c0bd646071d0ea7860212e3ae826e97ed0e0a092ec715084529b3a3cee3def63958dd3d56357b2e33e4e3d3946cca90bec3409469cf14d4 WHIRLPOOL 0aaf7aaba36de96525f0339a16df2c435e2f2c5cc6168c9b2da25bd7003af88f6d55ca53ae692c9c611b563ddfcb48a0e19e915f8361ba51a4aac813edc45f41

diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
new file mode 100644
index 0000000..4cb34fd
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION="0.20"
+VALA_USE_DEPEND="vapigen"
+# Vapigen is needed for the vala binding
+# Valac is needed when building from git for the engine
+UPSTREAM_VER=
+
+inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
+REQUIRED_USE="
+	|| ( gtk gtk3 X )
+	deprecated? ( python )
+	vala? ( introspection )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		|| ( deprecated ( gtk3 introspection ) ) )" #342903
+
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz
+	${UPSTRAM_PATCHSET_URI}"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	app-text/iso-codes
+	>=gnome-base/dconf-0.13.4
+	x11-libs/libnotify
+	gconf? ( >=gnome-base/gconf-2.12:2 )
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	python? ( ${PYTHON_DEPS} )
+	X? (
+		x11-libs/libX11
+		x11-libs/gtk+:2 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+	nls? ( virtual/libintl )
+	wayland? ( dev-libs/wayland )"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/setxkbmap
+	python? (
+		dev-python/pyxdg
+		deprecated? (
+			>=dev-python/dbus-python-0.83
+			dev-python/pygobject:2
+			dev-python/pygtk:2 )
+		gtk3? (
+			dev-python/pygobject:3
+			x11-libs/gdk-pixbuf:2[introspection]
+			x11-libs/pango[introspection]
+			x11-libs/gtk+:3[introspection] )
+	)"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5.8.1
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.16.1 )
+	vala? ( $(vala_depend) )"
+
+# stress test in bus/ fails
+# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
+RESTRICT="test"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To use ibus, you should:
+1. Get input engines from sunrise overlay.
+Run \"emerge -s ibus-\" in your favorite terminal
+for a list of packages we already have.
+
+2. Setup ibus:
+$ ibus-setup
+
+3. Set the following in your user startup scripts
+such as .xinitrc, .xsession or .xprofile:
+
+export XMODIFIERS=\"@im=ibus\"
+export GTK_IM_MODULE=\"ibus\"
+export QT_IM_MODULE=\"xim\"
+ibus-daemon -d -x
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
+	sed -e 's/dconf update/:/' \
+		-i data/dconf/Makefile.{am,in} || die
+	use vala && vala_src_prepare
+
+	eautoreconf
+}
+
+src_configure() {
+	local python_conf
+	if use python; then
+		python_conf="PYTHON=${PYTHON}
+			$(use_enable deprecated python-library)
+			$(use_enable gtk3 setup)"
+	else
+		python_conf="--disable-python-library --disable-setup"
+	fi
+	econf \
+		--enable-dconf \
+		$(use_enable introspection) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk2) \
+		$(use_enable gtk xim) \
+		$(use_enable gtk3) \
+		$(use_enable gtk3 ui) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable X xim) \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		${python_conf}
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+
+	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
+	rm -rf "${ED}"/usr/share/bash-completion || die
+	newbashcomp "${T}"/ibus.bash ${PN}
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-ibus ibus.conf
+
+	keepdir /usr/share/ibus/{engine,icons} #289547
+
+	use deprecated && python_optimize
+	use python && use gtk3 && python_optimize
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_schemas_savelist
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	use gconf && gnome2_schemas_update
+	gnome2_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     97a6aec8268998c24e7485281fd4ddf59c7d4da3
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  1 03:01:32 2016 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Feb  1 03:01:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97a6aec8

app-i18n/ibus: cleanup old versions

Package-Manager: portage-2.2.26

 app-i18n/ibus/Manifest             |   4 -
 app-i18n/ibus/ibus-1.5.5.ebuild    | 175 ---------------------------------
 app-i18n/ibus/ibus-1.5.8-r1.ebuild | 175 ---------------------------------
 app-i18n/ibus/ibus-1.5.9-r1.ebuild | 191 -------------------------------------
 4 files changed, 545 deletions(-)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 91e92c8..63f546c 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,7 +1,3 @@
 DIST ibus-1.5.10.tar.gz 2169299 SHA256 1d01b7806602875a1f3004f32e1000a39be01f59731d6baf36446498e26f5594 SHA512 2f7f07c20cac5f934f24c3bc99b29efe30aa5ced501ac442a9da16454cb889d946fa262b3495c1778f200c8f62a1fd8d67f47f43ae6ee214d3d392feb6e413c9 WHIRLPOOL 575d5bba84ed8afb608030260b5fbbd47bdfc4ff1368590e0c34b2fed1cf2878e71bdb7b6da286d0b0d5a27f7fcc9e2a02675a86bbc9417c1d060246b7a6acbd
 DIST ibus-1.5.11.tar.gz 2177026 SHA256 49995a298a39a137e65c6ee77811b030850ff344b875f29d4ed088f623a546bc SHA512 7745a06a4dc9502a957bdfa7faba3e6ff857ee102f34acfbc5d1c8ca5935eaf5660ebe6d837ee7bae584818c08a1769cf8a9daa012f87d43a1f10917c04615c2 WHIRLPOOL ae724b6609323e22f6fdff767484ec1259a6e3e4465b1a539cdfaa9178920d23d062d4eb6627fd3b45416d7fa9170a5bf467d6cddd4b1e80ae568a31e851be24
 DIST ibus-1.5.12.tar.gz 2190284 SHA256 e24da95995f4aca5b96359eaba709487dc5ad4c732e9b01b9bcf9fb34be2442c SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81 WHIRLPOOL 82354fc5006a0abe4cb431dda90a67dc1b775f0bac521b481eaeb7acd167ba6179cad14045c5141c57618845589094613bc489357ee8bf550f131ecfb1bf8293
-DIST ibus-1.5.5.tar.gz 2063794 SHA256 02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec SHA512 8249d6ee4918b0e0fe030af736eed2260e1376b2fdaf0d819f289e0bd880a5e3874f1fb3d097fc74b9f359822ce16f4dae52a263aa28c2e2ce7bdf671cb2fea9 WHIRLPOOL 33ba90e5cdd54ecd7a03af8c5d2c1d2e8cfc88bfc53b65e5240eb4c60d6138007b754a60e8b1e79c98ce92e299d14f1a0cce445ad40b04e862adf3919401d77d
-DIST ibus-1.5.8.tar.gz 2120220 SHA256 cfc562ae73de753dc8cb9ae30fe117286ddd94cd109002108f2eeb47e8101a29 SHA512 428e40be7ebea57832295e76b5c4350351c6d40c5178c57c61c8d6f31e524a315184c3d533ad88592e53ae7c6cb4beed67796ad61910f99f260fc9c243b2fc98 WHIRLPOOL 2fc0059a75b3f4b253770303a8c9c8ae02947153eaf7b9c220e2e10657275293a556b068ba4cad0d27f315b7374ffaedb53b20cd13f8408a3729cfaaea869d78
-DIST ibus-1.5.9-upstream-patches-0.tar.xz 30380 SHA256 9efe631008cfad1d59db01a83ae093149b2c827d480705836f0bf8a29706f1e0 SHA512 98c323de9793938d8c0bd646071d0ea7860212e3ae826e97ed0e0a092ec715084529b3a3cee3def63958dd3d56357b2e33e4e3d3946cca90bec3409469cf14d4 WHIRLPOOL 0aaf7aaba36de96525f0339a16df2c435e2f2c5cc6168c9b2da25bd7003af88f6d55ca53ae692c9c611b563ddfcb48a0e19e915f8361ba51a4aac813edc45f41
-DIST ibus-1.5.9.tar.gz 2128459 SHA256 ad41014aa3cb961854ee0aa392a5abd7452fab2c6b77d8ff2d736b7405b48ac6 SHA512 8a21303abceb38f1e5903342590c229a243db1497503fa08d547e1029bc25b90a2031f0386e57ddfcb897a14819d202289fcac1e3c8bad059698b04501a7ede9 WHIRLPOOL 88135818669cb3c189ce02a7caba3ec262bd95ffa6d139e8f76113ca91fc778f5f7703cfbfb1f5d5dd3cbb6948ba14d9c326f318b0286381caec45db3b453221

diff --git a/app-i18n/ibus/ibus-1.5.5.ebuild b/app-i18n/ibus/ibus-1.5.5.ebuild
deleted file mode 100644
index 3fed965..0000000
--- a/app-i18n/ibus/ibus-1.5.5.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.20"
-VALA_USE_DEPEND="vapigen"
-# Vapigen is needed for the vala binding
-# Valac is needed when building from git for the engine
-
-inherit bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://ibus.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
-REQUIRED_USE="|| ( gtk gtk3 X )
-	deprecated? ( python )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		|| ( deprecated ( gtk3 introspection ) ) )" #342903
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	app-text/iso-codes
-	>=gnome-base/dconf-0.13.4
-	x11-libs/libnotify
-
-	gconf? ( >=gnome-base/gconf-2.12:2 )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	python? ( ${PYTHON_DEPS} )
-	X? (
-		x11-libs/libX11
-		x11-libs/gtk+:2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
-	nls? ( virtual/libintl )
-	wayland? ( dev-libs/wayland )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/setxkbmap
-	python? (
-		dev-python/pyxdg
-		deprecated? (
-			>=dev-python/dbus-python-0.83
-			dev-python/pygobject:2
-			dev-python/pygtk:2 )
-		gtk3? (
-			dev-python/pygobject:3
-			x11-libs/gdk-pixbuf:2[introspection]
-			x11-libs/pango[introspection]
-			x11-libs/gtk+:3[introspection] )
-	)"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5.8.1
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )
-	vala? ( $(vala_depend) )
-	gnome-base/gconf"
-
-# stress test in bus/ fails
-# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
-RESTRICT="test"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To use ibus, you should:
-1. Get input engines from sunrise overlay.
-Run \"emerge -s ibus-\" in your favorite terminal
-for a list of packages we already have.
-
-2. Setup ibus:
-$ ibus-setup
-
-3. Set the following in your user startup scripts
-such as .xinitrc, .xsession or .xprofile:
-
-export XMODIFIERS=\"@im=ibus\"
-export GTK_IM_MODULE=\"ibus\"
-export QT_IM_MODULE=\"xim\"
-ibus-daemon -d -x
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
-	sed -e 's/dconf update/$(NULL)/' \
-		-i data/dconf/Makefile.{am,in} || die
-	use vala && vala_src_prepare
-	cp "${S}"/client/gtk2/ibusimcontext.c "${S}"/client/gtk3/ibusimcontext.c || die
-}
-
-src_configure() {
-	local python_conf
-	if use python; then
-		python_conf="PYTHON=${PYTHON}
-			$(use_enable deprecated python-library)
-			$(use_enable gtk3 setup)"
-	else
-		python_conf="--disable-python-library --disable-setup"
-	fi
-	econf \
-		--enable-dconf \
-		$(use_enable introspection) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk2) \
-		$(use_enable gtk xim) \
-		$(use_enable gtk3) \
-		$(use_enable gtk3 ui) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable X xim) \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		${python_conf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
-	rm -rf "${ED}"/usr/share/bash-completion || die
-	newbashcomp "${T}"/ibus.bash ${PN}
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-ibus ibus.conf
-
-	keepdir /usr/share/ibus/{engine,icons} #289547
-
-	use deprecated && python_optimize
-	use python && use gtk3 && python_optimize
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-	gnome2_schemas_savelist
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use gconf && gnome2_schemas_update
-	gnome2_schemas_savelist
-	gnome2_icon_cache_update
-}

diff --git a/app-i18n/ibus/ibus-1.5.8-r1.ebuild b/app-i18n/ibus/ibus-1.5.8-r1.ebuild
deleted file mode 100644
index 57b1cf5..0000000
--- a/app-i18n/ibus/ibus-1.5.8-r1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.20"
-VALA_USE_DEPEND="vapigen"
-# Vapigen is needed for the vala binding
-# Valac is needed when building from git for the engine
-
-inherit bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
-REQUIRED_USE="|| ( gtk gtk3 X )
-	deprecated? ( python )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		|| ( deprecated ( gtk3 introspection ) ) )" #342903
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	app-text/iso-codes
-	>=gnome-base/dconf-0.13.4
-	x11-libs/libnotify
-
-	gconf? ( >=gnome-base/gconf-2.12:2 )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	python? ( ${PYTHON_DEPS} )
-	X? (
-		x11-libs/libX11
-		x11-libs/gtk+:2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
-	nls? ( virtual/libintl )
-	wayland? ( dev-libs/wayland )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/setxkbmap
-	python? (
-		dev-python/pyxdg
-		deprecated? (
-			>=dev-python/dbus-python-0.83
-			dev-python/pygobject:2
-			dev-python/pygtk:2 )
-		gtk3? (
-			dev-python/pygobject:3
-			x11-libs/gdk-pixbuf:2[introspection]
-			x11-libs/pango[introspection]
-			x11-libs/gtk+:3[introspection] )
-	)"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5.8.1
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )
-	vala? ( $(vala_depend) )
-	gnome-base/gconf"
-
-# stress test in bus/ fails
-# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
-RESTRICT="test"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To use ibus, you should:
-1. Get input engines from sunrise overlay.
-Run \"emerge -s ibus-\" in your favorite terminal
-for a list of packages we already have.
-
-2. Setup ibus:
-$ ibus-setup
-
-3. Set the following in your user startup scripts
-such as .xinitrc, .xsession or .xprofile:
-
-export XMODIFIERS=\"@im=ibus\"
-export GTK_IM_MODULE=\"ibus\"
-export QT_IM_MODULE=\"xim\"
-ibus-daemon -d -x
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
-	sed -e 's/dconf update/:/' \
-		-i data/dconf/Makefile.{am,in} || die
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local python_conf
-	if use python; then
-		python_conf="PYTHON=${PYTHON}
-			$(use_enable deprecated python-library)
-			$(use_enable gtk3 setup)"
-	else
-		python_conf="--disable-python-library --disable-setup"
-	fi
-	econf \
-		--enable-dconf \
-		$(use_enable introspection) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk2) \
-		$(use_enable gtk xim) \
-		$(use_enable gtk3) \
-		$(use_enable gtk3 ui) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable X xim) \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		${python_conf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
-	rm -rf "${ED}"/usr/share/bash-completion || die
-	newbashcomp "${T}"/ibus.bash ${PN}
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-ibus ibus.conf
-
-	keepdir /usr/share/ibus/{engine,icons} #289547
-
-	use deprecated && python_optimize
-	use python && use gtk3 && python_optimize
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-	gnome2_schemas_savelist
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use gconf && gnome2_schemas_update
-	gnome2_schemas_savelist
-	gnome2_icon_cache_update
-}

diff --git a/app-i18n/ibus/ibus-1.5.9-r1.ebuild b/app-i18n/ibus/ibus-1.5.9-r1.ebuild
deleted file mode 100644
index 725ef8f..0000000
--- a/app-i18n/ibus/ibus-1.5.9-r1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.20"
-VALA_USE_DEPEND="vapigen"
-# Vapigen is needed for the vala binding
-# Valac is needed when building from git for the engine
-UPSTREAM_VER=0
-
-inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test +vala wayland +X"
-REQUIRED_USE="
-	|| ( gtk gtk3 X )
-	deprecated? ( python )
-	vala? ( introspection )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		|| ( deprecated ( gtk3 introspection ) ) )" #342903
-
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTRAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz
-	${UPSTRAM_PATCHSET_URI}"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	app-text/iso-codes
-	>=gnome-base/dconf-0.13.4
-	x11-libs/libnotify
-	gconf? ( >=gnome-base/gconf-2.12:2 )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	python? ( ${PYTHON_DEPS} )
-	X? (
-		x11-libs/libX11
-		x11-libs/gtk+:2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
-	nls? ( virtual/libintl )
-	wayland? ( dev-libs/wayland )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/setxkbmap
-	python? (
-		dev-python/pyxdg
-		deprecated? (
-			>=dev-python/dbus-python-0.83
-			dev-python/pygobject:2
-			dev-python/pygtk:2 )
-		gtk3? (
-			dev-python/pygobject:3
-			x11-libs/gdk-pixbuf:2[introspection]
-			x11-libs/pango[introspection]
-			x11-libs/gtk+:3[introspection] )
-	)"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5.8.1
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )
-	vala? ( $(vala_depend) )"
-
-# stress test in bus/ fails
-# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
-RESTRICT="test"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To use ibus, you should:
-1. Get input engines from sunrise overlay.
-Run \"emerge -s ibus-\" in your favorite terminal
-for a list of packages we already have.
-
-2. Setup ibus:
-$ ibus-setup
-
-3. Set the following in your user startup scripts
-such as .xinitrc, .xsession or .xprofile:
-
-export XMODIFIERS=\"@im=ibus\"
-export GTK_IM_MODULE=\"ibus\"
-export QT_IM_MODULE=\"xim\"
-ibus-daemon -d -x
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
-	sed -e 's/dconf update/:/' \
-		-i data/dconf/Makefile.{am,in} || die
-	use vala && vala_src_prepare
-
-	eautoreconf
-}
-
-src_configure() {
-	local python_conf
-	if use python; then
-		python_conf="PYTHON=${PYTHON}
-			$(use_enable deprecated python-library)
-			$(use_enable gtk3 setup)"
-	else
-		python_conf="--disable-python-library --disable-setup"
-	fi
-	econf \
-		--enable-dconf \
-		$(use_enable introspection) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk2) \
-		$(use_enable gtk xim) \
-		$(use_enable gtk3) \
-		$(use_enable gtk3 ui) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable X xim) \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		${python_conf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
-	rm -rf "${ED}"/usr/share/bash-completion || die
-	newbashcomp "${T}"/ibus.bash ${PN}
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-ibus ibus.conf
-
-	keepdir /usr/share/ibus/{engine,icons} #289547
-
-	use deprecated && python_optimize
-	use python && use gtk3 && python_optimize
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-	gnome2_schemas_savelist
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use gconf && gnome2_schemas_update
-	gnome2_schemas_savelist
-	gnome2_icon_cache_update
-}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Mike Frysinger]

commit:     2c750d8657dfe63e0f5fd0711bb0ec555980303f
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 24 19:07:09 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Dec 24 20:16:40 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c750d86

app-i18n/ibus: mark 1.5.5 alpha/ia64/sparc stable

 app-i18n/ibus/ibus-1.5.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.5.ebuild b/app-i18n/ibus/ibus-1.5.5.ebuild
index 3473d00..3fed965 100644
--- a/app-i18n/ibus/ibus-1.5.5.ebuild
+++ b/app-i18n/ibus/ibus-1.5.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://ibus.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="|| ( gtk gtk3 X )
 	deprecated? ( python )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     d8f541d95a42835ac462c2fcabcf53c7ab154e66
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 22 07:31:14 2015 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Dec 22 07:35:51 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8f541d9

app-i18n/ibus: drop gnome2_schemas_savelist() at pkg_postrm()

Gentoo-Bug: 566956

Package-Manager: portage-2.2.26

 app-i18n/ibus/ibus-1.5.10.ebuild | 1 -
 app-i18n/ibus/ibus-1.5.11.ebuild | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.10.ebuild b/app-i18n/ibus/ibus-1.5.10.ebuild
index 4cc235e..f6b1fe9 100644
--- a/app-i18n/ibus/ibus-1.5.10.ebuild
+++ b/app-i18n/ibus/ibus-1.5.10.ebuild
@@ -186,6 +186,5 @@ pkg_postrm() {
 	use gtk && gnome2_query_immodules_gtk2
 	use gtk3 && gnome2_query_immodules_gtk3
 	use gconf && gnome2_schemas_update
-	gnome2_schemas_savelist
 	gnome2_icon_cache_update
 }

diff --git a/app-i18n/ibus/ibus-1.5.11.ebuild b/app-i18n/ibus/ibus-1.5.11.ebuild
index 35eb4e2..5d6b826 100644
--- a/app-i18n/ibus/ibus-1.5.11.ebuild
+++ b/app-i18n/ibus/ibus-1.5.11.ebuild
@@ -186,6 +186,5 @@ pkg_postrm() {
 	use gtk && gnome2_query_immodules_gtk2
 	use gtk3 && gnome2_query_immodules_gtk3
 	use gconf && gnome2_schemas_update
-	gnome2_schemas_savelist
 	gnome2_icon_cache_update
 }

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Markus Meier]

commit:     2d636d3609030171ce55fb13a5f3df385aea035d
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 19:12:20 2015 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 19:12:20 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d636d36

app-i18n/ibus: arm stable, bug #565190

Package-Manager: portage-2.2.25
RepoMan-Options: --include-arches="arm"

 app-i18n/ibus/ibus-1.5.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.11.ebuild b/app-i18n/ibus/ibus-1.5.11.ebuild
index e0d8155..35eb4e2 100644
--- a/app-i18n/ibus/ibus-1.5.11.ebuild
+++ b/app-i18n/ibus/ibus-1.5.11.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ibus/ibus/wiki"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="
 	|| ( gtk gtk3 X )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Agostino Sarubbo]

commit:     5267a96a8597ee1758685eda290f6b8398babdac
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 13 09:41:53 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Nov 13 09:41:53 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5267a96a

app-i18n/ibus: ppc64 stable wrt bug #565190

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc64"

 app-i18n/ibus/ibus-1.5.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.11.ebuild b/app-i18n/ibus/ibus-1.5.11.ebuild
index e330b5c..e0d8155 100644
--- a/app-i18n/ibus/ibus-1.5.11.ebuild
+++ b/app-i18n/ibus/ibus-1.5.11.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ibus/ibus/wiki"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="
 	|| ( gtk gtk3 X )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Agostino Sarubbo]

commit:     ee0201c645b37d50c97c76466c5e519ca175f8da
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 09:39:17 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 09:39:17 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee0201c6

app-i18n/ibus: ppc stable wrt bug #565190

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc"

 app-i18n/ibus/ibus-1.5.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.11.ebuild b/app-i18n/ibus/ibus-1.5.11.ebuild
index 7701689..e330b5c 100644
--- a/app-i18n/ibus/ibus-1.5.11.ebuild
+++ b/app-i18n/ibus/ibus-1.5.11.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ibus/ibus/wiki"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="
 	|| ( gtk gtk3 X )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Agostino Sarubbo]

commit:     5666462244b608650ac985fac15599b64f394916
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 11 09:11:35 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Nov 11 09:11:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56664622

app-i18n/ibus: x86 stable wrt bug #565190

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"

 app-i18n/ibus/ibus-1.5.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.11.ebuild b/app-i18n/ibus/ibus-1.5.11.ebuild
index 9a2a3b0..7701689 100644
--- a/app-i18n/ibus/ibus-1.5.11.ebuild
+++ b/app-i18n/ibus/ibus-1.5.11.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ibus/ibus/wiki"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="
 	|| ( gtk gtk3 X )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Agostino Sarubbo]

commit:     256a7e78aec692b308b8bf19eec5ef3762d9fc85
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 11:44:40 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 11:44:40 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=256a7e78

app-i18n/ibus: amd64 stable wrt bug #565190

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 app-i18n/ibus/ibus-1.5.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.11.ebuild b/app-i18n/ibus/ibus-1.5.11.ebuild
index c83e988..9a2a3b0 100644
--- a/app-i18n/ibus/ibus-1.5.11.ebuild
+++ b/app-i18n/ibus/ibus-1.5.11.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ibus/ibus/wiki"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="
 	|| ( gtk gtk3 X )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     d9f0d11f796cb6187bb3950d9127173ec99d4264
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 15:31:16 2015 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 15:35:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9f0d11f

app-i18n/ibus: version bump 1.5.11

Package-Manager: portage-2.2.20.1

 app-i18n/ibus/Manifest           |   1 +
 app-i18n/ibus/ibus-1.5.11.ebuild | 191 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 192 insertions(+)

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index a8adb10..2b448d9 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,4 +1,5 @@
 DIST ibus-1.5.10.tar.gz 2169299 SHA256 1d01b7806602875a1f3004f32e1000a39be01f59731d6baf36446498e26f5594 SHA512 2f7f07c20cac5f934f24c3bc99b29efe30aa5ced501ac442a9da16454cb889d946fa262b3495c1778f200c8f62a1fd8d67f47f43ae6ee214d3d392feb6e413c9 WHIRLPOOL 575d5bba84ed8afb608030260b5fbbd47bdfc4ff1368590e0c34b2fed1cf2878e71bdb7b6da286d0b0d5a27f7fcc9e2a02675a86bbc9417c1d060246b7a6acbd
+DIST ibus-1.5.11.tar.gz 2177026 SHA256 49995a298a39a137e65c6ee77811b030850ff344b875f29d4ed088f623a546bc SHA512 7745a06a4dc9502a957bdfa7faba3e6ff857ee102f34acfbc5d1c8ca5935eaf5660ebe6d837ee7bae584818c08a1769cf8a9daa012f87d43a1f10917c04615c2 WHIRLPOOL ae724b6609323e22f6fdff767484ec1259a6e3e4465b1a539cdfaa9178920d23d062d4eb6627fd3b45416d7fa9170a5bf467d6cddd4b1e80ae568a31e851be24
 DIST ibus-1.5.5.tar.gz 2063794 SHA256 02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec SHA512 8249d6ee4918b0e0fe030af736eed2260e1376b2fdaf0d819f289e0bd880a5e3874f1fb3d097fc74b9f359822ce16f4dae52a263aa28c2e2ce7bdf671cb2fea9 WHIRLPOOL 33ba90e5cdd54ecd7a03af8c5d2c1d2e8cfc88bfc53b65e5240eb4c60d6138007b754a60e8b1e79c98ce92e299d14f1a0cce445ad40b04e862adf3919401d77d
 DIST ibus-1.5.8.tar.gz 2120220 SHA256 cfc562ae73de753dc8cb9ae30fe117286ddd94cd109002108f2eeb47e8101a29 SHA512 428e40be7ebea57832295e76b5c4350351c6d40c5178c57c61c8d6f31e524a315184c3d533ad88592e53ae7c6cb4beed67796ad61910f99f260fc9c243b2fc98 WHIRLPOOL 2fc0059a75b3f4b253770303a8c9c8ae02947153eaf7b9c220e2e10657275293a556b068ba4cad0d27f315b7374ffaedb53b20cd13f8408a3729cfaaea869d78
 DIST ibus-1.5.9-upstream-patches-0.tar.xz 30380 SHA256 9efe631008cfad1d59db01a83ae093149b2c827d480705836f0bf8a29706f1e0 SHA512 98c323de9793938d8c0bd646071d0ea7860212e3ae826e97ed0e0a092ec715084529b3a3cee3def63958dd3d56357b2e33e4e3d3946cca90bec3409469cf14d4 WHIRLPOOL 0aaf7aaba36de96525f0339a16df2c435e2f2c5cc6168c9b2da25bd7003af88f6d55ca53ae692c9c611b563ddfcb48a0e19e915f8361ba51a4aac813edc45f41

diff --git a/app-i18n/ibus/ibus-1.5.11.ebuild b/app-i18n/ibus/ibus-1.5.11.ebuild
new file mode 100644
index 0000000..e349271
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.11.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION="0.20"
+VALA_USE_DEPEND="vapigen"
+# Vapigen is needed for the vala binding
+# Valac is needed when building from git for the engine
+UPSTREAM_VER=
+
+inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="http://code.google.com/p/ibus/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
+REQUIRED_USE="
+	|| ( gtk gtk3 X )
+	deprecated? ( python )
+	vala? ( introspection )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		|| ( deprecated ( gtk3 introspection ) ) )" #342903
+
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz
+	${UPSTRAM_PATCHSET_URI}"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	app-text/iso-codes
+	>=gnome-base/dconf-0.13.4
+	x11-libs/libnotify
+	gconf? ( >=gnome-base/gconf-2.12:2 )
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	python? ( ${PYTHON_DEPS} )
+	X? (
+		x11-libs/libX11
+		x11-libs/gtk+:2 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+	nls? ( virtual/libintl )
+	wayland? ( dev-libs/wayland )"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/setxkbmap
+	python? (
+		dev-python/pyxdg
+		deprecated? (
+			>=dev-python/dbus-python-0.83
+			dev-python/pygobject:2
+			dev-python/pygtk:2 )
+		gtk3? (
+			dev-python/pygobject:3
+			x11-libs/gdk-pixbuf:2[introspection]
+			x11-libs/pango[introspection]
+			x11-libs/gtk+:3[introspection] )
+	)"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5.8.1
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.16.1 )
+	vala? ( $(vala_depend) )"
+
+# stress test in bus/ fails
+# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
+RESTRICT="test"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To use ibus, you should:
+1. Get input engines from sunrise overlay.
+Run \"emerge -s ibus-\" in your favorite terminal
+for a list of packages we already have.
+
+2. Setup ibus:
+$ ibus-setup
+
+3. Set the following in your user startup scripts
+such as .xinitrc, .xsession or .xprofile:
+
+export XMODIFIERS=\"@im=ibus\"
+export GTK_IM_MODULE=\"ibus\"
+export QT_IM_MODULE=\"xim\"
+ibus-daemon -d -x
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
+	sed -e 's/dconf update/:/' \
+		-i data/dconf/Makefile.{am,in} || die
+	use vala && vala_src_prepare
+
+	eautoreconf
+}
+
+src_configure() {
+	local python_conf
+	if use python; then
+		python_conf="PYTHON=${PYTHON}
+			$(use_enable deprecated python-library)
+			$(use_enable gtk3 setup)"
+	else
+		python_conf="--disable-python-library --disable-setup"
+	fi
+	econf \
+		--enable-dconf \
+		$(use_enable introspection) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk2) \
+		$(use_enable gtk xim) \
+		$(use_enable gtk3) \
+		$(use_enable gtk3 ui) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable X xim) \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		${python_conf}
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+
+	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
+	rm -rf "${ED}"/usr/share/bash-completion || die
+	newbashcomp "${T}"/ibus.bash ${PN}
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-ibus ibus.conf
+
+	keepdir /usr/share/ibus/{engine,icons} #289547
+
+	use deprecated && python_optimize
+	use python && use gtk3 && python_optimize
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_schemas_savelist
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	use gconf && gnome2_schemas_update
+	gnome2_schemas_savelist
+	gnome2_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

[Yixun Lan]

commit:     0f38ed64e8552b864ddbf0e2c852a90b2a894e8b
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 15:45:11 2015 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 15:45:11 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f38ed64

app-i18n/ibus: update HOME url

Package-Manager: portage-2.2.20.1

 app-i18n/ibus/ibus-1.5.10.ebuild   | 2 +-
 app-i18n/ibus/ibus-1.5.11.ebuild   | 2 +-
 app-i18n/ibus/ibus-1.5.5.ebuild    | 2 +-
 app-i18n/ibus/ibus-1.5.8-r1.ebuild | 2 +-
 app-i18n/ibus/ibus-1.5.9-r1.ebuild | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.10.ebuild b/app-i18n/ibus/ibus-1.5.10.ebuild
index bcdab7e..367f6ad 100644
--- a/app-i18n/ibus/ibus-1.5.10.ebuild
+++ b/app-i18n/ibus/ibus-1.5.10.ebuild
@@ -14,7 +14,7 @@ UPSTREAM_VER=
 inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://code.google.com/p/ibus/"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
 
 LICENSE="LGPL-2.1"
 SLOT="0"

diff --git a/app-i18n/ibus/ibus-1.5.11.ebuild b/app-i18n/ibus/ibus-1.5.11.ebuild
index e349271..c83e988 100644
--- a/app-i18n/ibus/ibus-1.5.11.ebuild
+++ b/app-i18n/ibus/ibus-1.5.11.ebuild
@@ -14,7 +14,7 @@ UPSTREAM_VER=
 inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="http://code.google.com/p/ibus/"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
 
 LICENSE="LGPL-2.1"
 SLOT="0"

diff --git a/app-i18n/ibus/ibus-1.5.5.ebuild b/app-i18n/ibus/ibus-1.5.5.ebuild
index f3120f7..3473d00 100644
--- a/app-i18n/ibus/ibus-1.5.5.ebuild
+++ b/app-i18n/ibus/ibus-1.5.5.ebuild
@@ -12,7 +12,7 @@ VALA_USE_DEPEND="vapigen"
 inherit bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://code.google.com/p/ibus/"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
 SRC_URI="https://ibus.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"

diff --git a/app-i18n/ibus/ibus-1.5.8-r1.ebuild b/app-i18n/ibus/ibus-1.5.8-r1.ebuild
index d4b39d2..57b1cf5 100644
--- a/app-i18n/ibus/ibus-1.5.8-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.8-r1.ebuild
@@ -13,7 +13,7 @@ VALA_USE_DEPEND="vapigen"
 inherit bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://code.google.com/p/ibus/"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
 SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"

diff --git a/app-i18n/ibus/ibus-1.5.9-r1.ebuild b/app-i18n/ibus/ibus-1.5.9-r1.ebuild
index 3a08b6e..725ef8f 100644
--- a/app-i18n/ibus/ibus-1.5.9-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.9-r1.ebuild
@@ -14,7 +14,7 @@ UPSTREAM_VER=0
 inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://code.google.com/p/ibus/"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
 
 LICENSE="LGPL-2.1"
 SLOT="0"