Don't install scsi_* scripts twice in /usr/(s)bin (bug #506362)

Package-Manager: portage-2.2.13/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 66 insertions, 15 deletions

diff --git a/sys-apps/sg3_utils/ChangeLog b/sys-apps/sg3_utils/ChangeLog
index 1285d45d5f7c..9eaad982780d 100644
--- a/sys-apps/sg3_utils/ChangeLog
+++ b/sys-apps/sg3_utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/sg3_utils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/ChangeLog,v 1.119 2014/08/16 21:14:43 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/ChangeLog,v 1.120 2014/09/19 17:52:21 polynomial-c Exp $
+
+*sg3_utils-1.39-r1 (19 Sep 2014)
+
+  19 Sep 2014; Lars Wendler <polynomial-c@gentoo.org>
+  +sg3_utils-1.39-r1.ebuild:
+  Don't install scsi_* scripts twice in /usr/(s)bin (bug #506362).
 
 *sg3_utils-1.39 (16 Aug 2014)
 
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index b2d23f893872..8f51651eee9b 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -9,23 +9,24 @@ DIST sg3_utils-1.39.tgz 1129740 SHA256 0fb6eae3de7f8e71398bf1315712eceae5b6776b5
 EBUILD sg3_utils-1.35.ebuild 1117 SHA256 d78fd9415d228629d1123e8d006ab0c7194a7cadfad2e986a49ef158b79049e5 SHA512 94f1fac5b4498f45f46aed8dc8cf1622c7a8bc174df69382aac16e8e4717ed41e57525d5069d8b12b1e5a9c144c58aaa128bc9537d162b9e838a56a408b65b7c WHIRLPOOL b79df3113d8087c2af70bc012a5c36201c7648d4b0cac18459bce215092efd778701b51e6e2c777e224a5bd54332421af57de21a32b687ad88309a1c01b9da28
 EBUILD sg3_utils-1.37.ebuild 1106 SHA256 d6b8ff01790aca91ca413471933c5e7099df40e627f77e9d67a536a80e00fd3e SHA512 72ff9c9b840a8a43f9322c18fa5cbe5783407a7ff3af87dd3f9d2f0fb8fb109ae354ab6cd38719acdae036ef9f8b4062fc817018afa63bf34776e8d37cb8f192 WHIRLPOOL 4fe4179a737eed4576478eeddb2770899478b37234a2731c1e032f2363ab1a25038d8175dc8cc1b30a2815513d33b6d2ffa18207c8202c2d4924bd987e73b21b
 EBUILD sg3_utils-1.38.ebuild 1118 SHA256 c838eb408199b1acb4cedc6ded3169b33fe15ae7ece5bd4d5be7256d750fb0be SHA512 c24f825a4fa4e1fcb37ad9836453552474255b6289bf9b82c6b2e1e292712b9b77b8444e161d10ca7b371c9c54b0feaf656a7ee3ee9f60f7c88814d19b5e02ce WHIRLPOOL d601f73502b096bb19892d1535f71e88fceb12a8d3360af0ab487d39396a82ada3c91969218904fa99f2f6fdcc1662c8d05dc596943ed3e3d2e1f8ac4262cfa0
+EBUILD sg3_utils-1.39-r1.ebuild 1093 SHA256 e5a1e7689bd961f878a7747408e72c914caf0fce989e01cc5822c407b5348898 SHA512 58f9b9cb45fd86d2103ac1aef10e7ec4d6a8631f400ed63c11635f03818447ab7c57a7159cdb7ca765ddc1bf5900034c4fe4b6bd2e994e6aee94aaf7847c619d WHIRLPOOL 88ab2404ecf92de84c639327c0f4c73df0501a599ffac5f8ddf2922e9eb7f33c7c43e44501b83663124da16478ac05e2d40b22e51cefa4145b0e25e041654134
 EBUILD sg3_utils-1.39.ebuild 1123 SHA256 3eddc8757aced3e05ef863b9fa9ab1aa49a3a08f361d210bf30806d2408645f1 SHA512 a360ea8ea8225ff5f4acb2e0143314425dd7099a3a2465d1335e281bd8041a6ee676b01dcb8bf982d2b10538ca9ec5877f471bb0a88eae77208cee61e44fe655 WHIRLPOOL 367b7aa9685bd74bdf4a5e584efc2dd34403b291375408869dc126b25a96619413b6933c257ab82b261f46aa4f72bcaccd68d3e50e1ec25b611f85f0c58a4a80
