gentoo resync : 24.12.2018

8 files changed, 67 insertions, 190 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index d29749d5ac86..af9b496acc9b 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/libpinyin/Manifest b/app-i18n/libpinyin/Manifest
index 77167c20da38..70179fba80ba 100644
--- a/app-i18n/libpinyin/Manifest
+++ b/app-i18n/libpinyin/Manifest
@@ -1,12 +1,5 @@
-DIST libpinyin-2.1.0.tar.gz 246219 BLAKE2B cae5b41faeb2e0eedc2ae2c098b2db04b22e36d0bd9fd222a4516f71ab9b3e8ade7fa96e0d6d898e197bf91c1cb6a0b98a9fff97e7be31bb4f901400c87bfea7 SHA512 e6aa3998ac466cb155750b574140dd43673bfeb4f13d1b88c4892b61bb773aee84610dd67ad17871961d51a48067c535eab33a6fb6c9ac28179a9958c4e9b518
-DIST libpinyin-2.1.91.tar.gz 256045 BLAKE2B 148a2617cbe335ebda5b9fb26f63f7c75f06d2dfd3fb950f60b4db37762a5bb3a91459dba0759abd33fbc01d38fe26d7cce92dfaaa2c6e45c80552f0bbeb3d27 SHA512 568b263726a022bdca52fd54c7583a36a31385a8f19bb5c5903918a6036c5499ef8c8bb91ebb2db877449ec5177d2d4e4f0a20e7bb528534361ba1405dd1fd92
-DIST libpinyin-2.2.0.tar.gz 256221 BLAKE2B 72c0dc42ca6e63852c92975b871706d24c1066cb9bb37faf9ff0ccde9773308e1a29c7587f00ab337c52a1f957c8e67d6241bdff13a50d9dbf73c3b4e530d2be SHA512 7327e6726acaf984492fdecb5ed04f81624da261aeac3cbea9a8ea5540d84f39ca8d41ec8835b509da97b9de5837534885e4ba5f4041ce9c7252c8a438480598
 DIST libpinyin-2.2.1.tar.gz 256262 BLAKE2B 4fc081aa42b07eb7d21277c95407eafbf618c9aaf0c6707893f212be70f51d43fe00f50d1b4758d857d0f8aed1e9c177d61d6ca912e776633e8179279f09fb2e SHA512 d323655419aaceda12d794ac25387a2e073e8c2372511913febd5b8049f9d1764a0011cd97b538bbfb14f5c248495a150cf7e3b9f4af21182941e5920f2d879f
-DIST libpinyin-model14.text.tar.gz 19361973 BLAKE2B 702f0c2cb0c8157758f8c46e7b47221475f2a96a5e4f6181b5dee605bd72002827431f017a913275b4e9cf6b4b07bccec4b9a5b7960a9b2c42ffba4631c57ed6 SHA512 792d3cf7ab7fdea701737cea66d18f697015f19d18b6d26273db2da0ae28291f38b3d8a5717f595da63fbe573921c552bdce10c4bec9a0834947dfec92265da9
 DIST libpinyin-model15.text.tar.gz 19361973 BLAKE2B 3d24321db407e28c1adf49373dd9bacafe0e89409511c0656d7b9a85f1d1ac8693249088dd99beef069576f4a8d0d5db3fd47f98822b32aa3098315cf2660d22 SHA512 d3f5b42f6ea6b22570b5ba67cf23d94a3fee2d7d894191ebc11eb72edc162c72b90b2fe10b312bfd8d77d110654ee5dc00c21b25fb8b7c3f905d4088c9895ac1
