gentoo resync : 25.03.2022

4 files changed, 6 insertions, 114 deletions

diff --git a/net-misc/usbip/Manifest b/net-misc/usbip/Manifest
index 4a32518a7046..cfd8cba53b9e 100644
--- a/net-misc/usbip/Manifest
+++ b/net-misc/usbip/Manifest
@@ -1,6 +1,3 @@
-AUX usbip-4.13-fno-common.patch 1027 BLAKE2B 20b8a310ee6952b9a2f9496a58b57362a83c578dfe01c772b344afd7af4c5b469a415d2a7104629a9525499b0e933fd4fe6881620a950060247fb8e9f2dd9c12 SHA512 9d11fcb07f4bef9494cfe52160a2c4b6f7f88e4a9488afd39f77bcbaf5b5d3e07b8aa19fd7387ca37adb7e2637167c71b7389ff4cdd3acf3b4f0071d3271e60a
-DIST linux-4.13.tar.xz 100579888 BLAKE2B 2f8be07d403071b097b019c43fa332bc7d4805dee633a6fdffe5a99d5475015ca9e4881e7f4cbfd36f8c451bacf423436364ea3d9f25b8723a29a178dededb2b SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
 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
+EBUILD usbip-5.15.ebuild 1165 BLAKE2B 566ae0a84f312ec0f45cc0d5b1394e18c52f91394e90bb7847403101b5417b0d725710232662dff6a92fb2921f5a0fec0431766f27e9247793ef5a0c194cae41 SHA512 359762a80a01808b118be0613503af128126fc8f7daeb0d18be8273cbbc2e1da269f02f89de8a456db2ebdd9f33da00f8dcb43063889fd74f39892eeeca7709b
 MISC metadata.xml 267 BLAKE2B 15dbae618f9047d37b671714f3615b968ff63cd013ec0dfe03fefd1b172d68c19f27276151efe8e005b7e59c4eaa017ec6693f2f03ec005894d8c67b1c8e47c2 SHA512 391ca69b1498920f9678a1e8cafbe14090bfdf6666fac4b508f11990f656de77717ce124cf435c2025474cc2034a22bc7df47257b5dec44c55d7bd99108fcf55
diff --git a/net-misc/usbip/files/usbip-4.13-fno-common.patch b/net-misc/usbip/files/usbip-4.13-fno-common.patch
deleted file mode 100644
index b8ffc40c4b9e..000000000000
--- a/net-misc/usbip/files/usbip-4.13-fno-common.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/libsrc/usbip_common.c
-+++ b/libsrc/usbip_common.c
-@@ -14,7 +14,7 @@
- int usbip_use_stderr;
- int usbip_use_debug;
- 
--extern struct udev *udev_context;
-+struct udev *udev_context;
- 
- struct speed_string {
- 	int num;
---- alibsrc/usbip_common.h
-+++ b/libsrc/usbip_common.h
-@@ -53,6 +53,8 @@
- #define ST_NODEV	0x04
- #define ST_ERROR	0x05
- 
-+extern struct udev *udev_context;
-+
- extern int usbip_use_syslog;
- extern int usbip_use_stderr;
- extern int usbip_use_debug ;
---- a/libsrc/usbip_host_common.c
-+++ b/libsrc/usbip_host_common.c
-@@ -23,8 +23,6 @@
- #include "list.h"
- #include "sysfs_utils.h"
- 
--struct udev *udev_context;
--
- static int32_t read_attr_usbip_status(struct usbip_usb_device *udev)
- {
- 	char status_attr_path[SYSFS_PATH_MAX];
---- a/libsrc/vhci_driver.c
-+++ b/libsrc/vhci_driver.c
-@@ -15,7 +15,6 @@
- #define PROGNAME "libusbip"
- 
- struct usbip_vhci_driver *vhci_driver;
--struct udev *udev_context;
- 
- static struct usbip_imported_device *
- imported_device_init(struct usbip_imported_device *idev, char *busid)
-
diff --git a/net-misc/usbip/usbip-4.13-r2.ebuild b/net-misc/usbip/usbip-4.13-r2.ebuild
deleted file mode 100644
index c8099fd53279..000000000000
--- a/net-misc/usbip/usbip-4.13-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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}"
-
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-
-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."
-}
diff --git a/net-misc/usbip/usbip-5.15.ebuild b/net-misc/usbip/usbip-5.15.ebuild
index 3fcee65007b6..136f8e4e290d 100644
--- a/net-misc/usbip/usbip-5.15.ebuild
+++ b/net-misc/usbip/usbip-5.15.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
@@ -10,6 +10,7 @@ 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}"
+S="${WORKDIR}/linux-${PV}/tools/usb/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,10 +23,8 @@ RDEPEND="
 	>=sys-kernel/linux-headers-3.17
 	virtual/libudev
 	tcpd? ( sys-apps/tcp-wrappers )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/linux-${PV}/tools/usb/${PN}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_unpack() {
 	tar xJf "${DISTDIR}"/${A} linux-${PV}/tools/usb/${PN} || die
@@ -41,8 +40,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-static \
-		$(use tcpd || echo --without-tcp-wrappers) \
+		$(usev !tcpd --without-tcp-wrappers) \
 		--with-usbids-dir="${EPREFIX}"/usr/share/hwdata
 }