gentoo resync : 04.05.2021

4 files changed, 69 insertions, 62 deletions

diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index a6e181062b93..63f560c6454f 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,7 +1,7 @@
-AUX 1.4.5-build-Fix-building-without-vapi.patch 1489 BLAKE2B ec5fc65a4b898c6c4a77c962a048042b3f9df532707bbc12bb5668d97c1683ea5ddc481b831f4e388ac10f16e728c840e7f420ab5061a4d1f25f50946000a35b SHA512 738d5a5570b7c22b87a851f4092b825ee2b1c0f59b1d4412b5e744eb1f5045ffb39146e1ffcd6b4b274db229fe872ef8352761161965ad175a2f45d334f00bab
+AUX 1.4.5-optional-introspection.patch 2436 BLAKE2B d2572caf95e94e12f64a1a15bdb2f686a0fc5196cd29b66f2ff7f312bd904167442b60e6cce05c738ffec0c06ed8da280e6738082afca2a9117576fcafd5f0a8 SHA512 46a0b28dccb54adfe562f3f5763ae6160588be7ce7d4bd6f691d15e4df3007d08a28c1c4f787abe05eb37ae5d07a058021553989c584180c924e6ab4a6a06016
 AUX 1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch 1768 BLAKE2B b8620120b46b9095235d33d92a862971ed6d3944ed7cdbfb44eb161104e96c571327965267ee8de10cfac71fa3956639f87c6d16dde81571f5f2e0c7db073779 SHA512 ca08f1325fde85da14f7a348df054ff47bc2a008f57f33c7cb8a8f60394bdb453da1e94402bc69cd16a9ac4899f0b75766b879b1a1cd8217b39557d4a3856158
 DIST colord-1.3.5.tar.xz 1263488 BLAKE2B de70f3f76e81d3cec826f444e4c6a1603c03b7d97fedcd04a0b9e1977d1e487d7e1327c8b2738b3cf74e9717fb6803d543786c749d3a244faa1a6480e77e3436 SHA512 a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f
 DIST colord-1.4.5.tar.xz 1869084 BLAKE2B 34c886bade6f71b0b81bbed216695d839873fba46423f6422b80ef2f62e88a403edd1686bb705ef78bcaeb352477e0581d784ccd388961cd42d880661b4b31ab SHA512 b6cc8087ceff4a99b7d764087208cc72e1219d9f6bb52bd3e3eb13bb62e3c1e99aefef36237dceff46925ab7680c76795f59057b7a4d1c8a123de6270708e03c
 EBUILD colord-1.3.5.ebuild 5020 BLAKE2B 0bf726b3dceb24289e27ff1db60e5bf02fa350b52e271539a101cb422d2beaa4a4014e2421c8842755d65991e4c26651234ecb0e15ffe3d0659fe51d9f436e85 SHA512 7d2050a8f9bd884498770ace429edc8c3fffa556f9bcd3861e17531988112b6e461a6b76cd0a1eb2d3ad95f1e01d493416ead82faa2aefcfd3a92ce6833a2805
-EBUILD colord-1.4.5.ebuild 3718 BLAKE2B c3024b1f3431c29bcf387c5ffb07eb0190fb6fa8e7118c9fa2ada0101a072535c294f028a8f26206c128ac97122d97471726d645828ff9341fd1ba39191560b0 SHA512 965604e7cae55a9fffcbdceac2e9c25c082c5cac16cfe0a5bf5d026e3d69d827365da51565d954ca8b9b6c7562709d089b3c2c39fd8cb179d04801e8c47d8f90
+EBUILD colord-1.4.5-r1.ebuild 3664 BLAKE2B 74774d26de158eed64280133dfcab40c9aec31f4a0ce0e858af92b924f1e715b48e09392462e0b210771cea1e75e7abbdee89712b50a9df8b56f9856f10852b9 SHA512 552f5e8c7652ad91a2331bc76066903aaacaff19593beb522d797d8fc5dc5dff95b7e9a68fac866da4ab924e061750cb54c1a39b922dd9579fc70099b56a1c09
 MISC metadata.xml 563 BLAKE2B b35a641da198a98fc9dc69dc0a49b0796060df467dfda31fa7cb1dab328a618e283f5ee9e05d7ad34742052e9441780b243f62f71329d88c1d93dfa83acc46a0 SHA512 e358961e8d31c2e9582d93875bdabe119e574b62d674e5b16028cccfa2e0604d39384fc2c5683aa343b9cf6d543f8fc35d2eef35662de43ea97fd0f50536df3a
