gentoo resync : 01.12.2017

5 files changed, 2 insertions, 119 deletions

diff --git a/app-i18n/fcitx-configtool/Manifest b/app-i18n/fcitx-configtool/Manifest
index 4a49ccd0ccd1..45d7587da9cf 100644
--- a/app-i18n/fcitx-configtool/Manifest
+++ b/app-i18n/fcitx-configtool/Manifest
@@ -1,10 +1,4 @@
-DIST fcitx-configtool-0.4.10.tar.xz 50440 SHA256 bcc4976976bfbddbfec3f689f38927fbabc7f7fa611ea252a789583ea14cd1fb SHA512 1c1267e9de694bbd5f258b5bba1e7514c4f8556cdc82a1cce5eafd8a4ec571955285dade0acd02f128eca01f867a30c5c6264ee7e91d32a333eba6e4d275fe8f WHIRLPOOL bbbc2a5c9d2247312b00c75a2469ec11f2992d8ca9d5b6bc7fec7b395973dd64fb3c7aed796682ea2a819f227daddb371a565cbedab7ba2b08838a74051c8417
-DIST fcitx-configtool-0.4.6.tar.xz 41992 SHA256 8d64107f9f12b4f2cbd82e40b87a2dc4dc76d0ff854481c1103d5e9a2c2e129d SHA512 946bceb77fc6d14210154d9264c86d3333f910893cf3054f65eab72641421847e8ac003889b742f4c28f74c8ab1cfbcfb82abe35ea83ca2548cfc1decc92fc4c WHIRLPOOL 58f8a420f6c98cb6d710bd05d8ca2a3ca48a115015e6de98b105bf71b59bf3dab34eb63009d763dc7a3554fa6ec0b442e8bb277f890230dd94ec371397a6766c
-DIST fcitx-configtool-0.4.8.tar.xz 47196 SHA256 0ebc06d9d325fed096e9cb61fe53b82000d2de0e9aefe5945ba8f0aa2ca851ed SHA512 7b3c43b9d7d1dab04880effe6fc4e80e64c9bad34699c0c8d2992ec971605ef2eaa0b1fb13f71a582289c75560c3edc95af21f6413ac2bb594d5cdb31a0b4cb7 WHIRLPOOL a1817bcc9d6bdcd96e66dbe71d44cb66d6b66802e366b8f21d5f922495176463fc23adff2bbdbfb4003ddcef43839fab06715231fdaada8714eec1e3a073f18f
-DIST fcitx-configtool-0.4.9.tar.xz 48796 SHA256 592075d28224f8ce5304281c507ab2f9a9dd93f118eeec30d442ff3db214f9fa SHA512 800c731b370ace833179560260df7ffc9c0235c4f3257e8a99a0194f2fd06b71f738e6c77985871c3368179f944da2165dac5d4a8f7ba083519cb2509a9eb62b WHIRLPOOL ae5157178cbaedd66512da6548e79b0a09dd11e4ce8797ae3387c698cd33b51facf1153dca0d3e16cbf77a01959d01251a5dcd7fb6b30f119807d56a2a0f8470
+DIST fcitx-configtool-0.4.10.tar.xz 50440 BLAKE2B f2f2241d3ea139f6f3de9b8c6ffcc71c789dfa291efe4c551596eebc8a04f13f9fe698cc25d8349a174399044d15ddca2aeab952ac2bc7f0f4e9e47d453329ca SHA512 1c1267e9de694bbd5f258b5bba1e7514c4f8556cdc82a1cce5eafd8a4ec571955285dade0acd02f128eca01f867a30c5c6264ee7e91d32a333eba6e4d275fe8f
 EBUILD fcitx-configtool-0.4.10.ebuild 827 BLAKE2B 5368682a0aaac1e504a7a5d4d1c951f1efa5b30843c6e6220c2f7569b8e23bf0c1b623cbc23f5a408fafca1458e4b0d80475a8a03cb6104afcf00284f5df8404 SHA512 7c1fc9ac08a20a1f307bb5c40bc70b15366e4cf59877cb11e645375ad75afc42d5431fb87477f1403e9c62294cde0eed1dadd0855990f38f36be3bc9bd8b5dfd
