gentoo resync : 23.09.2020

17 files changed, 130 insertions, 245 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index da8c3477ff0f..5a1205d50d59 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/bidiv/Manifest b/app-i18n/bidiv/Manifest
index 779d749a89e3..d6ad13178ea9 100644
--- a/app-i18n/bidiv/Manifest
+++ b/app-i18n/bidiv/Manifest
@@ -1,7 +1,4 @@
-AUX bidiv-1.5-fribidi.patch 1164 BLAKE2B 50a0a3a35ea7d7b526552fe0b4f1f99bd5ca52b1b42dd76a5dbad2127de2cdf40c1553263902d946d3ea8f7bfae1464de37737eb5af768a2767020b17f272f3c SHA512 0f2bbf5b2f337c335c009cf4672b896ff7b7dcdc94a839544aa5af1f80d43d64b373387b49e21f5bbd5111fc7f7014e0f058973a70154f1ad913ba8d7228c1be
-DIST bidiv-1.5.tgz 13865 BLAKE2B 9f289a2674b3d5ce895e65f6068252d78eafea735783ca8947be446d0830166708474fda041bea85adcc8930ec615d68978d7f8151afdcd645640b9941be009c SHA512 f8ddaa4a7ae6e7b723eb6e4f5dc91bd2e189c02e116ecd1fb02d300f12e913e9dbf328d65f40ef8c2e7d8e822d1a612966fe0f59f44129fd5dc7ece26c021cc2
 DIST bidiv_1.5-4.debian.tar.gz 5863 BLAKE2B b91f6756156815bd12b6c6e56a058a63db5be805cab2c5fb29e47f0e66bf8ba8638bdca2ed83c63117144c2f9912ed4ba79bb1b143f3bd2f6c4fef33397225e2 SHA512 63e998cae38e08181cf4e40a54119b9b4b5ab3ede7fcfbf852a1a7ad51a671d14d4094b3af8b89574eef51f8c6ee34f2eab6242bf69e77d954826931a801e8b1
 DIST bidiv_1.5.orig.tar.gz 13865 BLAKE2B 9f289a2674b3d5ce895e65f6068252d78eafea735783ca8947be446d0830166708474fda041bea85adcc8930ec615d68978d7f8151afdcd645640b9941be009c SHA512 f8ddaa4a7ae6e7b723eb6e4f5dc91bd2e189c02e116ecd1fb02d300f12e913e9dbf328d65f40ef8c2e7d8e822d1a612966fe0f59f44129fd5dc7ece26c021cc2
-EBUILD bidiv-1.5-r1.ebuild 631 BLAKE2B 22ff8101240d213b4593214b6c18481d6ea236c9d187367473401708bb71b43b008b6273351a329c783460f7f47cdf75b415ea63c5e03022140504dcccc58600 SHA512 89f0a57e7f3bb741e41d4c416cef6d3ef76dcfe1b3bccf314f71b325d3703945e4e7e898fdbc2ce4699c0b5243c0809c97e29e13fae9471744b69a0a9cbd2f1b
-EBUILD bidiv-1.5_p4.ebuild 1061 BLAKE2B c9c181238c39eaef6bab6a0af6e58953415487b51dc025f7c456f980d5ad4bc1174220161160b8cb1c52bc0269f0576c618d182573b63b35967f91ebf94dd138 SHA512 c86d3fdd1a5b924acef7a1588e5abdb786849d7ada0ab2535116a3a3cbb2d70ca2fd12db419d02512ab732050244881e2e382cc14a008cf115fe9cc3bbf02e34
+EBUILD bidiv-1.5_p4.ebuild 1110 BLAKE2B c7d76c8af02b97eb3afb7bac40f51b7570a8b98418355df6ea9c39efaec1ef6af0ca8ba7ce6d4d6a8d6236db4bd6669681ae7892b5ff1b2de51fe95145765d52 SHA512 64ce715b0dd99fc72a64fcd96f04e105a200352641f5617763c3a5b9457f8b16d604553dde1490c816830dbb518af0d8ce9efc78e1030b1f792ad1aef8cbf060
 MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/bidiv/bidiv-1.5-r1.ebuild b/app-i18n/bidiv/bidiv-1.5-r1.ebuild
