summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-10-26 10:54:25 +0000
committerJustin Lecher <jlec@gentoo.org>2013-10-26 10:54:25 +0000
commit141e2808c3fc2bc4b1ec0e53096ea1c24d07ea7e (patch)
tree99ab700fc4b6bf45522bc0b100d439b9856cfb5d /net-libs/zeromq
parentCleanup old versions (diff)
downloadgentoo-2-141e2808c3fc2bc4b1ec0e53096ea1c24d07ea7e.tar.gz
gentoo-2-141e2808c3fc2bc4b1ec0e53096ea1c24d07ea7e.tar.bz2
gentoo-2-141e2808c3fc2bc4b1ec0e53096ea1c24d07ea7e.zip
net-libs/zeromq: Remove README from dodoc, #489442; fix die() usage
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'net-libs/zeromq')
-rw-r--r--net-libs/zeromq/ChangeLog6
-rw-r--r--net-libs/zeromq/metadata.xml37
-rw-r--r--net-libs/zeromq/zeromq-4.0.1.ebuild14
3 files changed, 31 insertions, 26 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/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() {