-EBUILD fcitx-configtool-0.4.6.ebuild 735 BLAKE2B e24de9d59ba8356d807ca088d027342843fcfc38288d59dccee204c54c1266153d5432da574a44b6040b9a7f78a8ad80defba3b8f17f0fb14bde9a261fd8c006 SHA512 901003da2ddfef080860b1a4365b95952aac85c0364738b40398daf71fc32f69c3f1477f3a5cac21bd4260f5aca162fe21209564711a8f254b2ae03b8ba8d0a7
-EBUILD fcitx-configtool-0.4.8.ebuild 735 BLAKE2B 2427171cb3123db91b231cc0147f0a568785bafa1a0a6766e9781ccc90166260733167000c2d802ab186e4dcfc46402af9ebe74299f3e274ec75c09e4ace5414 SHA512 71b4fdfbe5fad660ef83fa3941bd704ae8c71dc62fc42619958d376c33f6bd5235b41951a55700fd1d4004564dfaf896bad18c9d47800c79a5a593157d5ae977
-EBUILD fcitx-configtool-0.4.9.ebuild 809 BLAKE2B 6920c7cada54ea7fdfb6fb2bd668479da2974f8b37650c7c1ff5343c6280899179dee747525eafa5a2019dc156285e38fec8d7446f69bb832f75f6127bd14034 SHA512 d67406a9d177b1e44d70f84b54887d268d3db2c71dd2bed3373943e08e953aeb8ea664cf861c3ddc394b2f41d58de86422b24984e3329280318bcac3ff9c1e6a
 EBUILD fcitx-configtool-4.9999.ebuild 808 BLAKE2B d053e6201acfaa68e6671a665651c9f4c7a701e20698eac4d3fd293ef0c1434bb7cec05e23c148c339c5b40c4ea107f4d62ebe34f722d18a23c6c488f680c20a SHA512 6767d4349e1baa4060bd62bab03abe20b6f0050507d81c80ec4ef1e35ffe3c9d143ad47e51610554b514c470a1a8bed162e5e6cf76d34686333a52c091ec3457
-MISC metadata.xml 520 BLAKE2B 4af46a7eb98f9bd7837838ae1d3617915a7928ad87766de8021924cf65f4a76fac9cd81e796401a36947aae56e84d7a5040941d745a2480f8ec72e25fb5bcc34 SHA512 3c6521342c319563317575bbd5ad69c3f904ed7e0354ebfb059e20c64be93b5b89c62f9b05537524af02e90a8a3ed39abefd46fae331dc3be7b1180febc916b3
+MISC metadata.xml 455 BLAKE2B 89268d866dde8861e25a631d76d7053a6e847134d02195aa883952b79a0f81742c4cad0f8938b0eb180240d5e95ff1c73b7c673d9a3b2dafd0b28f20e186589c SHA512 5fb4ff1f8fe55ba75d4609791f0f41cfe8728000cd0d5bf07d3f4df99bf375ab23f15cfd0754b032b333d67c7cfef6a13daa007d81a67b8be0b27454b7e7548e
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.6.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.6.ebuild
deleted file mode 100644
index 1bef6d8f0e68..000000000000
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A GTK+ GUI configuration tool for fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="https://fcitx.googlecode.com/files/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="4"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="gtk +gtk3"
-REQUIRED_USE="|| ( gtk gtk3 )"
-
-RDEPEND=">=app-i18n/fcitx-4.2.7
-	dev-libs/glib:2
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3	)"
-DEPEND="${RDEPEND}
-	app-text/iso-codes
-	dev-libs/libunique:1
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs="
-		$(cmake-utils_use_enable gtk GTK2)
-		$(cmake-utils_use_enable gtk3 GTK3)"
-	cmake-utils_src_configure
-}
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.8.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.8.ebuild
deleted file mode 100644
index 3a94d897cdae..000000000000
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="A GTK+ GUI configuration tool for fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="4"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
-IUSE="gtk +gtk3"
-REQUIRED_USE="|| ( gtk gtk3 )"
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	dev-libs/glib:2
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )"
-DEPEND="${RDEPEND}
-	app-text/iso-codes
-	dev-libs/libunique:1
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs="
-		$(cmake-utils_use_enable gtk GTK2)
-		$(cmake-utils_use_enable gtk3 GTK3)"
-	cmake-utils_src_configure
-}
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.9.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.9.ebuild
deleted file mode 100644
index 871b14fd1c26..000000000000
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-configtool"
-fi
-
-DESCRIPTION="GTK+ GUI configuration tool for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-configtool"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	app-text/iso-codes
-	dev-libs/glib:2
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=()
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_GTK2=OFF
-		-DENABLE_GTK3=ON
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/app-i18n/fcitx-configtool/metadata.xml b/app-i18n/fcitx-configtool/metadata.xml
index 16a37e906ad6..c7779e9268e6 100644
--- a/app-i18n/fcitx-configtool/metadata.xml
+++ b/app-i18n/fcitx-configtool/metadata.xml
@@ -9,9 +9,6 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Use GTK+3 instead of 2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">fcitx/fcitx-configtool</remote-id>
 	</upstream>