From 8cdccbd66637bdc03546bf2ca3848bce7f30a2a2 Mon Sep 17 00:00:00 2001 From: Alexander Vershilov Date: Wed, 18 Jun 2014 08:21:16 +0000 Subject: Adjust openpgm dependencies. Drop old (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xEAD50D64D8D3571A!) --- net-libs/zeromq/ChangeLog | 10 +++++- net-libs/zeromq/zeromq-2.1.11.ebuild | 52 ------------------------------ net-libs/zeromq/zeromq-2.2.0.ebuild | 4 +-- net-libs/zeromq/zeromq-3.2.4-r1.ebuild | 58 ++++++++++++++++++++++++++++++++++ net-libs/zeromq/zeromq-3.2.4.ebuild | 58 ---------------------------------- net-libs/zeromq/zeromq-4.0.4-r1.ebuild | 50 +++++++++++++++++++++++++++++ net-libs/zeromq/zeromq-4.0.4.ebuild | 50 ----------------------------- 7 files changed, 119 insertions(+), 163 deletions(-) delete mode 100644 net-libs/zeromq/zeromq-2.1.11.ebuild create mode 100644 net-libs/zeromq/zeromq-3.2.4-r1.ebuild delete mode 100644 net-libs/zeromq/zeromq-3.2.4.ebuild create mode 100644 net-libs/zeromq/zeromq-4.0.4-r1.ebuild delete mode 100644 net-libs/zeromq/zeromq-4.0.4.ebuild (limited to 'net-libs/zeromq') diff --git a/net-libs/zeromq/ChangeLog b/net-libs/zeromq/ChangeLog index 1e0d394741d9..b53c90851463 100644 --- a/net-libs/zeromq/ChangeLog +++ b/net-libs/zeromq/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-libs/zeromq # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/ChangeLog,v 1.59 2014/03/26 08:15:50 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/ChangeLog,v 1.60 2014/06/18 08:21:16 qnikst Exp $ + +*zeromq-4.0.4-r1 (18 Jun 2014) +*zeromq-3.2.4-r1 (18 Jun 2014) + + 18 Jun 2014; Alexander Vershilov +zeromq-3.2.4-r1.ebuild, + +zeromq-4.0.4-r1.ebuild, -zeromq-2.1.11.ebuild, -zeromq-3.2.4.ebuild, + -zeromq-4.0.4.ebuild, zeromq-2.2.0.ebuild: + Adjust openpgm dependencies. Drop old 26 Mar 2014; Patrick Lauer zeromq-4.0.1-r1.ebuild: Whitespace diff --git a/net-libs/zeromq/zeromq-2.1.11.ebuild b/net-libs/zeromq/zeromq-2.1.11.ebuild deleted file mode 100644 index c241dc2e0718..000000000000 --- a/net-libs/zeromq/zeromq-2.1.11.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-2.1.11.ebuild,v 1.4 2012/05/05 02:54:24 jdhore Exp $ - -# NOTES: -# 1- use flag 'pgm' (OpenPGM support) must be masked by profiles for ARM archs; - -EAPI=3 -WANT_AUTOCONF="2.5" -inherit autotools - -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? ( - virtual/pkgconfig - =net-libs/openpgm-5.1.118 - ) - sys-apps/util-linux" - -src_prepare() { - einfo "Removing bundled OpenPGM library" - rm -r "${S}"/foreign/openpgm/libpgm* || die - eautoreconf -} - -src_configure() { - local myconf - use pgm && myconf="--with-system-pgm" || myconf="--without-pgm" - econf \ - $(use_enable static-libs static) \ - $myconf -} - -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 -} diff --git a/net-libs/zeromq/zeromq-2.2.0.ebuild b/net-libs/zeromq/zeromq-2.2.0.ebuild index 3ae274f86a84..77960062d722 100644 --- a/net-libs/zeromq/zeromq-2.2.0.ebuild +++ b/net-libs/zeromq/zeromq-2.2.0.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-2.2.0.ebuild,v 1.13 2014/02/16 12:28:00 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-2.2.0.ebuild,v 1.14 2014/06/18 08:21:16 qnikst Exp $ # NOTES: # 1- use flag 'pgm' (OpenPGM support) must be masked by profiles for ARM archs; -EAPI=3 +EAPI=4 WANT_AUTOCONF="2.5" inherit autotools diff --git a/net-libs/zeromq/zeromq-3.2.4-r1.ebuild b/net-libs/zeromq/zeromq-3.2.4-r1.ebuild new file mode 100644 index 000000000000..da3136c240c5 --- /dev/null +++ b/net-libs/zeromq/zeromq-3.2.4-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-3.2.4-r1.ebuild,v 1.1 2014/06/18 08:21:16 qnikst Exp $ + +EAPI=5 + +inherit autotools eutils + +DESCRIPTION="ZeroMQ is a brokerless kernel" +HOMEPAGE="http://www.zeromq.org/" +SRC_URI="http://download.zeromq.org/${P}.tar.gz" + +LICENSE="LGPL-3" +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.2.122 + ) + elibc_glibc? ( sys-apps/util-linux )" +RDEPEND="" + +src_prepare() { + 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 + eautoreconf +} + +src_configure() { + local myconf + use pgm && myconf="--with-system-pgm" || myconf="--without-pgm" + econf \ + $(use_enable static-libs static) \ + $myconf +} + +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 +} + +src_test() { + emake -j1 check +} diff --git a/net-libs/zeromq/zeromq-3.2.4.ebuild b/net-libs/zeromq/zeromq-3.2.4.ebuild deleted file mode 100644 index dbe6fda5a190..000000000000 --- a/net-libs/zeromq/zeromq-3.2.4.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# 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-3.2.4.ebuild,v 1.1 2013/09/23 15:29:43 qnikst Exp $ - -EAPI=5 - -inherit autotools eutils - -DESCRIPTION="ZeroMQ is a brokerless kernel" -HOMEPAGE="http://www.zeromq.org/" -SRC_URI="http://download.zeromq.org/${P}.tar.gz" - -LICENSE="LGPL-3" -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 )" -RDEPEND="" - -src_prepare() { - 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 - eautoreconf -} - -src_configure() { - local myconf - use pgm && myconf="--with-system-pgm" || myconf="--without-pgm" - econf \ - $(use_enable static-libs static) \ - $myconf -} - -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 -} - -src_test() { - emake -j1 check -} diff --git a/net-libs/zeromq/zeromq-4.0.4-r1.ebuild b/net-libs/zeromq/zeromq-4.0.4-r1.ebuild new file mode 100644 index 000000000000..6c6004787884 --- /dev/null +++ b/net-libs/zeromq/zeromq-4.0.4-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-4.0.4-r1.ebuild,v 1.1 2014/06/18 08:21:16 qnikst Exp $ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=true + +inherit autotools-utils + +DESCRIPTION="A brokerless kernel" +HOMEPAGE="http://www.zeromq.org/" +SRC_URI="http://download.zeromq.org/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux" +IUSE="pgm static-libs test" + +RDEPEND=" + dev-libs/libsodium + pgm? ( =net-libs/openpgm-5.2.122 )" +DEPEND="${RDEPEND} + sys-apps/util-linux + pgm? ( virtual/pkgconfig )" + +src_prepare() { + einfo "Removing bundled OpenPGM library" + rm -fr "${S}"/foreign/openpgm/libpgm* || die + sed \ + -e '/libzmq_werror=/s:yes:no:g' \ + -i configure.ac || die + autotools-utils_src_prepare +} + +src_configure() { + local myeconfargs=() + use pgm && myeconfargs+=( --with-system-pgm ) || myeconfargs+=( --without-pgm ) + autotools-utils_src_configure +} + +src_test() { + autotools-utils_src_test -j1 +} + +src_install() { + autotools-utils_src_install + + doman doc/*.[1-9] +} diff --git a/net-libs/zeromq/zeromq-4.0.4.ebuild b/net-libs/zeromq/zeromq-4.0.4.ebuild deleted file mode 100644 index 9cac8390c5d8..000000000000 --- a/net-libs/zeromq/zeromq-4.0.4.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-4.0.4.ebuild,v 1.1 2014/03/24 14:54:34 qnikst Exp $ - -EAPI=5 - -AUTOTOOLS_AUTORECONF=true - -inherit autotools-utils - -DESCRIPTION="A brokerless kernel" -HOMEPAGE="http://www.zeromq.org/" -SRC_URI="http://download.zeromq.org/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux" -IUSE="pgm static-libs test" - -RDEPEND=" - dev-libs/libsodium - pgm? ( =net-libs/openpgm-5.1.118 )" -DEPEND="${RDEPEND} - sys-apps/util-linux - pgm? ( virtual/pkgconfig )" - -src_prepare() { - einfo "Removing bundled OpenPGM library" - rm -fr "${S}"/foreign/openpgm/libpgm* || die - sed \ - -e '/libzmq_werror=/s:yes:no:g' \ - -i configure.ac || die - autotools-utils_src_prepare -} - -src_configure() { - local myeconfargs=() - use pgm && myeconfargs+=( --with-system-pgm ) || myeconfargs+=( --without-pgm ) - autotools-utils_src_configure -} - -src_test() { - autotools-utils_src_test -j1 -} - -src_install() { - autotools-utils_src_install - - doman doc/*.[1-9] -} -- cgit v1.2.3-65-gdbad