gentoo resync : 03.11.2019

2 files changed, 20 insertions, 35 deletions

diff --git a/app-i18n/scim-tables/Manifest b/app-i18n/scim-tables/Manifest
index aaa45566728f..527612105a58 100644
--- a/app-i18n/scim-tables/Manifest
+++ b/app-i18n/scim-tables/Manifest
@@ -1,5 +1,5 @@
 AUX scim-tables-0.5.12-automake.patch 356 BLAKE2B bce5fcef77970e3504048389968a11e00bcdac1049425b99b75d5f5081c7966eb2c38f6c98aebd3512bfae78cca7b4171f916099ef77f40dfb59e7e3865350cf SHA512 020b32250566092c784727d316acb800013d1c4f7bbd970503e4033bd9006e523079f2b906c7b0db67501d6e441b98500d6da40bdf37b2749f6611c6f6523df9
 AUX scim-tables-0.5.8+gcc-4.3.patch 462 BLAKE2B 181974c195ce3a5d53ac4f95a067adbca82e60b44f664b6caec4f0052f46d02bceccf6aa102f6dc771b1bdc6186fa27c58a550f2cc11cd61cd304b9c4cf5bcf5 SHA512 450b5ca11d1f9b776edae027e8b9af1e24511c145e5df83e344b236be434f7ac7bb7fb24c304dc3e6b2e25ce38a4933acf09140b50f66eed3b734daf9d6c30f6
 DIST scim-tables-0.5.13.tar.gz 6716275 BLAKE2B 8b7932f38baab64d9e1db6e9f76e3d7425f3b1ff071c358b8f2a7d8b2602d3304248e97389f2423ebc12b37edf43c114f73e6bace3907547af44963e03317878 SHA512 400aa99acef83b82e6422398f41bf65e51b7e703adc3e87cdef03793d84983e600f9e6201fda6f9c54e97f35c44da72a657ce15caef09ef490c44ad19c3a9e33
-EBUILD scim-tables-0.5.13.ebuild 1487 BLAKE2B f64a6c7dc8e20a245e3e203b301c309721150114c43475c5d39a954d2e52b755dc6b32ca9cc7fbcb57f4252780804106cbdb986a3374f6de4eedb36d4ba79368 SHA512 5d0c37f6eeeed593601d070bd57ed63d257d575114ec146ee8c48f97fc466cc118a828154bdd66cd2be1c134173bf63e965f1200188676e528776f50e3835840
+EBUILD scim-tables-0.5.13.ebuild 852 BLAKE2B 9157826e62848160d0f1e0a53821991649a818b513a044da9327d21fbce254cec6b2b39cd3f3db4a7bb9725aebd6105ccd162f4a4509ed2fbf718f454ba09e1f SHA512 7d4db6d0f8d0590a6cf2ce97b5839b79a7fb90f22ffc8df5a06b5e19a67e8c7b66b1bafd8cb8a689404e99035fdc632f55b92347caa239fe4db5164c04fe4148
 MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
diff --git a/app-i18n/scim-tables/scim-tables-0.5.13.ebuild b/app-i18n/scim-tables/scim-tables-0.5.13.ebuild
index 530fd551b64c..718a68ef66c5 100644
--- a/app-i18n/scim-tables/scim-tables-0.5.13.ebuild
+++ b/app-i18n/scim-tables/scim-tables-0.5.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit autotools base eutils
+inherit autotools
 
 DESCRIPTION="Smart Common Input Method (SCIM) Generic Table Input Method Server"
 HOMEPAGE="http://www.scim-im.org/"
@@ -13,51 +13,36 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc x86"
 IUSE="nls"
-LANGS="am ar bn gu hi ja kn ko ml ne pa ru ta te th uk vi zh"
 
-RDEPEND=">=app-i18n/scim-1.4.7-r2
+RDEPEND="
+	>=app-i18n/scim-1.4.7-r2
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.5.8+gcc-4.3.patch"
+	"${FILESDIR}"/${PN}-0.5.8+gcc-4.3.patch
 	"${FILESDIR}"/${PN}-0.5.12-automake.patch
-	)
+)
 
-pkg_setup() {
-	elog "Not all languages are going to be compiled."
-	elog "Please set LINGUAS to your preferred language(s)."
-	elog "Supported LINGUAS values are:"
-	elog "${LANGS}"
+src_prepare() {
+	default
+	eautoreconf
 }
 
-src_unpack() {
-	base_src_unpack
-
-	strip-linguas ${LANGS}
-	local use_languages="additional ${LINGUAS}"
-	elog "Languages being compiled are: ${use_languages}"
-
-	cd "${S}"
-	sed -i -e "/^SUBDIRS/s/.*/SUBDIRS = ${use_languages}/g" \
-			tables/Makefile.{am,in} || die "sed ${m} failed"
-
-	AT_NO_RECURSIVE=yes AT_M4DIR=${S}/m4 eautoreconf
-}
-
-src_compile() {
+src_configure() {
 	econf \
 		--disable-skim-support \
-		$(use_enable nls) \
 		--disable-static \
-		--disable-dependency-tracking \
-		--without-arts || die "econf failed"
-	emake || die "make failed"
+		--without-arts \
+		$(use_enable nls)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc README ChangeLog AUTHORS
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }