gentoo resync : 25.08.2020

4 files changed, 172 insertions, 1 deletions

diff --git a/gnome-base/gnome-flashback/Manifest b/gnome-base/gnome-flashback/Manifest
index 2c5ac1fc2e61..4df286c72e6e 100644
--- a/gnome-base/gnome-flashback/Manifest
+++ b/gnome-base/gnome-flashback/Manifest
@@ -1,3 +1,7 @@
 DIST gnome-flashback-3.34.2.tar.xz 727812 BLAKE2B dd5fd4ff9f612d464f750343c17f0216366dfc6b9c7d892724e3b78ebf96b492a6192e32edb6c5f7c92c997a1d3325fea2b7e06874a3f03f1e5ea0965c63eba8 SHA512 9c2cfdcd0f896b56c6aff529c372b697fdd52db2660ba658aaef5ff7110a71b756ec708eebd260718ddd1c77df858bd00100070a1a32e282808bac519abb867d
-EBUILD gnome-flashback-3.34.2.ebuild 1203 BLAKE2B 0e8fbf5c86770c4de7ec38a9d3a30115674410e26dfe8132b6c51eea3f64a2e4faeeaf34e268e45cc5a33876d8fb8a5f42810dc64a672a928914cb8bcb149026 SHA512 df60e2bfc5120ff7166bddc36485a9bace1b2a99b6de02df37f88d01482113ae74c26883b7da89e55f1b11ae081fddf9476e8630f53445970ecb05705bb9365a
+DIST gnome-flashback-3.36.3.tar.xz 825812 BLAKE2B f758e719e06572ebf008eea7eda6965f6572c3a666dc70b39fcaa4e59e814297fa671449c1aa8617fca799e51407e9acc637644c8fbe50f571fb75f250d0a7fb SHA512 b0217ab72538983150f37c12ba0e78da0d9aa7a74075af0bd71390be9cc0686480dc831696f3febf4fed0bb1332547a494e5efb33c86b6879c46bc0443c53138
+DIST gnome-flashback-3.36.4.tar.xz 826568 BLAKE2B 6625b3a2d90649b9476d6340295b3cf8960f76908c23d75fe7b2a886d1a5c6a587bc8cb31ab866a40f2250b67d154a080f27534aaa11e822d901fc1cac0687af SHA512 6c1b910872530a86d6fb477ad55c8c44cbe5ef958073e2c675d95b9b4dbf9aab0d0a3b3cdae2daebbe3dad8a83c53ffe0604e12282864bfdee33402e119eff32
+EBUILD gnome-flashback-3.34.2.ebuild 1237 BLAKE2B 60396f8b0ce608f9a47d8cf1b2deca3ec38969de165fdb3ece914fe8824049e82cad7076d2f38f83c770373c02cbef9206a457f030757a5f5ca88961072c1b58 SHA512 d101581f4aa180c26295546f6b280205493ac9d70a46544f03a955bbe211e37062af695e854c9421b56be365eac6257affacb14c5d63e17f0e52d420ceace92c
+EBUILD gnome-flashback-3.36.3.ebuild 2539 BLAKE2B 9d4ea6cf2ca7510059d849323715f429d1a0c48b1d080957f2dc61bff9e6ef51f704bc8a2d5a4e61e71f184d6802bbe75ed1d63b5b4308612435f1cde957e6f2 SHA512 7228f42e85045fbe7a2d554c6eac86cdcf742d00fc4eae8a566b8e109f5c6a5fe4cc493900c53abcfd94bea68eb9b675ffee8f3f27f5a72f6ff75c6957de473f
+EBUILD gnome-flashback-3.36.4.ebuild 2539 BLAKE2B 57690d6422bb9d398886c307c17444abf86341afacc59d9b2de3f5ae9fa4d5ef08a05ca2740aaf2ae3b707671370ca75cf4f832229022c26caefa304fca9a790 SHA512 f088673b962c860eff0371f9c5a7f5e59989ae39d1808f39c4284eeee036728678136e7671108ca473314226dfdef0b9074ec059d013e4e63c46962495b0e96c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.34.2.ebuild b/gnome-base/gnome-flashback/gnome-flashback-3.34.2.ebuild
index 88af27a5a768..f287574ee194 100644
--- a/gnome-base/gnome-flashback/gnome-flashback-3.34.2.ebuild
+++ b/gnome-base/gnome-flashback/gnome-flashback-3.34.2.ebuild
@@ -16,6 +16,7 @@ RDEPEND="
 	>=x11-libs/gdk-pixbuf-2.32.2:2
 	>=x11-libs/gtk+-3.22.0:3[X]
 	>=gnome-base/gnome-desktop-3.12.0:3=
+	<gnome-base/gnome-desktop-3.35.4
 	>=media-libs/libcanberra-0.13[gtk3]
 	>=dev-libs/glib-2.44.0:2
 	>=gnome-base/gsettings-desktop-schemas-3.31.0
diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.36.3.ebuild b/gnome-base/gnome-flashback/gnome-flashback-3.36.3.ebuild
new file mode 100644
index 000000000000..f9f6fc5247ce
--- /dev/null
+++ b/gnome-base/gnome-flashback/gnome-flashback-3.36.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="GNOME Flashback session"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-flashback/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="elogind systemd"
+REQUIRED_USE="^^ ( elogind systemd )"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=x11-libs/gdk-pixbuf-2.32.2:2
+	>=x11-libs/gtk+-3.22.0:3[X]
+	>=gnome-base/gnome-desktop-3.12.0:3=
+	>=gnome-base/gnome-panel-3.35.2
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=dev-libs/glib-2.44.0:2
+	>=gnome-base/gsettings-desktop-schemas-3.31.0
+	>=sys-auth/polkit-0.97
+	>=app-i18n/ibus-1.5.2
+	>=sys-power/upower-0.99.0:=
+	>=x11-libs/libXrandr-1.5.0
+	>=x11-libs/libXxf86vm-1.1.4
+	x11-libs/libxcb
+	x11-libs/libX11
+	gnome-base/gdm
+	elogind? ( >=sys-auth/elogind-230 )
+	systemd? ( >=sys-apps/systemd-230:= )
+	net-wireless/gnome-bluetooth
+	x11-libs/libXext
+	>=x11-libs/libXi-1.6.0
+	x11-libs/pango
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	x11-libs/libXfixes
+	media-sound/pulseaudio[glib]
+	sys-libs/pam
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	x11-base/xorg-proto
+	virtual/pkgconfig
+" # autoconf-archive for eautoreconf
+RDEPEND="${RDEPEND}
+	x11-wm/metacity
+	gnome-base/gnome-panel
+	gnome-base/gnome-settings-daemon
+"
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		--without-compiz-session
+		$(use_enable systemd systemd-session)
+	)
+
+	# Below elogind DESKTOP_* and SCREENSAVER_* 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/SCREENSAVER], ...)" blocks did not change; otherwise adjust
+	# elogind conditional block below accordingly first.
+	if ver_test ${PV} -ne 3.36.3; then
+		die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
+	fi
+
+	if use elogind; then
+		myconf+=(
+			DESKTOP_CFLAGS=`pkg-config --cflags glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11 2>/dev/null`
+			DESKTOP_LIBS=`pkg-config --libs glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11 2>/dev/null`
+			SCREENSAVER_CFLAGS=`pkg-config --cflags gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm 2>/dev/null`
+			SCREENSAVER_LIBS=`pkg-config --libs gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm 2>/dev/null`
+		)
+	fi
+
+	gnome2_src_configure "${myconf[@]}"
+}
diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild b/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild
new file mode 100644
index 000000000000..033c47fe3410
--- /dev/null
+++ b/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="GNOME Flashback session"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-flashback/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="elogind systemd"
+REQUIRED_USE="^^ ( elogind systemd )"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=x11-libs/gdk-pixbuf-2.32.2:2
+	>=x11-libs/gtk+-3.22.0:3[X]
+	>=gnome-base/gnome-desktop-3.12.0:3=
+	>=gnome-base/gnome-panel-3.35.2
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=dev-libs/glib-2.44.0:2
+	>=gnome-base/gsettings-desktop-schemas-3.31.0
+	>=sys-auth/polkit-0.97
+	>=app-i18n/ibus-1.5.2
+	>=sys-power/upower-0.99.0:=
+	>=x11-libs/libXrandr-1.5.0
+	>=x11-libs/libXxf86vm-1.1.4
+	x11-libs/libxcb
+	x11-libs/libX11
+	gnome-base/gdm
+	elogind? ( >=sys-auth/elogind-230 )
+	systemd? ( >=sys-apps/systemd-230:= )
+	net-wireless/gnome-bluetooth
+	x11-libs/libXext
+	>=x11-libs/libXi-1.6.0
+	x11-libs/pango
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	x11-libs/libXfixes
+	media-sound/pulseaudio[glib]
+	sys-libs/pam
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	x11-base/xorg-proto
+	virtual/pkgconfig
+" # autoconf-archive for eautoreconf
+RDEPEND="${RDEPEND}
+	x11-wm/metacity
+	gnome-base/gnome-panel
+	gnome-base/gnome-settings-daemon
+"
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		--without-compiz-session
+		$(use_enable systemd systemd-session)
+	)
+
+	# Below elogind DESKTOP_* and SCREENSAVER_* 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/SCREENSAVER], ...)" blocks did not change; otherwise adjust
+	# elogind conditional block below accordingly first.
+	if ver_test ${PV} -ne 3.36.4; then
+		die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
+	fi
+
+	if use elogind; then
+		myconf+=(
+			DESKTOP_CFLAGS=`pkg-config --cflags glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11 2>/dev/null`
+			DESKTOP_LIBS=`pkg-config --libs glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11 2>/dev/null`
+			SCREENSAVER_CFLAGS=`pkg-config --cflags gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm 2>/dev/null`
+			SCREENSAVER_LIBS=`pkg-config --libs gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm 2>/dev/null`
+		)
+	fi
+
+	gnome2_src_configure "${myconf[@]}"
+}