From 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Mar 2019 13:42:34 +0000 Subject: gentoo resync : 03.03.2019 --- app-i18n/ibus/Manifest | 9 +- app-i18n/ibus/files/ibus-1.5.19-vala-0.43.4.patch | 191 ++++++++++++++++++++++ app-i18n/ibus/ibus-1.5.12.ebuild | 164 ------------------- app-i18n/ibus/ibus-1.5.16.ebuild | 180 -------------------- app-i18n/ibus/ibus-1.5.18.ebuild | 3 +- app-i18n/ibus/ibus-1.5.19.ebuild | 8 +- 6 files changed, 201 insertions(+), 354 deletions(-) create mode 100644 app-i18n/ibus/files/ibus-1.5.19-vala-0.43.4.patch delete mode 100644 app-i18n/ibus/ibus-1.5.12.ebuild delete mode 100644 app-i18n/ibus/ibus-1.5.16.ebuild (limited to 'app-i18n/ibus') diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest index 35c8aff6b905..5c79eda2ac5d 100644 --- a/app-i18n/ibus/Manifest +++ b/app-i18n/ibus/Manifest @@ -1,11 +1,8 @@ AUX ibus-1.5.18-enable-gsettings-in-runtest.patch 1707 BLAKE2B 760f99faf079a65b7c36e355f19f16e71a0d3fa5dcee2a8201e571732c317f238d7bac7bcde6d823d5ff6ecde40c430ff310356f921d665f08708c4b5e24c4d0 SHA512 fedcb39f6a4b70055aae2dd90a03fa6e709feebeff20bd5df30deec3346c85036ede017c0a8bab92680a5a004e50e5e450b288bd8981889a8b1cd89334f74531 AUX ibus-1.5.19-gdk-wayland.patch 2996 BLAKE2B d203c843a0ba692c1be81c1172866bea6ea30e6ea25c562d04ad31934af48f4e2bcc5d5ec862af049a026c3656c0fce960715c7271514e1d4faa54c8f6ed369c SHA512 e53619feafc4f5e7cc662d0c59be5beda916dc3b2ec2f74121b6b3fb874ed3bc15f43ee739b272f2304344c9acbc399b5c522d2f5d54695aca7e48d4b68430bb -DIST ibus-1.5.12.tar.gz 2190284 BLAKE2B 57ac7f9e8e8f0419bad1bf3aa629282ef3c0188d29e98bc872e594955f69e0863020d600c674cabed56db156a85210b5b3c1fe137b135395a27d2535e4938164 SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81 -DIST ibus-1.5.16.tar.gz 2375719 BLAKE2B cf4cbd4556e43403c73da3cd2cb9f6da8e0baf5f90b3bc74f6d12c1bad057198ed828053dcbb3ddfd28c37d9011b6166e834385720aa827a68f594dbd4cf9298 SHA512 494ead69cf9c0111fd25fd1de27e796d89db4f08443afa1ec469f638469b25d8b19a59ea7ab0db0f3a130b9a89b3f2819667099ba38fc973d6efc61b367ce237 +AUX ibus-1.5.19-vala-0.43.4.patch 8430 BLAKE2B 2c87c226b3e52710eac046d5c822031626629f8cc1fd85701f2102ea75883a55391c1f33909d041c31f78c0c305a23515b3151e35f92f2a4ff06d39c4b415e66 SHA512 cdbf1b5ab214a62c67d46c689c2f8ff98ab273b7faba6dafd88b3be78227c2897710ff105938936b93435c0f2ee896f2ffbea78ecfa96e59323e0535b799f367 DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42e0e086ad7be18ccb6239868ed940d2c371d83c2e2706c7120702af0bcb0106da60889f0b3d5857b8929b9165 SHA512 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3 DIST ibus-1.5.19.tar.gz 2842274 BLAKE2B a5aea4770c1c0a58a9e0b1aa26f47a8ab9eb5060a0c06179663984c5b531464ff4575a8ece2f2ee2122f777ca615296c1e46ad4833c68ba2da038f2b85dea374 SHA512 ddcd464c9afb6d081df1cfac65069506877eb4818c3ba5594bcf76f3c6795ef6c17177a778dc89b2ef69d10d87297aa12c8e04f156b750e500b51b32787bd9fc -EBUILD ibus-1.5.12.ebuild 3678 BLAKE2B 8b08b4f6cf2c188d387c43741f0e430749ba003dd7693ce4b70e36c21d5c046f8f0be82ecc2401df577603f7c074d99904d6dfc3aa60f1327157e835563779a7 SHA512 178fdf0169e444161b598ee800a99328060ec7a28a6cd73ca2c26ddce10372072faabe63234d2a9b7c0e31b758cdf7f533c508f05491be80a9ae130f466a5679 -EBUILD ibus-1.5.16.ebuild 3959 BLAKE2B 7a8872f49d619d6079915884ff25ee90a74653fa4614c61043d34414989cafebe122cedc65d72999b2eaca668f0ab0d76484d6ef177e419a3e284476430bb1ff SHA512 b664b04cc0010f3e6da17f7e2dfd5f10ba2241def9a807d5da176c8b1f0eb14a066dd9df6af3b750f06f3b476d867a30b18e32ce85ab1b4efa44274132b75e96 -EBUILD ibus-1.5.18.ebuild 4279 BLAKE2B cc9c0046615c92f1767e7c1e942a283e7ba6a1d9acc9f65c96b4f7bb60cdc0434017c112f21e1a321a55a0997d942b57ed8ef9013762d4ac635b5da3f0c31725 SHA512 65d60a8f53ea373982e35c8c817a1752565cd98f4c54db339119f762898aed3142ccd8d044ecec54b1375e9ffeaa306d07e6ad0cff198d63b58140ef4c12ee4e -EBUILD ibus-1.5.19.ebuild 4390 BLAKE2B 664fdf72ac243a5758951556a1f3f30d741a5c956672d57c2a05e80521c02b7293dbbbd4ca054c18fe64c0e3393102ec481c045de3df227980f8a07cbdd134d0 SHA512 6a729644d4142bc953d5bdf8f87f33ac68106beee93cbef4eef5cf5d6a9d4145bed916aa45c9861d9d3172d5bbef707cd9b303939a41f2c680585a11c4b4347b +EBUILD ibus-1.5.18.ebuild 4307 BLAKE2B 5247b7bfff9f685bc82925aaf076552aa523aa5224557bb4c3ce9aef270478bd0d2339c368e65773d15099fa9b4e6fd52546c0dd0092edd8658cd3592a21f3a8 SHA512 c6ce6899b4c8147ca6719d57cc8ff53dba0cc18857052bc1c71f585f1c7241516e5f9c377654af1062f38f5c03c6e6b2f4d01aba41befc7ed2691bb864f4975c +EBUILD ibus-1.5.19.ebuild 4397 BLAKE2B e0de168f4b387a859c93f1a23f22ec5eb5bc71eaf6f20c123371ab8954093e71f69de0e052a3f8e250dd332d808214ab7db8f0de09620e4d6ab018db9d16f881 SHA512 d36a9f44a60ca9a833b5779d73b0ad8e38e8b2ac5f63672aa8db7dc98c5ba42fa97c3047ec26c74614190e911cdd9e1d097f101c218a5258c2d25a2b8223a0cc MISC metadata.xml 942 BLAKE2B 9d8f0df17ae7c5c60892a8bf661c1f7325f4943e30d51667fe5e56f2c74f55e36c6f40cd6044435b9f046a88a267fa1b5d46f6cddc0cefa6b423554ff905e882 SHA512 5501b7ef3b46de30b69eabe28334556c979c99610f0a6051a254a7591de612d99ea9ee3c18c2f3869ae2046514df8cd555d801cc778bc1db111895256b7ab100 diff --git a/app-i18n/ibus/files/ibus-1.5.19-vala-0.43.4.patch b/app-i18n/ibus/files/ibus-1.5.19-vala-0.43.4.patch new file mode 100644 index 000000000000..0ebb92c21e5d --- /dev/null +++ b/app-i18n/ibus/files/ibus-1.5.19-vala-0.43.4.patch @@ -0,0 +1,191 @@ +From 4d7c1e00e15921a0448947961183c1c124b6b49f Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Tue, 29 Jan 2019 17:57:16 +0900 +Subject: [PATCH] Delete weak pointer in GList.SList for vala 0.43.4 + +Vala 0.43.4 does not allow to convert a weak pointer to the full one in SList. + +emojier.vala:424.36-425.73: error: Assignment: Cannot convert from +`GLib.SList' to `GLib.SList?' +emojier.vala:636.9-637.69: error: Assignment: Cannot convert from +`GLib.SList' to `GLib.SList' +panel.vala:526.36-526.65: error: Assignment: Cannot convert from +`GLib.List' to `GLib.List?' +--- + src/ibusbus.h | 11 ++++++----- + src/ibusemoji.h | 6 +++--- + src/ibusunicode.h | 8 ++++---- + ui/gtk3/emojier.vala | 24 ++++++++++++++++-------- + 4 files changed, 29 insertions(+), 20 deletions(-) + +diff --git a/src/ibusbus.h b/src/ibusbus.h +index dff3dfb7..fddcf5b2 100644 +--- a/src/ibusbus.h ++++ b/src/ibusbus.h +@@ -2,7 +2,8 @@ + /* vim:set et sts=4: */ + /* ibus - The Input Bus + * Copyright (C) 2008-2013 Peng Huang +- * Copyright (C) 2008-2013 Red Hat, Inc. ++ * Copyright (C) 2013-2019 Takao Fujiwara ++ * Copyright (C) 2008-2019 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public +@@ -692,7 +693,7 @@ gboolean ibus_bus_register_component_async_finish + * + * List engines synchronously. + * +- * Returns: (transfer container) (element-type IBusEngineDesc): ++ * Returns: (transfer full) (element-type IBusEngineDesc): + * A List of engines. + */ + GList *ibus_bus_list_engines (IBusBus *bus); +@@ -725,7 +726,7 @@ void ibus_bus_list_engines_async + * + * Finishes an operation started with ibus_bus_list_engines_async(). + * +- * Returns: (transfer container) (element-type IBusEngineDesc): ++ * Returns: (transfer full) (element-type IBusEngineDesc): + * A List of engines. + */ + GList *ibus_bus_list_engines_async_finish +@@ -740,7 +741,7 @@ GList *ibus_bus_list_engines_async_finish + * + * List active engines synchronously. + * +- * Returns: (transfer container) (element-type IBusEngineDesc): ++ * Returns: (transfer full) (element-type IBusEngineDesc): + * A List of active engines. + * + * Deprecated: 1.5.3: Read dconf value +@@ -782,7 +783,7 @@ void ibus_bus_list_active_engines_async + * + * Finishes an operation started with ibus_bus_list_active_engines_async(). + * +- * Returns: (transfer container) (element-type IBusEngineDesc): ++ * Returns: (transfer full) (element-type IBusEngineDesc): + * A List of active engines. + * + * Deprecated: 1.5.3: Read dconf value +diff --git a/src/ibusemoji.h b/src/ibusemoji.h +index 4edee726..5e9fbcf4 100644 +--- a/src/ibusemoji.h ++++ b/src/ibusemoji.h +@@ -1,8 +1,8 @@ + /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ + /* vim:set et sts=4: */ + /* bus - The Input Bus +- * Copyright (C) 2017 Takao Fujiwara +- * Copyright (C) 2017 Red Hat, Inc. ++ * Copyright (C) 2017-2019 Takao Fujiwara ++ * Copyright (C) 2017-2019 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public +@@ -209,7 +209,7 @@ void ibus_emoji_data_save (const gchar *path, + * ibus_emoji_data_load: + * @path: A path of the saved dictionary file. + * +- * Returns: (element-type IBusEmojiData) (transfer container): ++ * Returns: (element-type IBusEmojiData) (transfer full): + * An #IBusEmojiData list loaded from the saved cache file. + */ + GSList * ibus_emoji_data_load (const gchar *path); +diff --git a/src/ibusunicode.h b/src/ibusunicode.h +index 99de9451..473bdb19 100644 +--- a/src/ibusunicode.h ++++ b/src/ibusunicode.h +@@ -1,8 +1,8 @@ + /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ + /* vim:set et sts=4: */ + /* bus - The Input Bus +- * Copyright (C) 2018 Takao Fujiwara +- * Copyright (C) 2018 Red Hat, Inc. ++ * Copyright (C) 2018-2019 Takao Fujiwara ++ * Copyright (C) 2018-2019 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public +@@ -201,7 +201,7 @@ void ibus_unicode_data_save (const gchar *path, + * #IBusUnicodeData, * the total number of #IBusUnicodeData) of uint values + * with that signal by 100 times. Otherwise %NULL. + * +- * Returns: (element-type IBusUnicodeData) (transfer container): ++ * Returns: (element-type IBusUnicodeData) (transfer full): + * An #IBusUnicodeData list loaded from the saved cache file. + */ + GSList * ibus_unicode_data_load (const gchar *path, +@@ -290,7 +290,7 @@ void ibus_unicode_block_save (const gchar *path, + * ibus_unicode_block_load: + * @path: A path of the saved dictionary file. + * +- * Returns: (element-type IBusUnicodeBlock) (transfer container): ++ * Returns: (element-type IBusUnicodeBlock) (transfer full): + * An #IBusUnicodeBlock list loaded from the saved cache file. + */ + GSList * ibus_unicode_block_load (const gchar *path); +diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala +index 0b9b54a9..aedeb4cb 100644 +--- a/ui/gtk3/emojier.vala ++++ b/ui/gtk3/emojier.vala +@@ -2,7 +2,7 @@ + * + * ibus - The Input Bus + * +- * Copyright (c) 2017-2018 Takao Fujiwara ++ * Copyright (c) 2017-2019 Takao Fujiwara + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public +@@ -882,8 +882,13 @@ public class IBusEmojier : Gtk.ApplicationWindow { + update_unicode_blocks(); + return; + } else { +- unowned GLib.SList emojis = +- m_category_to_emojis_dict.lookup(category); ++ // Use copy_deep() since vala 0.43.4 does not allow to assign ++ // a weak pointer to the full one in SList: ++ // emojier.vala:885.48-886.62: error: Assignment: Cannot convert ++ // from `GLib.SList' to `GLib.SList?' ++ GLib.SList emojis = ++ m_category_to_emojis_dict.lookup(category).copy_deep( ++ GLib.strdup); + m_lookup_table.clear(); + m_candidate_panel_mode = true; + foreach (unowned string emoji in emojis) { +@@ -1547,8 +1552,8 @@ public class IBusEmojier : Gtk.ApplicationWindow { + m_vbox.add(widget); + widget.show_all(); + } +- unowned GLib.SList? annotations = +- data.get_annotations(); ++ GLib.SList annotations = ++ data.get_annotations().copy_deep(GLib.strdup); + var buff = new GLib.StringBuilder(); + int i = 0; + foreach (unowned string annotation in annotations) { +@@ -2001,17 +2006,20 @@ public class IBusEmojier : Gtk.ApplicationWindow { + ) as IBus.EmojiData; + m_emoji_to_data_dict.insert(favorite, new_data); + } else { +- unowned GLib.SList annotations = data.get_annotations(); ++ GLib.SList annotations = ++ data.get_annotations().copy_deep(GLib.strdup); + if (annotations.find_custom(annotation, GLib.strcmp) == null) { + annotations.append(annotation); +- data.set_annotations(annotations.copy()); ++ data.set_annotations(annotations.copy_deep(GLib.strdup)); + } + } + unowned GLib.SList emojis = + m_annotation_to_emojis_dict.lookup(annotation); + if (emojis.find_custom(favorite, GLib.strcmp) == null) { + emojis.append(favorite); +- m_annotation_to_emojis_dict.replace(annotation, emojis.copy()); ++ m_annotation_to_emojis_dict.replace( ++ annotation, ++ emojis.copy_deep(GLib.strdup)); + } + } + } 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 5e7791469af2..000000000000 --- 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 e4ffeb871fa3..000000000000 --- 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 -} diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild index 711a75dbc83f..99eecac986fa 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 diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild index d39593776ec0..3fbfb9f1be67 100644 --- a/app-i18n/ibus/ibus-1.5.19.ebuild +++ b/app-i18n/ibus/ibus-1.5.19.ebuild @@ -4,7 +4,6 @@ EAPI="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 @@ -15,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 ) @@ -74,7 +73,10 @@ DEPEND="${CDEPEND} nls? ( sys-devel/gettext ) unicode? ( app-i18n/unicode-data )" -PATCHES=( "${FILESDIR}"/${P}-gdk-wayland.patch ) +PATCHES=( + "${FILESDIR}"/${P}-gdk-wayland.patch + "${FILESDIR}"/${P}-vala-0.43.4.patch +) src_prepare() { vala_src_prepare --ignore-use -- cgit v1.2.3