1 |
commit: fcbbb5080644ef5ae77e5ba57c495a6d95beb461 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 2 15:21:05 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 2 16:14:50 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcbbb508 |
7 |
|
8 |
sys-apps/arrayprobe: Port to EAPI 6 |
9 |
|
10 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
11 |
|
12 |
sys-apps/arrayprobe/Manifest | 2 +- |
13 |
sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild | 14 +++++++---- |
14 |
sys-apps/arrayprobe/files/2.0-ida_headers.patch | 30 +++++++++-------------- |
15 |
sys-apps/arrayprobe/files/2.0-malloc-strlen.patch | 4 +-- |
16 |
4 files changed, 24 insertions(+), 26 deletions(-) |
17 |
|
18 |
diff --git a/sys-apps/arrayprobe/Manifest b/sys-apps/arrayprobe/Manifest |
19 |
index f5eec1d0563..b514c97f48f 100644 |
20 |
--- a/sys-apps/arrayprobe/Manifest |
21 |
+++ b/sys-apps/arrayprobe/Manifest |
22 |
@@ -1 +1 @@ |
23 |
-DIST arrayprobe-2.0.tar.gz 83831 SHA256 ccb560b5c7e8b378d110cad6e9245884e7e673acfa3c4016ef33acd699f1f4d0 SHA512 4664e20604697edf2f848447419b26ff860dd302b3d3e5aa0f3977855c590b5acbe23c39b684a2ecb1603c86cf7762e86bfc7125421ccad7f322e387c4178870 WHIRLPOOL 56eec2322f806f25e411614e12e9c584208202203f6d070846c73d04c0b379103ad2c45d3a6638a8cf6d66ea51173fbf0dcd91af3b01702a39848bb8a503cd34 |
24 |
+DIST arrayprobe-2.0.tar.gz 83831 BLAKE2B 6a9b76260c91b271068be914161bd99c4ce2285c58ce98c689f6bef32200701430bb65306e74a1d9277d7a4d9e4aa0adf4af60af0c4264020ae07a73f49a51de SHA512 4664e20604697edf2f848447419b26ff860dd302b3d3e5aa0f3977855c590b5acbe23c39b684a2ecb1603c86cf7762e86bfc7125421ccad7f322e387c4178870 |
25 |
|
26 |
diff --git a/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild b/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild |
27 |
index 98fae16e768..5f961969810 100644 |
28 |
--- a/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild |
29 |
+++ b/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild |
30 |
@@ -1,9 +1,9 @@ |
31 |
-# Copyright 1999-2014 Gentoo Foundation |
32 |
+# Copyright 1999-2017 Gentoo Foundation |
33 |
# Distributed under the terms of the GNU General Public License v2 |
34 |
|
35 |
-EAPI="4" |
36 |
+EAPI=6 |
37 |
|
38 |
-inherit eutils autotools |
39 |
+inherit autotools |
40 |
|
41 |
DESCRIPTION="Utility to report status of an HP (Compaq) array controller (both IDA & CCISS)" |
42 |
HOMEPAGE="http://www.strocamp.net/opensource/arrayprobe.php" |
43 |
@@ -14,8 +14,12 @@ SLOT="0" |
44 |
KEYWORDS="amd64 ~ia64 x86" |
45 |
IUSE="" |
46 |
|
47 |
+PATCHES=( |
48 |
+ "${FILESDIR}/${PV}-malloc-strlen.patch" |
49 |
+ "${FILESDIR}/${PV}-ida_headers.patch" |
50 |
+) |
51 |
+ |
52 |
src_prepare() { |
53 |
- epatch "${FILESDIR}/${PV}-malloc-strlen.patch" |
54 |
- epatch "${FILESDIR}/${PV}-ida_headers.patch" |
55 |
+ default |
56 |
eautoreconf |
57 |
} |
58 |
|
59 |
diff --git a/sys-apps/arrayprobe/files/2.0-ida_headers.patch b/sys-apps/arrayprobe/files/2.0-ida_headers.patch |
60 |
index fbdb20b87ea..3cd744b32a3 100644 |
61 |
--- a/sys-apps/arrayprobe/files/2.0-ida_headers.patch |
62 |
+++ b/sys-apps/arrayprobe/files/2.0-ida_headers.patch |
63 |
@@ -1,6 +1,5 @@ |
64 |
-diff -Naur arrayprobe-2.0.old/cciss_events.h arrayprobe-2.0/cciss_events.h |
65 |
---- arrayprobe-2.0.old/cciss_events.h 2005-12-27 10:51:29.000000000 +0100 |
66 |
-+++ arrayprobe-2.0/cciss_events.h 2010-01-13 15:46:53.000000000 +0100 |
67 |
+--- a/cciss_events.h |
68 |
++++ b/cciss_events.h |
69 |
@@ -27,8 +27,12 @@ |
70 |
#define QWORD __u64 |
71 |
|
72 |
@@ -14,9 +13,8 @@ diff -Naur arrayprobe-2.0.old/cciss_events.h arrayprobe-2.0/cciss_events.h |
73 |
|
74 |
#define CompareEvent(event,par_class,par_subclass,par_detail) \ |
75 |
((event.class.class==par_class) && \ |
76 |
-diff -Naur arrayprobe-2.0.old/configure.ac arrayprobe-2.0/configure.ac |
77 |
---- arrayprobe-2.0.old/configure.ac 2006-01-03 13:58:31.000000000 +0100 |
78 |
-+++ arrayprobe-2.0/configure.ac 2010-01-13 15:42:49.000000000 +0100 |
79 |
+--- a/configure.ac |
80 |
++++ b/configure.ac |
81 |
@@ -19,38 +19,6 @@ |
82 |
dnl Check for compile.h (2.6.x kernels only? |
83 |
AC_CHECK_HEADERS(linux/compiler.h) |
84 |
@@ -56,9 +54,8 @@ diff -Naur arrayprobe-2.0.old/configure.ac arrayprobe-2.0/configure.ac |
85 |
# Checks for typedefs, structures, and compiler characteristics. |
86 |
AC_C_CONST |
87 |
|
88 |
-diff -Naur arrayprobe-2.0.old/cpqarray.h arrayprobe-2.0/cpqarray.h |
89 |
---- arrayprobe-2.0.old/cpqarray.h 1970-01-01 01:00:00.000000000 +0100 |
90 |
-+++ arrayprobe-2.0/cpqarray.h 2010-01-13 15:40:11.000000000 +0100 |
91 |
+--- a/cpqarray.h |
92 |
++++ b/cpqarray.h |
93 |
@@ -0,0 +1,126 @@ |
94 |
+/* |
95 |
+ * Disk Array driver for Compaq SMART2 Controllers |
96 |
@@ -186,9 +183,8 @@ diff -Naur arrayprobe-2.0.old/cpqarray.h arrayprobe-2.0/cpqarray.h |
97 |
+#endif |
98 |
+ |
99 |
+#endif /* CPQARRAY_H */ |
100 |
-diff -Naur arrayprobe-2.0.old/ida_cmd.h arrayprobe-2.0/ida_cmd.h |
101 |
---- arrayprobe-2.0.old/ida_cmd.h 1970-01-01 01:00:00.000000000 +0100 |
102 |
-+++ arrayprobe-2.0/ida_cmd.h 2010-01-13 15:40:29.000000000 +0100 |
103 |
+--- a/ida_cmd.h |
104 |
++++ b/ida_cmd.h |
105 |
@@ -0,0 +1,349 @@ |
106 |
+/* |
107 |
+ * Disk Array driver for Compaq SMART2 Controllers |
108 |
@@ -539,9 +535,8 @@ diff -Naur arrayprobe-2.0.old/ida_cmd.h arrayprobe-2.0/ida_cmd.h |
109 |
+#pragma pack() |
110 |
+ |
111 |
+#endif /* ARRAYCMD_H */ |
112 |
-diff -Naur arrayprobe-2.0.old/ida_ioctl.h arrayprobe-2.0/ida_ioctl.h |
113 |
---- arrayprobe-2.0.old/ida_ioctl.h 1970-01-01 01:00:00.000000000 +0100 |
114 |
-+++ arrayprobe-2.0/ida_ioctl.h 2010-01-13 15:44:46.000000000 +0100 |
115 |
+--- a/ida_ioctl.h |
116 |
++++ b/ida_ioctl.h |
117 |
@@ -0,0 +1,87 @@ |
118 |
+/* |
119 |
+ * Disk Array driver for Compaq SMART2 Controllers |
120 |
@@ -630,9 +625,8 @@ diff -Naur arrayprobe-2.0.old/ida_ioctl.h arrayprobe-2.0/ida_ioctl.h |
121 |
+} ida_ioctl_t; |
122 |
+ |
123 |
+#endif /* IDA_IOCTL_H */ |
124 |
-diff -Naur arrayprobe-2.0.old/probe.c arrayprobe-2.0/probe.c |
125 |
---- arrayprobe-2.0.old/probe.c 2006-01-03 14:11:17.000000000 +0100 |
126 |
-+++ arrayprobe-2.0/probe.c 2010-01-13 15:45:22.000000000 +0100 |
127 |
+--- a/probe.c |
128 |
++++ b/probe.c |
129 |
@@ -33,10 +33,9 @@ |
130 |
#include <getopt.h> |
131 |
#include <errno.h> |
132 |
|
133 |
diff --git a/sys-apps/arrayprobe/files/2.0-malloc-strlen.patch b/sys-apps/arrayprobe/files/2.0-malloc-strlen.patch |
134 |
index 8d955a8f933..2732f75b939 100644 |
135 |
--- a/sys-apps/arrayprobe/files/2.0-malloc-strlen.patch |
136 |
+++ b/sys-apps/arrayprobe/files/2.0-malloc-strlen.patch |
137 |
@@ -1,5 +1,5 @@ |
138 |
---- probe.c.old 2010-01-13 12:15:32.000000000 +0100 |
139 |
-+++ probe.c 2010-01-13 12:16:44.000000000 +0100 |
140 |
+--- a/probe.c |
141 |
++++ b/probe.c |
142 |
@@ -354,7 +354,7 @@ |
143 |
int drivenum = event.detail.logstatchange.logicaldrivenumber; |
144 |
logdrvs[drivenum].state.state = event.detail.logstatchange.newlogicaldrivestate; |