gentoo Easter resync : 12.04.2020

3 files changed, 79 insertions, 3 deletions

diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 04dbfbca9b7d..8628a5001196 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-panel-3.32.0.tar.xz 3073664 BLAKE2B 90960646bb6a7d455e295203b0ae9af8fb2313d3f69c54907f5b975bcf2102667aac693c0e32912538015a48d784bfad45335df6df060dcebfeb04486955d850 SHA512 afbb5d61d024250bc6532ddcb2817067bb4e5f243a0d0f27efcaa9b1c2da8ab6c98e014e3a852ccb93d64aba8da51254d0e811f5eecc927cfc18c72e7c324e42
-EBUILD gnome-panel-3.32.0.ebuild 2021 BLAKE2B a5eb1850aa10715f7ab17d508586721a11f94ed56fab1c02b888dd87da8626f57fd4d7eb63870abdf2332f19a30d29576190b48cc232932252a088c606371200 SHA512 4e6b8fdd0e01c9f24d374b4b6231d94dba91fda074541540f0e859dd6b7a9b9b3034ade391942ac1c88b966f09ccd5ce3f75103d7374030f680224798bf5e151
+DIST gnome-panel-3.34.1.tar.xz 3072196 BLAKE2B 23fdfc0b78e13169ec6af92ee386ae3997536199c6f13406523e2deb6b696b90828ce614fc06115a83fdb6ec76fc14e0518f4eb839eabfbf29507d6fd4b2ab3d SHA512 6d43285cda00b2e9415cf11f47a51a00941ed294edefb411f7b40003ece814ac08da9d2ccfb167a0a91c7abb9eb17a7f70970ac4eb585ce665cca5fcfbddcf03
+EBUILD gnome-panel-3.32.0.ebuild 2064 BLAKE2B 6f9e3eac811eb03904bc4cff28dd78de3ac4111174eb2dbdfbdc387a704cc684df3a1934780e5b2c56c3c14c9fcf02b05c74021e7fc6122c4ee9b3aa92f541fc SHA512 a96f4f663e1c6066f35a70de90f9ea0681232bcb3ef2d4d0a314ad1a872d6be8a5a7619d0325f9fc148c99f023763b35a6d48d9cb779353ab685003616c3ec5e
+EBUILD gnome-panel-3.34.1.ebuild 2039 BLAKE2B 5bf63597da3c5e9f14bcfc399527c8f4b7a920f8aa5334cab00e9c893685bf152a6a47d5b4342181f7d695b9caec35d209da9a48cb0027e0f93013a49bcfab3f SHA512 a317f14f4559c6e99a6a691958f6753dd78bfe8a3c42313e678ef9ea51868f548aecde0b398b5491e5b8e320988bc8d30af2994cf9022c3176d65fcbe4231fa0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-panel/gnome-panel-3.32.0.ebuild b/gnome-base/gnome-panel/gnome-panel-3.32.0.ebuild
index 5f1bb00fd17f..565591dd17d6 100644
--- a/gnome-base/gnome-panel/gnome-panel-3.32.0.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-3.32.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,9 @@ RDEPEND="
 	>=x11-libs/gtk+-3.22.0:3[X]
 	>=x11-libs/libwnck-3.4.6:3
 	>=gnome-base/gnome-menus-3.7.90:3
-	eds? ( >=gnome-extra/evolution-data-server-3.5.3:= )
+	eds? ( >=gnome-extra/evolution-data-server-3.5.3:=
+		<gnome-extra/evolution-data-server-3.33
+	)
 	elogind? ( >=sys-auth/elogind-230 )
 	systemd? ( >=sys-apps/systemd-230:= )
 	>=x11-libs/cairo-1.0.0[X,glib]
diff --git a/gnome-base/gnome-panel/gnome-panel-3.34.1.ebuild b/gnome-base/gnome-panel/gnome-panel-3.34.1.ebuild
new file mode 100644
index 000000000000..fb34a9ab0034
--- /dev/null
+++ b/gnome-base/gnome-panel/gnome-panel-3.34.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eapi7-ver gnome2
+
+DESCRIPTION="The GNOME Flashback Panel"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-panel/"
+
+LICENSE="GPL-2+ FDL-1.1 LGPL-2.1+"
+SLOT="0"
+IUSE="eds elogind systemd"
+REQUIRED_USE="^^ ( elogind systemd )"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=gnome-base/gnome-desktop-2.91.0:3=
+	>=x11-libs/gdk-pixbuf-2.26.0:2
+	>=x11-libs/pango-1.15.4
+	>=dev-libs/glib-2.45.3:2
+	>=x11-libs/gtk+-3.22.0:3[X]
+	>=x11-libs/libwnck-3.4.6:3
+	>=gnome-base/gnome-menus-3.7.90:3
+	eds? ( >=gnome-extra/evolution-data-server-3.33.2:=
+	)
+	elogind? ( >=sys-auth/elogind-230 )
+	systemd? ( >=sys-apps/systemd-230:= )
+	>=x11-libs/cairo-1.0.0[X,glib]
+	>=dev-libs/libgweather-3.28.0:2=
+	>=gnome-base/dconf-0.13.4
+	>=x11-libs/libXrandr-1.3.0
+	gnome-base/gdm
+	x11-libs/libX11
+	x11-libs/libXi
+	sys-auth/polkit
+	x11-libs/libXi
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.25
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+" # yelp-tools and autoconf-archive for eautoreconf
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		$(use_enable eds)
+	)
+
+	# Below elogind MENU_* pkg-config calls need to match up with what upstream has
+	# each version (libsystemd replaced with libelogind). Explicit per-version die
+	# to force a manual recheck. Only update the explicit version if the
+	# "PKG_CHECK_MODULES([MENU], ...)" block did not change; otherwise adjust
+	# elogind conditional block below accordingly first.
+	if ver_test ${PV} -ne 3.34.1; then
+		die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
+	fi
+
+	if use elogind; then
+		myconf+=(
+			MENU_CFLAGS=`pkg-config --cflags gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind 2>/dev/null`
+			MENU_LIBS=`pkg-config --libs gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind 2>/dev/null`
+		)
+	fi
+
+	gnome2_src_configure "${myconf[@]}"
+}