gentoo resync : 31.05.2021

7 files changed, 3 insertions, 200 deletions

diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index 7452ea8067d9..7f79295a9f64 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,10 +1,3 @@
-AUX libwacom-1.1-configurable_docs.patch 1281 BLAKE2B 33a4ed7776580f3146351e552fd8fbd26ad4207d612596291272fee2d6f85aac36fc0fd2d47b31c1dffdcc58a325bb3aae28122a1e7cc4dab96d10efdc2fbfcf SHA512 d1d4aa074f8b3d14f7b59f66db86b132c1ab152324b8191a2d99f61b4283ced02f2d931a725c71a92427f31f89a14e323e57c163efbb1a3d71bafe43f5b2f0cc
-AUX libwacom-1.1-match-with-autotools.patch 854 BLAKE2B a89d65616346b943b4566c1619b6f1af45f6c9543e35f2722a114623480de7391a2cc3f99ee62ff214662ce61c3d0dfc48ff163173bd138cc433b94a43c73078 SHA512 abab5526cc4c9190bc8546d2c4c590d8af41d86a180ef87aaea8509c061837dfb81ba6fb9d34348c9ec63ebcb8736191549feb921b2f6702ffb2184a783b887c
-AUX libwacom-1.1-meson-add-private.patch 694 BLAKE2B 98330d479d1e24de0ad3f4c055be5c07a3581592cfcd3e8d122ff1157691e7847f18a11ec43ab8433ebaa8d2442688772e32fab2c063f74aa5d44d55ba2cded4 SHA512 32bb46c24145f06f3bcfa6e55322ba1ca2df859bd47f8d35725e9a361f9a74f0c0c1d6a221792dc9b20928cf82f393c74301dad159cb490ce14064f0c0e8c86b
-DIST libwacom-1.1.tar.bz2 502696 BLAKE2B 1c2e03b00eb3b17dea2d5cd3e61afa4b7f36dcb727f07bb1cc42631febc9d1939bdd2652d6fd1f0d020815cac1f937c1daddae3019ac9aa01659442cdc8b9054 SHA512 8b63d9bad18c27f8078711408a7b79c70086cd0c64fe692ee693d53d834dff8ab45631eabd206f0dfac80d8cc86c14b5833831b1b99b06e34aacd235176d266b
-DIST libwacom-1.7.tar.bz2 513320 BLAKE2B 36cead331b8d79fa629803441190de2c28e22c0e70822075d0ff31552f780e93d606ec2229a2fee744d9e6b91eb4879cb5a202075caf6adf1301b07502cefb7b SHA512 0cdd34c54a4477ffb763c4a291f0a6b33d2df6b1d237332b116e792685201a63a50c3ec98b84e9dc7c0b97c9e407c3531cd67c0af5a8398b5bbf8be6ca103066
 DIST libwacom-1.9.tar.bz2 516223 BLAKE2B 272dd462bee6f152840fb684213d5cdf83cda05b71b95e28a4a307240fa3edcb42b7afb9ef0ac1bd8b470a138e54f3fed9509b02186aff771314fa87ecf3307a SHA512 d62da97038caeaf727800a680a4ef2ef49a56e632844b9a0d6c0eed9c808e033bc1d969aa1c523b4a1724dfb9b8b3665290ecb90fcdcfbf5f50cae2d06c0bffa
