gentoo resync : 23.09.2020

7 files changed, 35 insertions, 39 deletions

diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 3ecdafb85a63..c360e6dcb50e 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/gwaei/Manifest b/app-dicts/gwaei/Manifest
index 74ec58caf0e0..9c3f97e16ff2 100644
--- a/app-dicts/gwaei/Manifest
+++ b/app-dicts/gwaei/Manifest
@@ -1,3 +1,3 @@
 DIST gwaei-3.6.2.tar.xz 547592 BLAKE2B 0a0f90639b81158ef6bfc69f0f74ad70af65ae9462c93f6e507d6a1087c424da9689f2308300c5d4b8090143d8d9e2f7fe183719e37fa463ffe2b937714b7463 SHA512 96876f7e15ff5e166dcd116e2286294b7b375e55723684e4e3dec31aba46d1c89ccd70007fc01cab97a5fd5e671ec073c3f69525ff7e68126851e587d4f20c3b
-EBUILD gwaei-3.6.2.ebuild 1357 BLAKE2B f610b5b3bde56cc03cc234b5fa9e2dfb5877af594c1dfb30a782576db59b9cbe24261310319f3f3aa22597321ef75a1bdcc16e5ee1f64f2f3628ccce2407a5a6 SHA512 9dec52d67c23c133df858aeab12200a6ac91dc9a332f45b58bcd4664bc6285cd74c2a4de6a52e06f05dde03b34debcd55b5a0fa71fbc399d8adec3ee68a81154
+EBUILD gwaei-3.6.2.ebuild 1275 BLAKE2B 8f8ec4f8939a39fc050a67740fee1181039fa0c09a8fc1c9725e7070977afcebfef737982d2707d901b9f926b9bc5a017cddfa8b1a1a242d62054a0518b093f5 SHA512 a5c7a67dbb50914488f4fd5d6e9cea144ada517fae71fd5dbb8c838265b60ffcd05552b3b782e618281fe3d7d924d6076a58cb2a00ac6238af15fb2038df7baa
 MISC metadata.xml 762 BLAKE2B 96509839f9438ea2d387e73790629af5db6f7307dd7dc009489ee9aac1520ac53efb6cf855ceaa3a272cb128b60e2bd068f61e0375c104985d30198c10a1995a SHA512 2fade949182ab7d2a48a98f24c45f806cc84fdb481c8357c282fffc44c7a02a36dcb58f3c7ec586ee87c7a98b04522c33cc01135bfddeb49044ee2791b8b820b
diff --git a/app-dicts/gwaei/gwaei-3.6.2.ebuild b/app-dicts/gwaei/gwaei-3.6.2.ebuild
index 760d43ab9b63..045d9d6ad1f2 100644
--- a/app-dicts/gwaei/gwaei-3.6.2.ebuild
+++ b/app-dicts/gwaei/gwaei-3.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit gnome2-utils eutils
+inherit gnome2-utils
 
 DESCRIPTION="Japanese-English Dictionary for GNOME"
 HOMEPAGE="http://gwaei.sourceforge.net/"
