gentoo resync : 05.12.2021

3 files changed, 63 insertions, 4 deletions

diff --git a/net-misc/usbip/Manifest b/net-misc/usbip/Manifest
index 65524633eb8b..4a32518a7046 100644
--- a/net-misc/usbip/Manifest
+++ b/net-misc/usbip/Manifest
@@ -1,4 +1,6 @@
 AUX usbip-4.13-fno-common.patch 1027 BLAKE2B 20b8a310ee6952b9a2f9496a58b57362a83c578dfe01c772b344afd7af4c5b469a415d2a7104629a9525499b0e933fd4fe6881620a950060247fb8e9f2dd9c12 SHA512 9d11fcb07f4bef9494cfe52160a2c4b6f7f88e4a9488afd39f77bcbaf5b5d3e07b8aa19fd7387ca37adb7e2637167c71b7389ff4cdd3acf3b4f0071d3271e60a
 DIST linux-4.13.tar.xz 100579888 BLAKE2B 2f8be07d403071b097b019c43fa332bc7d4805dee633a6fdffe5a99d5475015ca9e4881e7f4cbfd36f8c451bacf423436364ea3d9f25b8723a29a178dededb2b SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
-EBUILD usbip-4.13-r1.ebuild 1230 BLAKE2B af3b55afea8eefbc2c34b6a9231f2a885d8ef61d30907aa8c0d31505cf3dd5ec7570d784ba5600fb9da7f046ee81c73046eb4ca20a0044d2674c3531439f507e SHA512 223fe1747dcc0708f6875ec91b0202818ebe6fd414dfc2c859273e5ca1cf9ff3493c2de982ddf5394914deb5cc59728fd043e818d3633a9b2c6c178de5144554
+DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
+EBUILD usbip-4.13-r2.ebuild 1233 BLAKE2B 4e402e426fa3fce43b1b8652a4279e375b9390d440467d8bf9481f661c4f7f65c844554026dd3b8adc7f94a4e90c6f654918aeb7c7debcf6dc6b404fae460ab3 SHA512 6334010ad46cfb01d1a9e8d6593e7159cbafd7407ec935ab4208045252c10afd27bfd4ef81f73bb929d28ee1bcf2158d9d89702c013da53e98c4698455e22064
+EBUILD usbip-5.15.ebuild 1184 BLAKE2B a108b217e6c5d23301d686bf1c375b23160724794c9f4b9d01b844a013a4a8584cc638b917df79bd4a3f0b412ea8bf553e2e0d18f049dfbf2350191a9d9c4922 SHA512 5a19890873c75f8bbb632746ab507ba56658c8de2e9e0389c8cbe1b4cdf67dd26503d86a96bf9bb795b1439c0f10dd6b1935057b9fc63a413cb74342da44aa72
 MISC metadata.xml 267 BLAKE2B 15dbae618f9047d37b671714f3615b968ff63cd013ec0dfe03fefd1b172d68c19f27276151efe8e005b7e59c4eaa017ec6693f2f03ec005894d8c67b1c8e47c2 SHA512 391ca69b1498920f9678a1e8cafbe14090bfdf6666fac4b508f11990f656de77717ce124cf435c2025474cc2034a22bc7df47257b5dec44c55d7bd99108fcf55
diff --git a/net-misc/usbip/usbip-4.13-r1.ebuild b/net-misc/usbip/usbip-4.13-r2.ebuild
index 453bd87fa8fd..c8099fd53279 100644
--- a/net-misc/usbip/usbip-4.13-r1.ebuild
+++ b/net-misc/usbip/usbip-4.13-r2.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=6
@@ -18,7 +18,7 @@ IUSE="tcpd"
 
 RDEPEND="
 	>=dev-libs/glib-2.6
-	sys-apps/hwids
+	sys-apps/hwdata
 	>=sys-kernel/linux-headers-3.17
 	virtual/libudev
 	tcpd? ( sys-apps/tcp-wrappers )"
@@ -45,7 +45,7 @@ src_configure() {
 	econf \
 		--disable-static \
 		$(use tcpd || echo --without-tcp-wrappers) \
-		--with-usbids-dir="${EPREFIX}"/usr/share/misc
+		--with-usbids-dir="${EPREFIX}"/usr/share/hwdata
 }
 
 src_install() {
diff --git a/net-misc/usbip/usbip-5.15.ebuild b/net-misc/usbip/usbip-5.15.ebuild
new file mode 100644
index 000000000000..3fcee65007b6
--- /dev/null
+++ b/net-misc/usbip/usbip-5.15.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ETYPE="sources"
+K_NOUSENAME=1
+inherit autotools kernel-2
+
+DESCRIPTION="Userspace utilities for a general USB device sharing system over IP networks"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI="${KERNEL_URI}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tcpd"
+
+RDEPEND="
+	>=dev-libs/glib-2.6
+	sys-apps/hwdata
+	>=sys-kernel/linux-headers-3.17
+	virtual/libudev
+	tcpd? ( sys-apps/tcp-wrappers )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/linux-${PV}/tools/usb/${PN}"
+
+src_unpack() {
+	tar xJf "${DISTDIR}"/${A} linux-${PV}/tools/usb/${PN} || die
+}
+
+src_prepare() {
+	default
+	# remove -Werror from build, bug #545398
+	sed -i 's/-Werror[^ ]* //g' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use tcpd || echo --without-tcp-wrappers) \
+		--with-usbids-dir="${EPREFIX}"/usr/share/hwdata
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "For using USB/IP you need to enable USBIP_VHCI_HCD in the client"
+	elog "machine's kernel config and USBIP_HOST on the server."
+}