gentoo resync : 25.11.2020

4 files changed, 1 insertions, 113 deletions

diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest
index 28dff55277f9..59e1978ba991 100644
--- a/gnome-extra/gnome-color-manager/Manifest
+++ b/gnome-extra/gnome-color-manager/Manifest
@@ -1,7 +1,4 @@
-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 1084 BLAKE2B 4413e0a0f4150d1a4706010d41a027be5e0e3dc9188e7ecbd3ae3d9dd8daebde09f0c093f6bd91888656a933376da4926787c760e43aa5f302f03926a1b0b4e8 SHA512 401292151e97a6f7733301187faa77bdaf36e8c10a59513179e5c99346146ba816307662dc30df698bc66dbe354c8615c3257c1fbcd0a377a762c69ab77f811c
-MISC metadata.xml 525 BLAKE2B cc643bcc16f4fd5e8a76dd22ec36d3c4a3226d9062594cb313b445218cf9276e7d1b79b9a7a54afd3a2c9454ca1aa6a0e886bd2e2145ffcb7d656db1d538b652 SHA512 81f5a273a4686935f1b0d267fd056d2ba5a8f13750845ef3feda74586ffea0ce1bf98ac0c8a94b61c6bc893fbb9dc5bcb4864a020817bc27d4e61c9008069d2a
+MISC metadata.xml 405 BLAKE2B 1d1b549076134d25c224e0d819ca84352611646a1eb2dc8f3dde57696d8b64410f79093ca165543332b56eb1d321b51396f281be8a0ef21d7c9f310bfd154d0f SHA512 89abcda85bcd2724ff1af758185399a68d75a762bc90eb4da7a453d37e89905f3db3a66084b7bc0b96212df7d6d8f07fb2015c1e8fb7b3a1b5504ece886d569c
diff --git a/gnome-extra/gnome-color-manager/files/3.28-remove-unwvanted-check.patch b/gnome-extra/gnome-color-manager/files/3.28-remove-unwvanted-check.patch
deleted file mode 100644
index a9d3ad465a6f..000000000000
--- a/gnome-extra/gnome-color-manager/files/3.28-remove-unwvanted-check.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 534eed4f8664c9f263d666ed78144c37dc05bf90 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 27 May 2018 19:27:51 +0200
-Subject: [PATCH] Fix unwanted exiv check in packagekit option handling
-
----
- meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 9e179fb..08a0f79 100644
---- a/meson.build
-+++ b/meson.build
-@@ -108,7 +108,6 @@ if get_option('exiv')
- endif
- 
- if get_option('packagekit')
--  libexiv = dependency('exiv2')
-   conf.set('HAVE_PACKAGEKIT', '1')
- endif
- 
--- 
-2.19.1
-
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.32.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.32.0.ebuild
deleted file mode 100644
index def430c26486..000000000000
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.32.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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="packagekit raw test"
-RESTRICT="!test? ( test )"
-
-# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
-# vte could be made optional
-RDEPEND="
-	>=dev-libs/glib-2.31.10:2
-	>=media-libs/lcms-2.2:2
-	>=media-libs/libcanberra-0.10[gtk3]
-	media-libs/libexif
-	media-libs/tiff:0=
-
-	>=x11-libs/gtk+-3.3.8:3
-	>=x11-libs/vte-0.25.1:2.91
-	>=x11-misc/colord-1.3.1:0=
-	>=x11-libs/colord-gtk-0.1.20
-
-	packagekit? ( app-admin/packagekit-base )
-	raw? ( media-gfx/exiv2:0= )
-"
-# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
-DEPEND="${RDEPEND}
-	app-text/docbook-sgml-dtd:4.1
-	app-text/docbook-sgml-utils
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://bugzilla.gnome.org/show_bug.cgi?id=796428
-	"${FILESDIR}"/3.28-remove-unwvanted-check.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	# Fix hard-coded package name
-	# https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/3
-	sed 's:argyllcms:media-gfx/argyllcms:' -i src/gcm-utils.h || die
-}
-
-src_configure() {
-	# Always enable tests since they are check_PROGRAMS anyway
-	local emesonargs=(
-		$(meson_use raw exiv)
-		$(meson_use packagekit)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! has_version media-gfx/argyllcms ; then
-		elog "If you want to do display or scanner calibration, you will need to"
-		elog "install media-gfx/argyllcms"
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/gnome-extra/gnome-color-manager/metadata.xml b/gnome-extra/gnome-color-manager/metadata.xml
index 6f7911fa6dc3..4d2c71f23488 100644
--- a/gnome-extra/gnome-color-manager/metadata.xml
+++ b/gnome-extra/gnome-color-manager/metadata.xml
@@ -5,10 +5,6 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="packagekit">Enable support for the distro-neutral package
-			manager GUI PackageKit</flag>
-	</use>
 	<longdescription lang="en">GNOME Color Manager is a set of graphical utilities for color management
 to be used in the GNOME desktop.</longdescription>
 </pkgmetadata>