@@ -12,10 +12,11 @@ SRC_URI="mirror://sourceforge/gwaei/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gtk hunspell nls test mecab"
+IUSE="gtk hunspell nls mecab test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=net-misc/curl-7.20.0
+RDEPEND="
+	>=net-misc/curl-7.20.0
 	>=dev-libs/glib-2.31
 	gtk? (
 		x11-libs/gtk+:3
@@ -25,50 +26,44 @@ RDEPEND=">=net-misc/curl-7.20.0
 	nls? ( virtual/libintl )
 	mecab? ( app-text/mecab )"
 DEPEND="${RDEPEND}
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/scrollkeeper-dtd
-	)
 	gtk? (
 		x11-themes/gnome-icon-theme-symbolic
 		>=app-text/gnome-doc-utils-0.14.0
-	)
-	nls? ( >=sys-devel/gettext-0.17 )
+	)"
+BDEPEND="
 	app-text/rarian
 	dev-util/intltool
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.17 )
+	test? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/scrollkeeper-dtd
+	)"
 
 src_configure() {
 	econf \
+		--disable-static \
 		$(use_with gtk gnome) \
 		$(use_enable nls) \
 		$(use_with hunspell) \
-		$(use_with mecab) \
-		--disable-static \
-		--docdir=/usr/share/doc/${PF}
+		$(use_with mecab)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete
+	default
 
-	dodoc AUTHORS README
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_preinst() {
-	if use gtk ; then
-		gnome2_schemas_savelist
-	fi
+	use gtk && gnome2_schemas_savelist
 }
 
 pkg_postinst() {
-	if use gtk ; then
-		gnome2_schemas_update
-	fi
+	use gtk && gnome2_schemas_update
 }
 
 pkg_postrm() {
-	if use gtk ; then
-		gnome2_schemas_update
-	fi
+	use gtk && gnome2_schemas_update
 }
diff --git a/app-dicts/ipadic/Manifest b/app-dicts/ipadic/Manifest
index 015ae7d4bd3e..768d663c4ae1 100644
--- a/app-dicts/ipadic/Manifest
+++ b/app-dicts/ipadic/Manifest
@@ -1,4 +1,4 @@
 AUX ipadic-2.7.0-r2-gentoo.patch 896 BLAKE2B 69c2fb6a2379359d8060a59d0041faebd780769a0983e6797ed16d8143e0d05a046f82a0352a53226219c4888d91fd51b339a284e4e37f85d11c22e11a58f4a7 SHA512 0e6fa8f84c978c96d0fe8eebbda3166d298fa9709eec8025025e5705db04d08b3e7581f9341dad84808dba52c6dac2498743a4514701fa74289608287f3b2a82
 DIST ipadic-2.7.0.tar.gz 4300102 BLAKE2B bc6c60eb79c12dc06a30c021d5df2016f5b9c8a41540edfda3d9010716096ac25ee6a1a34b23690c86799eaa4c60fc68c499c0a20afbef865c07ec51b9ddcf40 SHA512 0c4617733d3a786f4a9d0773c50cd76da5433921dc4eb4f759b8b3c0fd3c0db411696068ee795a893063e1a7ab1bdb6afc740331c5fdd2c3ebc914324f4e33c3
-EBUILD ipadic-2.7.0-r2.ebuild 609 BLAKE2B 9c0ababad6dd3ac8afaa0657c95e476c2a68c0f0e5b6634d94aa7536550f64ac3a57446262cf9ac7fa74fb5d6eac8c0839bf43b23b6a8f1f2303abccb973e3be SHA512 98ea6a90f3399e9a3afacad9b9df5eb38be7b2a8af00cea9962174a8717e3e69034b828b59efbdedb4b47bc637cc78e1a4fdcf1740577c0451a2eb76c69ac288
+EBUILD ipadic-2.7.0-r2.ebuild 589 BLAKE2B 5eedcb3f4b7136ad18862a5830782cb071a4bdcb6f033e238fd493ffb67c7cc250e7ff86575ba3365d160b31e9225e47745ef9cec4808e9870cf8e13e010da4a SHA512 9abe5326fd119ed55c329f0817c3071a0c24fcc87f15b5bbde5bd3675396bb9ad96d8e001de9d594a7cf8e431166e65db3d16f37c11d84c8552be98095e8900c
 MISC metadata.xml 313 BLAKE2B 29d8fd0791c9ef1edc0c84bec6d51512b47510bf511fe987d1d4e3ec9ebe235cde890508a545d4e8e16a7ab73d988261348fdfa94a44f294ae57d8bf8d8e9de1 SHA512 3319aeaacecbac0b8005dc910cfbb7357d068d920c739230fbeb61b1653d433efcadad1d07674d01ff092d9cbf8cd4f11ee317234b44b747bef6cf2fa0b1132b
diff --git a/app-dicts/ipadic/ipadic-2.7.0-r2.ebuild b/app-dicts/ipadic/ipadic-2.7.0-r2.ebuild
index fba0b8b37b2d..54a6d1d4850d 100644
--- a/app-dicts/ipadic/ipadic-2.7.0-r2.ebuild
+++ b/app-dicts/ipadic/ipadic-2.7.0-r2.ebuild
@@ -1,23 +1,25 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Japanese dictionary for ChaSen"
 HOMEPAGE="http://sourceforge.jp/projects/ipadic/"
 SRC_URI="mirror://sourceforge.jp/${PN}/24435/${P}.tar.gz"
 
 LICENSE="ipadic"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
-IUSE=""
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
-DEPEND=">=app-text/chasen-2.3.1"
-RDEPEND=""
+BDEPEND=">=app-text/chasen-2.3.1"
+
+PATCHES=( "${FILESDIR}"/${PF}-gentoo.patch )
 
 src_prepare() {
-	epatch "${FILESDIR}/${PF}-gentoo.patch"
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -26,5 +28,4 @@ src_install() {
 
 	insinto /etc
 	doins chasenrc
-	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/app-dicts/verbiste/Manifest b/app-dicts/verbiste/Manifest
index 3ea9d9893990..c4a00b5055fc 100644
--- a/app-dicts/verbiste/Manifest
+++ b/app-dicts/verbiste/Manifest
@@ -3,5 +3,5 @@ DIST verbiste-0.1.41.tar.gz 751059 BLAKE2B 503411520a2b76463d20cae09af33f28255db
 DIST verbiste-0.1.44.tar.gz 780465 BLAKE2B 692fd3bdf00323b08d4c8a66baaf9f6800c4593428d36efb4cd4bfc51eea912297154e4b0610b94b66d1354317ac7cf24d6dca083d521c648338a0974f6d0899 SHA512 36c8a2af31f948dc3970bef260d5cd7f9d230f4966f846bcc823f006cd98ab98229544b7470466529344ac5735d1189c859c539f526cd58410d9a521510db5e5
 EBUILD verbiste-0.1.38-r1.ebuild 1241 BLAKE2B 91959ec74a90633023510224c8a032310c53c2f09e78a83b18a9066a5ef016fb2a4ec678714b1b24610327b4f76e065017fff3e1a660a5ef213495866b56f4e3 SHA512 07b96917a7d52902c9e04abddbe04a7991c685aba2dd5fb5be01eae189ca61fdc7661b48b0e69b127701882563a87360c1c419b381c406b4be47a0832ae46e08
 EBUILD verbiste-0.1.41.ebuild 1171 BLAKE2B e570299ec4b17525520e3b87555b9051b8728ac2df12b61f6cd3f189daf7cf1b933c203a49b61758df1fda85e2ee18ff6043b0363820c37fce862c723881689f SHA512 ead4f763affca7482b3081396de7bde6027fe7f55a8fbf74c1c63d6b99c5d73967f2421985ab4a01e332eda55ac4071aad2f9d6f05c6efc8a0e266341826535b
-EBUILD verbiste-0.1.44.ebuild 1170 BLAKE2B b0b57a8d4fdbf96d2de0f83c2e6d83fa8f5f8139665c064746bdb9515c87afd06fc06f08aeacf3f1be97a8d253f4fe73f5a75c182b3a42bb52d11894bd254a9e SHA512 e0631b95b924cb61a055c8658946c97f4d4c50c31a7d781881975e0910ed8e035e954b0359300948c27e14156c47ad1e5145cd7c2e86d1f8bbccc60a9e070fc6
+EBUILD verbiste-0.1.44.ebuild 1168 BLAKE2B a45c768729754e532c5a8ed9b5b3729474587fb5ad422daaaf14078475f85d978da4fc8629fabacef62819746e647bc1ab8b79e5463c1edb36cd1f7df509a6f1 SHA512 ff09897280d66f45da4a1a4bf3bd74cda8177ef95d82c8a68e822e0cb5fa6f00cee245276f562caf2fc30dac998d7d3e5a0d133a1e12712d9146a00fa2df8369
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-dicts/verbiste/verbiste-0.1.44.ebuild b/app-dicts/verbiste/verbiste-0.1.44.ebuild
index 4cb088601c5c..97076d8d151a 100644
--- a/app-dicts/verbiste/verbiste-0.1.44.ebuild
+++ b/app-dicts/verbiste/verbiste-0.1.44.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://sarrazip.com/dev/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 IUSE="gtk"