Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/sg3_utils/, sys-apps/sg3_utils/files/
Date: Fri, 14 May 2021 10:04:28
Message-Id: 1620986622.013b0c0ae1596a428482f13533a0ce502af4d51d.soap@gentoo
1 commit: 013b0c0ae1596a428482f13533a0ce502af4d51d
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 14 10:03:42 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Fri May 14 10:03:42 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=013b0c0a
7
8 sys-apps/sg3_utils: Remove old 1.42, 1.45-r2
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 sys-apps/sg3_utils/Manifest | 2 -
14 .../sg3_utils/files/sg3_utils-1.42-sysmacros.patch | 31 ---------------
15 sys-apps/sg3_utils/sg3_utils-1.42.ebuild | 44 ----------------------
16 sys-apps/sg3_utils/sg3_utils-1.45-r2.ebuild | 43 ---------------------
17 4 files changed, 120 deletions(-)
18
19 diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
20 index 1e300284516..cfa0aafc384 100644
21 --- a/sys-apps/sg3_utils/Manifest
22 +++ b/sys-apps/sg3_utils/Manifest
23 @@ -1,3 +1 @@
24 -DIST sg3_utils-1.42.tgz 1219231 BLAKE2B dd9ea2c324cb6f4c0ce770c90b7980da5e998bddc3a2be43a0aa9bea88dfe34291d0f58b393b2a5ac680c05dc673802ec9fae1ead37107bc49fa33bc7c4df503 SHA512 d16b65e36b2bccb4fc4c189f97e71fa38e6619f37d668a4ddd74a52c715fa62325288d9737812ed19c80547059dbd27be5a20565e27e1aabb571e8f5f8ac53ad
25 -DIST sg3_utils-1.45.tar.xz 989864 BLAKE2B 2d0a9e0edf514c8c7a566798f8087fc27d15d31cc8df39073dd97cff569da396b24236e0c231781625379b2ecefe7c99716d5d9c7dc104b15e150cb4e3c43e75 SHA512 fa25dedc447154d33937248a856af9a7ef380dda282a681d465a57d7dfc24b6c0409fa06aabf8cc28ba191e91db80fed0757b45212eddf713855574b48a97868
26 DIST sg3_utils-1.46.tar.xz 1031800 BLAKE2B 034af23d10da49938979ea4d0041c6ce4309b9ceac13f06bd524011dccf285e88fbc5f4c3f261ec3e316db86278ccff235015de43d98b0b62ff05a2f98df0850 SHA512 0b4caab97ccc11fb45e88219e460b37c6ff69b8f3c79e513279aef51783ff22399d141253abdbf55db198db0815bc39d30e9b1e3bd7dda5e15c5f4dae3fe89cf
27
28 diff --git a/sys-apps/sg3_utils/files/sg3_utils-1.42-sysmacros.patch b/sys-apps/sg3_utils/files/sg3_utils-1.42-sysmacros.patch
29 deleted file mode 100644
30 index e8440fb8c32..00000000000
31 --- a/sys-apps/sg3_utils/files/sg3_utils-1.42-sysmacros.patch
32 +++ /dev/null
33 @@ -1,31 +0,0 @@
34 -From 13ff34d408cf69339ce1f28756f5c7b5ad5f528b Mon Sep 17 00:00:00 2001
35 -From: Mike Frysinger <vapier@g.o>
36 -Date: Mon, 18 Apr 2016 18:36:09 -0400
37 -Subject: [PATCH] include sys/sysmacros.h for major/minor funcs
38 -
39 -These functions are not part of any official spec, and glibc has always
40 -kept them in sys/sysmacros.h. As glibc moves to conform to POSIX, and
41 -more alternative C libraries come up, we need to include this header
42 -explicitly to get the prototypes. Otherwise we fail to build like:
43 -
44 -sg_map26.o: In function 'nd_match_scandir_select':
45 -sg_map26.c:(.text+0x37b): undefined reference to 'major'
46 ----
47 - include/sg_lib.h | 1 +
48 - 1 file changed, 1 insertion(+)
49 -
50 -diff --git a/include/sg_lib.h b/include/sg_lib.h
51 -index b3e741b..a0e483c 100644
52 ---- a/include/sg_lib.h
53 -+++ b/include/sg_lib.h
54 -@@ -32,6 +32,7 @@
55 -
56 - #include <stdio.h>
57 - #include <stdint.h>
58 -+#include <sys/sysmacros.h>
59 -
60 - #ifdef __cplusplus
61 - extern "C" {
62 ---
63 -2.7.4
64 -
65
66 diff --git a/sys-apps/sg3_utils/sg3_utils-1.42.ebuild b/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
67 deleted file mode 100644
68 index 7509872c7d2..00000000000
69 --- a/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
70 +++ /dev/null
71 @@ -1,44 +0,0 @@
72 -# Copyright 1999-2021 Gentoo Authors
73 -# Distributed under the terms of the GNU General Public License v2
74 -
75 -EAPI=5
76 -
77 -inherit epatch multilib ltprune
78 -
79 -DESCRIPTION="Apps for querying the sg SCSI interface"
80 -HOMEPAGE="http://sg.danny.cz/sg/"
81 -SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
82 -
83 -LICENSE="GPL-2"
84 -SLOT="0"
85 -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
86 -IUSE="static-libs"
87 -
88 -DEPEND="sys-devel/libtool"
89 -RDEPEND=""
90 -PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
91 -
92 -src_prepare() {
93 - epatch "${FILESDIR}"/${PN}-1.26-stdint.patch #580236
94 - epatch "${FILESDIR}"/${PN}-1.42-sysmacros.patch #580236
95 -}
96 -
97 -src_configure() {
98 - econf $(use_enable static-libs static)
99 -}
100 -
101 -src_install() {
102 - default
103 - dodoc COVERAGE doc/README examples/*.txt
104 - newdoc scripts/README README.scripts
105 -
106 - # Better fix for bug 231089; some packages look for sgutils2
107 - local path lib
108 - path="/usr/$(get_libdir)"
109 - for lib in "${ED}"${path}/libsgutils2.*; do
110 - lib=${lib##*/}
111 - dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
112 - done
113 -
114 - prune_libtool_files
115 -}
116
117 diff --git a/sys-apps/sg3_utils/sg3_utils-1.45-r2.ebuild b/sys-apps/sg3_utils/sg3_utils-1.45-r2.ebuild
118 deleted file mode 100644
119 index 9a35e645d32..00000000000
120 --- a/sys-apps/sg3_utils/sg3_utils-1.45-r2.ebuild
121 +++ /dev/null
122 @@ -1,43 +0,0 @@
123 -# Copyright 1999-2021 Gentoo Authors
124 -# Distributed under the terms of the GNU General Public License v2
125 -
126 -EAPI=7
127 -
128 -inherit multilib
129 -
130 -DESCRIPTION="Apps for querying the sg SCSI interface"
131 -HOMEPAGE="http://sg.danny.cz/sg/"
132 -#SRC_URI="https://github.com/hreinecke/sg3_utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
133 -SRC_URI="http://sg.danny.cz/sg/p/${P}.tar.xz"
134 -
135 -LICENSE="GPL-2"
136 -SLOT="0/${PV}"
137 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
138 -IUSE="static-libs"
139 -
140 -DEPEND="sys-devel/libtool"
141 -RDEPEND="!sys-apps/rescan-scsi-bus"
142 -
143 -PATCHES=(
144 - "${FILESDIR}"/${PN}-1.26-stdint.patch #580236
145 -)
146 -
147 -src_configure() {
148 - econf $(use_enable static-libs static)
149 -}
150 -
151 -src_install() {
152 - default
153 - dodoc COVERAGE doc/README examples/*.txt
154 - newdoc scripts/README README.scripts
155 -
156 - find "${ED}" -type f -name "*.la" -delete || die
157 -
158 - # Better fix for bug 231089; some packages look for sgutils2
159 - local path lib
160 - path="/usr/$(get_libdir)"
161 - for lib in "${ED}/"${path}/libsgutils2{,-${PV}}.*; do
162 - lib=${lib##*/}
163 - dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
164 - done
165 -}