gentoo resync : 25.08.2020

3 files changed, 74 insertions, 0 deletions

diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest
index 8a6e7e03b737..01f8627b0f1f 100644
--- a/gnome-extra/gnome-color-manager/Manifest
+++ b/gnome-extra/gnome-color-manager/Manifest
@@ -1,4 +1,7 @@
 AUX 3.28-remove-unwvanted-check.patch 556 BLAKE2B 1037c7dfc3102ab7d10fc407e09b1948f3b666d81fb20678751ed3cd06fd2c8d59b9532a7b7487e3ab2bbfedacc447b4184b2789f069cd2ea1f1f327084e8bdb SHA512 0e27b8df076f211f2210a207005cf2f3f2b9e73ab7e7323c4edbd837957e5abe5abe0d657d528dd27fec8e85b410314e0efc1e8c0db1a1ea898c09457025bf90
+AUX 3.36.0-remove-libcanberra-include.patch 556 BLAKE2B 83f94fc9192c516b99ebb6c9e34e7b3e909312057912382f060a0879b4c4eca2ab975614bc449a574258ed75f02a440848b5d201428e2544e103b738d550df67 SHA512 5c23e608a9f5edfac31569f7d174f44b689e6c7c5db6319e2749bd537e5579ab92f088aaefa04aeab7e206c3d819bf279ab5a3d757d2292f7e47b1826101fc76
 DIST gnome-color-manager-3.32.0.tar.xz 2602104 BLAKE2B 6219c3b7dd31ba49c671ef1f330d8ce561b7d8716a5cf5ef393dcf827c6bbc4e82b95c082e9297a27be7652d958a92c397fbafa8bd68f2c48b32533a3fe14483 SHA512 e5b0c6a39f9202fde79af1e966be65ef3d770fe4de777a281398ee68feef6c57dee95a1fcba496512f163bf561528ece840480b3c8612b5c3af2b7f550335f38
+DIST gnome-color-manager-3.36.0.tar.xz 2175016 BLAKE2B 263bc58c2a4ebafabebeba958279e4ad607eeca986dda9093c3e9d1a0870f44eefec7248aab11e6b408b063c5d5a28a3cdb88c96a58e3a0a5064055c44989143 SHA512 217c00696d7d0e99ee4cc65ee343c09682387d909feabdd6e4a52f9fd0586dda553b4796fbcb11392b880aa5c5bbaebde27906afb4e3ffd692ee3187023bfaac
 EBUILD gnome-color-manager-3.32.0.ebuild 1844 BLAKE2B 50be2919d7e59c1a8c8425e4fa25d13ef7261b63c71ec2822a5aa948f9d9d4350e88b8438c877a225afc067d8e1408db2b230d665f38909b95e8501b97d57649 SHA512 b77ceb55414a7172c80ba68e49cdb508c6c57765a8675dbbedc7aa3798884110e689bbe856841d7d8d81ce39030501ad84a47ae52181d7929fe4553f5851bb30
+EBUILD gnome-color-manager-3.36.0.ebuild 1086 BLAKE2B 3212e1d90dc5a93346e30e6df12cf6e132b27ed82d095ccc041f567ca276e483f64b9c8ecd0af4c206531a51ecfee273c7104f7f4c500461824be9b02400f58c SHA512 25e236bb2ae3362ce4f2283871c16c9dad807f384094bd051d8f1fb38c68539d8cca8eadf14ca64ce3ec87d01774e83e792c001e2617e48905c9db0003fbee08
 MISC metadata.xml 525 BLAKE2B cc643bcc16f4fd5e8a76dd22ec36d3c4a3226d9062594cb313b445218cf9276e7d1b79b9a7a54afd3a2c9454ca1aa6a0e886bd2e2145ffcb7d656db1d538b652 SHA512 81f5a273a4686935f1b0d267fd056d2ba5a8f13750845ef3feda74586ffea0ce1bf98ac0c8a94b61c6bc893fbb9dc5bcb4864a020817bc27d4e61c9008069d2a
diff --git a/gnome-extra/gnome-color-manager/files/3.36.0-remove-libcanberra-include.patch b/gnome-extra/gnome-color-manager/files/3.36.0-remove-libcanberra-include.patch
new file mode 100644
index 000000000000..5d3644f9bcbd
--- /dev/null
+++ b/gnome-extra/gnome-color-manager/files/3.36.0-remove-libcanberra-include.patch
@@ -0,0 +1,24 @@
+From 66aea36411477f284fa8a379b3bde282385d281c Mon Sep 17 00:00:00 2001
+From: Jan Tojnar <jtojnar@gmail.com>
+Date: Wed, 8 Apr 2020 16:41:32 +0200
+Subject: [PATCH] Remove forgotten libcanberra include
+
+---
+ src/gcm-viewer.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/gcm-viewer.c b/src/gcm-viewer.c
+index 77463af5..d778877d 100644
+--- a/src/gcm-viewer.c
++++ b/src/gcm-viewer.c
+@@ -12,7 +12,6 @@
+ #include <gdk/gdkx.h>
+ #include <glib/gstdio.h>
+ #include <locale.h>
+-#include <canberra-gtk.h>
+ #include <colord.h>
+ #include <math.h>
+ 
+-- 
+2.20.1
+
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.36.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.36.0.ebuild
new file mode 100644
index 000000000000..117633a19538
--- /dev/null
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.36.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org meson virtualx xdg
+
+DESCRIPTION="GNOME color profile tools"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-color-manager/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
+RDEPEND="
+	>=dev-libs/glib-2.31.10:2
+	>=x11-libs/gtk+-3.3.8:3
+	>=x11-misc/colord-1.3.1:0=
+	>=media-libs/lcms-2.2:2
+"
+DEPEND="${RDEPEND}"
+# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
+BDEPEND="
+	app-text/docbook-sgml-dtd:4.1
+	app-text/docbook-sgml-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-remove-libcanberra-include.patch # should be in next upstream release
+)
+
+src_configure() {
+	# Always enable tests since they are check_PROGRAMS anyway
+	local emesonargs=(
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}