-EBUILD libwacom-1.1.ebuild 1021 BLAKE2B 577fe004acb6e80e80dbb40f15ecd1d8d3cc0821c6b63286adb419679aa8ee91104ff62904125b5485848d6e1e4dcf14c519661026a318c8967b358b3f0aecdc SHA512 433e73ee88ee25a5fb70079bd3f8226819a805d5f16c48017dbfd164bfb7c3b7d448015ea3841e45c4adc1aecf8116f58763958d34de398843aff81bd4c6fc91
-EBUILD libwacom-1.7.ebuild 1368 BLAKE2B 26ad7167edb40eb97405cabfdd43766615e5d2085b13d7117ced28f83cdc05f09e7168390fe55d3b3b240ecdeaa7d98e02308142fe6abb5a0b5e65cf06879467 SHA512 ddef8cc3392f7210d4053b7f157eb979e0088f3357406c7b5c994ad7e223b7177a0e4dcd2d665be4c8a591733d3bb55ced00eff46f788453be33bc1bfe25bc62
-EBUILD libwacom-1.9.ebuild 1368 BLAKE2B 26ad7167edb40eb97405cabfdd43766615e5d2085b13d7117ced28f83cdc05f09e7168390fe55d3b3b240ecdeaa7d98e02308142fe6abb5a0b5e65cf06879467 SHA512 ddef8cc3392f7210d4053b7f157eb979e0088f3357406c7b5c994ad7e223b7177a0e4dcd2d665be4c8a591733d3bb55ced00eff46f788453be33bc1bfe25bc62
+EBUILD libwacom-1.9.ebuild 1362 BLAKE2B 9362fa7a2ad34ac1c6a35dd056e34c5bfd821d92e8cfc1e593352088c3d8be6c0bbfa73e8ea9edd6a4baf5eec109db2cda72c59d366f9f5b463f011c18aa0593 SHA512 d89258d47923070b4b1e40ae689c7f473e28961d9ba068659bb5b5b4985a746b95cbdf0eb4f6c6910b486210b9d0db2ea498f097eb5fdaac1f2b2652c4d2ce3a
 MISC metadata.xml 308 BLAKE2B dc6dc477d74ab5e2071a87814f3d21f5347891f8e36e36bbcf1590c253146f65210f28257cd5ec26fe0b69209d19d489ce3c52697423c087321191694561144d SHA512 fc208d84f859f167919179d96eeea91beba8825cc2b4e225bfd86db40ab7e1e9f7c1d5eb9023166bae7d4f784b0e08e04674ab72f75c49d638b6ca5ec52857a5
