net-libs/zeromq: Remove README from dodoc, #489442; fix die() usage

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 48 insertions, 39 deletions

diff --git a/net-libs/zeromq/ChangeLog b/net-libs/zeromq/ChangeLog
index e71146ebe498..f0eba6157e30 100644
--- a/net-libs/zeromq/ChangeLog
+++ b/net-libs/zeromq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/zeromq
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/ChangeLog,v 1.48 2013/10/26 07:46:35 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/ChangeLog,v 1.49 2013/10/26 10:54:25 jlec Exp $
+
+  26 Oct 2013; Justin Lecher <jlec@gentoo.org> zeromq-4.0.1.ebuild,
+  metadata.xml:
+  Remove README from dodoc, #489442; fix die() usage
 
 *zeromq-4.0.1 (26 Oct 2013)
 
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 354e784cfa1d..39638d14962b 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX zeromq-3.2.3-unused-variable.patch 4012 SHA256 f80558d4bd5557128d2ebb44d075f4e32925fbcc5a726498184b0fa2721d672f SHA512 c54ee2ff1d11c33c734b7696a3fa98be8e0a5025678ac31599c652a4f0e2b507f41de3aae8d6808086bbe72fd0d485945ed2b822f984c2053f1f6f69b62a7b1f WHIRLPOOL 56113c224b01d7f300e1c6a1cb4bec2d297a3a285fe5ee3849c1f1cc82a984b8170869c67c1979a575042412e26675f8d5bfbbb4f531411d6243fc9b81309e95
 DIST zeromq-2.1.11.tar.gz 1891038 SHA256 e1cd4abbe353d3d72df42a2ee05593047915987024a4baf965745d29832eb214 SHA512 a014e75975c959ccefbee1cfd8663f6a186b179f248a2d95167bf36fd468cd5d49967d352f2f515e7a8b94df8b2bcaa6ba5311e82b7604b7db34f42a2c44ff84 WHIRLPOOL 1d7ae9e68630f8896d39ef8e0911e1fe24b3cc0db9c12f2a53b23e2207cc9727a976f728de3f44793aad8ecf78ed9f2c16f3847c4b08a68a2aa5a13b596fc8c8
@@ -11,19 +11,23 @@ EBUILD zeromq-2.1.11.ebuild 1325 SHA256 054ad8d7d1d0bc7ac0ba677dcca02520fdaca7a4
 EBUILD zeromq-2.2.0.ebuild 1404 SHA256 d639a74b0e8c4058f8f286b7f9420ca295794605c650ec0cbb60d658614986e5 SHA512 040e88e2c864d990fb94ba38b4a081d8d5c3755590510708675f194e9a110c99b2a253eebda4d6d17641172920ef15a4d8a3d9a4af1a8aa3216345e2866e403e WHIRLPOOL b8772c6069c19d4d5138c2e295222b29546e1446ae28985ecb75266614dddd3707e08eb8ea3081fef12ba6c71263acc7e2adb6917c7369b739c165943067a69d
 EBUILD zeromq-3.2.3.ebuild 1713 SHA256 bec823e0414004fbd5da10e693ce324d40880d6526af3fc5610edeaecfeab6f5 SHA512 ec22cef41690b2d5aa3f75e8d5da7aff45f399ad545e270667f704f4bfbd1298db5c41c7ff79e3d994f12c5f4d82762a051c8df12e08f1110d4b8163a19831fa WHIRLPOOL 2ef410b18874dfe8efd3f396f23bbcff432de2e0368d483b5fe802d3270264c8d92fb96f9eb5c1c81859806a312d6a6736818741a816c0caf6acc24893c31164
 EBUILD zeromq-3.2.4.ebuild 1663 SHA256 a3b382a66c2c24e3834b41eb3ecddd71c4cc8ca71408e73cf1767af43a7cf818 SHA512 f10b2e270bdbf3c93b2c476c67ef6a78ff7821354f947c169e003c3ef6c5ce247f638f7ea5aa316001e631a7288590c88813e5c0e0127a3b03bdd277bd2edfdc WHIRLPOOL 91009577be6f4367c855356adb9121893ffc4bc7bb3e4bedc5ad8783a87eecccbd4289a362051cb2114b64101261a4dc1199c40e6255aa0855ff70b6886608b9
