gentoo resync : 20.10.2021

4 files changed, 4 insertions, 117 deletions

diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index adc148b6677e..1e041d11ec9b 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,6 +1,3 @@
-DIST gnome-applets-3.36.4.tar.xz 8638044 BLAKE2B 1ccf045c568ca2d4280eeeebbaec67b63f9c2f1edd3248ef89ff93ef7d468e6a581f3c678e93ff45662368b9ecd189aa38da2ca91a7b14ed3e7b2bd6aac8971f SHA512 6fd8f891358f02f40c8d6548b1680139f18cbbcd20d773798a998246b6431692ce8550e8652eaff09bde3651a4e5449779a0dc85b897345a22c17be2e386d2c7
 DIST gnome-applets-3.40.0.tar.xz 9390340 BLAKE2B 0d8e76086e444789b7a327623db9b21ef0a51f071b67aa5d99dc3e7988be40ec353ced795aaa1acbbe8d1b303d3878e2a0589214dac10f35ab2e40381ee64978 SHA512 909a1e9ecbe6904537b7408239a17aad265890cf179c4b8929968fa4d8ba6f1ac1f6e98612eb9c54266d3abacaaa7ed0e218f41b081b7539532527a3234fc037
-EBUILD gnome-applets-3.36.4.ebuild 1441 BLAKE2B 67e91aee32ed9150486f1752191491ceb569807cc111a953c88e87af7b6875e64906a1a1e033839422ce2ec033d8673863dc6c01d7d0499f68e41b3d50a7d6a9 SHA512 19f95d6aa983f7ed091ae0715a5198919a3630fef2400b3adb52e8be8fc85096a8a277b6e6265e4b4ac42ce437a898ea0444110ee1e3abd60ea9413cee28b784
-EBUILD gnome-applets-3.40.0-r1.ebuild 1299 BLAKE2B 555cb2edd080416a03731ea682bd3f0dcd71b13546f8a7cd042cd279dfc3503ae04a8552c71cf336361e7f5ba6802490e572310d405046ae89ea8dd40e15982c SHA512 e6891d1f7171f94affe00ab28eed166a7407934949bad70338fee14d190ea6e95674f2cd962280ffab362d296eef7a09fed3e22a4f3242abb1c8e77a9d46d929
-EBUILD gnome-applets-3.40.0.ebuild 1303 BLAKE2B 2edfb5561e7cf8ab3b493b86f13ce210900e22f56e85177690e7afa79202448a500aabaf4b0e0dc4d8a91213c5e4afbe1aa560430249cd96e2fa69045ac8bcf8 SHA512 d34397b78d5f6fbb53221714e8953436d3f8bb832d6e2aaf473b235b473f7b2f2bb1d4a4ca9034aefcfcdfc477aa8250545ab6e4711f315825c1038570882e0d
+EBUILD gnome-applets-3.40.0-r2.ebuild 1262 BLAKE2B 957ed6f2b3ee5a42e4a7e0bf945eefdfc3b474faae5ae5414059444b7b91e03c498e5620a4bc54dc1f8597fed038c73966d0bd265e8994cea59bebf0e6023494 SHA512 3d3c4a091d6134cbdec2f96f710e6327803d1139072779046d75ce400376714ad7a457cbb2ff96e1fee6b107561d21c96efb3e47348e69feec60bd3f4ebbac77
 MISC metadata.xml 328 BLAKE2B 23e54626993373e58fbb0718c51e2b9c4eafcd7a0f2cd3968d05b72bc6a3cebeec386d96ab317cc92a17f08d17f8cb9091d6c47d4e6af49993451dd98b8aa04c SHA512 b4936e6332bbd5de094ec96060c84aa6eecc737260a093dc01da4687f68994a5a622eec0b3fce353abfb851b90c31ce7b0ee93e330d6ae2f4b288ab104655463
