gentoo resync : 07.07.2018

5 files changed, 10 insertions, 162 deletions

diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index dac560d8d289..04f60b84c42b 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,11 +1,9 @@
-DIST fcitx-4.2.9.5_dict.tar.xz 8736972 BLAKE2B 01255554aa0caf5e4f638121febcf0951549d5752884dd436c90042587048598724b91d4839ff2470e8b9ee119f0abb40650c45fd8253ae1bd74608812c84a1d SHA512 5e2ec5405b01fe85b1659b1db3e15389b0d7e096808db598d0865381bcb8f6de960e8e16d4432c95c586cfc3359d17d4f7bad0cff2fe0146fe00b9fb80491168
 DIST fcitx-4.2.9.6_dict.tar.xz 8738408 BLAKE2B 812256657ef8f6648a8a3de4bef4e423288ee3d91d493783eae2cb55b5b5964a791f3317af1aea0d877e01ea06491c34f6c594038d27713be3a6b35c93bc5545 SHA512 dc8308d1a4e9b7595da285ca6521f33027f5b8e6968bc28f751bd4f40116166cabbe1c05e29072afbe88473d2a9d6999124476260785e07f62a243df6e896bb0
 DIST fcitx-data-en_dict-20121020.tar.gz 630491 BLAKE2B 2df897b1c9fb3a2ce186ee590e5f3ccbc7930f047218bf0fefa317f74b3287fc0be9c393d3310fe07208379118ec4c46608a1c703ef37b3aee65b2d790cb7f0d SHA512 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
 DIST fcitx-data-pinyin.tar.gz 1608886 BLAKE2B 3b7e72559bb838b4f2245e6faf2d627df17e9383ef8fe382e10333c1a95d79409ec042caa7d77c9bcd956b1c5d5456dab9d82208cd89d90e2be759c76f56f3d1 SHA512 1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131
 DIST fcitx-data-py_stroke-20121124.tar.gz 445601 BLAKE2B 43b29b30da11b18196918e4df847406871eff75595b62608ad86b0ef6de83ec5e1b722645cabb809281075b393b5970e4d9580594caa73060c866c2d3cd988e7 SHA512 d80ff9a3549e07c7a6935e686785f9a076c58f1a782a832ae28ee65e2a213d67f089f450ce09bed87ec2a141c32b9c1fcb83c221ddcab436858fa9009f161fb3
 DIST fcitx-data-py_table-20121124.tar.gz 186822 BLAKE2B d696413f2e88f1ca87938d632e12997d14a31a66eaf011c6a7b3c0f607cf45f48e53644ea07d73dbbb0ad898dee6d5ff2d0e4fc2fdcae923acbc03d3d387aaeb SHA512 0fa72ce6820a316e9729bc0d7a08af5ca3468134de9ff1bf0c559a398846a7bcf7313a3609d943e6bab637d930cf45ad9acfe25a8d3df078a774b071a7296486
 DIST fcitx-data-table.tar.gz 4144686 BLAKE2B 696845bb234915a364d614d47cc3baf8421a12ca1778611b0843e52e651da98b5ed9f3e0c9895a829b67f1bcceb1f982a7f6606c8a2d383af8c4573a150c71ef SHA512 99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9