diff --git a/dev-libs/libwacom/files/libwacom-1.1-configurable_docs.patch b/dev-libs/libwacom/files/libwacom-1.1-configurable_docs.patch
deleted file mode 100644
index 47eb27d54bf8..000000000000
--- a/dev-libs/libwacom/files/libwacom-1.1-configurable_docs.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 18722d30b9eb38d0cd22609e076ad45c810f137d Mon Sep 17 00:00:00 2001
-From: David Heidelberg <david@ixit.cz>
-Date: Sun, 27 Oct 2019 20:34:55 +0100
-Subject: [PATCH] meson: make documentation a feature
-
-Nice to have for distributions, which needs to have predicable build.
-
-Signed-off-by: David Heidelberg <david@ixit.cz>
----
- meson.build       | 3 ++-
- meson_options.txt | 4 ++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 8283613..be2fcb3 100644
---- a/meson.build
-+++ b/meson.build
-@@ -460,7 +460,8 @@ install_man(configure_file(input: 'tools/libwacom-list-local-devices.man',
- 			   copy: true))
- 
- ############### docs ###########################
--doxygen = find_program('doxygen', required: false)
-+docs_feature = get_option('documentation')
-+doxygen = find_program('doxygen', required: docs_feature)
- if doxygen.found()
- 	src_doxygen = [
- 		join_paths(dir_src, 'libwacom.h'),
-diff --git a/meson_options.txt b/meson_options.txt
-index 1d75434..84c92bf 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,3 +1,7 @@
-+option('documentation',
-+       type: 'feature',
-+       value: 'auto',
-+       description: 'Build doxygen documentation [default=auto]')
- option('udev-dir',
-        type: 'string',
-        value: '',
diff --git a/dev-libs/libwacom/files/libwacom-1.1-match-with-autotools.patch b/dev-libs/libwacom/files/libwacom-1.1-match-with-autotools.patch
deleted file mode 100644
index 06858cd36ad1..000000000000
--- a/dev-libs/libwacom/files/libwacom-1.1-match-with-autotools.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 07753990d7476d52cfd34fb7558c077bd8b44eeb Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 23 Sep 2019 09:29:45 +1000
-Subject: [PATCH] meson.build: match the libwacom.pc file Name with the
- autotools one (#164)
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 13459f7..3e0cc07 100644
---- a/meson.build
-+++ b/meson.build
-@@ -81,7 +81,7 @@ dep_libwacom = declare_dependency(link_with: lib_libwacom)
- install_headers('libwacom/libwacom.h', subdir: 'libwacom-1.0/libwacom')
- 
- pkgconfig.generate(filebase: 'libwacom',
--		   name: 'Libwacom',
-+		   name: 'libwacom',
- 		   description: 'Wacom model feature query library',
- 		   version: meson.project_version(),
- 		   subdirs: 'libwacom-1.0',
diff --git a/dev-libs/libwacom/files/libwacom-1.1-meson-add-private.patch b/dev-libs/libwacom/files/libwacom-1.1-meson-add-private.patch
deleted file mode 100644
index e31df3a683d0..000000000000
--- a/dev-libs/libwacom/files/libwacom-1.1-meson-add-private.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 6953c5a9fc51e286134cb977b3fdfe0999f3503a Mon Sep 17 00:00:00 2001
-From: worldofpeace <worldofpeace@protonmail.ch>
-Date: Sun, 22 Sep 2019 19:04:58 -0400
-Subject: [PATCH] meson: add private requires to .pc (#163)
-
----
- meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/meson.build b/meson.build
-index 0ae03e1..13459f7 100644
---- a/meson.build
-+++ b/meson.build
-@@ -85,6 +85,7 @@ pkgconfig.generate(filebase: 'libwacom',
- 		   description: 'Wacom model feature query library',
- 		   version: meson.project_version(),
- 		   subdirs: 'libwacom-1.0',
-+		   requires_private: deps_libwacom,
- 		   libraries: lib_libwacom)
- 
- #################### data files ########################
diff --git a/dev-libs/libwacom/libwacom-1.1.ebuild b/dev-libs/libwacom/libwacom-1.1.ebuild
deleted file mode 100644
index 786822b481a5..000000000000
--- a/dev-libs/libwacom/libwacom-1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson udev toolchain-funcs
-
-DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
-HOMEPAGE="https://github.com/linuxwacom/libwacom"
-SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libgudev:=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-meson-add-private.patch"
-	"${FILESDIR}/${P}-match-with-autotools.patch"
-	"${FILESDIR}/${P}-configurable_docs.patch"
-)
-
-pkg_setup() {
-	tc-ld-disable-gold # bug https://github.com/linuxwacom/libwacom/issues/170
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature doc documentation)
-		$(meson_use test tests)
-		-Dudev-dir=$(get_udevdir)
-
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libwacom/libwacom-1.7.ebuild b/dev-libs/libwacom/libwacom-1.7.ebuild
deleted file mode 100644
index 0c54c6c491e4..000000000000
--- a/dev-libs/libwacom/libwacom-1.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit meson python-any-r1 toolchain-funcs udev
-
-DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
-HOMEPAGE="https://github.com/linuxwacom/libwacom"
-SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/python-libevdev[${PYTHON_USEDEP}]
-			dev-python/pyudev[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libgudev:=
-"
-DEPEND="${RDEPEND}"
-
-python_check_deps() {
-	has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/pyudev[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	tc-ld-disable-gold # bug https://github.com/linuxwacom/libwacom/issues/170
-
-	if use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature doc documentation)
-		$(meson_feature test tests)
-		-Dudev-dir=$(get_udevdir)
-
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libwacom/libwacom-1.9.ebuild b/dev-libs/libwacom/libwacom-1.9.ebuild
index 0c54c6c491e4..be1415a4cf5a 100644
--- a/dev-libs/libwacom/libwacom-1.9.ebuild
+++ b/dev-libs/libwacom/libwacom-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"