gentoo resync : 24.02.2018

3 files changed, 74 insertions, 6 deletions

diff --git a/app-i18n/libpinyin/Manifest b/app-i18n/libpinyin/Manifest
index e48509a3fbdc..0f758a5d939e 100644
--- a/app-i18n/libpinyin/Manifest
+++ b/app-i18n/libpinyin/Manifest
@@ -1,5 +1,8 @@
 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-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 1350 BLAKE2B bd3e4ccd07dc7cdfb87558edc664cedf6a0fd6a2c8ab8b6e89007b5157ed4a055483370a1eb314c21139a9bc32b92eb07b04cad3c8568969cf435fed947d1355 SHA512 22c4a8e787b2b74e8150440f67a8a9e7ee93d0a2080f6023358cebc74be1de6ddde1263caf243f37ced254d408f08558752e1744468a66d6111235029c753085
-EBUILD libpinyin-9999.ebuild 1324 BLAKE2B 7137a2f1512622794c0e5d698d48ab299025962cee78218ea050642fbc78d1fe14bb927b24532ec5ce99706a54681e64e695b5027e0fc93d9e317150dd9f80eb SHA512 4d0b893b7f40303d60ec59ef4afcfb11b017814ef79ab751e5b5cc382a0b1721a8dd3e67ab5a7684d05c72b164274c1c9b6d60f621923107c1d54c79ee39e1ba
+EBUILD libpinyin-2.1.91.ebuild 1409 BLAKE2B beda549a27fa4a635755a44f372ad82817f935f33af25b95efae307e43c54402d8f929ba0b28879eb241cb4249ae8100c32ba22714de1254a0cc94547bbe7d13 SHA512 c142b0755dfebbc6f803b2722274949e278273cfe5cfdba51565822e8a1ec97ab8a46a714a2676f89619a2ce4fd9525c8c4bb7b6cb23fe8ca8f8fa910a472133
+EBUILD libpinyin-9999.ebuild 1379 BLAKE2B bdeff67c490facc1d2ad114cb7e0e35ef5cd444512e7d453ac87f5e9455f941c6027ec5ffed5960a8f27ca3921d660ec0694b59d44749f70d06f8d1f44f1e39e SHA512 e04c290416fb6e7c7a995a1e638fcda5c5a21c39620d05fdbbd29246ca06a406bbc53dfbfc7638bfeba5f47545665d96831bf095c7a64be1e9434a8c10268668
 MISC metadata.xml 384 BLAKE2B b3f62b356f505bb69731e6f56d43a080e509b578da0762be6ccc112ed1262446034b82d89cbdcca87d502c006319fd11cb4069804b8d8c12f4263a15bbf4f525 SHA512 4317a502e82b23aa2c66d406148eab83996139b4522f999884559b7b6d15709ded6779dc64aeedc657a1be3cd1337281c9e1297ae22dc6b227aef419dc707518
diff --git a/app-i18n/libpinyin/libpinyin-2.1.91.ebuild b/app-i18n/libpinyin/libpinyin-2.1.91.ebuild
new file mode 100644
index 000000000000..528e0eee1113
--- /dev/null
+++ b/app-i18n/libpinyin/libpinyin-2.1.91.ebuild
@@ -0,0 +1,63 @@
+# 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/${PN}/${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/libintl
+	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-9999.ebuild b/app-i18n/libpinyin/libpinyin-9999.ebuild
index e5df0d1c77a9..4d8960cc6eda 100644
--- a/app-i18n/libpinyin/libpinyin-9999.ebuild
+++ b/app-i18n/libpinyin/libpinyin-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,9 +11,9 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/libpinyin/libpinyin"
 fi
 
-LIBPINYIN_MODEL_VERSION="14"
+LIBPINYIN_MODEL_VERSION="15"
 
-DESCRIPTION="Library to deal with pinyin"
+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=""
@@ -45,14 +45,16 @@ src_unpack() {
 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
+	ln -s "${DISTDIR}/${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" "data/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" || die
 
 	eautoreconf
 }
 
 src_configure() {
-	econf --disable-static
+	econf \
+		--enable-libzhuyin \
+		--disable-static
 }
 
 src_install() {