deleted file mode 100644
index 86d05fe04bf0..000000000000
--- a/app-i18n/bidiv/bidiv-1.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A BiDirectional Text Viewer"
-HOMEPAGE="http://www.ivrix.org.il"
-SRC_URI="http://ftp.ivrix.org.il/pub/ivrix/src/cmdline/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/fribidi-0.19.2-r2"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fribidi.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake
-}
-
-src_install() {
-	dobin bidiv
-	dodoc README WHATSNEW
-	doman bidiv.1
-}
diff --git a/app-i18n/bidiv/bidiv-1.5_p4.ebuild b/app-i18n/bidiv/bidiv-1.5_p4.ebuild
index 9635bec349c9..73aafaeb98cd 100644
--- a/app-i18n/bidiv/bidiv-1.5_p4.ebuild
+++ b/app-i18n/bidiv/bidiv-1.5_p4.ebuild
@@ -1,39 +1,38 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 PATCH_LEVEL=4
 
 DESCRIPTION="A commandline tool displaying logical Hebrew/Arabic"
 HOMEPAGE="https://packages.qa.debian.org/b/bidiv.html"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz
+SRC_URI="
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PATCH_LEVEL}.debian.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE=""
 
 RDEPEND=">=dev-libs/fribidi-0.19.2-r2"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
+DEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
-src_prepare() {
+PATCHES=(
 	# Use order from "series" file:
-	local ddir=${WORKDIR}/debian/patches
-	epatch \
-		"${ddir}"/try_utf8_fix \
-		"${ddir}"/makefile \
-		"${ddir}"/fribidi_019 \
-		"${ddir}"/hyphen_minus \
-		"${ddir}"/term_size_get \
-		"${ddir}"/type_fix \
-		"${ddir}"/cast_fix
-}
+	"${WORKDIR}"/debian/patches/try_utf8_fix
+	"${WORKDIR}"/debian/patches/makefile
+	"${WORKDIR}"/debian/patches/fribidi_019
+	"${WORKDIR}"/debian/patches/hyphen_minus
+	"${WORKDIR}"/debian/patches/term_size_get
+	"${WORKDIR}"/debian/patches/type_fix
+	"${WORKDIR}"/debian/patches/cast_fix
+)
 
 src_compile() {
 	tc-export CC
@@ -41,7 +40,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin ${PN}
-	doman ${PN}.1
+	dobin bidiv
+	doman bidiv.1
 	dodoc README WHATSNEW "${WORKDIR}"/debian/changelog
 }
