6 files changed, 144 insertions, 2 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 3c731dc236b6..2511819cab25 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index b7e8f0980601..ac3f30b1f225 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,5 +1,7 @@
 DIST libgusb-0.4.2.tar.xz 48440 BLAKE2B 6241271efe40a8653e417ffcbd9b7ba0463c5a1e289a39fb8aab6b6c70da75973af1bcb8afba0a6c3a1535a7015e7d0f121f22ca1dddcd74d57722af3c95c312 SHA512 c3e8e7a21f1e2f355cda5dddbde7235f9c48d4ff96c2d012e48df5bd7e1216ed41f3cc81f4a215ceead8b6e8cf0d04a85916043adfd074e543c041dbe63acd48
 DIST libgusb-0.4.3.tar.xz 48536 BLAKE2B 64ebe5f30cf7f0c43c12c8208559a698faa6df6e6cd7039a81c117d21ce8c5d0c2fec3a78565634eb348316fddabc6ff488a60b2d6bfaaf613510c76c3e28644 SHA512 d76c41af4962ec6af2dd22f41c0fabe46de64805a32fe7ad56b037725a26f217c8fa8705dd1d8e9008237ce0bb739c4e95f1b652fdb38b66ac6ed23840dfccc5
+DIST libgusb-0.4.4.tar.xz 49096 BLAKE2B 9ea68cd4fc415893cdf1bf34720d99a6eeb67b23403c4de64284b6c9072c68d6431cca842f3be4c5a6997ce3aa8a14f581cdb4d6768e6035d2337326bdd6f44c SHA512 1150315741f99d7ba96cba9eb341709ba1cbd84e59e95dce4d398b795e46b083151262b7ba80d102b7b201aac745a975d6f2549a981339df5e18cf9e0831e1fa
 EBUILD libgusb-0.4.2.ebuild 1743 BLAKE2B 584fcccaccfe7e1be80ab377f5c7ae077f72d80392aa930177e0fc01e9f844a7a98bce435e1d95733ea207a1d83941bc1c0f01ead84b3f9036d883d739fbb475 SHA512 58a59f8841a73c3021d68c2b2239cdba5e13a7800f0c18931e3194d536bef963ffbde6285b432b03479a425815031dbc731e378fb4269f6449d76a662446c35f
 EBUILD libgusb-0.4.3.ebuild 1758 BLAKE2B 863ee7b581567afb1ba0d746b6c4664dec4d39c3e238bf65599d81848d92dc2abb20561428dd32e85d3491368cbbe3f093120da05cddc3df95b270a72c87c168 SHA512 87ef4b62956d0022a62b84b5cc9785413033c28dc308bcb8a6f07595579bcc456487b090c8c7b5b2d690f744f802270e41cdff25fcee1dcf1c0d81bfd75ce1d4
+EBUILD libgusb-0.4.4.ebuild 1758 BLAKE2B 863ee7b581567afb1ba0d746b6c4664dec4d39c3e238bf65599d81848d92dc2abb20561428dd32e85d3491368cbbe3f093120da05cddc3df95b270a72c87c168 SHA512 87ef4b62956d0022a62b84b5cc9785413033c28dc308bcb8a6f07595579bcc456487b090c8c7b5b2d690f744f802270e41cdff25fcee1dcf1c0d81bfd75ce1d4
 MISC metadata.xml 344 BLAKE2B bd362d7e89ba2d88c2f220ab47593b4ae25bc4ca486bdafda16448407213d7558d7ea807c489e5aafbb8ec83a40e8e339c8ba20d3bfc3957da33a7e7711c6898 SHA512 93166c6dd4d764901c87fc567ab1c67add1c654b7ea1f3326e7144d5c14789bdee2a1e37874f8b6158136e03363372bf1d972f49f96095b0e3e568af89c4af34
diff --git a/dev-libs/libgusb/libgusb-0.4.4.ebuild b/dev-libs/libgusb/libgusb-0.4.4.ebuild
new file mode 100644
index 000000000000..79fdfd6e4237
--- /dev/null
+++ b/dev-libs/libgusb/libgusb-0.4.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit meson-multilib python-any-r1 vala
+
+DESCRIPTION="GObject wrapper for libusb"
+HOMEPAGE="https://github.com/hughsie/libgusb"
+SRC_URI="https://github.com/hughsie/libgusb/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="gtk-doc +introspection test +vala"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
+	virtual/libusb:1[udev,${MULTILIB_USEDEP}]
+	>=dev-libs/json-glib-1.1.1[${MULTILIB_USEDEP},introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	sys-apps/hwdata
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/umockdev-0.17.7[${MULTILIB_USEDEP}] )"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+	gtk-doc? ( dev-util/gi-docgen )
+	vala? ( $(vala_depend) )
+	virtual/pkgconfig
+"
+
+python_check_deps() {
+	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_library=shared
+		$(meson_use test tests)
+		$(meson_native_use_bool vala vapi)
+		-Dusb_ids="${EPREFIX}"/usr/share/hwdata/usb.ids
+		$(meson_native_use_bool gtk-doc docs)
+		$(meson_native_use_bool introspection)
+		$(meson_feature test umockdev)
+
+	)
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/ || die
+		mv "${ED}"/usr/share/{doc,gtk-doc}/libgusb || die
+	fi
+}
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index 81a54e826a9f..f6b9e4ba8dea 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,5 +1,7 @@
 DIST libwacom-2.4.0.tar.xz 108812 BLAKE2B 18f41cd052b18c652c61062948355b4738afe57db344749055492cc6853bcbe3048c582a72318891727ec0fb01a7799f4c80c544b37b51c9246f98e5ae3fef1b SHA512 c67b8a81e9f4285a4e6f422b29e9b8b3677e3fc45e5190fd2b95ad361e5ef35e124b7d78bcf2bb9d7b7183525a6be9916b3038714c42c9ef405a1075750465f3
 DIST libwacom-2.5.0.tar.xz 109284 BLAKE2B cb9443aba276694eb64c6073488746ff4aff75ed77f334425d2f391a591f0a6cf222ef2124b6533ca7f2ca8e5eef36cd335026a87afabc12d912918ac1f930ed SHA512 62d181a5f4ce1335cd72623b7e82d5d44b9a11c08ec2ef4a98fd815fe2e1f814f42c909c2977e1b1ce803f04bac43414577830ff3724643fcecaf37113d098cf
