fix #495198 wrt zeromq dependencies thx to Allen Parker

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

6 files changed, 21 insertions, 17 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index 90a072d9ac0f..86103b4e9185 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.104 2013/11/19 15:14:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.105 2013/12/24 11:33:12 ultrabug Exp $
+
+  24 Dec 2013; Ultrabug <ultrabug@gentoo.org> rsyslog-7.2.7.ebuild,
+  rsyslog-7.4.3.ebuild, rsyslog-7.4.4.ebuild, rsyslog-7.4.6.ebuild:
+  fix #495198 wrt zeromq dependencies thx to Allen Parker
 
   19 Nov 2013; Jeroen Roovers <jer@gentoo.org> rsyslog-7.4.4.ebuild:
   Stable for HPPA (bug #475882).
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 1f75d4d0f386..3b374bf61825 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -13,16 +13,16 @@ DIST rsyslog-7.2.7.tar.gz 2761741 SHA256 4833533a140c1aebed069082ad579ac25e488b6
 DIST rsyslog-7.4.3.tar.gz 2908523 SHA256 d96fcb733452177f5f06789507e06f5c01434d83001c130c9fcdf21e0fffe382 SHA512 bf840b59c4fb6e0978ca55df5ef48cb6898e0c6ec633efce8e148c0d8af5497346c98290df388811b2f94425119dd0bf28dd272418a35f958ed59a3f5946d25a WHIRLPOOL b57acc662e232c27293c2836d5547e0cc7e7902fdd3ed5d2bfcbf85a747ecdb6c984b25da1a38196f485e2473d2de3f5ae8d9d764cdd86778d4bc99b9a3f574d
 DIST rsyslog-7.4.4.tar.gz 2910075 SHA256 276d094d1e4c62c770ec8a72723667f119eee038912b79cf3337d439bc2f9087 SHA512 cefaa0d5c5e9deb8a6e049a5b6c4503a9f30bfe89324a06f3e8ac6d85334bbddfec9e81010a1821ad5f902347bbc519e92d501783f77bd12f29e216a9abbfc08 WHIRLPOOL 0ba87e3edd7e0eba6ceaeef251d9e29d580452e0305c9df9577769abd53e01345a86de45c0289b945eca3d283838d7cbc4d36eb04ba8105fe3cb754c06a759b9
 DIST rsyslog-7.4.6.tar.gz 2932031 SHA256 07c2cdc4152c05a4f226361fb12c6124087182cc100bf063334af18153d5f7d2 SHA512 07e63c3ac892b9e1a146c057f46e4d3834858569784fbac0c57fd6320a4e4b79d382384fdbba2070fabaea213f5a7c216db56d0d7616b4b55119aff2878dc5a0 WHIRLPOOL 3ad567965609ac35127430c525f82ebbb971f5930d188fe7208f64959c670c54ad1d658d040bbbec0006ff4f74b75c5eb3ce319d752fb0691468635c81961390
-EBUILD rsyslog-7.2.7.ebuild 7143 SHA256 d93c7195e4ed6aab2fbe8714cd5259b9dd76ea0739cb351d72b0c9cb6695ebe9 SHA512 326132a2c8a439d29c3ed4a8392c3340727b93fd343ab6a1dd1cb31f62e3513f835499cccfb1143b89ecb846a2ca8ef439fe01df2ff01c28b5d533911dd97574 WHIRLPOOL e88f641d00b2bc657284e3966ce99202b5154301b80d8f18f098a3e24dc61c3e28fb776485df9ab4d99b86fc2f013400fb760b98a8e3086cc7f87156f681d22f
-EBUILD rsyslog-7.4.3.ebuild 7021 SHA256 8344cd5e74b7726de9294c17f71f65e32fa18ac6b707b805248fc805b232e7ce SHA512 9c77df44044be67e9ef3b4b880801f64093bc2cfbb1dfa59fd1656e9ae1cc03242878e55259890a1215fa249c1ded9afad5fe3aa4f32f651b86acb7eed1de7f6 WHIRLPOOL 26c9e732aeac51ab3eefd7a8bf06ac69bf5cda6d150f5739eb8bee777ae54ba373d93ab6990ba2b5473f355a231bd01f751979799b6fd3604f05410e66e30f40
-EBUILD rsyslog-7.4.4.ebuild 6958 SHA256 2db405b126f381e40101370eee64f49cdf279d7e7d412c73a43dbdfef7186c28 SHA512 0b0b3673f9e021098ff1ec8cca9217d154e70a8e0ae6e082fa77c62bd55b6d0ba3b5c178412a190137b0d802fce57652c563d34ec1f5e1369ff13a61e33c556e WHIRLPOOL 7fa463186c3b8a43720df063a594363bbe9fe76b1e84f9410646530a0376d073b69ad97d72131b72865f9ebe18a69bf0b984dd776b9ff79d80d89c66bbd180d0
-EBUILD rsyslog-7.4.6.ebuild 6966 SHA256 d141ee7aca6e4a64805822dffeddb8fe3fe1cbde05db22fc9202ddd25f73e407 SHA512 c0b418f3c8d9e5fc95c32be9a730d42ed058f585f5018aa77f4ab5d1205e67045bb56fb2ea57dd1b42d8960329c01cd98719744d7ccf3a244ca2a985a9acc734 WHIRLPOOL 42c6b04278bbaa5accc02e1942040494b2d2e93f014af0a5eed1ff81df749a43ef883d8a3bfff03abd153b258c71c9a46cb608fdc1e1ee1608879e0ce524958e
-MISC ChangeLog 19301 SHA256 86fa76805e7c1467d413f217d18768670238ed6fdf5bf103e730bfecdd604465 SHA512 af53bd07f55573123e8f84195bbf7593840e9c3f04ab86c0ad0626f7495c81a0d0e868df60bfe321cbee14e488ae27d997f2400443a962f100765c380bc5807f WHIRLPOOL bb9599e5fbc0b6f20f77b18c9b2db61b87276d38ea9d377a2f61c12df284550cb5e2554d3b533046d1fdb7a65912a7940d3628770322520c8925190fb03daa05
+EBUILD rsyslog-7.2.7.ebuild 7166 SHA256 f53463c58ee9097877858f2c6d9373c9b7bfec0ca9a2b808bc2ee2d635f17025 SHA512 e1709cd8a84c30ec2584ac2107a7f4eb9847981690df7b86fd1491a958e475633100d96cbcbd52c8b4f600f19867c772703d04e6d51faaddcd1682a4057e05cc WHIRLPOOL 4f164baee08dd55902522eac1e7e677ea675bd69e528115bf9930b70dfafc61d47cdaa2e0435376ce60fc7a78257f7b9e60b3e54ee18590fd9aa773d910de788
+EBUILD rsyslog-7.4.3.ebuild 7044 SHA256 792d3bedea89c34c7629307ad30d5829689088662680ad4ffa575b9464371129 SHA512 cc445b48de2e23518ec7578cb1f7bcec37b29b6b8a95c81ab29f4626dfccf597c6acacd0a4de14b12b4f63890e9c742b984dc6ad3227b33894579b3c85285a24 WHIRLPOOL 5513c151c1190eeb8898a4a74c73eb126aef17e72565c65092b2f40086b1e86e30576a7fa26d4a2499ef65044c6771f53722c0fc1aa78554e3f07039f36792a5
+EBUILD rsyslog-7.4.4.ebuild 6986 SHA256 c4b369079db072ee2f738d52cfe477bdec0c5a9c62b91d93a82e1e83f4f51277 SHA512 199ebde9cedec3dbee12459716c4d8dbf9d8a74f2dbb1a8c83a24449e17b4ea1ab542898ad71cba8a60a24f181ab032fe9df250f0e35b5f124ccedc2d401fafe WHIRLPOOL 53a437226442a34729d938157b6c3c80b1353249a4a9c5ee96c044a10322f083ee79e84d0fabd43e06665b0602f78d6da5e7c5904b5faa3f8946a3edd8acd34a
+EBUILD rsyslog-7.4.6.ebuild 6989 SHA256 cc7edebb862d27c3b3a08a746bffccbbe3d9509a49b8ae5b7b21d215706e3969 SHA512 6be54dc72b2d689b5981bb6dcca72075b7d07fcc6905c4b3b4601f86eeb2bdb1aab120106d08216e0ca1e3c9d6670f783c695f08e18f833727efd9f5b4fa509b WHIRLPOOL a896e5e10c6db98be9c35ea65c4293e8736c907ae0528bcaa753dd5748ba4b6eb60762ff9e4ce465d918ff6abb8ffa9e3a61cb60f5bd0b8c1b506850bd2d5296
+MISC ChangeLog 19501 SHA256 2d62bbd4d8cc9b27fafb9da1f64d9b799fbed9159c0fd5dad7c45285ca316268 SHA512 38c25859f5d305f5bf110adeac26aaf0d6026f3a0729012075a17a51d121dab5695e50303b35ab209ad54e9b4ff7608563f0b4d2e369c47cc67620f217df28d4 WHIRLPOOL 47c44031d7edf49814859b793c685a2777b392c2d7b2bd2b3c2754de12ffecf01151509a7196278a282f1f627b51bfaebfc7de0832f95209ce602a956099ba7f
 MISC metadata.xml 742 SHA256 368ca508427131393dc5fcfb20b82ea3b96b97f617a79a846569b9f955096733 SHA512 cbb8033cfea6cade5f45b288bc98f3e1d31cd84b8efb28b0ce6be89ba39e0c95eff5160e2cb23f95f53313724f2cd3f3607e3971fc3054769c4f4bb08f35329f WHIRLPOOL 2a674c053d505a5ab5732c371815ef85fc5f9260f0d205e611a175f026a21fe07a887d216f92f85de70fcac051d26c42338a478451026923e6c77f364890db76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKLgG8ACgkQVWmRsqeSphNlPQCfYJySlYUKFjumTO9dUZaJl8Vl
-cmgAnAr7XKiQjuHes+u06AOfhC/BUW9t
-=8CeS
+iF4EAREIAAYFAlK5cP4ACgkQKiQSS7ZY+hNHFgD/emXU3CBf6iqxMnhNJnDemvVN
+35NkKtpHdVWoQ2PGhMgBAKZlwrQrZhIMlwNKPppK58sgJtf7tbJfg4d4eMkssrJ3
+=QZbR
 -----END PGP SIGNATURE-----
diff --git a/app-admin/rsyslog/rsyslog-7.2.7.ebuild b/app-admin/rsyslog/rsyslog-7.2.7.ebuild
index 18f7f7cf5996..691361dc7b73 100644
--- a/app-admin/rsyslog/rsyslog-7.2.7.ebuild
+++ b/app-admin/rsyslog/rsyslog-7.2.7.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/app-admin/rsyslog/rsyslog-7.2.7.ebuild,v 1.6 2013/11/18 14:19:04 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.7.ebuild,v 1.7 2013/12/24 11:33:12 ultrabug Exp $
 
 EAPI=4
 AUTOTOOLS_AUTORECONF=yes
@@ -30,7 +30,7 @@ RDEPEND="
 	relp? ( >=dev-libs/librelp-1.0.1 )
 	snmp? ( net-analyzer/net-snmp )
 	ssl? ( net-libs/gnutls dev-libs/libgcrypt )
-	zeromq? ( net-libs/czmq )
+	zeromq? ( >=net-libs/zeromq-3 <net-libs/czmq-2 )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/app-admin/rsyslog/rsyslog-7.4.3.ebuild b/app-admin/rsyslog/rsyslog-7.4.3.ebuild
index 94034635c24b..cd2c80f0c316 100644
--- a/app-admin/rsyslog/rsyslog-7.4.3.ebuild
+++ b/app-admin/rsyslog/rsyslog-7.4.3.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/app-admin/rsyslog/rsyslog-7.4.3.ebuild,v 1.4 2013/11/18 14:19:04 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.3.ebuild,v 1.5 2013/12/24 11:33:12 ultrabug Exp $
 
 EAPI=4
 AUTOTOOLS_AUTORECONF=yes
@@ -30,7 +30,7 @@ RDEPEND="
 	relp? ( >=dev-libs/librelp-1.0.3 )
 	snmp? ( net-analyzer/net-snmp )
 	ssl? ( net-libs/gnutls dev-libs/libgcrypt )
-	zeromq? ( net-libs/czmq )
+	zeromq? ( >=net-libs/zeromq-3 <net-libs/czmq-2 )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/app-admin/rsyslog/rsyslog-7.4.4.ebuild b/app-admin/rsyslog/rsyslog-7.4.4.ebuild
index a97ae31db833..c4c7c4f95a09 100644
--- a/app-admin/rsyslog/rsyslog-7.4.4.ebuild
+++ b/app-admin/rsyslog/rsyslog-7.4.4.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/app-admin/rsyslog/rsyslog-7.4.4.ebuild,v 1.6 2013/11/19 15:14:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.4.ebuild,v 1.7 2013/12/24 11:33:12 ultrabug Exp $
 
 EAPI=4
 AUTOTOOLS_AUTORECONF=yes
@@ -31,7 +31,7 @@ RDEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	ssl? ( net-libs/gnutls dev-libs/libgcrypt )
 	systemd? ( sys-apps/systemd )
-	zeromq? ( net-libs/czmq )
+	zeromq? ( >=net-libs/zeromq-3 <net-libs/czmq-2 )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/app-admin/rsyslog/rsyslog-7.4.6.ebuild b/app-admin/rsyslog/rsyslog-7.4.6.ebuild
index c3f2d97de7f2..857b0f1d47d1 100644
--- a/app-admin/rsyslog/rsyslog-7.4.6.ebuild
+++ b/app-admin/rsyslog/rsyslog-7.4.6.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/app-admin/rsyslog/rsyslog-7.4.6.ebuild,v 1.2 2013/11/18 14:19:04 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.6.ebuild,v 1.3 2013/12/24 11:33:12 ultrabug Exp $
 
 EAPI=4
 AUTOTOOLS_AUTORECONF=yes
@@ -31,7 +31,7 @@ RDEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	ssl? ( net-libs/gnutls dev-libs/libgcrypt )
 	systemd? ( sys-apps/systemd )
-	zeromq? ( net-libs/czmq )
+	zeromq? ( >=net-libs/zeromq-3 <net-libs/czmq-2 )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"