gentoo resync : 20.03.2022

4 files changed, 251 insertions, 0 deletions

diff --git a/x11-misc/gpaste/Manifest b/x11-misc/gpaste/Manifest
index b8bb982ae464..22ed9c75e173 100644
--- a/x11-misc/gpaste/Manifest
+++ b/x11-misc/gpaste/Manifest
@@ -1,3 +1,8 @@
+AUX fix-build-with-meson-0.60.patch 1675 BLAKE2B 05eb33673db4e40862ceb934aeaa7c406932d53a1b692a8249eba8488975674b81def461aff74df365de91eafc4afc85142fc8b49f507811a31a189172ff5bfa SHA512 c7d9d9ecbbbab0c819efb4d3ba95499d398e2ce3deb6ad948496124e8c7d922f46f00d2fa23443f5fd63b6e2fe348c6a653e44ef61d17f000737264506a02b80
 DIST gpaste-3.36.3.tar.gz 186352 BLAKE2B b00af3f32076bbeb4f06853a7892772901d0c72dd972d08fff0520afae388bed0c9eee81892a2492f4bb972b3a80a924519e1c137edb660fa5f9dfa2fab31856 SHA512 e5fe4a31367e96089aefd1af5ed0a3ad591eee009bbc74b1b33c9c736061831979d79f2d6a5c072cf55fc6f1982ade581fe73d2039c5dbd607081683860c7b9f
+DIST gpaste-3.42.2.tar.gz 289280 BLAKE2B f133304be36e99324891723914a40b6ba9fb70596f8b6898a012abcf93e013f6c9de3bc5eff85bb12103b4d6c4bb23e497cbe9a8d590453185be67e9e1832312 SHA512 34504fed5a1ccb1d91c2fb301800ce1058404a63a2ddf860bd77485bee6a7c8cfc7f36053e0c6661551eda868022773cc1695b941b6aa2ddf834e317c2c83dce
+DIST gpaste-3.42.5.tar.gz 301630 BLAKE2B bb1151ab67a798322a2c23cdc12581bf7c660dd9d7769725afe30d34619dabc6550f2ad1b22ed00f350ed8ef07230ca1de9cbd777e816959849f71d59d8cdd82 SHA512 e9ef9403131aefc5c8b5452053feaad1061274e6b2b77efd9012da418d154017833789764d8e834fcd82164948111d21000909943bd102cc9932770af7e58ebb
 EBUILD gpaste-3.36.3.ebuild 1663 BLAKE2B 86ead7cb8147cb3aa16f295d260a645f96b367a2e528c394208a019532b8ff362a99e342411c943ef071e0aad53f8673b1d72ce37208d1cd833a59c8639cec4c SHA512 da84e0add550cec51df0b45d983e8ae5d7491dc3fa77eab25efc4c09e60cce67713bac488997a7036e7f1627213b3c1b2501460744076c82d37059cd42ac8c6d
+EBUILD gpaste-3.42.2.ebuild 1727 BLAKE2B 1e49ad98feb658def82c9d454b36b75fa1b0afc5fe1c8e93e936b6247fb07932f406c7f9c1bbbac5f125b3ba5a743c52ee34f4728bc3e8198be3e7a9d1292c92 SHA512 f5295b7fb0ccd99c5892054323f9fe941f814210895daedc461c22aa510a9bd0d9300137231afb8c28cc0b223c1e19d64a59ab0ab7aa8d1d304bee96abd5783d
+EBUILD gpaste-3.42.5.ebuild 1667 BLAKE2B b5c3698dc232f6ff68d020d7f9f7a16dc530461d42e685f559cca2fa33c2ee1085f760dc5047852cbc6197a09b26f8ba726223eecd274384ead5f593b2eb11db SHA512 24ba40c52b3637bf6cd178100197472ab81d99294a379c78908a60826f4c1020b86e30b7fb4f577ff5ad8f6ffa380017b772e2224733140039385081092dc5e8
 MISC metadata.xml 355 BLAKE2B d02f9ea7f3af332ca5308ef587a367411140103a8eaab03423161855888a6d1f9012dd8883d350c4e494cc30614fc7d069348b95995d7a94b9e8cbd948ec3993 SHA512 d1410f469786c4bf4e55c2cd8e833ad7aa8b06f7aed65da727d18b02ccaf4f7ef1abb704e35438c789b834c009da8316f1d8ede873be233f9656c7e44a068da6