-EBUILD fcitx-4.2.9.5.ebuild 4492 BLAKE2B 645c945bb687141763bac75d0bdd8fc4ad496d008232e3480e4ff21a19daca4b9b80cd8af9276aa58370a695dcd55a3312a2cbd64ec67ff96b07e7e5bb91f001 SHA512 87ebc30abd084722c12fc6af0abae2972e3e145af5b836bd127029cf18586bfd22c258819609f9168e6bbaf94df1f0fdb284bb504074b296bf2a6213d19a12a4
-EBUILD fcitx-4.2.9.6.ebuild 4492 BLAKE2B 645c945bb687141763bac75d0bdd8fc4ad496d008232e3480e4ff21a19daca4b9b80cd8af9276aa58370a695dcd55a3312a2cbd64ec67ff96b07e7e5bb91f001 SHA512 87ebc30abd084722c12fc6af0abae2972e3e145af5b836bd127029cf18586bfd22c258819609f9168e6bbaf94df1f0fdb284bb504074b296bf2a6213d19a12a4
-EBUILD fcitx-4.9999.ebuild 4467 BLAKE2B d574d8ee533e0ae37a2b2f1dabf8e230b7bc78b89c9cfb0658aefe2d6e00949b07bc4bb15f07adc26f21a08feaa4ca066033cfb8fe1fd7a3b56af5dd15b0d842 SHA512 f7d9d243928dfb9d65681dbc250782f238357308f6547ec1dc64e32e492c0f3ee2a52b74b062182f54425b91e4a5ed9385e2b68ad1292c57052fc3bd811c704e
-MISC metadata.xml 1139 BLAKE2B 1d0e287f8a81ad163e7fcd36d59cf805bba9a7d5c22591441e5c3c0c83fb4febac59325ee1ff3b413ba9a1a2ef8d9e92fb0d26e128456c2f0b82d40f09165801 SHA512 e0b7a99f5909e14025680275bd21d3a089eff766960afe6b55f2663fe833e44e6ca4fa1a2f5f54a8dba24cce9c0c1749bf7d67ea756ed0167a54dd820d546f9a
+EBUILD fcitx-4.2.9.6.ebuild 4496 BLAKE2B b6bac936499ab6ee25b793ab38a20216b8f81b83b0514c5a3eabfd98bf8e96fad7616f0a9cfcce6686ccbd5ac5eb9b5c4a4222573d4b5d9c14b6f5e95b5088b9 SHA512 11e08f367df55805fc178dd9699506922094365646ae4bb68bc858da9c3f9d4043b741297e6002d9a74bf077f7c2828699933d7938b347fed16a4fcb10797270
+EBUILD fcitx-4.9999.ebuild 4471 BLAKE2B 6d7b590c69384e109731669cc510a516e76a6b7bd661238c7e8dcc50f159fc380dc6e99d59126552dfe161f59b91f96f4be082129751d565ac0c6d66c5260de4 SHA512 c593762d88126401d022eddf1a6c59f5dc480b7c97c02bb2b92a5e224de9fc76da41a7f8725c4fa996e4c425181047b5a04a1b5e21ae208ca60b7ff95643565c
+MISC metadata.xml 1139 BLAKE2B 3402416658db0bc853f3aaf8362cd37ac9454c8232cc94865a77f0414246f23542b3cc432daea8e25feb2837e89e3266c5bb266ec0118570bd855aa8493fcfc1 SHA512 eebc7e6f6e5baf897b0bba53075d2160512822c3f9f0b536c447b27fe7f9c23a6cce7f39e3bf0c78e6d2b959231df425b40af783b8d0b5e7a6137f8395c59301
diff --git a/app-i18n/fcitx/fcitx-4.2.9.5.ebuild b/app-i18n/fcitx/fcitx-4.2.9.5.ebuild
deleted file mode 100644
index 5fe6492b498a..000000000000
--- a/app-i18n/fcitx/fcitx-4.2.9.5.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx"
-fi
-
-DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
-		https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
-		https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz
-		https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz
-		https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz"
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
-fi
-
-LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
-SLOT="4"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
-REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
-
-RDEPEND="dev-libs/glib:2
-	sys-apps/dbus
-	sys-apps/util-linux
-	virtual/libiconv
-	virtual/libintl
-	x11-libs/libxkbcommon
-	X? (
-		x11-libs/libX11
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrender
-		xml? (
-			x11-libs/libxkbfile
-			x11-misc/xkeyboard-config
-		)
-	)
-	cairo? (
-		x11-libs/cairo[X]
-		x11-libs/libXext
-		pango? ( x11-libs/pango )
-		!pango? ( media-libs/fontconfig )
-	)
-	enchant? ( app-text/enchant:0= )
-	gtk2? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	introspection? ( dev-libs/gobject-introspection )
-	lua? ( dev-lang/lua:= )
-	nls? ( sys-devel/gettext )
-	opencc? ( app-i18n/opencc:= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-	)
-	xml? (
-		app-text/iso-codes
-		dev-libs/libxml2
-	)"
-DEPEND="${RDEPEND}
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig"
-
-DOCS=(AUTHORS ChangeLog THANKS)
-
-src_prepare() {
-	if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-		ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die
-		ln -s "${DISTDIR}/fcitx-data-table.tar.gz" src/im/table/data/table.tar.gz || die
-		ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz" src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die
-		ln -s "${DISTDIR}/fcitx-data-py_table-20121124.tar.gz" src/module/pinyin-enhance/data/py_table-20121124.tar.gz || die
-		ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
-	fi
-
-	# https://github.com/fcitx/fcitx/issues/250
-	sed \
-		-e "/find_package(XkbFile REQUIRED)/i\\    if(ENABLE_X11)" \
-		-e "/find_package(XkbFile REQUIRED)/s/^/    /" \
-		-e "/find_package(XkbFile REQUIRED)/a\\        find_package(XKeyboardConfig REQUIRED)\n    endif(ENABLE_X11)" \
-		-e "/^find_package(XKeyboardConfig REQUIRED)/,+1d" \
-		-i CMakeLists.txt
-
-	cmake-utils_src_prepare
-	xdg_environment_reset
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DSYSCONFDIR="${EPREFIX}/etc"
-		-DENABLE_CAIRO=$(usex cairo)
-		-DENABLE_DEBUG=$(usex debug)
-		-DENABLE_ENCHANT=$(usex enchant)
-		-DENABLE_GETTEXT=$(usex nls)
-		-DENABLE_GIR=$(usex introspection)
-		-DENABLE_GTK2_IM_MODULE=$(usex gtk2)
-		-DENABLE_GTK3_IM_MODULE=$(usex gtk3)
-		-DENABLE_LIBXML2=$(usex xml)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_OPENCC=$(usex opencc)
-		-DENABLE_PANGO=$(usex pango)
-		-DENABLE_QT=$(usex qt4)
-		-DENABLE_QT_GUI=$(usex qt4)
-		-DENABLE_QT_IM_MODULE=$(usex qt4)
-		-DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
-		-DENABLE_STATIC=$(usex static-libs)
-		-DENABLE_TABLE=$(usex table)
-		-DENABLE_TEST=$(usex test)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_XDGAUTOSTART=$(usex autostart)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	rm -r "${ED}usr/share/doc/${PN}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	use gtk2 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-
-	elog
-	elog "Quick Phrase Editor is provided by:"
-	elog "  app-i18n/fcitx-qt5:4"
-	elog
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	use gtk2 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-}
diff --git a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
index 5fe6492b498a..98e30b8de8fa 100644
--- a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils xdg-utils
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
 
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx"
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx.git"
 fi
 
 DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx"
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
 		https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