diff --git a/gnome-base/gnome-applets/gnome-applets-3.36.4.ebuild b/gnome-base/gnome-applets/gnome-applets-3.36.4.ebuild
deleted file mode 100644
index 91a8bbf9357f..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-3.36.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Applets for the GNOME Flashback Panel"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-applets/"
-
-LICENSE="GPL-2+ FDL-1.1"
-SLOT="0"
-IUSE="ipv6 tracker upower"
-KEYWORDS="~amd64"
-
-# FIXME: automagic wireless-tools
-# TODO: gucharmap could be optional, but no knob
-# TODO: libgweather could be optional, but no knob
-RDEPEND="
-	>=x11-libs/gtk+-3.20.0:3[X]
-	>=dev-libs/glib-2.44.0:2
-	>=gnome-base/gnome-panel-3.24.1
-	>=gnome-base/libgtop-2.11.92:=
-	>=x11-libs/libwnck-3.14.1:3
-	>=x11-libs/libnotify-0.7
-	upower? ( >=sys-power/upower-0.99.8:= )
-	>=x11-themes/adwaita-icon-theme-3.14.0
-	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/libgweather-3.28.0:2=
-	>=gnome-extra/gucharmap-2.33.0:2.90
-	>=sys-auth/polkit-0.97
-	x11-libs/libX11
-	tracker? ( app-misc/tracker:0/2.0 )
-"
-# app-text/docbook-sgml-utils for jw binary
-DEPEND="${RDEPEND}
-	app-text/docbook-sgml-utils
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.35.0
-	dev-util/itstool
-	sys-devel/gettext
-	x11-base/xorg-proto
-	virtual/pkgconfig
-" # yelp-tools and autoconf-archive for eautoreconf
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_with upower) \
-		--disable-battstat \
-		--disable-cpufreq \
-		$(use_enable tracker tracker-search-bar) \
-		$(use_enable ipv6)
-}
diff --git a/gnome-base/gnome-applets/gnome-applets-3.40.0-r1.ebuild b/gnome-base/gnome-applets/gnome-applets-3.40.0-r2.ebuild
index 4320fd2e92f1..0f434b492bc0 100644
--- a/gnome-base/gnome-applets/gnome-applets-3.40.0-r1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-3.40.0-r2.ebuild
@@ -22,9 +22,10 @@ RDEPEND="
 	>=gnome-base/libgtop-2.11.92:=
 	>=x11-libs/libwnck-3.14.1:3
 	>=x11-libs/libnotify-0.7
+	>=sys-power/upower-0.99.8:=
 	>=x11-themes/adwaita-icon-theme-3.14.0
 	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/libgweather-3.28.0:2=
+	>=dev-libs/libgweather-40.0:2=
 	>=gnome-extra/gucharmap-2.33.0:2.90
 	>=sys-auth/polkit-0.97
 	x11-libs/libX11
@@ -33,15 +34,13 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 "
-# app-text/docbook-sgml-utils for jw binary
 BDEPEND="
-	app-text/docbook-sgml-utils
 	app-text/docbook-xml-dtd:4.1.2
 	dev-libs/libxslt
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	dev-util/itstool
-	sys-devel/gettext
+	>=sys-devel/gettext-0.19.6
 	virtual/pkgconfig
 " # yelp-tools and autoconf-archive for eautoreconf
 
diff --git a/gnome-base/gnome-applets/gnome-applets-3.40.0.ebuild b/gnome-base/gnome-applets/gnome-applets-3.40.0.ebuild
deleted file mode 100644
index 52182b3d367b..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-3.40.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2
-
-DESCRIPTION="Applets for the GNOME Flashback Panel"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-applets/"
-
-LICENSE="GPL-2+ FDL-1.1"
-SLOT="0"
-IUSE="tracker"
-KEYWORDS="~amd64"
-
-# FIXME: automagic wireless-tools
-# TODO: gucharmap could be optional, but no knob
-# TODO: libgweather could be optional, but no knob
-RDEPEND="
-	>=x11-libs/gtk+-3.20.0:3[X]
-	>=dev-libs/glib-2.44.0:2
-	>=gnome-base/gnome-panel-3.37.0
-	>=gnome-base/libgtop-2.11.92:=
-	>=x11-libs/libwnck-3.14.1:3
-	>=x11-libs/libnotify-0.7
-	>=x11-themes/adwaita-icon-theme-3.14.0
-	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/libgweather-3.28.0:2=
-	>=gnome-extra/gucharmap-2.33.0:2.90
-	>=sys-auth/polkit-0.97
-	x11-libs/libX11
-	tracker? ( app-misc/tracker:0/2.0 )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-# app-text/docbook-sgml-utils for jw binary
-BDEPEND="
-	app-text/docbook-sgml-utils
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-" # yelp-tools and autoconf-archive for eautoreconf
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-cpufreq \
-		$(use_enable tracker tracker-search-bar)
-}