gentoo resync : 20.03.2022

3 files changed, 2 insertions, 51 deletions

diff --git a/app-dicts/gnome-dictionary/Manifest b/app-dicts/gnome-dictionary/Manifest
index 251b0605b025..dae2b3e5dcf1 100644
--- a/app-dicts/gnome-dictionary/Manifest
+++ b/app-dicts/gnome-dictionary/Manifest
@@ -1,5 +1,4 @@
 AUX gnome-dictionary-40.0-meson-0.61.patch 3469 BLAKE2B ad1290e8727ce222746dca3c72c42d53dfe276ebbf54c39f0efea847da6768103f5176ed1f4715418058cbb650426ab55412d1e275551230fc440cc3414fdc21 SHA512 31e5232edd1f00468dc870037a831a99092de956c9faa65c4513fad2c6c470fd948d812d309b4bcced93e0bbab3d1ae72c142afa49dfd075c8f2db299f1fcb48
 DIST gnome-dictionary-40.0.tar.xz 603388 BLAKE2B 1fae73ea5b554786f1ee1bf641b0dc94ee8953a045e4a59b72823075b8c0905d0098827ad35f94e26d26fcbdbed1fd2980391ce582871ae6df4d273d9de5add4 SHA512 96e8c5efbba43e1a7d247703ac17cbcb8579cc633f6db74b6fe4431e0b1aed47ab76fd15cc114497b5ee76fb33b57fd9936cc869ffe905f208c836b5a231b126
-EBUILD gnome-dictionary-40.0-r1.ebuild 1190 BLAKE2B d9905b04962869481c0179d5e01132adccefaa853fa3bd77dde2af93e9087e6d98ff4fc25329b28c07a58fac4b4892a5c79ec8664a8b95e997209e23c8158cdd SHA512 83099b29a529b3ed1011826f205e90075b6dfd0cdc07574847d802382efaaad7af7ec548d5a7372d087f6a10b478331b2a54bcf9ef65d7083d5b14e4198728fa
-EBUILD gnome-dictionary-40.0.ebuild 985 BLAKE2B b027d9bbadabd18a6e7943fd1ea3c92c76d03ad608e361eefa27a3652bf8bb5943fda18033b38163bec37cdf73ca3496262ce8f8c9c56772407bb2c343800e0c SHA512 2d30869962ad3be0d26fb7d221ccdb68e373c38610a0c3297de1c8402665ce33ac60563da8eb688483e4cb5aeea230c21466b0a5013641118851c7a2c50d572f
+EBUILD gnome-dictionary-40.0-r1.ebuild 1187 BLAKE2B e43fd3259885e591cf2f756bf5f046ddb60ef69cc5756c4e3605add8b4f31a74534e820c560f4155579bf9a2a70ddd93d8470956e68e2bf0faeb7f120bdc6df5 SHA512 cff6a14ded8c9a849661504ad3699194e387563b6d1c97eea6b40d62bed77e159a71d5ff09ea8cfc8e7ced934657ed405d379b08477f282070549c0933b84edb
 MISC metadata.xml 317 BLAKE2B 0f99dd59faa31be1761a21290c1d34ed89467c22582727cb88030c0dba83bc7ee9d390f655ab7a63a0b5cb25e8efa2f17b90fbd08c093fece6d4d873018ea201 SHA512 28137d259d69aae3d9ea5161100a0063718bf43c3447ad5d42e75c4ab212288b07f5cbc281e44d648817c2fe7bc05af0a2428a9f9d5f495b2ecefa66f16bda34
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-40.0-r1.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-40.0-r1.ebuild
index 9ff55d568d54..ae8cc8578f75 100644
--- a/app-dicts/gnome-dictionary/gnome-dictionary-40.0-r1.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-40.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
 LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="0" # does not provide a public libgdict-1.0.so anymore
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/glib-2.42:2
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-40.0.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-40.0.ebuild
deleted file mode 100644
index ca2a078abf80..000000000000
--- a/app-dicts/gnome-dictionary/gnome-dictionary-40.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Dictionary utility for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
-
-LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-SLOT="0" # does not provide a public libgdict-1.0.so anymore
-IUSE="ipv6"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-libs/glib-2.42:2
-	>=x11-libs/gtk+-3.21.2:3
-"
-RDEPEND="${DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use ipv6 use_ipv6)
-		-Dbuild_man=true
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}