[gentoo-commits] repo/gentoo:master commit in: dev-libs/libvarlink/, dev-libs/libvarlink/files/

[Louis Sautier]

commit:     c1cf4ded49c7dbd3edf335ff998ea6b5421a4b73
Author:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Tue May  5 22:25:47 2020 +0000
Commit:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Tue May  5 22:56:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1cf4ded

dev-libs/libvarlink: bump to 19, fix build, add ~x86

Closes: https://bugs.gentoo.org/710084
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>

 dev-libs/libvarlink/Manifest                       |  1 +
 .../files/libvarlink-19-fix-meson-build.patch      | 44 ++++++++++++++++++++++
 dev-libs/libvarlink/libvarlink-19.ebuild           | 31 +++++++++++++++
 3 files changed, 76 insertions(+)

diff --git a/dev-libs/libvarlink/Manifest b/dev-libs/libvarlink/Manifest
index d0e3ff59dff..fca204fc1d5 100644
--- a/dev-libs/libvarlink/Manifest
+++ b/dev-libs/libvarlink/Manifest
@@ -1,2 +1,3 @@
 DIST libvarlink-16.tar.gz 56886 BLAKE2B 6c65199ced429eac733d1114cfad59c4514d299bd3bba0d4a9907498655545fd9edb9999428f39df936cd1e6710bacc08c04f05710e80f0ceb974b43809b9c22 SHA512 8152fc4fab4e9e829c2bc1585e479c23b0329c59da0be8712ff64dbbe01cde9630f228ac7edc06e9faa39dfd3d38007032ec6ed561e2363d4d33f65856f1a271
 DIST libvarlink-18.tar.gz 57708 BLAKE2B 035a3cad38d2429fa7a1bde049d6c5772ef10ef65040179839459d8672ef7fc619ff2a250ad48b108a9068c1f927226ad4ec08fa355b6c6f30a8ab8830422e9e SHA512 a0f2cfe6a3ce3e7c08b24436d4210691d6334ec903cb3d590627595ee3bda79bf4e22e7c72c7ea8ebe817e4e2b045f86d2603ae56b3fd7d429fd281fd7e5e2e8
+DIST libvarlink-19.tar.gz 57715 BLAKE2B 2175e2c9f053b7b4f4f7d8778c966bc4d39954b95c533296b6d1d1cea0e86a37634d502271fa4a5a6b70230725336c9aa152a11210f0b58435616e1a054033cd SHA512 395aaf08e5166daf31c1d3cd05ed7ad2982e817a022f2e6bf6512664f45107ed98c56d851ac098778f9018807ca98fd2903c1ee5aac387691d64610e46ea435b

diff --git a/dev-libs/libvarlink/files/libvarlink-19-fix-meson-build.patch b/dev-libs/libvarlink/files/libvarlink-19-fix-meson-build.patch
new file mode 100644
index 00000000000..9d2e8512468
--- /dev/null
+++ b/dev-libs/libvarlink/files/libvarlink-19-fix-meson-build.patch
@@ -0,0 +1,44 @@
+From 5fad96254cf20fc6d473037b48c50031cd7e8b45 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@××××××.pl>
+Date: Fri, 3 Apr 2020 18:35:21 +0200
+Subject: [PATCH] Drop tags and ctags targets
+
+meson 0.43 started providing a built-in ctags target which
+conflicts with the hand-rolled one here. There shouldn't be
+much difference, so let's drop ours.
+
+Fixes #22.
+---
+ meson.build | 22 ----------------------
+ 1 file changed, 22 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 5fc51d2..72ac786 100644
+--- a/meson.build
++++ b/meson.build
+@@ -79,25 +79,3 @@ subdir('lib')
+ subdir('tool')
+ subdir('vim')
+ subdir('bash-completion')
+-
+-############################################################
+-
+-git = find_program('git', required : false)
+-
+-if git.found()
+-        all_files = run_command(
+-                git,
+-                ['--git-dir=@0@/.git'.format(meson.current_source_dir()),
+-                 'ls-files',
+-                 ':/*.[ch]'])
+-        all_files = files(all_files.stdout().split())
+-
+-        custom_target(
+-                'tags',
+-                output : 'tags',
+-                command : ['env', 'etags', '-o', '@0@/TAGS'.format(meson.current_source_dir())] + all_files)
+-        custom_target(
+-                'ctags',
+-                output : 'ctags',
+-                command : ['env', 'ctags', '-o', '@0@/tags'.format(meson.current_source_dir())] + all_files)
+-endif

diff --git a/dev-libs/libvarlink/libvarlink-19.ebuild b/dev-libs/libvarlink/libvarlink-19.ebuild
new file mode 100644
index 00000000000..b8c592de9de
--- /dev/null
+++ b/dev-libs/libvarlink/libvarlink-19.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="C implementation of the Varlink protocol and command line tool"
+HOMEPAGE="https://github.com/varlink/libvarlink"
+SRC_URI="https://github.com/varlink/libvarlink/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+RDEPEND=""
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/meson-0.47.0
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-meson-build.patch" )
+
+src_configure() {
+	local emesonargs=(
+		-Dtests="$(usex test true false)"
+	)
+	meson_src_configure
+}