From 3976474f88890d3a07f5ec484ad0c5fbdaf522ef Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 8 Jun 2015 10:37:44 +0200 Subject: [PATCH] zeromq: reverts 4.1.1 4.1.1 breaks pyzmq, so revert this for now. --- ...c9ec5b8886b291e3ad8b8a05b6d255822c8f.patch | 31 ------------------- srcpkgs/zeromq/template | 21 +++++-------- 2 files changed, 8 insertions(+), 44 deletions(-) delete mode 100644 srcpkgs/zeromq/patches/c75cc9ec5b8886b291e3ad8b8a05b6d255822c8f.patch diff --git a/srcpkgs/zeromq/patches/c75cc9ec5b8886b291e3ad8b8a05b6d255822c8f.patch b/srcpkgs/zeromq/patches/c75cc9ec5b8886b291e3ad8b8a05b6d255822c8f.patch deleted file mode 100644 index d1e754de43..0000000000 --- a/srcpkgs/zeromq/patches/c75cc9ec5b8886b291e3ad8b8a05b6d255822c8f.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c75cc9ec5b8886b291e3ad8b8a05b6d255822c8f Mon Sep 17 00:00:00 2001 -From: Jason Unovitch -Date: Sat, 6 Jun 2015 18:49:21 -0400 -Subject: [PATCH] Enable install of man pages when BUILD_DOC is not set by - shifting INSTALL_MAN outside of BUILD_DOC's if/endif - ---- - doc/Makefile.am | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/doc/Makefile.am b/doc/Makefile.am -index 0bc2e0e..d73e5b2 100644 ---- doc/Makefile.am -+++ doc/Makefile.am -@@ -28,13 +28,13 @@ MAINTAINERCLEANFILES = $(MAN_DOC) $(MAN_HTML) - - EXTRA_DIST = asciidoc.conf $(MAN_TXT) - --if BUILD_DOC --EXTRA_DIST += $(MAN_HTML) -- - if INSTALL_MAN - dist_man_MANS = $(MAN_DOC) - endif - -+if BUILD_DOC -+EXTRA_DIST += $(MAN_HTML) -+ - SUFFIXES=.html .txt .xml .3 .7 - - .txt.html: diff --git a/srcpkgs/zeromq/template b/srcpkgs/zeromq/template index bb98eaa7f5..231e89e115 100644 --- a/srcpkgs/zeromq/template +++ b/srcpkgs/zeromq/template @@ -1,31 +1,26 @@ # Template file for 'zeromq' pkgname=zeromq -version=4.1.1 +reverts=4.1.1_1 +version=4.0.6 revision=1 build_style=gnu-configure -# automake, libtool and pre_configure only for patch. patch shouldn't -# be needed in the next version. -hostmakedepends="pkg-config automake libtool" +hostmakedepends="pkg-config" makedepends="libsodium-devel" short_desc="The Intelligent Transport Layer" maintainer="Juan RP " -license="LGPL-2.1" +license="LGPL-3" homepage="http://www.zeromq.org" distfiles="http://download.zeromq.org/zeromq-${version}.tar.gz" -checksum=43d61e5706b43946aad4a661400627bcde9c63cc25816d4749c67b64c3dab8db - -pre_configure() { - autoreconf -fi -} +checksum=28a2a9c9b77014c39087a498942449df18bb9885cdb63334833525a1d19f2894 zeromq-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/man/man3 - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" + vmove usr/lib/*.a + vmove usr/lib/*.so } }