gentoo resync : 03.12.2017

4 files changed, 27 insertions, 29 deletions

diff --git a/sys-apps/arrayprobe/Manifest b/sys-apps/arrayprobe/Manifest
index c527c8302010..a85bafa25d11 100644
--- a/sys-apps/arrayprobe/Manifest
+++ b/sys-apps/arrayprobe/Manifest
@@ -1,5 +1,5 @@
-AUX 2.0-ida_headers.patch 16391 BLAKE2B b004f86dcea5e4789245bf9582d96356fa969a0a46ce994d59e9ef614057891d227989804a82488609974e06328814f014822a827c52038024f6bb71d9d663c1 SHA512 ff3e06dce610866362a020137b4c9c45802ce4a2566bcf01930c6351ef51aa60a2ad80bc97a7207f8644f58a5c1fe7722d0ccd20f7740eb06ebac8c896f9ebab
-AUX 2.0-malloc-strlen.patch 1152 BLAKE2B fb8c24e8bcba49d2cd52e15017da72b5f691dcef84d3774eea789aee81bf0b9ddec8843ed96c97c75da0f3ee53c7d771215c9a08388ebcf865ea6cd5c36f5828 SHA512 19f112d1e830ebe769025f3327e793d79d9f943324393a5d466bbda852a319201525a469d0f41bbc0d4d4d2ef8212c525d6300c80d5fc994df444b96f3729bc6
-DIST arrayprobe-2.0.tar.gz 83831 SHA256 ccb560b5c7e8b378d110cad6e9245884e7e673acfa3c4016ef33acd699f1f4d0 SHA512 4664e20604697edf2f848447419b26ff860dd302b3d3e5aa0f3977855c590b5acbe23c39b684a2ecb1603c86cf7762e86bfc7125421ccad7f322e387c4178870 WHIRLPOOL 56eec2322f806f25e411614e12e9c584208202203f6d070846c73d04c0b379103ad2c45d3a6638a8cf6d66ea51173fbf0dcd91af3b01702a39848bb8a503cd34
-EBUILD arrayprobe-2.0-r2.ebuild 559 BLAKE2B 2454b9340be56d75938eb7f59d9f7c0cc14a50c9d9f00a75aaa85aaba73c25719fc9afa95a0aef2b9bda8a8156ebf2c9e5e87ee9d5a08a1009ef2287bd3367c9 SHA512 43b644482c826a3f5510e55d129c7f6268722b89180d09e80008f35e4eaef7fa7068bed3e3cd1c10f222631d558f47a96e15997f4f39dc201572897e7d6370fc
+AUX 2.0-ida_headers.patch 15371 BLAKE2B 2a551fd71e90255abb853fd9ab544e839fa4a44b7b65c1951d867dd7583c62ab420b4c7d2d70ab30ab8035aa1fc8cd8fdd83f0a48d853a6827e88ca99ff254c4 SHA512 73d4addbaaecbffe762c7b0866c2ddca62efadf3e00997939be2c859508f93b24516fdae95ab001f438c8c8493f382043d7214f01f5d0eb4e1fcf272ab9d9461
+AUX 2.0-malloc-strlen.patch 1080 BLAKE2B 55a1ba7f3c18bc4d2b1bef277a250a9cab8aff7eaf9760981a564a3df671875fd47be0b658b01bd379d1682788c856271c66046ea412cca3838a2da4ff202a16 SHA512 6eca6fdc118ab21451640540f4ab76213a8a79d9e6bb4cbb1519535c8b44b955824486fdeab622cf6fe1ad421b36012399d029ae2679deb159a56918e7003981
+DIST arrayprobe-2.0.tar.gz 83831 BLAKE2B 6a9b76260c91b271068be914161bd99c4ce2285c58ce98c689f6bef32200701430bb65306e74a1d9277d7a4d9e4aa0adf4af60af0c4264020ae07a73f49a51de SHA512 4664e20604697edf2f848447419b26ff860dd302b3d3e5aa0f3977855c590b5acbe23c39b684a2ecb1603c86cf7762e86bfc7125421ccad7f322e387c4178870
+EBUILD arrayprobe-2.0-r2.ebuild 558 BLAKE2B 4b94a0963538e77755d008decd74b4f26d3a787058bc4864252843c452548a37192ead816eb8b33de43f6fba62fb29f561b618bb01bc61705ccc3dba749f575c SHA512 af2f61ca914863caa32b63c21fda428e63817b1cec1f4d401f89cea5e4cc3ae50a982fde8d04486df1ce4b1afbd0b9ec8c46569dd54d4e4612c165f7babd7bda
 MISC metadata.xml 330 BLAKE2B 30259c749509242f02c31dd55057f4ab4ba7e13cdda877ef28e5a66c6d4da5b12684bbb6a2e144cae18cb6dc9bbc1b5c1fb14b1bfcf17474151a6624a1041036 SHA512 a7b0f31767ddd2a38acc2af4700f6129e6a78553f6bee63827d7706064570dccd5e5bf48b407b9e534bef4bbc6b384c326a79121079e68d25e3494601b3b0e1b
diff --git a/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild b/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild
index 98fae16e7682..5f961969810b 100644
--- a/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild
+++ b/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="Utility to report status of an HP (Compaq) array controller (both IDA & CCISS)"
 HOMEPAGE="http://www.strocamp.net/opensource/arrayprobe.php"
@@ -14,8 +14,12 @@ SLOT="0"
 KEYWORDS="amd64 ~ia64 x86"
 IUSE=""
 
