Version bump zeromq to 2.1.3 (bug 355525).

(Portage version: 2.1.9.45/cvs/Linux x86_64)

3 files changed, 182 insertions, 1 deletions

diff --git a/net-libs/zeromq/ChangeLog b/net-libs/zeromq/ChangeLog
index b0173c1c916e..06cd81099ec9 100644
--- a/net-libs/zeromq/ChangeLog
+++ b/net-libs/zeromq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/zeromq
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/ChangeLog,v 1.4 2011/03/04 17:26:53 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/ChangeLog,v 1.5 2011/03/30 17:18:44 djc Exp $
+
+*zeromq-2.1.3 (30 Mar 2011)
+
+  30 Mar 2011; Dirkjan Ochtman <djc@gentoo.org> +zeromq-2.1.3.ebuild,
+  +files/zeromq-2.1.3-configure.patch:
+  Version bump to 2.1.3 (bug 355525).
 
   04 Mar 2011; Dirkjan Ochtman <djc@gentoo.org> zeromq-2.0.9.ebuild,
   metadata.xml:
diff --git a/net-libs/zeromq/files/zeromq-2.1.3-configure.patch b/net-libs/zeromq/files/zeromq-2.1.3-configure.patch
new file mode 100644
index 000000000000..062b74777abc
--- /dev/null
+++ b/net-libs/zeromq/files/zeromq-2.1.3-configure.patch
@@ -0,0 +1,120 @@
+--- configure.in.bak	2011-03-28 15:04:47.000000000 +0200
++++ configure.in	2011-03-28 15:11:24.000000000 +0200
+@@ -269,54 +269,16 @@
+ AC_TYPE_UINT32_T
+ AC_C_VOLATILE
+ 
+-#  PGM extension
+-ac_zmq_pgm_ext="no"
+-
+-pgm_basename="libpgm-5.1.114~dfsg"
+-
+-AC_SUBST(pgm_basename)
+-
+-AC_ARG_WITH([pgm], [AS_HELP_STRING([--with-pgm], 
+-    [build libzmq with PGM extension [default=no]])], 
+-    [with_pgm_ext=$withval], [with_pgm_ext=no])
+-
+-if test "x$with_pgm_ext" != "xno"; then
+-
+-    # This allows placing the tar.gz to foreign/openpgm
+-    # and using ./configure --with-pgm=libpgm-x.y.z
+-    if test "x$with_pgm_ext" != "xyes"; then
+-        pgm_basename="$with_pgm_ext"
+-    fi
+-
+-    # Unpack libpgm
+-    AC_MSG_NOTICE([Unpacking ${pgm_basename}.tar.gz])
+-    ac_zmq_pwd=`pwd`
+-    cd foreign/openpgm
+-
+-    if ! (gzip -dc "${pgm_basename}.tar.gz" || echo "failed") | ${am__untar}; then
+-        AC_MSG_ERROR([cannot unpack the foreign/openpgm/${pgm_basename}.tar.gz file])
+-    fi
+-
+-    cd "${ac_zmq_pwd}"
+-
+-    if test -d foreign/openpgm/build-staging; then
+-        rm -rf foreign/openpgm/build-staging
+-    fi
+-
+-    mv foreign/openpgm/${pgm_basename} foreign/openpgm/build-staging
+-    pgm_srcdir=foreign/openpgm/build-staging/openpgm/pgm
+-
+-    if ! test -d foreign/openpgm/build-staging/openpgm/pgm/config; then
+-        mkdir foreign/openpgm/build-staging/openpgm/pgm/config
+-    fi
+-
+-    AC_SUBST(pgm_srcdir)
+-    AC_CONFIG_SUBDIRS([foreign/openpgm/build-staging/openpgm/pgm/])
+-
+-    #  Success!
+-    AC_DEFINE(ZMQ_HAVE_OPENPGM, 1, [Have OpenPGM extension])
+-    ac_zmq_pgm_ext="yes"
+-fi
++# check for the presence of OpenPGM
++AC_ARG_WITH([pgm], AS_HELP_STRING([--with-pgm],
++	[build libzmq with PGM extension [default=no]]))
++
++AS_IF([test "x$with_pgm" = "xyes"], [
++	PKG_CHECK_MODULES([OpenPGM], [openpgm-5.1 >= 5.1])
++	AC_DEFINE(ZMQ_HAVE_OPENPGM, 1, [Have OpenPGM extension])
++	LIBZMQ_EXTRA_CXXFLAGS="$OpenPGM_CFLAGS $LIBZMQ_EXTRA_CXXFLAGS"
++	LIBS="$OpenPGM_LIBS $LIBS"
++])
+ 
+ # Set -Wall, -Werror and -pedantic
+ AC_LANG_PUSH([C++])
+@@ -341,52 +303,6 @@
+ AC_CHECK_FUNCS(perror gettimeofday memset socket getifaddrs freeifaddrs)
+ AC_CHECK_HEADERS([alloca.h])
+ 
+-if test "x$with_pgm_ext" != "xno"; then
+-
+-    # Check additional functions for PGM build
+-    AC_CHECK_FUNCS(poll epoll_create pselect getopt vasprintf getprotobyname_r2 getprotobyname_r)
+-
+-    if test "x$ac_cv_func_gettimeofday" = "xyes"; then
+-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_GETTIMEOFDAY $LIBZMQ_EXTRA_CFLAGS"
+-    fi
+-    if test "x$ac_cv_func_getprotobyname_r2" = "xyes"; then
+-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_GETPROTOBYNAME_R2 $LIBZMQ_EXTRA_CFLAGS"
+-    fi    
+-    if test "x$ac_cv_func_poll" = "xyes"; then
+-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_POLL $LIBZMQ_EXTRA_CFLAGS"
+-    fi
+-    if test "x$ac_cv_func_epoll_create" = "xyes"; then
+-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_EPOLL $LIBZMQ_EXTRA_CFLAGS"
+-    fi
+-    if test "x$ac_cv_func_getifaddrs" = "xyes"; then
+-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_GETIFADDRS $LIBZMQ_EXTRA_CFLAGS"
+-    fi
+-    if test "x$ac_cv_func_getopt" = "xyes"; then
+-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_GETOPT $LIBZMQ_EXTRA_CFLAGS"
+-    fi
+-    if test "x$ac_cv_func_pselect" = "xyes"; then
+-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_PSELECT $LIBZMQ_EXTRA_CFLAGS"
+-    fi
+-    if test "x$ac_cv_header_alloca_h" = "xyes"; then
+-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_ALLOCA_H $LIBZMQ_EXTRA_CFLAGS"
+-    fi
+-    if test "x$ac_cv_c_compiler_gnu" = "xno"; then
+-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_ISO_VARARGS $LIBZMQ_EXTRA_CFLAGS"
+-    else
+-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_GNU_VARARGS $LIBZMQ_EXTRA_CFLAGS"
+-    fi
+-    if test "x$ac_cv_func_vasprintf" = "xyes"; then
+-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_VASPRINTF $LIBZMQ_EXTRA_CFLAGS"
+-    fi
+-    case "${host_cpu}" in
+-        i*86|x86_64|amd64|*sparc*)
+-            LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_TSC -DCONFIG_HAVE_RTC -DCONFIG_HAVE_HPET $LIBZMQ_EXTRA_CFLAGS"
+-        ;;
+-        *sparc*|s390*)
+-        ;;
+-    esac
+-fi
+-
+ # Subst LIBZMQ_EXTRA_CFLAGS & CXXFLAGS & LDFLAGS
+ AC_SUBST(LIBZMQ_EXTRA_CFLAGS)
+ AC_SUBST(LIBZMQ_EXTRA_CXXFLAGS)
diff --git a/net-libs/zeromq/zeromq-2.1.3.ebuild b/net-libs/zeromq/zeromq-2.1.3.ebuild
new file mode 100644
index 000000000000..0fd687c62cb7
--- /dev/null
+++ b/net-libs/zeromq/zeromq-2.1.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-2.1.3.ebuild,v 1.1 2011/03/30 17:18:44 djc Exp $
+
+# NOTES:
+# 1- use flag 'pgm' (OpenPGM support) must be masked by profiles for ARM archs;
+
+EAPI=3
+WANT_AUTOCONF="2.5"
+inherit autotools
+
+PGM_VERSION=5.1.114
+
+DESCRIPTION="ZeroMQ is a brokerless messaging kernel with extremely high performance."
+HOMEPAGE="http://www.zeromq.org"
+SRC_URI="http://download.zeromq.org/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pgm test static-libs"
+
+RDEPEND=""
+DEPEND="pgm? (
+		dev-util/pkgconfig
+		=net-libs/openpgm-${PGM_VERSION}
+	)
+	sys-apps/util-linux"
+
+src_prepare() {
+	einfo "Removing bundled OpenPGM library"
+	rm -r "${S}"/foreign/openpgm || die
+	epatch "${FILESDIR}/${P}"-configure.patch || die
+	eautoreconf
+}
+
+src_configure() {
+	myconf=""
+	use pgm && localconf="--with-pgm=libpgm-${PGM_VERSION}"
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with pgm pgm "libpgm-${PGM_VERSION}")
+}
+
+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"
+
+	# remove useless .la files
+	find "${D}" -name '*.la' -delete
+
+	# remove useless .a (only for non static compilation)
+	use static-libs || find "${D}" -name '*.a' -delete
+}