diff --git a/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch b/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch
deleted file mode 100644
index 0223329cbe5e..000000000000
--- a/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- bidiv.c
-+++ bidiv.c
-@@ -172,7 +172,7 @@
- 		}
- #ifndef TRY_UTF8
- 		in[len]='\0';
--		fribidi_iso8859_8_to_unicode(in, unicode_in);
-+		fribidi_charset_to_unicode(FRIBIDI_CHAR_SET_ISO8859_8, in, unicode_in);
- #endif
- 
- 		/* output the line */
-@@ -201,10 +201,10 @@
- 			rtl_line=0;
- 
- 		if(out_utf8)
--			fribidi_unicode_to_utf8(unicode_out, len,
-+			fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, unicode_out, len,
- 					     out);
- 		else
--			fribidi_unicode_to_iso8859_8(unicode_out, len,
-+			fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_ISO8859_8, unicode_out, len,
- 						     out);
- 		/* if rtl_line (i.e., base_dir is RL), and we didn't fill the
- 		   entire width, we need to pad with spaces. Maybe in the
---- Makefile
-+++ Makefile
-@@ -1,16 +1,14 @@
- PREFIX=/usr/local
- BIN_DIR=$(PREFIX)/bin
- MAN_PATH=$(PREFIX)/man
--CC_OPT_FLAGS=-O2 -Wall
- 
--
--CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `fribidi-config --cflags`
--LDFLAGS=`fribidi-config --libs`
-+CFLAGS+=`pkg-config fribidi --cflags` -Wall
-+LIBS=`pkg-config fribidi --libs`
- 
- all: bidiv
- 
- bidiv: bidiv.o
--	$(CC) -o bidiv bidiv.o $(LDFLAGS)
-+	$(CC) $(LDFLAGS) -o bidiv bidiv.o $(LIBS)
- 
- clean:
- 	rm -f bidiv.o *~
diff --git a/app-i18n/pology/Manifest b/app-i18n/pology/Manifest
index 4f008f9d0cef..fa4c0d50d4e2 100644
--- a/app-i18n/pology/Manifest
+++ b/app-i18n/pology/Manifest
@@ -1,4 +1,3 @@
 DIST pology-0.12.tar.bz2 1773467 BLAKE2B 7725b6dcb10c0f14533ee31a3d75c78e4fbd12d79ce21017b16d339a880cb73c47c8801e54f5ca0c49d8f364a12179caf6f4100b6eee5b5c47638f61d47a30d0 SHA512 2e23d1dd0c38cc17826908734adf46fb30c30d58f906fc223e2e9251791dad43d02840ae4eca55e04682af574df45a553ccd83faf85a785a1446f645e4222b4f
 EBUILD pology-0.12-r2.ebuild 1637 BLAKE2B 442bd1b818c343258f31fe93ed4b98a3bb43d5bdcb818bb62557533167f12700d2671b723f12d50b24828fb1adaf5cfa2f93e11c830fca05c1d6a0eeb60abe75 SHA512 780318047c162857ce910e6d5fdfb7b0125a4cf6b39b7c2235091ab3905491e28bd5ac91d18808f474d9dc1be2d588a5963c9137d22fb3eb6985d462b8dccaed
-EBUILD pology-9999.ebuild 1639 BLAKE2B 65458ae746686a4c5065e7c01d1c9e1f9e23f10d47a43edb024fd9208349460a55737da1d55cbca370bddf912e1f0c760178b6cfe4898cf20eea159ca07b0036 SHA512 07d16a74de5d82a88fbe58588dc89df741684493495faa69265dd8f13cc8744a4b068971d4ebbc1e56bcede72d8d0ed16d0b5fa5166025646f715eee4ed840eb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-i18n/pology/pology-9999.ebuild b/app-i18n/pology/pology-9999.ebuild
deleted file mode 100644
index 033de2d14358..000000000000
--- a/app-i18n/pology/pology-9999.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit bash-completion-r1 cmake kde.org python-single-r1
-
-DESCRIPTION="A framework for custom processing of PO files"
-HOMEPAGE="http://pology.nedohodnik.net"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="http://pology.nedohodnik.net/release/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.5
-"
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libxml2
-	dev-libs/libxslt
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-	')
-	sys-devel/gettext
-"
-DEPEND="${RDEPEND}"
-
-# Magic on python parsing makes it impossible to make it parallel safe
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "/DOC_INSTALL_DIR/s/^/#DONT/" -i CMakeLists.txt || die
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Epydoc=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Pygments=ON
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_optimize
-
-	dosym ../../../pology/syntax/kate/synder.xml /usr/share/apps/katepart/syntax/synder.xml
-
-	newbashcomp "${ED}"/usr/share/pology/completion/bash/pology posieve
-	bashcomp_alias {posieve,poediff}{,.py}
-
-	elog "You should also consider following packages to install:"
-	elog "    app-text/aspell"
-	elog "    app-text/hunspell"
-	elog "    dev-vcs/git"
-	elog "    dev-vcs/subversion"
-	elog "    sci-misc/apertium"
-}
diff --git a/app-i18n/qkc/Manifest b/app-i18n/qkc/Manifest
index 76c1a3251f85..3e1bd7f82c6e 100644
--- a/app-i18n/qkc/Manifest
+++ b/app-i18n/qkc/Manifest
@@ -1,3 +1,4 @@
+AUX qkc-1.00-makefile.patch 354 BLAKE2B a8914be639dabd2fe5aaf35d274fa318c0443a93729802887136e3cb1174787922ae1a7976cb415bc95cc18933219c3a3c716f48d6d37a5d0d7b79fbd933d64c SHA512 2ef29ca90681d02cc39f75124b764b48244b27755b145f8b21213f1faba2d9dbea1ab691dc7ad8dde11a6e7afa8e53cd72bbe77e0c512b6d8f826f3967b6f364
 DIST qkcc100.zip 36308 BLAKE2B 3291a7159a63f62c045230e045c6749f6d44ee5173270f1e994c770c14c0381c279c7452acd6861932a8227f13b1e4e8888e9f49654b3a59c93fb9069bfb09aa SHA512 a03f12625c1205d1220c70e2c3bd8f4ef281a3f0f6317ad7a0221624ba6461a7f9fbbb1da68048fc2bb3b071895dfb13aaa630e780fd49eddb0b6c528ce2e4a0
-EBUILD qkc-1.00.ebuild 654 BLAKE2B 2a6abe3bf46eb1bc2762197376b8f9a087d8737fae52a7e9d47e16306fb38aab26945e95b5009555d050dd8bb4881d991cab695b5ac66ac482e87855e21b77d4 SHA512 d7b4f7dc72c5b64fefe8ad94a5484c946c1e97e2dee4bfc9b08aca37c1c20abb378434e1b0310b4934ebd201cfaa0a81d52fedbfed1c987a95e1639b21838628
+EBUILD qkc-1.00.ebuild 580 BLAKE2B 4f6b973356fb51db5e4b950e737a344d0ce802606cd6e6b315f27ffc2fc65930888799d667dbd39169dbba0f87c8ded5eab364be7e6c7843f26351708faa9704 SHA512 31edd0a8f446f9a299fec74e14ddc533d2c7532edd045dea8914e7c50eba6d366df48a0e4894f4750d27fdba64f532df8d170f49492d3fb641117078c6e5ec89
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/qkc/files/qkc-1.00-makefile.patch b/app-i18n/qkc/files/qkc-1.00-makefile.patch
new file mode 100644
index 000000000000..ff9d1c97b920
--- /dev/null
+++ b/app-i18n/qkc/files/qkc-1.00-makefile.patch
@@ -0,0 +1,22 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,18 +1,6 @@
+ # Makefile for qkc
+ 
+-CC     = cc
+-BIND   = $(CC)
+-CFLAGS = -O
+-LFLAGS = -o qkc $(CFLAGS)
+-OBJ    = qkc.o qkcopt.o qkchelp.o qkcconv.o qkctbl.o
+-
+-.c.o:
+-	$(CC) $(CFLAGS) -c $<
+-
+-qkc: $(OBJ)
+-	$(BIND) $(LFLAGS) $(OBJ)
+-
+-$(OBJ): qkc.h
++qkc: qkcopt.o qkchelp.o qkcconv.o qkctbl.o
+ 
+ clean:
+ 	rm -f *.o qkc
diff --git a/app-i18n/qkc/qkc-1.00.ebuild b/app-i18n/qkc/qkc-1.00.ebuild
index b9877517dd47..164c0c12afa7 100644
--- a/app-i18n/qkc/qkc-1.00.ebuild
+++ b/app-i18n/qkc/qkc-1.00.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -14,17 +14,15 @@ SRC_URI="http://hp.vector.co.jp/authors/VA000501/${MY_P}.zip"
 LICENSE="freedist"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
+
 S="${WORKDIR}"
 
-src_prepare() {
-	sed -i "/^LFLAGS/s:$: \${LDFLAGS}:" Makefile
-}
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
diff --git a/app-i18n/scim-input-pad/Manifest b/app-i18n/scim-input-pad/Manifest
index e6c8e47e6295..54b6f7ed8f90 100644
--- a/app-i18n/scim-input-pad/Manifest
+++ b/app-i18n/scim-input-pad/Manifest
@@ -1,5 +1,5 @@
 DIST scim-input-pad-0.1.3.1.tar.gz 591478 BLAKE2B a89a4d5717f89125e9ae3a9f360e8746cd5eb8a41646e886aa3f9c341f9dbd3e36453ea071896002ae182476cccfb8114323ec6e2b363f7d1ca151e697f510bb SHA512 864a254814c0afa04c10143a6b0de4a927ff8612e01bed3776d09a910cfb12899c17245a89a0386f4fac59ebdaae9e6fb9dc9ff5981f72dbec952a9da52a413d
 DIST scim-input-pad-0.1.3.tar.gz 1362611 BLAKE2B a9defe7b70a11b39a405c8e490030bc31b8372b3a7636f7215d5d5a4e1920aff38a810ab5d02ce0d987cd8280b09483e7a77a670de6f26d305ee47d87c1c6c8d SHA512 2a7f52c92feb5f882827f8a7240da6dc347be0f34c5b378ee8c26aba39b925d56caff3145ef237c4e0604d65179b755124b8b40c507666b2f76d12715de1103c
-EBUILD scim-input-pad-0.1.3.1.ebuild 1368 BLAKE2B 5f6a2cc572d8143fe09928d35162d578c7673fc6722a11591ebcd5b307112b6f38cd0ed2386b477a3ac3d9f1a8318ab695172a2b9515fdbcdd011becd7623060 SHA512 f16eab2c5e9e783caee1470e463423dd4a23d8cae574418bfb7dfb9917c9af385d08158ff9a38b27df79800a984ce5a23177c9bb587f4ffebdb057d6e7f7dfd0
-EBUILD scim-input-pad-0.1.3.ebuild 1366 BLAKE2B 1a64ad5b40646895d914eefd42a2b24581463aeef7d2c68c3a175af2f84cfdf2ca4e52566aa9b18a51e63686178e4fef505eb622935dbcf68b91d4cb41344ee4 SHA512 b0bc7e7ebd492d2533ea9ef400443f4d14ef41743db0e75492d11650c8eb3bb8ebea5d771b6743d71f30c47c479ff35cf99c3eb1dd2c48986b854afda546ea2e
+EBUILD scim-input-pad-0.1.3.1.ebuild 1429 BLAKE2B 0a1812f147d02760d626f14e6f50482de65dd4eb50d427bb005c1bb411f7f770ae4d71e1d49b75b6b7534180f34d5ab5375c23f213cdf2478f6444e50adaaf3e SHA512 0269d840c532632584dba39dc467a22e0b67b6db1bda0aba9b0159a84921261758c8eb4588b0f2904699aaec7a36bfb48c92ee119e5f69d58094758d71f19e4e
+EBUILD scim-input-pad-0.1.3.ebuild 1427 BLAKE2B f1db14112a30a6e772e4477513860771c590e2798c67bfacff36860df014283de4941468f77d62ad7678474868cc777a6e36787c71c2fd30614ecdae8b80c6f4 SHA512 14c83ef4df7c9cace3839f186f5324bd965c0421c93f81ce4dd1031879718d9cd4c6e08e5a2b5614326e96491e673140a3682bb2698e3bde17ac23becf7995c4
 MISC metadata.xml 1730 BLAKE2B 694fbd77ffc1d75bbf3726dfb0c0e9225e5e313f52af6212992b2b27378a0fd41fc2b470fb1169ade9b6d6a83a153615d9a4330053f56cccde4e86c9dad14ab2 SHA512 5e6fa898e9267551b94352919a0cffba74784cc70a84a5c22543c3d0c12ab2185e8b226a333813afedd839c9d05c46939c553bf8a2288fd191b1c6fc08b70edb
diff --git a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild
index 4f87c9cc0793..d6613ab82f8b 100644
--- a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild
+++ b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 inherit autotools
 
@@ -14,29 +14,35 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
-RDEPEND=">=app-i18n/scim-1.2.0
+RDEPEND="
+	>=app-i18n/scim-1.2.0
 	>=x11-libs/gtk+-2.6.0:2"
-
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=dev-util/intltool-0.33
 	virtual/pkgconfig"
 
 src_prepare() {
-	rm "${S}"/m4/intltool.m4 || die
+	default
+
+	rm m4/intltool.m4 || die
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable nls)
+	econf \
+		--disable-static \
+		$(use_enable nls)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog README
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
-
 	elog
 	elog "The SCIM input pad should be startable from the SCIM (and Skim)"
 	elog "systray icon right click menu. You will have to restart SCIM"
@@ -49,7 +55,6 @@ pkg_postinst() {
 	elog "table, from the SCIM Input Pad interface."
 	elog
 	elog "To add new characters to the tables, see the documentation"
-	elog "(README file in /usr/share/doc/${PF})."
+	elog "(README file in ${EROOT}/usr/share/doc/${PF})."
 	elog
-
 }
diff --git a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild
index 65ab96d29a17..0cbb2a9701e8 100644
--- a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild
+++ b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 inherit autotools
 
@@ -14,29 +14,35 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="nls"
 
-RDEPEND=">=app-i18n/scim-1.2.0
+RDEPEND="
+	>=app-i18n/scim-1.2.0
 	>=x11-libs/gtk+-2.6.0:2"
-
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=dev-util/intltool-0.33
 	virtual/pkgconfig"
 
 src_prepare() {
-	rm "${S}"/m4/intltool.m4 || die
+	default
+
+	rm m4/intltool.m4 || die
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable nls)
+	econf \
+		--disable-static \
+		$(use_enable nls)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog README
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
-
 	elog
 	elog "The SCIM input pad should be startable from the SCIM (and Skim)"
 	elog "systray icon right click menu. You will have to restart SCIM"
@@ -49,7 +55,6 @@ pkg_postinst() {
 	elog "table, from the SCIM Input Pad interface."
 	elog
 	elog "To add new characters to the tables, see the documentation"
-	elog "(README file in /usr/share/doc/${PF})."
+	elog "(README file in ${EROOT}/usr/share/doc/${PF})."
 	elog
-
 }
diff --git a/app-i18n/uchardet/Manifest b/app-i18n/uchardet/Manifest
index c0acc1736da9..aa05776df701 100644
--- a/app-i18n/uchardet/Manifest
+++ b/app-i18n/uchardet/Manifest
@@ -4,4 +4,4 @@ DIST uchardet-0.0.7.tar.xz 215492 BLAKE2B 1f8b171676bc6edf1f3493a4a370e32b7b9561
 EBUILD uchardet-0.0.6-r2.ebuild 854 BLAKE2B cf08d7188aeb89ed3b08956f404bd79392716206a2c8384f31978e0b5b726fc8d3916224bc0420ab2d085927d98629160116830c2a92a75cc8d6ee6dde257727 SHA512 254306625498713aa5406cdd3e2eeadb3a6b944656f806bb82bc5dca807574a68f0129fe2d94414a2ee7c39ab2e57f40d38ae49bd4c69de5a2dfc6b2452b7a6e
 EBUILD uchardet-0.0.7.ebuild 899 BLAKE2B 8986cc6e306cf85d8bd33944748450783aac0280e5415308dc3c005ebf33df275e37f680942823c244864c9bcffc05cd35b73171ac5f410453fd90d911a73689 SHA512 b802c47645927791f8ea8c64ca544ec7901aa7eec7f3d4067cadc767e7149d9203009ed64c2564f4753a5d54b2d3a31cb04d2f3efe35eda0cc832c389ef4cc95
 EBUILD uchardet-9999.ebuild 838 BLAKE2B 1fa9152117465b5e792942983a98d1a0f69373b34f723d1811d5bc8718cffa6f61f3a808d5e70e5837bd4969eb32a49b744a7e200d7d1760d60a0bdf1b08a6c2 SHA512 2a0a59e862a98c88f1a4186043e3eb6819ea09b5b28fa5ae8ec5edaa2f328ced05cd2ad19b2288ee119741987ed7f8ba8756d440d48c264996f2e3d6a6e39e04
-MISC metadata.xml 533 BLAKE2B 37f21d9d4553f2fcd80e5de0d6896005d21f5595a7d070aa385cc55a9dcb1a1ec6f50f06d81d99d18da5ff9dbdeb4afed3bd0eecf9ae7453f3d29645d0802400 SHA512 914c9c5d837e9508f5a33191971761d6d956b785e9ff8329d42c821eba4613e7e7d45e40fb112667c3891b1aa2d824f09d2b2c13e3e412e12d0d937bb3fef782
+MISC metadata.xml 531 BLAKE2B 704db918c9ad9f097c7db7003c925e3d880611a2fe8da3b1439737db4e6b74dda42d990b8073b159e2a437b8e671d54467ead7aadae6ac25181a668dde715141 SHA512 01b7353c36311f9c12d819339afec0e6b7cd081ec9bcafab57108fb4b128dc435f66b3bdd6df4962c261881cfbf51b46cb3dcccfa493e71ba0c94ecbaa41f5b7
diff --git a/app-i18n/uchardet/metadata.xml b/app-i18n/uchardet/metadata.xml
index 3c431c24f073..8e0af8580e0a 100644
--- a/app-i18n/uchardet/metadata.xml
+++ b/app-i18n/uchardet/metadata.xml
@@ -10,6 +10,6 @@
         <name>Proxy Maintainers</name>
     </maintainer>
     <upstream>
-        <bugs-to>https://bugs.freedesktop.org/enter_bug.cgi?product=uchardet</bugs-to>
+        <bugs-to>https://gitlab.freedesktop.org/uchardet/uchardet/-/issues</bugs-to>
     </upstream>
 </pkgmetadata>
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
 }