-MISC ChangeLog 16055 SHA256 bfcd755f2a56144aab4919ab99239edb0120a1f336d9a68d8cba70bc73242359 SHA512 1b6b7d192fdb136519553ad0caf64f7aea2e7057dc8518601f5e965892cd6387306f9684cc9c66fc1070d86bd6c8924a16012e8f37d2ea39d43b2b6578a8c1fa WHIRLPOOL 64fb88c116620847ef9d68ccc244dff40fe413145b62e2d76121bd82e6f6f31f1f6ef2b8f5aa926edd6f1d8917dd94b7922858918e2b5b68bb784298bbaddebc
+MISC ChangeLog 16240 SHA256 994c07908cc0d42d875fab6f7eeb522cb65ee7a24d54f3706caae8159cea191c SHA512 56245b4a3715b4a82c489814ac9eb02ad247eba66eab24edd7e7162640667771c4f879d0219b3fe7698a32d7ab0e9565fc157d64a03e142a856865c0926f5e10 WHIRLPOOL d2e5e9dadddec1dbad934d2d17fbc38bf2647930ad3a0a4b151866f17f5919182774ad4975588247cbfda2fb242dc1457ca231d258f7cdbfed4a7e2bb69802f3
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT78nEAAoJEPiazRVxLXTF1c4QAImrN+sN1/29TLhSZKewBJP+
-5xMs2WYO79+NAkwAdDrREf19sJ9D323y5SqLdxKiW3kr4qQ34LUfKw9ADChv1sKt
-3S2QHM+t+Fmf5LbNekk8XD8Jt8RxsDFqUP4i4OLffX7HGOQWnnpa2G1XvrOump33
-2X81GWP0rsB98aa3oEgYKSPKcZ0oONBG4Rv40haAgPSc8KSNzaQKoX5i7xQT6BNT
-f7Bbd/2wFFoOD3T/dXYsK0jTwZDLL99Gt7wOkne5fcoruvj2sBit7DPyTwwnnjfI
-rNDfoh/uc3RRSwuqNYt5L0x/+GvEsCl8w70wYUnw+h8VrdkT04eQRjnTCAeYlcPP
-sUBJXINpBq7RtOYPF1I1/BVISLrH3Y0QU+dT9nVprYa+B6CHnXAiiQ9oDmg0YUYs
-7UaE3jWf3exmqk7c2O/Q7h3NpIV2nvhb47Cs4ctWDeSQMZRaZRtHtn8dbPIOiZfe
-loJpeEV8BFDyIppUXKiw0v6qW9Gp2BfXzKU1iyX9YWVXJEZMTpm/6GrtWzI2KbrT
-9cNV9OGQmKvNZogyZqZIUct3jOy/4EblngEwi8xSSsTOwfttTyjfg1UgAWybkPpJ
-pCwDWvDe5oFxfkepArF3I9kArxoPfIlHKLNII/XXXGq4CR1tHidExTyM+IKNhJQI
-9ngTSdRcU704Eg0aUxHy
-=97q3
+iQIcBAEBCAAGBQJUHG1WAAoJEPiazRVxLXTFQJ0P/imZiFWjSMR2Ow6VuhIWqU20
+o7QcbZLG8wCtKmd70FSJjLVkHEEdf3N7XdkWLbRrvTmoBJ/UVq20Ty9X6IdeF8eb
+aLngVWhhyY/b4GkP3EE7A5a9jluTAlaiVK8bDxD517rmJD2NPvC/NEVqR/bi3mRh
+luC+x8L3euzqhCJJgcaPovT2f4nzFNlvRyfXpMvKh7z3q3pqlp7KNtX4fRpGF1iW
+LvZlT5JsZAnPp3Y00z5xclp1bX9HD0Y12poe5AE9qro0YC+R9u1jQ7mfTJCZu98N
+39oYFr84pBhdfd3XYIImPGfIon64pGAUEzu7Ghm579gYCd7vZUFExI6SxSN+d4pf
+u5uvaBJrKBTopIvdKL8F2UYgrosOpJp1yMYCgrWSkcLLTupxqNt6j7rUUnMswAYH
+jnIspLztT/lNSsMcShuC7waCpoIL/nPQOa46hI/DTHzg9QBtuJcD3s+dKxEtNNWy
+R9pn8Ot2ND0trzia0CussG4uV+KlzqWTQwQdUlX8+AaJ73dzW3XXUZp6viw6PbbX
+KScKadQJGqFIEGWnB9kHa2UXt9uGp8oUI/E9p2aa028wZd7bNBIb7q9nqpkvHGgu
+EGnDT09Nk0Ybh3r/Z5T72+qzQYmdlLfL435vWYgG+YpwkjyzxQrCM+JQRdcvhDdA
+n2M1cQxUIxNHqYtdb01/
+=Qs4+
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/sg3_utils/sg3_utils-1.39-r1.ebuild b/sys-apps/sg3_utils/sg3_utils-1.39-r1.ebuild
new file mode 100644
index 000000000000..0e75145b9bb6
--- /dev/null
+++ b/sys-apps/sg3_utils/sg3_utils-1.39-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.39-r1.ebuild,v 1.1 2014/09/19 17:52:21 polynomial-c Exp $
+
+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
+}