gentoo resync : 15.09.2018

4 files changed, 18 insertions, 62 deletions

diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index 81458645c76f..d1c1e1457f9d 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -1,11 +1,9 @@
-AUX sg3_utils-1.26-stdint.patch 758 BLAKE2B 08fa2bde2dbba27eff678b39d7e42489f2d75f6052ddb570a0f4ebc6eb62b3e1d8cf3c54a56925639586a9c0016f2147432c305803f531c02cb9d6052b6fbe0e SHA512 e7a9b51595a17a33513accf4b1b2fb98914fb8328664e77ca9cc6a9ebd1f2bd32e85c53c8b854e3b617130b750e858d235bb259052fea632f367d430b1f1d8f0
+AUX sg3_utils-1.26-stdint.patch 678 BLAKE2B 52a78fcc176492e6ca5a7a4465e76a3b6642b27c3b6dd77d5d0e8e7f7c59e564cd7e78f2297847db2e0c6b4611284cf5a67973ec9bcc533deab4625381f27d04 SHA512 07f7d46d70f79508169c482bbe251dd4057be4d546ce8ac4b0928ca8708c55086ca2765c78e5f894af1828ff7383ff33b5d354d4c1af9857a9122dfd6fc916fb
 AUX sg3_utils-1.42-sysmacros.patch 925 BLAKE2B 0a066dccd2e69c0a9a5e6ed20d87700e85061146956601777c754e9411b70de01456bb894091fb0ea0228eb060172601492ea678de158c4733f6ec423f176156 SHA512 f90ecb687f851a45684ad0b1f13269c4d674e849f6782b4f328d7f43f04209ee8442a7b428c27a57610f0ffc4c04343f357e700b22a6817835a3da09300a4f89
-DIST sg3_utils-1.40.tgz 1179730 BLAKE2B 219605afdf87dc7cb88dca5cc1603718e4ff4a0b74e61f2e455b88b27a8f9d5457654776098ec24c6efd74dd7ccccdcedb2dddaf2de629613bb39d0f04684cc3 SHA512 cf4909c46d509ea7c1c8930d81df2b20ce56c56092830f017e69fa4ce7eddb395ae1d17f51657d8dfb539fdd78229223e54e0db2d61d2612d23313cd6846043a
-DIST sg3_utils-1.41.tgz 1194212 BLAKE2B a9abfafbabebceb8e10dce5abb4363b12dcdf5da228594e5f4caed89671b6992faea2213b22efd27c8d75679994a2105c005b4962571d5a1332d4c8142cf9877 SHA512 ceca778a2f4d16dd341dd47cc1d92df5bc85d7f75d75e6b7c1a99c31e03e98103a18abf624880172e162bd0b751f760f0e919cbbb989303a9e1fbe9ff3eb1f46
 DIST sg3_utils-1.42.tgz 1219231 BLAKE2B dd9ea2c324cb6f4c0ce770c90b7980da5e998bddc3a2be43a0aa9bea88dfe34291d0f58b393b2a5ac680c05dc673802ec9fae1ead37107bc49fa33bc7c4df503 SHA512 d16b65e36b2bccb4fc4c189f97e71fa38e6619f37d668a4ddd74a52c715fa62325288d9737812ed19c80547059dbd27be5a20565e27e1aabb571e8f5f8ac53ad
 DIST sg3_utils-1.43.tar.gz 1180760 BLAKE2B 20475d974f9f4c0f275499a63f921b587df76e1b8addcd5201fd5db95e100eb0b4c8c97aba7e9651ae069c43e30cd7b780643212307dec6d53e5b91cd2c653e8 SHA512 5f2eea6f61300e288ce32ca613179a944de34576fd6e596c4c3aa6cc2c0ef397cf5bfd2c148b737f678aac0c574321994525486430ea14ae8e7cb1c02184636f
-EBUILD sg3_utils-1.40.ebuild 958 BLAKE2B 0c3e77fe8abd3e63c93238aecf1bdfb7d0f9bbb8c25fc4420965d59170bcad5a560f9f9062d7fffa211597dacbd4cee7a94dec7d90297f2663dbdce5df998e8e SHA512 e347e8fc51a5875b71f4f6350ae03a6d03c8d77b5aab42dab36c0ec43441ebf75a8b291a906dd6a2ee0f07d053bdb453dda8476d2a569c3e16b52eb95fec1102
-EBUILD sg3_utils-1.41.ebuild 969 BLAKE2B 6e4f1e17980afc6adafb681a857bb56e1d302b595c8e007492bd003fe12187e1d063ce14c99569d8cf592bcb42a99b20bcabddd0888339870b011152ba6e7263 SHA512 542582bd4130f2cc0bbacbc30a2a487ff8300845b43f0f7e4b83edfea4274d34468ddcf65ce919123afb93ecbd2d76853d80ce708456c4852390cb207f2e4055
+DIST sg3_utils-1.44.tar.xz 922152 BLAKE2B 8596ef78fbb7ade5a969f485b0f4ff63863dc8a5ff58fe630cffa91900ba9946b47ddf857346aa3904da8502afa4928f54baf99428344d2e561a90e52c8533ed SHA512 4f4d5536ebed62f2c81c55741043d9ac3f4610a4dd6ef2e3125f041afd57aae03a32c2affe84a960c9f61fb6f84784bc901c756a8c36c1bc97082fa61e73ae8d
 EBUILD sg3_utils-1.42.ebuild 1030 BLAKE2B 7086604cc7f4e6ccbea214d7bbb9e66d1d07146d1cca14220dfc358ded7cfb4bd8f54b2f6fc49a082a2fbbb162ff3494b3bdb3a254448fb5e2db5b76018ca5c1 SHA512 8e8ac9d7b4293e8361e593685988fd92fb38a22e58e22b5f556216160fe494d9f2862509225ffcc75064bb18dc3eb9088a9c8595d6d6a7ed978d9189b8de2b59
 EBUILD sg3_utils-1.43.ebuild 1082 BLAKE2B 3fd661d203baa20ab824cfff31d60d5f3aa004c99e514b5182931c353f38f32a2948dded981637f85a7baf79c002e4df56768a1a3f0d630d2a5cdf45fddde761 SHA512 ebb7d708d91268e3e23b54a07060e8a351f97a32815821212872cc6645a8da06c5f558ea37c036e70b579bfcad03e7423e283f4d6e11445e2f1b7d6cfe8a44ff
