gentoo resync : 04.05.2021

3 files changed, 0 insertions, 73 deletions

diff --git a/sys-apps/usbmon/Manifest b/sys-apps/usbmon/Manifest
index bfe232bdc8db..844009589691 100644
--- a/sys-apps/usbmon/Manifest
+++ b/sys-apps/usbmon/Manifest
@@ -1,6 +1,3 @@
-AUX usbmon-6-sysmacros.patch 1103 BLAKE2B e4ea9107680a108dcc15e9b53eff87dc3905b4f799335ec560d4905ecb3c848d3b8a5aab361f6602c4545d5549303d14423d75402ac4bb959737e8f7c44c7aa3 SHA512 e3a1b55effd247ac8911c07220c187bc099db011269608d09a8b6698670b5e3d1c34a8cd60acdbfd69ae3bae24ab4cdcb69927b4c9b8c573bfc7045c5e3d1a0f
 DIST usbmon-6.1.tar.gz 16358 BLAKE2B 94e7793c6ce2ef6a8616f04871efbf22c388c569834c34869d51bbf3138c4c0ce89adaaaba19fc70a2371e244a99c7fe365f360530b9366a339be3cbf291f6cf SHA512 580aa1edd6336ac86e562081a79698a98e6c7aa3dd8605a4c12201dd0e3ab1dc58b3d69f670742e007aeb76fb6ebfff9b5d10114df93814763e0c393b6473b54
-DIST usbmon-6.tar.gz 16796 BLAKE2B 14faca99b44a1d9aa33217f75633251a7932d57732780ba6d871d2dee1b48202071186704959b623f8afc276e9e7da5e4d11204b40f567057cfa731d851cc413 SHA512 4ee41379196b86697a5156d4411860ba31540b98e50165c65f873e22eee1c3caadbc73a2c61903531f968797eca8e7f95490255a0820dc0778fba82c7eb260f5
-EBUILD usbmon-6-r1.ebuild 656 BLAKE2B f9a7f8de8e36f160fc452f682d6b270427a75bf4109ea3af1741824d1c9930fd36eadb9d42c64b4e8213efb44e30af17208228e93434200a2f861d6636bf77eb SHA512 a00661e774332a263d0ace466b90551f7fb430815e7e16776bd5ebdf8315e7f1556fec798cf11f4bc15884f9ac21577c6690acd7f8a4c0c04e14b5a9fa847734
 EBUILD usbmon-6.1.ebuild 528 BLAKE2B 5adde7cbaa47e3f02dfb819778952c2259983900128a60266a372b0d47d566e274a7acce8696526e63cb692776aa2cfbacc04875ed5c4cc5da979da84a882391 SHA512 4cb63c0d3d76ae4aa892993c4044086daa54e740af0f4e8b27830128b013bed4bd3bb53f771caa891c4c2df2c8ad7473ca363acaaa6352379d94b6fe508af4af
 MISC metadata.xml 222 BLAKE2B 5000e095f9389a9ea81b6ae970f1f1587ce12f13fb4ce95ca82be803b45d9553af4c13f5ceb47eaefc780dd6be374c8b905d12aa84179ad7b58aea44c5bf1927 SHA512 05134582b0d0287f20fd3702d042ca556dc42f3ca4568bfa73f6d9886ed8027057936af758ffbb252a5677e1af876c46e8d044f5fc691148922c5fa0c5cddc03
diff --git a/sys-apps/usbmon/files/usbmon-6-sysmacros.patch b/sys-apps/usbmon/files/usbmon-6-sysmacros.patch
deleted file mode 100644
index 109b4745dc0a..000000000000
--- a/sys-apps/usbmon/files/usbmon-6-sysmacros.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://bugs.gentoo.org/580360
-
-From 449f591d0220e57face02898a9ae2617baace814 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 18 Apr 2016 18:24:49 -0400
-Subject: [PATCH] usbmon: include sys/sysmacros.h for makedev func
-
-Since glibc has always placed these funcs in sys/sysmacros.h, and other
-C libs require this, include it directly.  Otherwise we fail to build:
-usbmon.c: In function 'make_device':
-usbmon.c:966:8: warning: implicit declaration of function 'makedev' [-Wimplicit-function-declaration]
-  dev = makedev(major, p->ifnum);
-        ^
-usbmon.c:966:2: warning: nested extern declaration of 'makedev' [-Wnested-externs]
-  dev = makedev(major, p->ifnum);
-  ^
-...
-usbmon.o: In function 'make_device':
-usbmon.c:966: undefined reference to 'makedev'
----
- usbmon.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/usbmon.c b/usbmon.c
-index 37929f2..8d2acfc 100644
---- a/usbmon.c
-+++ b/usbmon.c
-@@ -32,6 +32,7 @@
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
-+#include <sys/sysmacros.h>
- #include <inttypes.h>
- #include <stdarg.h>
- 
--- 
-2.7.4
-
diff --git a/sys-apps/usbmon/usbmon-6-r1.ebuild b/sys-apps/usbmon/usbmon-6-r1.ebuild
deleted file mode 100644
index 887cedcf62d5..000000000000
--- a/sys-apps/usbmon/usbmon-6-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs epatch
-
-DESCRIPTION="Userland for USB monitoring framework"
-HOMEPAGE="https://people.redhat.com/zaitcev/linux/"
-SRC_URI="https://people.redhat.com/zaitcev/linux/${P}.tar.gz"
-
-LICENSE="GPL-2" # GPL-2 only
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="!=sys-apps/usbutils-0.72-r2"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sysmacros.patch #580360
-	sed \
-		-e '/CFLAGS =/s, = , \+= ,g' \
-		-e 's:-O2::g' \
-		-i "${S}"/Makefile || die
-	tc-export CC
-}
-
-src_install() {
-	dosbin ${PN}
-	doman ${PN}.8
-	dodoc README
-}