@@ -82,7 +82,7 @@ src_prepare() {
 		ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
 	fi
 
-	# https://github.com/fcitx/fcitx/issues/250
+	# https://gitlab.com/fcitx/fcitx/issues/250
 	sed \
 		-e "/find_package(XkbFile REQUIRED)/i\\    if(ENABLE_X11)" \
 		-e "/find_package(XkbFile REQUIRED)/s/^/    /" \
diff --git a/app-i18n/fcitx/fcitx-4.9999.ebuild b/app-i18n/fcitx/fcitx-4.9999.ebuild
index 94eef9789bf6..6a3c3d9e00b8 100644
--- a/app-i18n/fcitx/fcitx-4.9999.ebuild
+++ b/app-i18n/fcitx/fcitx-4.9999.ebuild
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils xdg-utils
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
 
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx"
+	EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx.git"
 fi
 
 DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx"
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
 		https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
@@ -82,7 +82,7 @@ src_prepare() {
 		ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
 	fi
 
-	# https://github.com/fcitx/fcitx/issues/250
+	# https://gitlab.com/fcitx/fcitx/issues/250
 	sed \
 		-e "/find_package(XkbFile REQUIRED)/i\\    if(ENABLE_X11)" \
 		-e "/find_package(XkbFile REQUIRED)/s/^/    /" \
diff --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml
index f6fcd96b889e..7090f71a5172 100644
--- a/app-i18n/fcitx/metadata.xml
+++ b/app-i18n/fcitx/metadata.xml
@@ -20,6 +20,6 @@
 		<flag name="table">Install table input methods for Simplified Chinese</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">fcitx/fcitx</remote-id>
+		<remote-id type="gitlab">fcitx/fcitx</remote-id>
 	</upstream>
 </pkgmetadata>