gentoo resync : 23.09.2020

2 files changed, 41 insertions, 31 deletions

diff --git a/app-i18n/xcin/Manifest b/app-i18n/xcin/Manifest
index 4bd6b3716a51..014207f2a775 100644
--- a/app-i18n/xcin/Manifest
+++ b/app-i18n/xcin/Manifest
@@ -3,5 +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-r3.ebuild 1750 BLAKE2B c0ff06be269facde316290042cc739bfb743ef3f638f1f690b7aa078b4b453f1832f10503bfc4ba6fb2f7c88bdeb1cf77c62709bb04e6e682e466aec63c3c268 SHA512 f4d7e20c2454c1798c32fcf2a345a439914435a3d31a4ccf768bacc6524e45fa3c9ea60696e2d1ec74f7d54648fb473c9a395f8c03388e068a677e6f4b15a82e
+EBUILD xcin-2.5.3_pre3-r3.ebuild 1837 BLAKE2B 10ba782171dbcb0cc225e34d6785624ca86f87c5eca54706f068d83e0baca5c78c2bb40f45bcc2da57b4da752e74bf8a66ee603c35b3209ddf7cbfca49da3045 SHA512 9e4edc75219ee75a2dff77a465c344520b02a654a351c4836f6821a7235b40cc81b71d6e5db77567e82365b31cc237418b0ba930578bacaefc37eed89010942f
 MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
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 3950d850a1cb..e71f39985112 100644
--- a/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
+++ b/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
-inherit multilib eutils autotools libtool
+EAPI=7
+
+inherit autotools
 
 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
+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"
@@ -16,38 +18,42 @@ 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 )
+RDEPEND="
 	app-i18n/libchewing
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+	>=app-i18n/libtabe-0.2.6
+	>=sys-libs/db-4.5:*
+	x11-libs/libX11
+	unicode? ( media-fonts/arphicfonts )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 S="${WORKDIR}/${MY_P/_/-}"
 
+PATCHES=(
+	"${WORKDIR}"/${MY_P}-1.4.diff
+	"${FILESDIR}"/${P}-glibc-2.10.patch
+	"${FILESDIR}"/${P}-make.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
+
 src_prepare() {
-	epatch \
-		"${WORKDIR}"/${MY_P}-1.4.diff \
-		"${FILESDIR}"/${P}-glibc-2.10.patch \
-		"${FILESDIR}"/${P}-make.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-	rm -f configure
-	cd script
-	elibtoolize
+	default
+
+	rm configure || die
+	cd script || die
+	mv configure.{in,ac} || die
 	eautoreconf
-	mv configure ../
+	mv configure .. || die
 }
 
 src_configure() {
 	econf \
 		--disable-static \
-		--with-xcin-rcdir="${EPREFIX}/etc" \
-		--with-xcin-dir="${EPREFIX}/usr/$(get_libdir)/xcin25" \
-		--with-db-lib="${EPREFIX}/usr/$(get_libdir)" \
-		--with-tabe-inc="${EPREFIX}/usr/include/tabe" \
-		--with-tabe-lib="${EPREFIX}/usr/$(get_libdir)" \
+		--with-xcin-rcdir="${EPREFIX}"/etc \
+		--with-xcin-dir="${EPREFIX}"/usr/$(get_libdir)/xcin25 \
+		--with-db-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tabe-inc="${EPREFIX}"/usr/include/tabe \
+		--with-tabe-lib="${EPREFIX}"/usr/$(get_libdir) \
 		$(use_enable debug)
 }
 
@@ -61,16 +67,20 @@ src_install() {
 		program_prefix="${D}" \
 		install
 
-	find "${ED}" -name "*.la" -type f -delete || die
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 
+	local docdir
 	for docdir in doc doc/En doc/En/internal doc/history doc/internal doc/modules; do
 		docinto ${docdir#doc/}
-		for doc in $(find ${docdir} -maxdepth '1' -type 'f'); do
+
+		local doc
+		while IFS="" read -d $'\0' -r doc; do
 			if use unicode; then
-					iconv -f BIG5 -t UTF-8 --output=${doc}.UTF-8 ${doc}
-					mv ${doc}.UTF-8 ${doc}
+					iconv -f BIG5 -t UTF-8 --output=${doc}.UTF-8 ${doc} || die
+					mv ${doc}.UTF-8 ${doc} || die
 			fi
 			dodoc ${doc}
-		done
+		done < <(find ${docdir} -maxdepth '1' -type f -print0)
 	done
 }