[gentoo-commits] repo/gentoo:master commit in: sys-apps/usbmon/files/, sys-apps/usbmon/

[Andreas Sturmlechner]

commit:     f70399c8261ef60f8b923973bcc5e6990e0d8506
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 18 10:55:18 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 19:02:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f70399c8

sys-apps/usbmon: Drop 6-r1, EAPI5--

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sys-apps/usbmon/Manifest                       |  1 -
 sys-apps/usbmon/files/usbmon-6-sysmacros.patch | 38 --------------------------
 sys-apps/usbmon/usbmon-6-r1.ebuild             | 32 ----------------------
 3 files changed, 71 deletions(-)

diff --git a/sys-apps/usbmon/Manifest b/sys-apps/usbmon/Manifest
index aafbf0ef936..14b75db561e 100644
--- a/sys-apps/usbmon/Manifest
+++ b/sys-apps/usbmon/Manifest
@@ -1,2 +1 @@
 DIST usbmon-6.1.tar.gz 16358 BLAKE2B 94e7793c6ce2ef6a8616f04871efbf22c388c569834c34869d51bbf3138c4c0ce89adaaaba19fc70a2371e244a99c7fe365f360530b9366a339be3cbf291f6cf SHA512 580aa1edd6336ac86e562081a79698a98e6c7aa3dd8605a4c12201dd0e3ab1dc58b3d69f670742e007aeb76fb6ebfff9b5d10114df93814763e0c393b6473b54
-DIST usbmon-6.tar.gz 16796 BLAKE2B 14faca99b44a1d9aa33217f75633251a7932d57732780ba6d871d2dee1b48202071186704959b623f8afc276e9e7da5e4d11204b40f567057cfa731d851cc413 SHA512 4ee41379196b86697a5156d4411860ba31540b98e50165c65f873e22eee1c3caadbc73a2c61903531f968797eca8e7f95490255a0820dc0778fba82c7eb260f5

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 109b4745dc0..00000000000
--- 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@g.o>
-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 887cedcf62d..00000000000
--- 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
-}