+PATCHES=(
+	"${FILESDIR}/${PV}-malloc-strlen.patch"
+	"${FILESDIR}/${PV}-ida_headers.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${PV}-malloc-strlen.patch"
-	epatch "${FILESDIR}/${PV}-ida_headers.patch"
+	default
 	eautoreconf
 }
diff --git a/sys-apps/arrayprobe/files/2.0-ida_headers.patch b/sys-apps/arrayprobe/files/2.0-ida_headers.patch
index fbdb20b87ea6..3cd744b32a33 100644
--- a/sys-apps/arrayprobe/files/2.0-ida_headers.patch
+++ b/sys-apps/arrayprobe/files/2.0-ida_headers.patch
@@ -1,6 +1,5 @@
-diff -Naur arrayprobe-2.0.old/cciss_events.h arrayprobe-2.0/cciss_events.h
---- arrayprobe-2.0.old/cciss_events.h	2005-12-27 10:51:29.000000000 +0100
-+++ arrayprobe-2.0/cciss_events.h	2010-01-13 15:46:53.000000000 +0100
+--- a/cciss_events.h
++++ b/cciss_events.h
 @@ -27,8 +27,12 @@
  #define QWORD __u64
  
@@ -14,9 +13,8 @@ diff -Naur arrayprobe-2.0.old/cciss_events.h arrayprobe-2.0/cciss_events.h
  
  #define CompareEvent(event,par_class,par_subclass,par_detail) \
                       ((event.class.class==par_class) && \
-diff -Naur arrayprobe-2.0.old/configure.ac arrayprobe-2.0/configure.ac
---- arrayprobe-2.0.old/configure.ac	2006-01-03 13:58:31.000000000 +0100
-+++ arrayprobe-2.0/configure.ac	2010-01-13 15:42:49.000000000 +0100
+--- a/configure.ac
++++ b/configure.ac
 @@ -19,38 +19,6 @@
  dnl Check for compile.h (2.6.x kernels only?
  AC_CHECK_HEADERS(linux/compiler.h)
@@ -56,9 +54,8 @@ diff -Naur arrayprobe-2.0.old/configure.ac arrayprobe-2.0/configure.ac
  # Checks for typedefs, structures, and compiler characteristics.
  AC_C_CONST
  
-diff -Naur arrayprobe-2.0.old/cpqarray.h arrayprobe-2.0/cpqarray.h
---- arrayprobe-2.0.old/cpqarray.h	1970-01-01 01:00:00.000000000 +0100
-+++ arrayprobe-2.0/cpqarray.h	2010-01-13 15:40:11.000000000 +0100
+--- a/cpqarray.h
++++ b/cpqarray.h
 @@ -0,0 +1,126 @@
 +/*
 + *    Disk Array driver for Compaq SMART2 Controllers
@@ -186,9 +183,8 @@ diff -Naur arrayprobe-2.0.old/cpqarray.h arrayprobe-2.0/cpqarray.h
 +#endif
 +
 +#endif /* CPQARRAY_H */
-diff -Naur arrayprobe-2.0.old/ida_cmd.h arrayprobe-2.0/ida_cmd.h
---- arrayprobe-2.0.old/ida_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ arrayprobe-2.0/ida_cmd.h	2010-01-13 15:40:29.000000000 +0100
+--- a/ida_cmd.h
++++ b/ida_cmd.h
 @@ -0,0 +1,349 @@
 +/*
 + *    Disk Array driver for Compaq SMART2 Controllers
@@ -539,9 +535,8 @@ diff -Naur arrayprobe-2.0.old/ida_cmd.h arrayprobe-2.0/ida_cmd.h
 +#pragma pack()	
 +
 +#endif /* ARRAYCMD_H */
-diff -Naur arrayprobe-2.0.old/ida_ioctl.h arrayprobe-2.0/ida_ioctl.h
---- arrayprobe-2.0.old/ida_ioctl.h	1970-01-01 01:00:00.000000000 +0100
-+++ arrayprobe-2.0/ida_ioctl.h	2010-01-13 15:44:46.000000000 +0100
+--- a/ida_ioctl.h
++++ b/ida_ioctl.h
 @@ -0,0 +1,87 @@
 +/*
 + *    Disk Array driver for Compaq SMART2 Controllers
@@ -630,9 +625,8 @@ diff -Naur arrayprobe-2.0.old/ida_ioctl.h arrayprobe-2.0/ida_ioctl.h
 +} ida_ioctl_t;
 +
 +#endif /* IDA_IOCTL_H */
-diff -Naur arrayprobe-2.0.old/probe.c arrayprobe-2.0/probe.c
---- arrayprobe-2.0.old/probe.c	2006-01-03 14:11:17.000000000 +0100
-+++ arrayprobe-2.0/probe.c	2010-01-13 15:45:22.000000000 +0100
+--- a/probe.c
++++ b/probe.c
 @@ -33,10 +33,9 @@
  #include <getopt.h>
  #include <errno.h>
diff --git a/sys-apps/arrayprobe/files/2.0-malloc-strlen.patch b/sys-apps/arrayprobe/files/2.0-malloc-strlen.patch
index 8d955a8f933d..2732f75b939a 100644
--- a/sys-apps/arrayprobe/files/2.0-malloc-strlen.patch
+++ b/sys-apps/arrayprobe/files/2.0-malloc-strlen.patch
@@ -1,5 +1,5 @@
---- probe.c.old	2010-01-13 12:15:32.000000000 +0100
-+++ probe.c	2010-01-13 12:16:44.000000000 +0100
+--- a/probe.c
++++ b/probe.c
 @@ -354,7 +354,7 @@
  	int drivenum = event.detail.logstatchange.logicaldrivenumber;
  	logdrvs[drivenum].state.state = event.detail.logstatchange.newlogicaldrivestate;