diff --git a/x11-misc/gpaste/files/fix-build-with-meson-0.60.patch b/x11-misc/gpaste/files/fix-build-with-meson-0.60.patch
new file mode 100644
index 000000000000..c2cbc9a60f74
--- /dev/null
+++ b/x11-misc/gpaste/files/fix-build-with-meson-0.60.patch
@@ -0,0 +1,62 @@
+From 1ec2699daa600e34d73b8d200dd7bb22f4eace27 Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Fri, 7 Jan 2022 10:42:41 +0100
+Subject: fix build with meson 0.60
+
+Fixes #385
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+---
+ data/appstream/meson.build | 3 +--
+ data/desktop/meson.build   | 3 +--
+ meson.build                | 2 +-
+ 3 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/data/appstream/meson.build b/data/appstream/meson.build
+index 8f5fe29a463c..f279be6616f3 100644
+--- a/data/appstream/meson.build
++++ b/data/appstream/meson.build
+@@ -1,8 +1,7 @@
+ i18n.merge_file(
+-  'gpaste-appdata',
+   input: 'org.gnome.GPaste.Ui.appdata.xml.in',
+   po_dir: gpaste_po_dir,
+   output: 'org.gnome.GPaste.Ui.appdata.xml',
+   install: true,
+   install_dir: join_paths(get_option('datadir'), 'metainfo'),
+-)
+\ No newline at end of file
++)
+diff --git a/data/desktop/meson.build b/data/desktop/meson.build
+index 6268765c3285..18be1b69a86c 100644
+--- a/data/desktop/meson.build
++++ b/data/desktop/meson.build
+@@ -5,11 +5,10 @@ untranslated_desktop_file = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  'gpaste-desktop-file',
+   input: untranslated_desktop_file,
+   po_dir: gpaste_po_dir,
+   type: 'desktop',
+   output: 'org.gnome.GPaste.Ui.desktop',
+   install: true,
+   install_dir: join_paths(get_option('datadir'), 'applications'),
+-)
+\ No newline at end of file
++)
+diff --git a/meson.build b/meson.build
+index 1b0095f3f92c..676ad4e3032f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,6 +1,6 @@
+ project('GPaste',
+   'c',
+-  version: '3.42.1',
++  version: '3.42.2',
+   meson_version: '>=0.50.0',
+ )
+ 
+-- 
+2.34.1
+
diff --git a/x11-misc/gpaste/gpaste-3.42.2.ebuild b/x11-misc/gpaste/gpaste-3.42.2.ebuild
new file mode 100644
index 000000000000..5ae0c10506e0
--- /dev/null
+++ b/x11-misc/gpaste/gpaste-3.42.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VALA_MIN_API_VERSION="0.42"
+VALA_USE_DEPEND="vapigen"
+
+inherit meson vala gnome2-utils
+
+DESCRIPTION="Clipboard management system"
+HOMEPAGE="https://github.com/Keruspe/GPaste"
+SRC_URI="https://github.com/Keruspe/GPaste/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gnome +introspection systemd vala"
+REQUIRED_USE="
+	gnome? ( introspection )
+	vala? ( introspection )
+"
+
+DEPEND="
+	dev-libs/appstream-glib
+	>=dev-libs/glib-2.7:2
+	sys-apps/dbus
+	>=x11-libs/gdk-pixbuf-2.34:2
+	>=x11-libs/gtk+-3.24:3
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/pango
+	gnome? (
+		>=x11-wm/mutter-41.3
+	)
+	introspection? (
+		dev-libs/gjs
+		>=dev-libs/gobject-introspection-1.48.0
+		>=x11-wm/mutter-41.3[introspection]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	gnome? (
+		gnome-base/gnome-control-center:2
+	)
+	systemd? (
+		sys-apps/systemd
+	)
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${DEPEND}
+	gnome? (
+		gnome-base/gnome-control-center:2
+		gnome-base/gnome-shell
+	)
+	systemd? (
+		sys-apps/systemd
+	)
+"
+
+S="${WORKDIR}/GPaste-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/fix-build-with-meson-0.60.patch
+)
+
+src_prepare() {
+	use vala && vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use systemd systemd)
+		-Dbash-completion=true
+		-Dzsh-completion=true
+		-Dx-keybinder=true
+		-Dcontrol-center-keybindings-dir=$(usex gnome '' \
+		'/usr/share/gnome-control-center/keybindings')
+		$(meson_use introspection introspection)
+		$(meson_use vala vapi)
+		$(meson_use gnome gnome-shell)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/x11-misc/gpaste/gpaste-3.42.5.ebuild b/x11-misc/gpaste/gpaste-3.42.5.ebuild
new file mode 100644
index 000000000000..ab7970b32e46
--- /dev/null
+++ b/x11-misc/gpaste/gpaste-3.42.5.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VALA_MIN_API_VERSION="0.42"
+VALA_USE_DEPEND="vapigen"
+
+inherit meson vala gnome2-utils
+
+DESCRIPTION="Clipboard management system"
+HOMEPAGE="https://github.com/Keruspe/GPaste"
+SRC_URI="https://github.com/Keruspe/GPaste/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gnome +introspection systemd vala"
+REQUIRED_USE="
+	gnome? ( introspection )
+	vala? ( introspection )
+"
+
+DEPEND="
+	dev-libs/appstream-glib
+	>=dev-libs/glib-2.7:2
+	sys-apps/dbus
+	>=x11-libs/gdk-pixbuf-2.34:2
+	>=x11-libs/gtk+-3.24:3
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/pango
+	gnome? (
+		>=x11-wm/mutter-41.3
+	)
+	introspection? (
+		dev-libs/gjs
+		>=dev-libs/gobject-introspection-1.48.0
+		>=x11-wm/mutter-41.3[introspection]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	gnome? (
+		gnome-base/gnome-control-center:2
+	)
+	systemd? (
+		sys-apps/systemd
+	)
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${DEPEND}
+	gnome? (
+		gnome-base/gnome-control-center:2
+		gnome-base/gnome-shell
+	)
+	systemd? (
+		sys-apps/systemd
+	)
+"
+
+S="${WORKDIR}/GPaste-${PV}"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use systemd systemd)
+		-Dbash-completion=true
+		-Dzsh-completion=true
+		-Dx-keybinder=true
+		-Dcontrol-center-keybindings-dir=$(usex gnome '' \
+		'/usr/share/gnome-control-center/keybindings')
+		$(meson_use introspection introspection)
+		$(meson_use vala vapi)
+		$(meson_use gnome gnome-shell)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}