+EBUILD sg3_utils-1.44.ebuild 1076 BLAKE2B 3b917030f5363a698efd36e3060f42935b7755259e0315fed930d861e54ad98f3e4b451c1a220b8aa1c63bd6a343861f9e773e31c1b122d7f7f5ac260651147e SHA512 db18c2fc70c535d6431f318e4dcaaec7a31c3eb66659bb553b0359f96f70ee3a5a7157fc58ac3783d3a5b396592942495e84164952255f2eb7ea3824f8a136be
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/sg3_utils/files/sg3_utils-1.26-stdint.patch b/sys-apps/sg3_utils/files/sg3_utils-1.26-stdint.patch
index a82ab6add9a4..62fb30240e10 100644
--- a/sys-apps/sg3_utils/files/sg3_utils-1.26-stdint.patch
+++ b/sys-apps/sg3_utils/files/sg3_utils-1.26-stdint.patch
@@ -7,8 +7,8 @@ Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
 For uint64_t to be available, <stdint.h> must be included:
 http://www.opengroup.org/onlinepubs/009695399/basedefs/stdint.h.html
 
---- include/sg_cmds_basic.h	2008/06/26 23:27:40	1.1
-+++ include/sg_cmds_basic.h	2008/06/26 23:28:06
+--- a/include/sg_cmds_basic.h
++++ b/include/sg_cmds_basic.h
 @@ -30,6 +30,8 @@
   *
   */
@@ -18,8 +18,8 @@ http://www.opengroup.org/onlinepubs/009695399/basedefs/stdint.h.html
  #ifdef __cplusplus
  extern "C" {
  #endif
---- include/sg_cmds_extra.h	2008/06/26 23:27:40	1.1
-+++ include/sg_cmds_extra.h	2008/06/26 23:29:02
+--- a/include/sg_cmds_extra.h
++++ b/include/sg_cmds_extra.h
 @@ -30,6 +30,8 @@
   *
   */
diff --git a/sys-apps/sg3_utils/sg3_utils-1.41.ebuild b/sys-apps/sg3_utils/sg3_utils-1.41.ebuild
deleted file mode 100644
index d3355b724833..000000000000
--- a/sys-apps/sg3_utils/sg3_utils-1.41.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-DESCRIPTION="Apps for querying the sg SCSI interface"
-HOMEPAGE="http://sg.danny.cz/sg/"
-SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="static-libs"
-
-DEPEND="sys-devel/libtool"
-RDEPEND=""
-PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.26-stdint.patch
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	dodoc COVERAGE doc/README examples/*.txt
-	newdoc scripts/README README.scripts
-
-	# Better fix for bug 231089; some packages look for sgutils2
-	local path lib
-	path="/usr/$(get_libdir)"
-	for lib in "${ED}"${path}/libsgutils2.*; do
-		lib=${lib##*/}
-		dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
-	done
-
-	prune_libtool_files
-}
diff --git a/sys-apps/sg3_utils/sg3_utils-1.40.ebuild b/sys-apps/sg3_utils/sg3_utils-1.44.ebuild
index 0a444d19b7d5..d98714db0ff7 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.40.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.44.ebuild
@@ -1,26 +1,27 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 
-inherit eutils multilib
+inherit multilib
 
 DESCRIPTION="Apps for querying the sg SCSI interface"
 HOMEPAGE="http://sg.danny.cz/sg/"
-SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
+#SRC_URI="https://github.com/hreinecke/sg3_utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://sg.danny.cz/sg/p/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="static-libs"
 
 DEPEND="sys-devel/libtool"
 RDEPEND=""
 PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.26-stdint.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.26-stdint.patch #580236
+)
 
 src_configure() {
 	econf $(use_enable static-libs static)
@@ -34,10 +35,10 @@ src_install() {
 	# Better fix for bug 231089; some packages look for sgutils2
 	local path lib
 	path="/usr/$(get_libdir)"
-	for lib in "${ED}"${path}/libsgutils2.*; do
+	for lib in "${ED%/}/"${path}/libsgutils2.*; do
 		lib=${lib##*/}
 		dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
 	done
 
-	prune_libtool_files
+	find "${ED}" -name "*.la" -delete || die
 }