diff --git a/x11-misc/colord/colord-1.4.5.ebuild b/x11-misc/colord/colord-1.4.5-r1.ebuild
index deeb744abd98..a3b707ebd6d4 100644
--- a/x11-misc/colord/colord-1.4.5.ebuild
+++ b/x11-misc/colord/colord-1.4.5-r1.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 	>=dev-libs/glib-2.58.0:2[${MULTILIB_USEDEP}]
 	>=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
 	dev-db/sqlite:3=[${MULTILIB_USEDEP}]
-	>=dev-libs/libgusb-0.2.7[${MULTILIB_USEDEP}]
+	>=dev-libs/libgusb-0.2.7[introspection?,${MULTILIB_USEDEP}]
 	udev? (
 		dev-libs/libgudev:=[${MULTILIB_USEDEP}]
 		virtual/libudev:=[${MULTILIB_USEDEP}]
@@ -55,15 +55,10 @@ BDEPEND="
 	extra-print-profiles? ( media-gfx/argyllcms )
 	vala? ( $(vala_depend) )
 "
-# These dependencies are required to build native build-time programs.
-BDEPEND="${BDEPEND}
-	dev-libs/glib:2
-	media-libs/lcms
-"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-tests-Don-t-use-exact-floating-point-comparisons.patch
-	"${FILESDIR}"/${PV}-build-Fix-building-without-vapi.patch
+	"${FILESDIR}"/${PV}-optional-introspection.patch
 )
 
 src_prepare() {
@@ -97,6 +92,7 @@ multilib_src_configure() {
 		-Dargyllcms_sensor=$(multilib_native_usex argyllcms true false)
 		-Dreverse=false
 		-Dsane=$(multilib_native_usex scanner true false)
+		-Dintrospection=$(multilib_native_usex introspection true false)
 		-Dvapi=$(multilib_native_usex vala true false)
 		-Dprint_profiles=$(multilib_native_usex extra-print-profiles true false)
 		$(meson_use test tests)
diff --git a/x11-misc/colord/files/1.4.5-build-Fix-building-without-vapi.patch b/x11-misc/colord/files/1.4.5-build-Fix-building-without-vapi.patch
deleted file mode 100644
index cbf79a830c09..000000000000
--- a/x11-misc/colord/files/1.4.5-build-Fix-building-without-vapi.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2bbcefa35225ba836b1672449f1de59ce9a90078 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Sun, 18 Apr 2021 16:46:52 -0400
-Subject: [PATCH] build: Fix building without vapi
-
----
- lib/colord/meson.build   | 2 +-
- lib/colorhug/meson.build | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/lib/colord/meson.build b/lib/colord/meson.build
-index dbb3d19..3126046 100644
---- a/lib/colord/meson.build
-+++ b/lib/colord/meson.build
-@@ -146,6 +146,7 @@ pkgg.generate(
-   description : 'colord is a system daemon for managing color devices',
- )
- 
-+if get_option('vapi')
- libcolord_girtarget = gnome.generate_gir(colord,
-   sources : [
-     'cd-client.c',
-@@ -203,7 +204,6 @@ libcolord_girtarget = gnome.generate_gir(colord,
- libcolord_gir = libcolord_girtarget[0]
- libcolord_typelib = libcolord_girtarget[1]
- 
--if get_option('vapi')
- gnome.generate_vapi('colord',
-   sources: libcolord_girtarget[0],
-   packages: ['gio-2.0'],
-diff --git a/lib/colorhug/meson.build b/lib/colorhug/meson.build
-index 9526ea4..9f17553 100644
---- a/lib/colorhug/meson.build
-+++ b/lib/colorhug/meson.build
-@@ -73,6 +73,7 @@ pkgg.generate(
-   description : 'ColorHug is a simple display hardware colorimeter',
- )
- 
-+if get_option('vapi')
- libcolorhug_gir = gnome.generate_gir(colorhug,
-   sources : [
-     'ch-common.c',
-@@ -107,6 +108,7 @@ libcolorhug_gir = gnome.generate_gir(colorhug,
-   ],
-   install : true
- )
-+endif
- 
- if get_option('tests')
-   e = executable(
--- 
-2.26.3
-
diff --git a/x11-misc/colord/files/1.4.5-optional-introspection.patch b/x11-misc/colord/files/1.4.5-optional-introspection.patch
new file mode 100644
index 000000000000..8bc4580bebe3
--- /dev/null
+++ b/x11-misc/colord/files/1.4.5-optional-introspection.patch
@@ -0,0 +1,64 @@
+From e73723cabe4d5a2e2b281d2f1ea751b2d75bccc6 Mon Sep 17 00:00:00 2001
+From: David Michael <fedora.dm0@gmail.com>
+Date: Fri, 30 Apr 2021 16:28:17 -0400
+Subject: [PATCH] build: Make introspection optional in meson
+
+It defaults to enabled to preserve existing behavior.
+---
+ lib/colord/meson.build   | 2 ++
+ lib/colorhug/meson.build | 2 ++
+ meson_options.txt        | 1 +
+ 3 files changed, 5 insertions(+)
+
+diff --git a/lib/colord/meson.build b/lib/colord/meson.build
+index dbb3d196..fe9d1cdb 100644
+--- a/lib/colord/meson.build
++++ b/lib/colord/meson.build
+@@ -146,6 +146,7 @@ pkgg.generate(
+   description : 'colord is a system daemon for managing color devices',
+ )
+ 
++if get_option('introspection')
+ libcolord_girtarget = gnome.generate_gir(colord,
+   sources : [
+     'cd-client.c',
+@@ -202,6 +203,7 @@ libcolord_girtarget = gnome.generate_gir(colord,
+ )
+ libcolord_gir = libcolord_girtarget[0]
+ libcolord_typelib = libcolord_girtarget[1]
++endif
+ 
+ if get_option('vapi')
+ gnome.generate_vapi('colord',
+diff --git a/lib/colorhug/meson.build b/lib/colorhug/meson.build
+index 9526ea4d..c0ce2887 100644
+--- a/lib/colorhug/meson.build
++++ b/lib/colorhug/meson.build
+@@ -73,6 +73,7 @@ pkgg.generate(
+   description : 'ColorHug is a simple display hardware colorimeter',
+ )
+ 
++if get_option('introspection')
+ libcolorhug_gir = gnome.generate_gir(colorhug,
+   sources : [
+     'ch-common.c',
+@@ -107,6 +108,7 @@ libcolorhug_gir = gnome.generate_gir(colorhug,
+   ],
+   install : true
+ )
++endif
+ 
+ if get_option('tests')
+   e = executable(
+diff --git a/meson_options.txt b/meson_options.txt
+index c184898e..10517622 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -7,6 +7,7 @@ option('systemd', type : 'boolean', value : true, description : 'Enable systemd
+ option('argyllcms_sensor', type : 'boolean', value : true, description : 'Enable ArgllCMS sensor')
+ option('reverse', type : 'boolean', value : false, description : 'Enable reverse engineering tools')
+ option('sane', type : 'boolean', value : false, description : 'Enable SANE support')
++option('introspection', type : 'boolean', value : true, description : 'Build gobject-introspection typelib files')
+ option('vapi', type : 'boolean', value : false, description : 'Build vala bindings')
+ option('print_profiles', type : 'boolean', value : false, description : 'Build extra print profiles')
+ option('tests', type : 'boolean', value : true, description : 'Build self tests')