gentoo auto-resync : 21:11:2022 - 01:03:25

3 files changed, 21 insertions, 27 deletions

diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest
index c93386f9a097..d4f9d21294e9 100644
--- a/app-text/gtkspell/Manifest
+++ b/app-text/gtkspell/Manifest
@@ -1,5 +1,5 @@
 DIST gtkspell-2.0.16.tar.gz 351277 BLAKE2B ccb49b99c4f9059ed4461bb5ffda4dbeb691c5a062184ba7b51d8464d2461c5be0d648e4f69dbc36fe345be2addbc271af9701a0a387975265585dd3a7926e99 SHA512 7d3afb327c2e15608194e6ee6110107a0ce082e483788d831d636b2e579472304137373c09a966d8e5c0cd2f830bf2e0ee477c9b5fca7da6ee27fd1498915b9d
 DIST gtkspell3-3.0.10.tar.xz 300968 BLAKE2B aa167e9e5068e9c6c5fcf6933a28246de0be8386be43ab3af80a45dfbc092e1381503822d09742d20dde2e0b8dae77210001c955e37a8dab263b832ee52675a1 SHA512 3b1ceaa9ffa06bd3f6dae39c95db951588e5cf2edf4f551cac6972822ba230af3415c5045fa24f7a4dfe05c2e386ab3f67cb80cb779576b4e54293b7b9fbc28e
-EBUILD gtkspell-2.0.16-r1.ebuild 969 BLAKE2B e738ab3471d36c2e6481766fc0dc53b61fa5b4d37f67816bfc37e214214cd3650edae0931ba70762ce0c04b06df80cb239a953e888570a70d31a18c3028a1ec7 SHA512 d7bbb41b8f69a769ea699fe2c6e912d356bffb3d71e299e18806dd18798ef5b71ce9613a514921e107593b3e5bd733d7a646c75089d559cdab20f62863f67a0d
-EBUILD gtkspell-3.0.10.ebuild 1056 BLAKE2B b67483668cffcec1745ec6cfe994630f46f8d8e9532e62194919f53785497039050df7a71cd5b9e606c2697fe7869a12812cb9912945c08b59afa351c7d676c3 SHA512 9aaf07d5b94e22bab319b3908079a4de079647e0213e8447d3a5e3f7d904bacefb25ee594b37fc71a143e18cd8172e8f00e5d3ba68f8756d641a47ee55d89faf
+EBUILD gtkspell-2.0.16-r2.ebuild 902 BLAKE2B 1ec25eefb1d679f44d4332380c405d264957037dc9b647b30e807e20b3077e530bd022fe3d3eb39e2904e653a5538d142b994dadcf4ecda4ae4be786302a2137 SHA512 56999a42237ed2c0d6ede26667f26367adac85fe20c890b9ad59be105241df17160fb0d41e209ed0e8701c639fbba9e5bcece2d989d3fab6f2117e90c4ffed76
+EBUILD gtkspell-3.0.10-r1.ebuild 1000 BLAKE2B 80272b4461a73ef94470b6a9d0f627859d3762c31566f1651f98642898314cef9e3926b712182f0391a16cd40a5dd84fc0cd2f1ac824a8954dc686d470e146b1 SHA512 c94893d76495e6f369b720d83f4a43069c038d89cb19d7fd73786ef011be1aaa8d3c2a2a9ed8c765ec9a35a710511dd067d3b9c9da02cc1d6065db65a665c03e
 MISC metadata.xml 332 BLAKE2B 27079d23e02f65245be8d872fc8939d75eae2009d2396447736d993191a489fe773ac46e3d4f3829911dfa79444894ccfd6e18bf26af341d652cb07d7699b545 SHA512 a67c2f81b050afc0d3c00d730928e29d88726dde736936b4b69c2863933fd2fd28f96c90bbc56062ce229a632ee6fff20c5f1a99d02adcee2a6826eecf28dd04
diff --git a/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild b/app-text/gtkspell/gtkspell-2.0.16-r2.ebuild
index d2a9465c87c3..e7f3727506aa 100644
--- a/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild
+++ b/app-text/gtkspell/gtkspell-2.0.16-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Spell checking widget for GTK"
 HOMEPAGE="http://gtkspell.sourceforge.net/"
@@ -11,17 +11,16 @@ SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="2"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="
+	x11-libs/gtk+:2
 	>=app-text/enchant-1.1.6:0"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35.0
 	virtual/pkgconfig"
 
-DOCS=( AUTHORS ChangeLog README ) # NEWS file is empty
-
 src_prepare() {
 	default
 
@@ -30,10 +29,10 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --disable-static --disable-gtk-doc
+	econf --disable-gtk-doc
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/app-text/gtkspell/gtkspell-3.0.10.ebuild b/app-text/gtkspell/gtkspell-3.0.10-r1.ebuild
index 9e36430f1a65..bfa4472c0e2e 100644
--- a/app-text/gtkspell/gtkspell-3.0.10.ebuild
+++ b/app-text/gtkspell/gtkspell-3.0.10-r1.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit gnome2 vala
 
+MY_P="${PN}3-${PV}"
+
 DESCRIPTION="Spell checking widget for GTK"
 HOMEPAGE="http://gtkspell.sourceforge.net/"
-MY_P="${PN}3-${PV}"
 SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="3/0"
@@ -22,25 +24,18 @@ RDEPEND="
 	dev-libs/glib:2
 	x11-libs/gtk+:3[introspection?]
 	>=x11-libs/pango-1.8.0[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-"
-DEPEND="${RDEPEND}
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=dev-util/gtk-doc-am-1.17
 	>=dev-util/intltool-0.35.0
 	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
+	vala? ( $(vala_depend) )"
 
 src_configure() {
+	use vala && vala_setup
+
 	gnome2_src_configure \
-		--disable-static \
 		$(use_enable introspection) \
 		$(use_enable vala)
 }