gentoo resync : 04.07.2020

3 files changed, 36 insertions, 7 deletions

diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index a05325a53ff2..8067be96317f 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1,6 +1,6 @@
 AUX libjcat-0.1.1-disable_installed_tests.patch 1131 BLAKE2B fdefa9b78c1c8fa80ef35d1eb1d1f5bfa9f6d6434dc517e5c84affde5de8fe195d4ad605b59c45acaf73fb5bc75fb6c57bb0a95ccace0b67e3480b9157a6a704 SHA512 171b9c60e4afff59cb25bd6f94ece92e3e80dc1267395415d3d283ab429c3a2de49d43c0a0efce1b9b9f4d217e01a08ce4458c691ad270d427284ed45a88a1cf
-DIST libjcat-0.1.2.tar.gz 62630 BLAKE2B cb333098d984f840a80c4ea4b7feab32ca7d04882f2f4aa788c01dd13c616b85576af5bbcd0ca343a7f5b7221ab69b202c7a8cacb230eeeefab9a3a9a61d7d3f SHA512 9184b761cad5a43ac1f0b0cd4ff54c372ec067785c9b796d813aab6a936fbb522f419e965b70d4d71fbec9f7c25f9d185f957cf1e73cb0e5bdeca9492e11b0fd
+AUX libjcat-0.1.3-optional_vala.patch 944 BLAKE2B 4a764d59a429f7d0d78e5cffa6f63d6cc88db92a41a46a5e3ed47fde2b358209aa4e61302d071e4e15366232992961c0837eb708f840f36c8468aee48f3fc3a2 SHA512 0b9879099933b4f5eb31af48994597a17e5e0331c55df7711271a4e65e375a85c7301801038d62ff3c7704ae4e4a0baa01ff160d92fd7522c2d81b050154dea0
 DIST libjcat-0.1.3.tar.gz 63765 BLAKE2B a9847fe2a93f49773ba6451036d7908b8b615a6334557a68c94db3c402e1f502e2915bb1abc9f58c495fe1453cb5653cae9b548d2f9d7b39dcd5d7824e965bc2 SHA512 f021e10d740ac6d0f0c73cefc9deacdbc74882a5e340b249c28427ece4917358940413914ce19c5aac96c86d8056349ff2ee633c2a9541f4382f109d9e0d9e69
-EBUILD libjcat-0.1.2.ebuild 1405 BLAKE2B 6fce2d734bf40ca38ff11efef56a87b8fb68b987f3b51486a91e09c6175c6e2eaccdbf51a7214b5d63dbd500ba22fbb0be2ea06443771bc54a6b86b5c0878de9 SHA512 3813e816d8cedc1ad807ca59639a6caa607935cf315fb29ccbc685b10d6d92aee8dfc20e7f66f898c893d4170c0afd90493d40db284337316136b2c793c98478
+EBUILD libjcat-0.1.3-r1.ebuild 1485 BLAKE2B d12e00334a25c4b44c77a35214953808897db2391ceff642b68b4d4bc8cffb6a40ea753dc3b8113ba130bfd8387fe59e56c15145adceb6da204d0f431f4d4ed3 SHA512 6f5c7d87680e48dc7a1c40e4f85c6b4265bb0e1d1283964879bdbc4c5178baa4ff249bf4bd24e62e7978eabaf76f4ad163839d97e15bc96f5cf6f88c498f881e
 EBUILD libjcat-0.1.3.ebuild 1403 BLAKE2B 95f1152cdf7bde258b549d08646f2de4f85c97af540f70b79e381143ecba366765fcc2971c9f5f983d435ffc47e6084a39bb9e13a75e0104f45f0af43c394904 SHA512 e4c17f8feab615a290f4495d03f24ca7a6a2371643476634165fc7db69abaa57185487f8477ddece2f60ec8e54cd2e000166e170320590dd1a3ce75b2bb0c73f
 MISC metadata.xml 993 BLAKE2B 3f186f6514cbea4951c5e2b4c26a305d615cfa52237ba5e21495c7843a82fd551557e53592e7aacbc568b8bd09832fef0054e4f095fdeb07194e9dc8258bbee3 SHA512 fa07148261c97c53718c489a0cd70d60eea42fccc1723a88d9a35b06c7a91b92e2e0d66bed11f719f160f749ea4a0cbb3eab89c6dc68eda5ff75386d4958e3bc
diff --git a/dev-libs/libjcat/files/libjcat-0.1.3-optional_vala.patch b/dev-libs/libjcat/files/libjcat-0.1.3-optional_vala.patch
new file mode 100644
index 000000000000..3c31e63eff59
--- /dev/null
+++ b/dev-libs/libjcat/files/libjcat-0.1.3-optional_vala.patch
@@ -0,0 +1,28 @@
+Make installation of dev-lang/vala bindings optional. Unfortunately
+the option name "vala" is reserved so we must use a different one.
+
+--- a/libjcat/meson.build
++++ b/libjcat/meson.build
+@@ -122,6 +122,7 @@
+     install : true
+   )
+ 
++  if get_option('vala-bindings')
+   gnome.generate_vapi('jcat',
+     sources : jcat_gir[0],
+     packages : [
+@@ -130,6 +131,7 @@
+     ],
+     install : true,
+   )
++  endif
+ 
+   python = import('python')
+   python_interpreter = python.find_installation('python3',
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -4,3 +4,4 @@
+ option('gpg', type : 'boolean', value : true, description : 'enable the GPG verification support')
+ option('pkcs7', type : 'boolean', value : true, description : 'enable the PKCS7 verification support')
+ option('man', type : 'boolean', value : true, description : 'enable man pages')
++option('vala-bindings', type : 'boolean', value : true, description : 'enable vala bindings')
diff --git a/dev-libs/libjcat/libjcat-0.1.2.ebuild b/dev-libs/libjcat/libjcat-0.1.3-r1.ebuild
index 32fec2f11c2a..ccbbdf6c2393 100644
--- a/dev-libs/libjcat/libjcat-0.1.2.ebuild
+++ b/dev-libs/libjcat/libjcat-0.1.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="xml"
 
 inherit meson python-any-r1 vala xdg-utils
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gpg gtk-doc +introspection +man pkcs7 test"
+IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
 
 RDEPEND="dev-libs/glib:2
 	dev-libs/json-glib:=
@@ -25,7 +25,7 @@ RDEPEND="dev-libs/glib:2
 	)
 	introspection? ( dev-libs/gobject-introspection:= )
 	pkcs7? ( net-libs/gnutls )
-	dev-lang/vala:="
+	vala? ( dev-lang/vala:= )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
 	$(python_gen_any_dep '
@@ -39,6 +39,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch
+	"${FILESDIR}"/${PN}-0.1.3-optional_vala.patch
 )
 
 python_check_deps() {
@@ -47,8 +48,7 @@ python_check_deps() {
 
 src_prepare() {
 	xdg_environment_reset
-# TODO: make vala optional
-	vala_src_prepare
+	use vala && vala_src_prepare
 	default
 }
 
@@ -60,6 +60,7 @@ src_configure() {
 		$(meson_use man)
 		$(meson_use pkcs7)
 		$(meson_use test tests)
+		$(meson_use vala vala-bindings)
 	)
 	meson_src_configure
 }