Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

2 files changed, 0 insertions, 183 deletions

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 7775029070b7..9cfc1872e10c 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -3,8 +3,6 @@ AUX ibus-1.5.19-gdk-wayland.patch 2996 BLAKE2B d203c843a0ba692c1be81c1172866bea6
 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
-DIST ibus-1.5.20.tar.gz 3393487 BLAKE2B 0ed930cbadf7ecf9fa82ee2c0e2a8aa8cfb25a8dc1a2e2ffef0d4f894df31f879f08d7ed14508736836545cbc25b929707939c3b0ea53f2b44ba7489d6dc80ed SHA512 2bbcc19742882fa55d9c8704251f133c5be9f36a93cf52d70c460a4713419868deb634f965e67c1d5c45b615de388b92c0fbb863b118a546fbb89370a38eb77b
 EBUILD ibus-1.5.18.ebuild 4307 BLAKE2B 5247b7bfff9f685bc82925aaf076552aa523aa5224557bb4c3ce9aef270478bd0d2339c368e65773d15099fa9b4e6fd52546c0dd0092edd8658cd3592a21f3a8 SHA512 c6ce6899b4c8147ca6719d57cc8ff53dba0cc18857052bc1c71f585f1c7241516e5f9c377654af1062f38f5c03c6e6b2f4d01aba41befc7ed2691bb864f4975c
 EBUILD ibus-1.5.19.ebuild 4394 BLAKE2B a3674ee38f08b65d257c873c7fec6dbd18df9362be6bf25fc2a49d21dd451aa021e392ab5e270f3c685c90cc30129313b0a58ad8bdf6e7db1ea60fce7e958b6f SHA512 3441e56a149d25b2abdbeefa626f7fd6b85f5b96088d1e293a97b1dfb0eea76fd4c2d157dc6e68bc70bd2e847e2daca020b75885b8939eb86a125c0152e4ded8
-EBUILD ibus-1.5.20.ebuild 4160 BLAKE2B 604a81b4786558da6ac975be3fa265fc8ab2de74d923ff9e13e751bade584f1782adc920b5256d19f9c165eb34521777ec4b44937ec5da90bad20e677b281c5b SHA512 ca7891184421023e8cf838d4f4d065fdff2d2a5b40bb7088e3bc0a21edfbed5f30ea0d5155da894134d183a6c779ead58a430382cbd6a2e2dbe217f2893fd82d
 MISC metadata.xml 942 BLAKE2B 9d8f0df17ae7c5c60892a8bf661c1f7325f4943e30d51667fe5e56f2c74f55e36c6f40cd6044435b9f046a88a267fa1b5d46f6cddc0cefa6b423554ff905e882 SHA512 5501b7ef3b46de30b69eabe28334556c979c99610f0a6051a254a7591de612d99ea9ee3c18c2f3869ae2046514df8cd555d801cc778bc1db111895256b7ab100
diff --git a/app-i18n/ibus/ibus-1.5.20.ebuild b/app-i18n/ibus/ibus-1.5.20.ebuild
deleted file mode 100644
index 09b0683c5cb1..000000000000
--- a/app-i18n/ibus/ibus-1.5.20.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# 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
-}