gentoo resync : 13.10.2019

3 files changed, 3 insertions, 76 deletions

diff --git a/app-i18n/xcin/Manifest b/app-i18n/xcin/Manifest
index 164f248b38f6..e80e4717730a 100644
--- a/app-i18n/xcin/Manifest
+++ b/app-i18n/xcin/Manifest
@@ -3,6 +3,5 @@ AUX xcin-2.5.3_pre3-ldflags.patch 4525 BLAKE2B b66701186b4d37bf7191ab43fe87e4f9d
 AUX xcin-2.5.3_pre3-make.patch 3886 BLAKE2B d7d43a493f5d0bc8349f5e6fc5a32733db033e370ff03b8d4ecd9a424c2e568a33e8b645ab9a5fc67d228e4faeec92e9cddaf2aeb7a2e79f6c35279df08cd023 SHA512 033811b89842369740af7df884d29acd52a9c47fa773e087226116d6cbf7d9127cc1bfc7de3b511a9a01d7135c74d17860d0a782ba6c32ee6220b828b3055e6c
 DIST xcin_2.5.2.99.pre2+cvs20030224-1.4.diff.gz 1321937 BLAKE2B 4213f585d62d37215495354890203272fda0d7068bd6ceb8c0d75a2d1cd8c6626997607ab5b821887248f2e4207733eb3a26d021873893488b8dee83fddd3e52 SHA512 d1c6a667a8dcf996e02d694a0ff73eca409f542ce11b0e4d8563ed04c62e12c1d8feb6307153c5cfe982e66848b414dd65fc23d022ccc54cf2a0e3978b8c33e5
 DIST xcin_2.5.2.99.pre2+cvs20030224.orig.tar.gz 1530591 BLAKE2B 1c68d8bd4f11c458c2fefe974fc5f565a59deee23129f1c53e5714655d5be543e7a97f72eab2dc56aa098b78b53bfa77a4c0fbcb56cb93b936cc8b4ee5435135 SHA512 1068a9cf7f3b7ff3c2ff7e0443e487e660f3ec8c7f0114f1ad614fb1c7a73d15613ce0c198514816f00afaaa22434660ed11d329413bf010aa52b27513a5ac14
-EBUILD xcin-2.5.3_pre3-r2.ebuild 1594 BLAKE2B 63ec3b7caefb1706525ba7fd5fb6067ded36e2a14516b305b50145c6f5c419bead3a758d9881a26990fd58ee1c3ba5905b1f1618893eb7872935abf1db4bf519 SHA512 f55670efd003105c3c2f0c98255e46e6f4e3d44de4b6374e2af31f4355d045303af3b07ffe7bcd919c5572a1ee1207e769f55868c6c78fba9cc67ac49831c4f4
-EBUILD xcin-2.5.3_pre3-r3.ebuild 1785 BLAKE2B 77da973cfb86b3fb3612cf0bf35efd0b1c797b200303fcb80a61f456823d27f834eb7615e4629a6ada3223028e5ff10819e4c223780ac2c9b7440c78608e31e3 SHA512 229f3107ffedb76d20d9fccb19a6be4c86393e8b5ed382d1ef44c45148487210192b96f3dffb8c6a3aa0e8612380bb3e24cb7bec2fbe986f8cb21c7e8bce646e
+EBUILD xcin-2.5.3_pre3-r3.ebuild 1780 BLAKE2B 8cf1f50ba2cbde0c1277c97692128b6143ad2911c0a6db29c34f10a43f6c77dfa69506010f32734537322409b24b5c68ebca2adb08b4522caf86a6076a28d9ef SHA512 c55caba36a5b6340d10aef8c8497877cba65786d9656da64a89b374fe3c92b647015246e17990512276e945c7a7f5dd56f4136d55786ce84497545c5cea2482b
 MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/xcin/xcin-2.5.3_pre3-r2.ebuild b/app-i18n/xcin/xcin-2.5.3_pre3-r2.ebuild
deleted file mode 100644
index 44255b37febd..000000000000
--- a/app-i18n/xcin/xcin-2.5.3_pre3-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit multilib eutils autotools libtool
-
-MY_P=${PN}_2.5.2.99.pre2+cvs20030224
-
-DESCRIPTION="Chinese X Input Method"
-HOMEPAGE="http://cle.linux.org.tw/xcin/"
-SRC_URI="mirror://debian/pool/main/x/${PN}/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/x/${PN}/${MY_P}-1.4.diff.gz"
-
-LICENSE="XCIN GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="debug nls unicode"
-
-RDEPEND=">=sys-libs/db-4.5
-	>=app-i18n/libtabe-0.2.6
-	unicode? ( media-fonts/hkscs-ming
-		media-fonts/arphicfonts )
-	app-i18n/libchewing
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P/_/-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${MY_P}-1.4.diff
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
-	rm -f configure
-	cd script
-	elibtoolize
-	eautoreconf
-	mv configure ../
-	cd ..
-}
-
-src_compile() {
-	myconf="--with-xcin-rcdir=/etc
-		--with-xcin-dir=/usr/$(get_libdir)/xcin25
-		--with-db-lib=/usr/$(get_libdir)
-		--with-tabe-inc=/usr/include/tabe
-		--with-tabe-lib=/usr/$(get_libdir)
-		$(use_enable debug)"
-
-	econf ${myconf}
-	emake -j1 || die "emake failed."
-}
-
-src_install() {
-	emake \
-		prefix="${D}/usr" \
-		program_prefix="${D}" \
-		install || die
-
-	for docdir in doc doc/En doc/En/internal doc/history doc/internal doc/modules; do
-		docinto ${docdir#doc/}
-		if use unicode; then
-			for doc in $(find ${docdir} -maxdepth '1' -type 'f'); do
-				iconv -f BIG5 -t UTF-8 --output=${doc}.UTF-8 ${doc}
-				mv ${doc}.UTF-8 ${doc}
-			done
-		fi
-		dodoc ${docdir}/*
-	done
-}
diff --git a/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild b/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
index 5ba8a1b13e56..e83ff62b4098 100644
--- a/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
+++ b/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/x/${PN}/${MY_P}.orig.tar.gz
 
 LICENSE="XCIN GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE="debug nls unicode"
 
 RDEPEND=">=sys-libs/db-4.5