+DIST libwacom-2.6.0.tar.xz 110288 BLAKE2B 321bacccab84f287141257b4c7af12822fca976c335027d399765fdbbb2c59eabcc76f40d4fd83c7cf1cdc88e2c57ccd317b1922ea3dddb98cf2a0847e920ff1 SHA512 aacf234e77bd976de2e2a687294c5ab704dca5a70df01fa2485441029e4faa34bec2824c455642115ae79f5cbbac41d064569e4eb2788655c324b37149009d26
 EBUILD libwacom-2.4.0.ebuild 1507 BLAKE2B f470234baaf9cc8fc33f07881b172745c7fe475c41c15f272df89ffad41b095adfc706caadbe7e6d2ee0e8452100e5fbd28cb45544b56916b4439e67267858a8 SHA512 f4cfc95491539e33b89675f6e5c3dc135e7c4269321d140c69e9856c68e27bec99eba91844e0dcc7eff39b70b4b739daa1109b3041aee5493eb569a1d91de7e3
 EBUILD libwacom-2.5.0.ebuild 1507 BLAKE2B f470234baaf9cc8fc33f07881b172745c7fe475c41c15f272df89ffad41b095adfc706caadbe7e6d2ee0e8452100e5fbd28cb45544b56916b4439e67267858a8 SHA512 f4cfc95491539e33b89675f6e5c3dc135e7c4269321d140c69e9856c68e27bec99eba91844e0dcc7eff39b70b4b739daa1109b3041aee5493eb569a1d91de7e3
-MISC metadata.xml 309 BLAKE2B 707d30ff0df4fef9c458c658c8d8ae763cc48ded42b7acba94098236fb56bfa486e8be61974113c6234c1831d08939c0c94d65d17abd2bc7a5e092fdcdef2888 SHA512 49b894496ae441153607ef14034c0df9ce6c9582e788cd55afd414a2f8189f1828da1b056142d258f7edb38e8a6ec023994b1d00734010b65ad7b50c2a108837
+EBUILD libwacom-2.6.0.ebuild 1469 BLAKE2B 7d417e53561b365dda360decc4bbf6d2ead6efd6168933638257130462ebea63c7e041a180f0b8844408d78ac453aad153e256c1bd307302e9d2108f6f3b471e SHA512 46ab496b2ff93c476c17cfa5d019e5bca34f2515c6d14a0e97472492bc99d60ec0edacdeff068bd18a5ad006a2244c01c08abbd49acb78be346323a56f919af8
+MISC metadata.xml 313 BLAKE2B bee5263fa9309d84996574f86a17a4292e58a7eefc65159ecd0df578ccab24e39f4c050deaaabbcd33e5a86292af6c57c5b2c9eb2c9b6e3caeab86e5633cf3c7 SHA512 b1575775a9f633ffe2124bd5ebef65ab864ae697ed733f50e3028484d2d60ea827e5ac12305d57beedcdbe58d8699bbc7e67cb0c844041c7a56045cb91eae633
diff --git a/dev-libs/libwacom/libwacom-2.6.0.ebuild b/dev-libs/libwacom/libwacom-2.6.0.ebuild
new file mode 100644
index 000000000000..87bd2af102ef
--- /dev/null
+++ b/dev-libs/libwacom/libwacom-2.6.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..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.xz"
+
+LICENSE="MIT"
+SLOT="0/9" # libwacom SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libgudev:=
+"
+DEPEND="${RDEPEND}"
+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}]
+		')
+	)
+"
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/pyudev[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+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)
+		$(meson_feature test tests)
+		-Dudev-dir=$(get_udevdir)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/dev-libs/libwacom/metadata.xml b/dev-libs/libwacom/metadata.xml
index cef68d2eba57..7b987913f902 100644
--- a/dev-libs/libwacom/metadata.xml
+++ b/dev-libs/libwacom/metadata.xml
@@ -5,6 +5,6 @@
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">linuxwacom</remote-id>
+		<remote-id type="github">linuxwacom/libwacom</remote-id>
 	</upstream>
 </pkgmetadata>