Version Bump; fix subslots to soname

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)

1 files changed, 22 insertions, 19 deletions

diff --git a/net-libs/zeromq/zeromq-3.2.3.ebuild b/net-libs/zeromq/zeromq-3.2.3.ebuild
index 73c3ded69ba5..5ec6d2f52197 100644
--- a/net-libs/zeromq/zeromq-3.2.3.ebuild
+++ b/net-libs/zeromq/zeromq-3.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-3.2.3.ebuild,v 1.10 2014/02/16 19:56:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-3.2.3.ebuild,v 1.11 2015/06/04 10:58:58 jlec Exp $
 
 EAPI=5
 
@@ -15,22 +15,24 @@ SLOT="0"
 KEYWORDS="amd64 arm hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="pgm test static-libs elibc_glibc"
 
-DEPEND="|| ( sys-devel/gcc sys-devel/gcc-apple )
-		pgm? (
-		  virtual/pkgconfig
-		  =net-libs/openpgm-5.1.118
-		)
-		elibc_glibc? ( sys-apps/util-linux )"
+DEPEND="
+	|| ( sys-devel/gcc sys-devel/gcc-apple )
+	pgm? (
+		virtual/pkgconfig
+		=net-libs/openpgm-5.1.118
+	)
+	elibc_glibc? ( sys-apps/util-linux )"
 RDEPEND=""
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-unused-variable.patch || die
+	epatch "${FILESDIR}"/${P}-unused-variable.patch
 	einfo "Removing bundled OpenPGM library"
 	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
 	rm -r "${S}"/foreign/openpgm/libpgm* || die
 	# apply effective bit of below commit to fix compilation on Darwin
 	# https://github.com/zeromq/zeromq3-x/commit/400cbc208a768c4df5039f401dd2688eede6e1ca
 	sed -i -e '/strndup/d' tests/test_disconnect_inproc.cpp || die
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -39,21 +41,22 @@ src_configure() {
 	use pgm && myconf="--with-system-pgm" || myconf="--without-pgm"
 	econf \
 	  $(use_enable static-libs static) \
-	  $myconf
+	  ${myconf}
+}
+
+src_test() {
+	emake -j1 check
 }
 
 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"
+	default
+	doman doc/*.[1-9]
 
 	# remove useless .la files
-	find "${D}" -name '*.la' -delete
+	find "${ED}" -name '*.la' -delete || die
 
 	# remove useless .a (only for non static compilation)
-	use static-libs || find "${D}" -name '*.a' -delete
-}
-
-src_test() {
-	emake -j1 check
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
 }