gentoo resync : 29.12.2022

3 files changed, 29 insertions, 12 deletions

diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index 72e435ea05e4..3fea84a91539 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,5 +1,5 @@
-DIST libwacom-1.11.tar.bz2 519285 BLAKE2B fb26190d752316b5d25659d2ae76681bfff1803463360aa138eab91ed7d7ef2d04dfb6bdd4f8c2effc45a495ef3afc312a817d4fd41cd8167172cafd9f5cee9f SHA512 24e8183502dd2b928d53b3d26d8479210e855c94c225649d63ac33062a30615654ff0ab8666a25503fb3253125539cd845ca467fb228a01c608dc3adbbec73b5
 DIST libwacom-1.12.tar.bz2 543819 BLAKE2B fdbfba23d7b1e047757b0c0ff698a484cadc91c199459e1da49bfd5a5406aeb62d2ca43856f7d8363c3f36c7c05f4d3160e8fb576c3d18f085144dec259d49c5 SHA512 4e0084eda01e78f52336f3f1f1ea3ea86cb9c5fdd6d6c0316662405ebe2a328d6837f8db855e58f5fa95a640a5d456a081a7de339a372bf851bc0d5c69530379
-EBUILD libwacom-1.11.ebuild 1361 BLAKE2B 5d1f2961c5b32db01681d9f2c044e89198130c2b9c18c7eab947a5157694d218ca9c8688491315e31cb1f64e703465bc2590bf4101dcffdfec20f06b1616a90f SHA512 43ba7996cd0926bf9ef34b2946f32db8aeed4263ae14377b5ce9f1107f753c04060a1ca9a802abd7ee7415eb62af7268bbf42ce171040cf4b7bdaaa6bf5cd7e2
-EBUILD libwacom-1.12.ebuild 1361 BLAKE2B 5d1f2961c5b32db01681d9f2c044e89198130c2b9c18c7eab947a5157694d218ca9c8688491315e31cb1f64e703465bc2590bf4101dcffdfec20f06b1616a90f SHA512 43ba7996cd0926bf9ef34b2946f32db8aeed4263ae14377b5ce9f1107f753c04060a1ca9a802abd7ee7415eb62af7268bbf42ce171040cf4b7bdaaa6bf5cd7e2
+DIST libwacom-2.3.0.tar.xz 107872 BLAKE2B 5589067eabb0b0d5384015a0200950146d1c028ce8cd870b845de8ec22ca1710645755253952e49f9c1db585a945c6ea8da37318b900f16602a1a7081512ecd9 SHA512 ccbeddc55cc67d8102aa4536616f3c379877ba9154a72d7ad92941854c79b727a21efacf4282b9a8730ff181d094749bf84a9fe5850de6246d91a17e5029d888
+EBUILD libwacom-1.12.ebuild 1394 BLAKE2B 19152e1d6fb3cb580c2763dfd16812eae387eeeaa69b77524a321468c6244b6fa00a1012cd5b6f0f72dcb00ba2ddc6c8fcc3806b1631caf061a0c1865c428679 SHA512 5869d7cb13e8162410558c9d6f6af31c141be5d5469e125e9a451e8785bfce21cda27e6edd7b4b053491d4536adc618ecbc86d042f9c49d05bfb17f5cc0ad436
+EBUILD libwacom-2.3.0.ebuild 1501 BLAKE2B 5c575736f3559516261d5dde4d4134a1ce07c383dc1c271733a806507e5b7222d0b19f99bf72c5c87f8a15649149e3a8e1a8f905acb4640f398dfe83b9c7fb9d SHA512 ac6ff77254301395a4c3c75b8a74c99cb9a0bdb39c63a61c02a113e957a6e7e67f003ba185421412fa7d5d0a5b7285f312fb9a515764be754ad97ecb8ff3f07f
 MISC metadata.xml 309 BLAKE2B 707d30ff0df4fef9c458c658c8d8ae763cc48ded42b7acba94098236fb56bfa486e8be61974113c6234c1831d08939c0c94d65d17abd2bc7a5e092fdcdef2888 SHA512 49b894496ae441153607ef14034c0df9ce6c9582e788cd55afd414a2f8189f1828da1b056142d258f7edb38e8a6ec023994b1d00734010b65ad7b50c2a108837
diff --git a/dev-libs/libwacom/libwacom-1.12.ebuild b/dev-libs/libwacom/libwacom-1.12.ebuild
index acfda32d8405..ee050d97c7ce 100644
--- a/dev-libs/libwacom/libwacom-1.12.ebuild
+++ b/dev-libs/libwacom/libwacom-1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -56,3 +56,7 @@ src_configure() {
 	)
 	meson_src_configure
 }
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/dev-libs/libwacom/libwacom-1.11.ebuild b/dev-libs/libwacom/libwacom-2.3.0.ebuild
index acfda32d8405..450f5ceeff32 100644
--- a/dev-libs/libwacom/libwacom-1.11.ebuild
+++ b/dev-libs/libwacom/libwacom-2.3.0.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
-inherit meson python-any-r1 toolchain-funcs udev
+PYTHON_COMPAT=( python3_{8..11} )
+inherit meson python-any-r1 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"
+SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
+SLOT="0/9" # libwacom SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
@@ -41,13 +41,18 @@ python_check_deps() {
 }
 
 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_prepare() {
+	default
+
+	# Don't call systemd daemon-reload in the test suite
+	sed -i -e '/daemon-reload/d' test/test_udev_rules.py || die
+}
+
 src_configure() {
 	local emesonargs=(
 		$(meson_feature doc documentation)
@@ -56,3 +61,11 @@ src_configure() {
 	)
 	meson_src_configure
 }
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}