-EBUILD libpinyin-2.1.0.ebuild 1336 BLAKE2B 278b7906485b7cbc0f4b3d2ae89af99a074cd9ad9a773521e3df1eeb869b8035e6a971cb8745fde6a659455b467a7bb63b29cc45cb883edd7906839dfcbabc60 SHA512 2c750d9f7dba999d155f0a1f587a12aab7fc4f0356ce2a241b8a884539732d3ed310ce5b7ada5226b519e18a8335cc7f9fb9bca41700c60049bb2c291af545ae
-EBUILD libpinyin-2.1.91.ebuild 1395 BLAKE2B e14ab61ce077f41ddefbf6d28231d9af8a4f1ecc5435ac46536a7c8c3c3af799c6bf7ebbcfe10c26a35a354f89ec9595e90d88d8393e265004cceff57c0bd67c SHA512 62eb6b628fa4dd91a89ebbf1c6d894b646015f7a445d4f96283ebf14a80ffad4b6fc17cf7f81848f482c2a9c595221f73d5208a0805fb15ceac7ce07d29ff0a0
-EBUILD libpinyin-2.2.0.ebuild 1395 BLAKE2B e14ab61ce077f41ddefbf6d28231d9af8a4f1ecc5435ac46536a7c8c3c3af799c6bf7ebbcfe10c26a35a354f89ec9595e90d88d8393e265004cceff57c0bd67c SHA512 62eb6b628fa4dd91a89ebbf1c6d894b646015f7a445d4f96283ebf14a80ffad4b6fc17cf7f81848f482c2a9c595221f73d5208a0805fb15ceac7ce07d29ff0a0
-EBUILD libpinyin-2.2.1.ebuild 1398 BLAKE2B b7b56b4d5803a54537f2f08bb1d22758db2e74216d015aed65afdfa4e231ef772890ac3ac69b3ff4d33e01cc54f574f28cc804767bb5bc779074f91da6aaeec6 SHA512 3276340093f6220eeee8549398182085deb68e8cf4d2d3df0746ae2359aa0c86191e4dc910015f98cfc8e9ea835cef94665300ec568466fe86896725067464ea
+EBUILD libpinyin-2.2.1.ebuild 1396 BLAKE2B 2a6e6b08af53efbd94a2a78c2d4cfc82e61b65bcb1d9bd1811218531a0b3e4c7b7cd91afeadab3228d7af3c862fa6776c5b47bd677d109d5f5332cebb0c31fe8 SHA512 b3530e8c101990101884a74c06643f75e8e75c01db95313b735e7fec6ca06c792f91964445dd9f88320f5f832b9dda490cdb9b32842500fff4f873fe094249a0
 EBUILD libpinyin-9999.ebuild 1370 BLAKE2B e8d09bac832f84d10e84b3f46cf9436d41c752b796c6eb008c04a1ea71d1902a9b90701165dfb9cf4fc85bb56c2830db5b8765f1c9e6ff1d44d0483134ce98e8 SHA512 de49fe3137247ca25e6b175ee3cefa689901de1455698360a513ad732f25e4bb9447a4c5f68c35a8eeb6221e3f10266d4b599bfc8c711966125545dd6a4a0136
 MISC metadata.xml 384 BLAKE2B b3f62b356f505bb69731e6f56d43a080e509b578da0762be6ccc112ed1262446034b82d89cbdcca87d502c006319fd11cb4069804b8d8c12f4263a15bbf4f525 SHA512 4317a502e82b23aa2c66d406148eab83996139b4522f999884559b7b6d15709ded6779dc64aeedc657a1be3cd1337281c9e1297ae22dc6b227aef419dc707518
diff --git a/app-i18n/libpinyin/libpinyin-2.1.0.ebuild b/app-i18n/libpinyin/libpinyin-2.1.0.ebuild
deleted file mode 100644
index 949814bc8171..000000000000
--- a/app-i18n/libpinyin/libpinyin-2.1.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/libpinyin/libpinyin"
-fi
-
-LIBPINYIN_MODEL_VERSION="14"
-
-DESCRIPTION="Library to deal with pinyin"
-HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0/13"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	sys-libs/db:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_unpack() {
-	if [[ "${PV}" == "9999" ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${P}.tar.gz
-	fi
-}
-
-src_prepare() {
-	default
-
-	ln -s "${DISTDIR}/${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" "data/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" || die
-	sed -e "/^\twget .*\/model${LIBPINYIN_MODEL_VERSION}\.text\.tar\.gz$/d" -i data/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/app-i18n/libpinyin/libpinyin-2.1.91.ebuild b/app-i18n/libpinyin/libpinyin-2.1.91.ebuild
deleted file mode 100644
index 0529ee397abe..000000000000
--- a/app-i18n/libpinyin/libpinyin-2.1.91.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/libpinyin/libpinyin"
-fi
-
-LIBPINYIN_MODEL_VERSION="15"
-
-DESCRIPTION="Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao"
-HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0/13"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	sys-libs/db:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_unpack() {
-	if [[ "${PV}" == "9999" ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${P}.tar.gz
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -e "/^\twget .*\/model${LIBPINYIN_MODEL_VERSION}\.text\.tar\.gz$/d" -i data/Makefile.am || die
-	ln -s "${DISTDIR}/${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" "data/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-libzhuyin \
-		--disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/app-i18n/libpinyin/libpinyin-2.2.0.ebuild b/app-i18n/libpinyin/libpinyin-2.2.0.ebuild
deleted file mode 100644
index 0529ee397abe..000000000000
--- a/app-i18n/libpinyin/libpinyin-2.2.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/libpinyin/libpinyin"
-fi
-
-LIBPINYIN_MODEL_VERSION="15"
-
-DESCRIPTION="Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao"
-HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0/13"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	sys-libs/db:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_unpack() {
-	if [[ "${PV}" == "9999" ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${P}.tar.gz
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -e "/^\twget .*\/model${LIBPINYIN_MODEL_VERSION}\.text\.tar\.gz$/d" -i data/Makefile.am || die
-	ln -s "${DISTDIR}/${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" "data/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-libzhuyin \
-		--disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/app-i18n/libpinyin/libpinyin-2.2.1.ebuild b/app-i18n/libpinyin/libpinyin-2.2.1.ebuild
index 8591f5303c1c..6175d2a05f98 100644
--- a/app-i18n/libpinyin/libpinyin-2.2.1.ebuild
+++ b/app-i18n/libpinyin/libpinyin-2.2.1.ebuild
@@ -24,7 +24,7 @@ SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.tex
 
 LICENSE="GPL-3+"
 SLOT="0/13"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 IUSE=""
 
 BDEPEND="virtual/pkgconfig"
diff --git a/app-i18n/poedit/Manifest b/app-i18n/poedit/Manifest
index 6f5c33272307..a5fe85e4ed98 100644
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@@ -1,5 +1,7 @@
 DIST poedit-2.0.9.tar.gz 2567156 BLAKE2B 29e616256a19430cb3efd3db5d6c2cc450155009e30ee056f6be712bac9e631e5aa20b0758262e9fbe00937eedf6ac777cd8e7407a3060f04503e3fa4d9cd6d0 SHA512 9981339ae0c3f11f972ed2f25e0c96e5c0cc0210771cc44d163e219c32eb951fa4180c8a03acdd7f0232a5e4b535f3202dda703b57ccfb02773eb24e6a1eb02d
 DIST poedit-2.1.1.tar.gz 2722379 BLAKE2B 3e5102ab9b2b6b6701abd3f44dab846d6989e5abdbcadf924cf7032d725fa1b405425cefa37eb0230d3de68ea0c60ec05e7bfe84f906cdec0230d8c1284f5779 SHA512 0b5e13c3e59c9bde78b95b45aa8765c16c03d12ca9fbabe4448e409ff4cd627676d1b77c011c75a54dc0e10acda23ceb49ca063e76a29154344dc5fdb9e5f8a8
+DIST poedit-2.2.tar.gz 2746800 BLAKE2B b093e5c1cd66eada6238af3b731752cc8dbf9feb3238c9b53ca972b805033f9f00b3ec92cae2b87353100653e7d7bd60a68bd109f07e523d4875e0f8ca8114e5 SHA512 14a5cc997e6cdc0d1fc14b05ea293a010537d71f846537270296e2a14bdfd7a352b6d0a88a3d4f60193192a918b276509e31926715e69725e595423adfac5fbc
 EBUILD poedit-2.0.9.ebuild 1365 BLAKE2B 93c8532afa34a886b753b01bb86636c990bc417cff101cb6371c4811bb61dd4f1ec628e624122d60c8cccad1a07c9c234991cd592208ed065f1e512793dfdffb SHA512 8b4752f34950dc08d11ab5caa016c7d8809a8f1cc3852a52b5686ae82bee93c2c84b7a6591863d2965d7c703760514a0832d2384a079753a1a3c7aadd1cd5ec9
 EBUILD poedit-2.1.1.ebuild 1388 BLAKE2B 040a78630d85e2c4c0005071fa159b6021a9b1759016eec281b93d83a87c931d7c52f5f52035c312e3cfb55991c07304fdfdbdc8e6d9ff94246a51e3c6314b92 SHA512 e40a70aa919ad1e51aa3f98e1f5a9aa581df065b86063d31a7c5a204fcc63a229ff1f6a9111139fbb791ab53f5b548e5b92a8f6511f60a1282b6d6d88c39224a
+EBUILD poedit-2.2.ebuild 1393 BLAKE2B e411372c520b371afe101dd3dbf1e91cc08688ee9b0f9f0935e11160b2c58891dffc6a0da2e698b72a5828e97fb68eff932fa4022b41bf6c445c0259a830ab4c SHA512 ba4ca12c6077984b2fbeee96ec0af748050d8807a16b9164558e2ce210b2e43b7412ca0c0484c4cfb13aff287df1cc02ce1b1d47688db83e2fb68dff341d3eae
 MISC metadata.xml 611 BLAKE2B 7eda7aaa83b70b383879068c765a142c5e18bb79865a88c325c0a4ab8aa7f6ca00b197030f7a73baa4bbcb87dbb14097dd218d30dd6475705552500d6d0fb4f7 SHA512 96dfc2db0caf0915cca3997cff6fc021a3c196f4b7a5b9f2007c6284d9dfecfc66c1d5e0f44928a98810f6a23a7d5c6fc9db2ee3b24ce7ff7b9cb42afafd5f2f
diff --git a/app-i18n/poedit/poedit-2.2.ebuild b/app-i18n/poedit/poedit-2.2.ebuild
new file mode 100644
index 000000000000..ad916d29df2f
--- /dev/null
+++ b/app-i18n/poedit/poedit-2.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="af an ar az be be@latin bg bs ca ckb co cs da de el en_GB es et eu fa fi fr ga gl he hr hu hy id is it ja ka kab kk ko lt lv ms nb nl oc pa pl pt_BR pt_PT ro ru sk sl sq sr sv tg th tr uk uz vi zh_CN zh_TW"
+WX_GTK_VER=3.0-gtk3
+
+inherit gnome2-utils l10n wxwidgets xdg
+
+DESCRIPTION="GUI gettext translations editor"
+HOMEPAGE="https://poedit.net"
+SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	app-text/gtkspell:3
+	x11-libs/gtk+:3
+	>=dev-cpp/lucene++-3.0.5
+	>=dev-libs/pugixml-1.9
+	dev-libs/boost:=[nls]
+	dev-libs/icu:=
+	>=x11-libs/wxGTK-3.0.3:${WX_GTK_VER}[X]
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	my_rm_loc() {
+		sed -i -e "/^POEDIT_LINGUAS = /s: ${1}::" locales/Makefile.in || die
+		rm "locales/${1}.mo" || die
+	}
+
+	l10n_find_plocales_changes 'locales' '' '.mo'
+	l10n_for_each_disabled_locale_do my_rm_loc
+
+	setup-wxwidgets
+	xdg_src_prepare
+}
+
+src_configure() {
+	# CLD2 and C++ Rest are not available in Gentoo
+	local myeconfargs=(
+		--without-cld2
+		--without-cpprest
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}