gentoo resync : 22.10.2018

4 files changed, 2 insertions, 60 deletions

diff --git a/sys-fs/lsscsi/Manifest b/sys-fs/lsscsi/Manifest
index 0751a0bb7e42..e25afda0cc04 100644
--- a/sys-fs/lsscsi/Manifest
+++ b/sys-fs/lsscsi/Manifest
@@ -1,8 +1,5 @@
-AUX lsscsi-0.28-sysmacros.patch 1232 BLAKE2B 655fd3daf9da57c30b2e65632e863e9ec7794421ab86c21bd5895bd2b25edb0fc8e5635dffe7b3661c6556e061c92179ec60574948024c505bdb6393c0f272fc SHA512 d597b32f42a9616476cd54ceb7480cd34850289dd3c0fff8d0d54aad22a6fbc473613f18ab011819de7eeefb4232ad0152630a6da03cc02057b3d9eec763ac62
-DIST lsscsi-0.28.tgz 150259 BLAKE2B e8376f306c61ebcbef055ba603bf42ece4dab13bd7755a1a90df64d9d70997943e73388c5a56b182d2fa3aed7aad8afeeab9ff89dd1ae9d0178f740de701503d SHA512 6d5cf8ebc42af0d8dbe8f2a1e90f4c429d058f184027318686fd22bc117e66c0b1847e4c97964d3d0e1b7bf4a5f1e296e1e3575ed2f5ff999eef70bdfb9ea4d4
 DIST lsscsi-0.29.tgz 353116 BLAKE2B 6374410cadf7fb091f6dcc99bf9435b0af56bc603bbecdeadb76407efc5b2f6106a0fc65f9705d6dfe4cdbbd66494b8a966caffb08bb350d2e6128ee881546d9 SHA512 2c595cfc738815c9231ac078e47215ac46c1283bc8ad784a898eaef6d64f41311a9a08c96ea0dc9379bd79fe6c6ff4d2af176cea5aecaca74a0fa255746d84ad
 DIST lsscsi-0.30.tgz 190598 BLAKE2B e22000c4c03fe31f40e6e95dbb6875fdf9266cb103108dc93748d2b245f2dc7edd93da7d3bf3b176187a2d8cace78ce1f7ce8f42da1454c05d8fd308e02db3b3 SHA512 ea1ba2bd2892b7e7feff0bf08ea09ffcdc38d21e4dba2cdce598d8ffde926a5908f2d02116d692bf4747b76c76c1c35974569583cb2da75eb49553959368dc76
-EBUILD lsscsi-0.28.ebuild 424 BLAKE2B aa2f6df0b61816d547c8670bb06cd65f8f16402c3ff1c3164b905eef22565097f43383127dcf7820576527d8598bdef51687add0faf88d526666c0abd78845dd SHA512 4efed74f282adc66f35b6c2308ffea8a4d96a815a15406622eb52cf2077e3fcb9480f98b2882bc3e57127d7543ea4d36da122348dd5952f5231a9a072e1adf4f
-EBUILD lsscsi-0.29.ebuild 340 BLAKE2B 7ec2757d4b6f46bc4b80dc1de287ef6235e1c876d8c738d22fd70c9f875af3dc0fc8242875e213096b5fa1632c548734b0350259de6335c7ba5aba25903d9f47 SHA512 1dd0ebe8a4d85a1dcf1f8d85095723077f34b5bf5285cb4e24094dcd175c4be261f1338d8479dab62f7b3d2c779770ea75fd9630d92e14c44980d4b0fa568b9d
+EBUILD lsscsi-0.29.ebuild 336 BLAKE2B ba2f977431250c9ddc5ebffa2678fb336a3468d46058b76e1cdf1b0d013b6989fd29caee177896406dd86bf7822f83b1851f7d80419fc33536747fe7e00e84d9 SHA512 6bb1bb5649eb8544b3f4617f6da90ffb0cccc42174ee924e1d2154bbba9fb933e8f1e819cb75b1f8a18c776cf2927889a9bb262821edaaaaea3d9622ec7a9433
 EBUILD lsscsi-0.30.ebuild 377 BLAKE2B aac0c30fcbd3b83940dab241e9bae9b62a8e31c36bbb293aa09997ed2a7d4483e1c73e89519c79ef2b546be0726ec24b8a29a9a8b5ad50028031cd5ddc55d4ef SHA512 d437e2da55502b0dbfc524c66409a3a90c255df0b92a27fb63d49059d1b5b9e9deec473e5abd0646be8e468f9ef2183e9b9cc10494c9e8ce08dfc810b25408df
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/lsscsi/files/lsscsi-0.28-sysmacros.patch b/sys-fs/lsscsi/files/lsscsi-0.28-sysmacros.patch
deleted file mode 100644
index 099256fdcdca..000000000000
--- a/sys-fs/lsscsi/files/lsscsi-0.28-sysmacros.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/580494
-
-From 5f1d6f46c8c1ac134841cfcce22dc7639598e032 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 19 Apr 2016 03:07:23 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor
-
-These funcs are defined in sys/sysmacros.h, so include it to avoid:
-lsscsi.c: In function 'collect_dev_nodes':
-lsscsi.c:961:32: warning: implicit declaration of function 'major' [-Wimplicit-function-declaration]
-                 cur_ent->maj = major(stats.st_rdev);
-                                ^
-lsscsi.c:962:32: warning: implicit declaration of function 'minor' [-Wimplicit-function-declaration]
-                 cur_ent->min = minor(stats.st_rdev);
-                                ^
-lsscsi.o: In function 'get_dev_node':
-lsscsi.c:(.text+0x10f0): undefined reference to 'major'
-lsscsi.c:(.text+0x1117): undefined reference to 'minor'
----
- src/lsscsi.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lsscsi.c b/src/lsscsi.c
-index e494169..61cfebd 100644
---- a/src/lsscsi.c
-+++ b/src/lsscsi.c
-@@ -23,6 +23,7 @@
- #include <unistd.h>
- #include <getopt.h>
- #include <fcntl.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <dirent.h>
--- 
-2.7.4
-
diff --git a/sys-fs/lsscsi/lsscsi-0.28.ebuild b/sys-fs/lsscsi/lsscsi-0.28.ebuild
deleted file mode 100644
index e45263a560f3..000000000000
--- a/sys-fs/lsscsi/lsscsi-0.28.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="SCSI sysfs query tool"
-HOMEPAGE="http://sg.danny.cz/scsi/lsscsi.html"
-SRC_URI="http://sg.danny.cz/scsi/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sysmacros.patch #580494
-}
diff --git a/sys-fs/lsscsi/lsscsi-0.29.ebuild b/sys-fs/lsscsi/lsscsi-0.29.ebuild
index f327ebdf96e8..67ee21242156 100644
--- a/sys-fs/lsscsi/lsscsi-0.29.ebuild
+++ b/sys-fs/lsscsi/lsscsi-0.29.ebuild
@@ -9,4 +9,4 @@ SRC_URI="http://sg.danny.cz/scsi/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"