gentoo resync : 23.09.2020

3 files changed, 36 insertions, 26 deletions

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
-
 }