-EBUILD zeromq-4.0.1.ebuild 1379 SHA256 63363b776ff017913b50559c192b96feeeefd0d5b9a5d5682040b6546a79f7af SHA512 cc4c4b246059a13376b00b0343f1792fa0b562910e0dc9c1568ab5782e0ab31a864d02658c38f969f9edfbcff90051746749fd9cdea17c50563585e91c0e4834 WHIRLPOOL cda9fa9747b15da9ccbaa2ba7606ec841b0a2564fbc2c7190cfb3d4a3b029ffd6478201d2c72799fcf5fdfa43eaf7a4744ac5d4bf36f3bfbdcd5799ac061229c
-MISC ChangeLog 6150 SHA256 efaa7fc2bf6ed656c2d06f80b1c9d97d9064c404416a71283c553188f92997f5 SHA512 44f5532fd22431e84cef45923e3b92be6503c01e185381beecef1cfbf93fadb7685dc589617a2cc225a11874514a84c118e816a8fdcf5a510b48c29bf9cfa41f WHIRLPOOL 4c2b1323097919d67d39589dba43ea731fa786847c382f6d34f4ed4dd4154e81dd784a9d2b67fbc7d7fc29b38d6456308bb37023bf6f13b7f632b1623a12d73e
-MISC metadata.xml 1174 SHA256 c32959012189d2280d0b3037bc534be373f0f923ac6d6ee2fb54928ffa179f5a SHA512 8d129089f1d77995f5032e6da9e96c5e1364ffa28565474097b609eaa6212d693ce414632697702c68eef89937f5a6929398a70ab8fe2df1817caea5217a6438 WHIRLPOOL 45f990ff9c5f5cfbd06d4730e6d633ce5cb8eb1c4c9e4128e150d45f8f2054b9dba076aaae82e614baaffaf78e801b60951efb4f4909f1ac245150ce1dcee8c0
+EBUILD zeromq-4.0.1.ebuild 1322 SHA256 1dec1e000489a0f3ae893a319b7d38149339ae393f1066c2f726221b760fbda9 SHA512 5948e764cbc2f19cea95c84821bb4a287708f8886b6449266be3d8f8fea21dd393b974c562e37de1bd844ab9fe45b865fcb81da92f8d60867b06b4cbc5e1f924 WHIRLPOOL 588742192eafa5dba2478b88670a61a368718b7107d168bd335f88b3ccbcecf69fafdc2333024cee8879b0826716978e42fea90e36d02cde79d17046fb5b7950
+MISC ChangeLog 6286 SHA256 268b0172f9d635dc40679497d40c67836a6dbd6009792dcb08f6f2fe53bfa303 SHA512 5ce49ac0a979e44b5f298d042e1349f546293f5fb312e3a76d91392f79e478ce5f9f21c28f36edb58f5dd8bf29d66720c9dfc58b8728d387a88f5c2390a93a6d WHIRLPOOL 87db6e4f9e9756347b4632abfb5b2223d84f7b107f573923a94b889c4c3e642c1a8fdcc0725ee5af1c8169b9d51258caba9f8bb741770b9606b14c171dd324c3
+MISC metadata.xml 1205 SHA256 aa5d3cf383d233fb3dcc987ee1defb5145452603fa7559712cd6a6b65c490699 SHA512 28c8088cae0dbc58fd5cf32bf76e6f7e234595467416864dcc3e57df4271b02c50c1cf4de5ae9bad271f3b1833644653c0d63c3a81da5364c5c9f26766ca2f0f WHIRLPOOL 22aec7996be27f1b54223f3dda9910786290315bb62013de8a87c29ed36e2c94c265f4ed11d11a03e160c0c28d617badfc7222303e7f1af203dffad6ce4a4ba4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQF8BAEBCABmBQJSa3NkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwMTlGQTEwRTVCMUJCNjdFRDM5Qzg3RjdF
-QUQ1MEQ2NEQ4RDM1NzFBAAoJEOrVDWTY01casCIIAJ6kwyUwq3mKbKjWsD5b3WZ8
-7jk9jrcitzDSHw1bgUDkiUJTwMfQNL3NgUiKhgBwvSZxnJb02CIcW5TY3bt6Yhui
-Ed7GxGex3MTtg533+VfUe3zlsxq/89pYuPgzm9hasUnlk54bPbxTEDUjEQ/HnQow
-rBE31KL7YN7/EhiDfcPTwQZRA2HqczoZ5cIA0x14jfGmQ4+MhCy7L/BkWDB54f7c
-JYsqBbUnYF85xoRJXy9eGLtHRtzqDYNpVLo7/Zfbq4FMFBqmfpBTh7xjLgdEbZZi
-rZxIbl8k4YbcV4xJmFHYSCuv8W2RS4rzt6W22OEqKMg/1yjIsK3E9riqzEhcQRk=
-=wwFZ
+iQIcBAEBCgAGBQJSa59iAAoJELnU8jG9FViri1cQAI7Oyt3IX9i7pBZmGMdE25UU
+Ei+30zDJUhMP/iK4x2/KoKOopmuiyEM3reW6qdsSGeVnINrZeLH20aVSXMresd+k
+/+v4uCVCv+BGzgxZv5IqTOGd3HiAWwF1d4DhWsRt1z1756cos/ODp28P9OFHfR4v
+Hyk1yazK3HrE2/8St1TfbDyknej4zK+mAALIkjo8uu6Bn1GYmEviSWe1mLxDvPh3
+uIPTJ3AD/Uke9JIXNeLTOJUchA/luhp8jvj75CPUhfqWInNJEIH0nqMkIdx7kjlr
+HGYzCKm1KLuceJ8hniQHaHbbiM9UKZZ/lFV5GNhPDF5kC2wYXGtyGwkSL3NQ3IJ9
+XR9Wu1SnU/ZVjBWOcNZFumr10OiM4nc/K5AY3ug2ECy7hxLRvE1mTocZD9mkFws6
+4g19xF7b27vN297Or1v8/98EiEckJMwOZkx8pd0++m9+wYCUJU2fECq1ixmGHmOk
+zZtYb6zR1DFdgduKmABjaV5arSXMDMJknDUUcTcA3YU2k0RnYvOW3JaQB62gikrA
+5xcBBKT/MIXZAlOV5IUPX5sZxjw1K8aaj7b2aZmuSldv1Iin4nf/+5tTBYyKwt/d
+dQQ6h2cBOzXPtJgBCd1WGw50VrquoAiow0ud3AhHBG41UJXOWVvxhCCYoArrW5uH
+dZrwSzrGNvMghSLWJj+J
+=Voea
 -----END PGP SIGNATURE-----
