gentoo resync : 31.05.2021

4 files changed, 2 insertions, 149 deletions

diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index d73153132209..4b2198edd57e 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-calculator-3.38.2.tar.xz 1004684 BLAKE2B c2b6a0ff2e6a91c43a1670945af989b715f0f7369050dac13bec02898ef6780ec4484c6ee9f6e6bb19b8ecc9d7d8c2df0c824ac9c3309783cbc89b96fe1f16b9 SHA512 41e58b34640e795108a552aa0d95b03f0c84c4d5af6eef7fe8350c5f4e031a0fad7cad73034b38b2121f09687815b6b10a6a86fb00c7cbf720ccb06a8eea0403
-DIST gnome-calculator-40.0.tar.xz 1022596 BLAKE2B 9522c8698492eeb07fbd86e8baeaee67433a1d43b2c97c4c895ca7ac8958a01c4e05c73598b1c14a2b333bfbc156b824669b20e878fcb681ade99c1ceef5ce72 SHA512 f22e9a9ade2f236142b7ebc3e54ed07834b049087ed8606571730e3bef2ab86317718df622368515266ba9578f660d7cd892cf87cf43bca9441369c838967c5d
 DIST gnome-calculator-40.1.tar.xz 1023164 BLAKE2B 977fc227adaa50efa271776035a11ca79166a703c9c8d618c13af477056622a9faa42c3a8876257a117486399e91fceec7a19b930293883078846a645db912fe SHA512 f46acc802ef130ec59e4376a02032ab683e6d166d691d7c5f626e2a978f017f171c0e8ad50991d1828cb325b1bd53f63ef256b9b24860842224fa3dd7e27f4da
-EBUILD gnome-calculator-3.38.2.ebuild 1595 BLAKE2B 508741b5f8eb80e83d16e3d035b61baf96253db07ef3f9dbdf08d4c0035d926be754087c6118cdf7186c9bf6c57f966363a5a388fcb76437faf0c711940d729d SHA512 7d1667034f9041836fcae738b6c197efd02126da6f95bf868da200040eea10ccc36e66a7aed61a49c546ab3578abee95ce9b4a5ff71bada6d0bd522c73943921
-EBUILD gnome-calculator-40.0.ebuild 1690 BLAKE2B 8a4c93d1c5466668b3bb2a8ac40124e15eba2ae5ade32cc1bb2a5282fb717bde09734f7a11fb791bacd6bf07ced3391691155f248d9c7d1a8706bee9a605b1a6 SHA512 bcf726e99cd69ee997aaa32d4059f328a3a93bf18633719bf44b7533303520bc12cb0f0cc4c815cff2b665134adb059a6b581f09f2420b123e41359f30ebb962
-EBUILD gnome-calculator-40.1.ebuild 1690 BLAKE2B 8a4c93d1c5466668b3bb2a8ac40124e15eba2ae5ade32cc1bb2a5282fb717bde09734f7a11fb791bacd6bf07ced3391691155f248d9c7d1a8706bee9a605b1a6 SHA512 bcf726e99cd69ee997aaa32d4059f328a3a93bf18633719bf44b7533303520bc12cb0f0cc4c815cff2b665134adb059a6b581f09f2420b123e41359f30ebb962
+EBUILD gnome-calculator-40.1.ebuild 1688 BLAKE2B 7b653a1ea2310a6c36a393b5fe04dd3df9bc78c7b42c12de6db74f62ab6c1346413ca46240c8f07514a6acd179c1c6842adda236afd6da139dc800acbc0a8a22 SHA512 e11e1cbe2a4876529bcfdee88b2da2f4c068f56b64997f7a23ba036bc6441cd165e8d18098e2bb5eb048571511c4bdd00c6db32f8fece103d724c27bf395196e
 MISC metadata.xml 435 BLAKE2B f9ee442cf41d13599b2ac8bbe73a3f69961b5bce68e82544e8d1e5f886c97301b92675ccd38607d5bad961c910ec8ed9ae30a12ca9028e3d9cd92a2ac3bd8681 SHA512 4af60d7bd9142bc3293176d47ff239dbbc10d86493801244e9766bddd556a9c3b34b188f76d250074b3f337e88dc3d97c803ce244e15503c7380015772a9228c
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.38.2.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.38.2.ebuild
deleted file mode 100644
index 466d1d3cd563..000000000000
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.38.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson vala virtualx xdg
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+introspection test"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-# gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
-# altogether, thus we need them installed by gtksourceview[vala]
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	dev-libs/libxml2:2
-	>=net-libs/libsoup-2.42:2.4
-	>=dev-libs/libgee-0.20.0:0.8
-	dev-libs/mpc:=
-	dev-libs/mpfr:0=
-	>=x11-libs/gtk+-3.19.3:3
-	>=x11-libs/gtksourceview-4.0.2:4
-	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	net-libs/libsoup:2.4[vala]
-	x11-libs/gtksourceview:4[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-	# Automagic dep on valadoc - don't bother for now
-	sed -e '/subdir.*doc/d' -i meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddisable-ui=false
-		#-Dvala-version # doesn't do anything in 3.34
-		$(meson_use !introspection disable-introspection)
-		$(meson_use test ui-tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-40.0.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-40.0.ebuild
deleted file mode 100644
index 17bd94f4fdf8..000000000000
--- a/gnome-extra/gnome-calculator/gnome-calculator-40.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala virtualx xdg
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+introspection test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-# gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
-# altogether, thus we need them installed by gtksourceview[vala]
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	dev-libs/libxml2:2
-	>=net-libs/libsoup-2.42:2.4
-	>=dev-libs/libgee-0.20.0:0.8
-	dev-libs/mpc:=
-	dev-libs/mpfr:0=
-	>=x11-libs/gtk+-3.24.1:3
-	>=gui-libs/libhandy-1.0.0:1=
-	>=x11-libs/gtksourceview-4.0.2:4
-	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	net-libs/libsoup:2.4[vala]
-	x11-libs/gtksourceview:4[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-	# Automagic dep on valadoc - don't bother for now
-	sed -e '/subdir.*doc/d' -i meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddisable-ui=false
-		#-Dvala-version # doesn't do anything in 3.34
-		$(meson_use !introspection disable-introspection)
-		$(meson_use test ui-tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild
index 17bd94f4fdf8..69a80e716f93 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="+introspection test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
 # altogether, thus we need them installed by gtksourceview[vala]