gentoo resync : 13.11.2021

5 files changed, 4 insertions, 113 deletions

diff --git a/dev-libs/libvarlink/Manifest b/dev-libs/libvarlink/Manifest
index 68e9bc4ae7a9..44323f9e9c2d 100644
--- a/dev-libs/libvarlink/Manifest
+++ b/dev-libs/libvarlink/Manifest
@@ -1,8 +1,3 @@
-AUX libvarlink-19-fix-meson-build.patch 1443 BLAKE2B df67a1f7b075e1c2ef91deaf881889302fabcf22ca19190d6d62134901ed32d1631b70dce51f624af3b8297991c13eba95654dc9522a2e50eb51563dc5accd79 SHA512 090e507395c5de07e864d626008a5a8b21588be728d68b917be75428e62f2e302dabdd9f4646e1382fd6abce551a9c02bfdb16d0959367e529f8ba49701cf32d
-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
-EBUILD libvarlink-16.ebuild 556 BLAKE2B a35c69c46abe245acd09d17c9e917a34925f3c405657c03b900513aed3ee103266f5e91343b68c72c48e87d6a01bd6bca7a3a559a43c3b7b525025e9d83a68de SHA512 d0425e3929f69c8f8eeedabbad12335748a7602b6876e1197bd3539fb0e6483211cbe3e4bfc991396dea301bed5942a4c36f70c6aa0a1b512b939b3675e1cbfd
-EBUILD libvarlink-18.ebuild 556 BLAKE2B a35c69c46abe245acd09d17c9e917a34925f3c405657c03b900513aed3ee103266f5e91343b68c72c48e87d6a01bd6bca7a3a559a43c3b7b525025e9d83a68de SHA512 d0425e3929f69c8f8eeedabbad12335748a7602b6876e1197bd3539fb0e6483211cbe3e4bfc991396dea301bed5942a4c36f70c6aa0a1b512b939b3675e1cbfd
-EBUILD libvarlink-19.ebuild 615 BLAKE2B c3180fa22c2259d34515b38889754d106b91493f0f654dc4a0d591ac1a17d198219c713e7f5b1b2fc295ed21c4d5c5844e2f809f9eb06e148333c22abb749bcb SHA512 3f287cec779ac3975bf093359394b6cc8611f2203c928e252bbb017d96a8822db3e970c317c783887df2e56cf58162d1aadbc05bd506e34f4811cfa717a6c7a2
+DIST libvarlink-22.tar.gz 80867 BLAKE2B 4b538846219d21dce92f8b49548b24c6efa72e31fc78ce09e5bb8f76bfddc2c05479bc5b84981042315fae154c2884c9956fb651812ec257bc4a2b0fc0e70021 SHA512 edb6aab02df775b872621f59bb98e8567b74ec4e1311ad5195f87529e7070fbfb6a92e1580b0433efcd7512d5f47f55ed91a406a3fb51f61c8d6feb263367fa0
+EBUILD libvarlink-22.ebuild 439 BLAKE2B 404caf68b22ba3b05a68e4c0171b00569fca8b9ea4167a75e3abf1760bbd53cd32bc8db77cc2cdd6a0e15129d18e132bf34740f33a2b5641a1ec8265694ac7cd SHA512 ad31df379c1bff093ddffdb8c2ed045ba21da935e89263ac0e587a5a9c80eb45c6b3b99eb21b80fe34e962db8a3c05eef598354340acdcc8cdcc5f0e5545e359
 MISC metadata.xml 328 BLAKE2B 42775f0eb790f17bd598085e9e6afe34b48f53ec57ff8f9541a45d0f1bd7096943ee42b38396edc1a5521d9cfb5d8f04d26aa0c6d0cc985033063e9ea55841dd SHA512 d2da3af9a630d2d0f4c070b6076033986c494bda8696c98aa118721aaf9adcd4e9f500d407ca545946ac012f2b7fd02d8455081a5ffbfadeea0b028bab3c238e
diff --git a/dev-libs/libvarlink/files/libvarlink-19-fix-meson-build.patch b/dev-libs/libvarlink/files/libvarlink-19-fix-meson-build.patch
deleted file mode 100644
index 9d2e85124681..000000000000
--- a/dev-libs/libvarlink/files/libvarlink-19-fix-meson-build.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 5fad96254cf20fc6d473037b48c50031cd7e8b45 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.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-18.ebuild b/dev-libs/libvarlink/libvarlink-18.ebuild
deleted file mode 100644
index 806ab716b325..000000000000
--- a/dev-libs/libvarlink/libvarlink-18.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local emesonargs=(
-		-Dtests="$(usex test true false)"
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libvarlink/libvarlink-19.ebuild b/dev-libs/libvarlink/libvarlink-19.ebuild
deleted file mode 100644
index 1bc5971cde85..000000000000
--- a/dev-libs/libvarlink/libvarlink-19.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 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 )"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-fix-meson-build.patch" )
-
-src_configure() {
-	local emesonargs=(
-		-Dtests="$(usex test true false)"
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libvarlink/libvarlink-16.ebuild b/dev-libs/libvarlink/libvarlink-22.ebuild
index 806ab716b325..03eb294c694d 100644
--- a/dev-libs/libvarlink/libvarlink-16.ebuild
+++ b/dev-libs/libvarlink/libvarlink-22.ebuild
@@ -11,15 +11,7 @@ SRC_URI="https://github.com/varlink/libvarlink/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~x86"
+RESTRICT+=" test"
 
 BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local emesonargs=(
-		-Dtests="$(usex test true false)"
-	)
-	meson_src_configure
-}