diff --git a/net-libs/zeromq/metadata.xml b/net-libs/zeromq/metadata.xml
index 509802e0bde3..a2ae5afd41ba 100644
--- a/net-libs/zeromq/metadata.xml
+++ b/net-libs/zeromq/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>qnikst@gentoo.org</email>
-		<name>Alexander Vershilov</name>
-	</maintainer>
-	<upstream>
-		<maintainer>
-			<email>sustrik@fastmq.com</email>
-			<name>Martin Sustrik</name>
-			<description>iMatrix Corporation</description>
-		</maintainer>
-		<doc>http://zguide.zeromq.org/chapter:1</doc>
-		<bugs-to>http://github.com/zeromq/zeromq2/issues</bugs-to>
-		<!-- remote-id type="github">zeromq/zeromq2</remote-id-->
-	</upstream>
-	<longdescription lang="en">
+  <maintainer>
+    <email>qnikst@gentoo.org</email>
+    <name>Alexander Vershilov</name>
+  </maintainer>
+  <upstream>
+    <maintainer>
+      <email>sustrik@fastmq.com</email>
+      <name>Martin Sustrik</name>
+      <description>iMatrix Corporation</description>
+    </maintainer>
+    <doc>http://zguide.zeromq.org/chapter:1</doc>
+    <bugs-to>http://github.com/zeromq/zeromq2/issues</bugs-to>
+    <!-- remote-id type="github">zeromq/zeromq2</remote-id-->
+  </upstream>
+  <longdescription lang="en">
 		The 0MQ lightweight messaging kernel is a library which
 		extends the standard socket interfaces with features
 		traditionally provided by specialised messaging middleware
@@ -24,11 +24,10 @@
 		(subscriptions), seamless access to multiple transport protocols
 		and more.
 	</longdescription>
-	<use>
-		<flag name="pgm">
+  <use>
+    <flag name="pgm">
 			0MQ is build with 'Pragmatic General Multicast' (RFC 3208) support
 			using the excellent OpenPGM implementation.
 		</flag>
-	</use>
+  </use>
 </pkgmetadata>
-
diff --git a/net-libs/zeromq/zeromq-4.0.1.ebuild b/net-libs/zeromq/zeromq-4.0.1.ebuild
index e3060f1572f6..83119cd9ac77 100644
--- a/net-libs/zeromq/zeromq-4.0.1.ebuild
+++ b/net-libs/zeromq/zeromq-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-4.0.1.ebuild,v 1.1 2013/10/26 07:46:35 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-4.0.1.ebuild,v 1.2 2013/10/26 10:54:25 jlec Exp $
 
 EAPI=5
 
@@ -40,15 +40,17 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc NEWS README AUTHORS ChangeLog || die "dodoc failed"
-	doman doc/*.[1-9] || die "doman failed"
+	emake DESTDIR="${D}" install
+	dodoc NEWS AUTHORS ChangeLog
+	doman doc/*.[1-9]
 
 	# remove useless .la files
-	find "${D}" -name '*.la' -delete
+	find "${D}" -name '*.la' -delete || die
 
 	# remove useless .a (only for non static compilation)
-	use static-libs || find "${D}" -name '*.a' -delete
+	if use static-libs; then
+		find "${D}" -name '*.a' -delete || die
+	fi
 }
 
 src_test() {