fix #542330

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

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index a489a96bc1dd4e507cc5335ef8649d6a110f4f42..da03e33864a76825332717f4e17198d610273a3b 100644 (file)
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.133 2015/02/23 14:46:03 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.134 2015/03/23 11:44:44 ultrabug Exp $
+
+*rsyslog-8.7.0-r1 (23 Mar 2015)
+
+  23 Mar 2015; Ultrabug <ultrabug@gentoo.org> -rsyslog-8.7.0.ebuild,
+  +rsyslog-8.7.0-r1.ebuild:
+  fix some deps and doc building thx to Martin Dummer and Thomas D. fix #542330
 
 *rsyslog-8.7.0 (23 Feb 2015)
 

diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 8e1ac3802135d259e48f2ae1d8c2ca192bf25365..84bd161bfb6f96e10cc2e7d59280fe899333eaac 100644 (file)
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -17,13 +17,13 @@ DIST rsyslog-doc-8.6.0.tar.gz 4056307 SHA256 515a33c2aabeb64b0fee3096aa6544a3b4a
 DIST rsyslog-doc-8.7.0.tar.gz 4105507 SHA256 f131bfb963eed4fe74d7336ee5261876b436004b78994d47523a82c0f7d666a8 SHA512 9b5b6f28a55b58c956ca614301fc9667243d02c321f8b4071264e4040dd8fe79ba7eb5a08912e2a229bdcf12f68eec24f1c65ba7b82ccd60c8e70d34267b8405 WHIRLPOOL 386ad5164768a5a4919ba5acda29f3ef670b78cc9d6845e3c8ee252b43d6622c19c7f8ec1edd7d0f1d111bf2c06d29fb5dbf9af6b46c426932ae6caa0e63c30c
 EBUILD rsyslog-8.4.2.ebuild 9553 SHA256 7a4c84cef6a9dfd89be22ca8736487597acf5ebe022ab6e7fbadd0f30f1e3c44 SHA512 29c00a2bc9c879e75a14af69f82c0a4eb734d82862a5e02c1c194a3aff8191f22ba32afb256683a3e2d68374d89a30b1a16446180f35a6f2ec53d6b1a326ca1f WHIRLPOOL c1624c6f3fe27c233a8193b1ce7010be36f8c8c3ac2c4a4115cd1ff5da78b5b17924ce3a9a72d4190abb9a1415b184da84427c3f2f5b74de99b04ef586d16993
 EBUILD rsyslog-8.6.0.ebuild 10905 SHA256 6874ab8f77c0d553e41936b76afc7d8c9db5006aa86b7e7b7873c6dcbee35096 SHA512 e693d3e15d470a7badf100ba563294effffad179c5df64aafa1c6a372904c755c9aa4c6f201a956167ffffb6e6a51ab732cf84bce2dafbde21c4848a4d447df7 WHIRLPOOL fcb4d11a84feeb8ae28da28b4294888031c8ede7965edf8b10badb47a68227b09c025f11946fa8701645819ef8973088b7eafdc268f22c82bb1452d6bee9a705
-EBUILD rsyslog-8.7.0.ebuild 10743 SHA256 a5b2f914b526472c5783ce6cb54a96aa4003fac27529f0550e287241f801d689 SHA512 43a473db9d2bbb8254aadc238bf948b1f5be41bb6d40e3b5afb32ed1313f0df9d348813590626b5a19667b156f8bd3383bc0bf6ed0ea1a5846ce98a3812a3c43 WHIRLPOOL 586698f9d3a6f72627d3e86e14c47860f0a5f7016d97a51e041146a3aa8d0cc07b85e8894fc780fd3fe142c98d457e652329ebc13898fabaec4e0adaaf7dcff5
-MISC ChangeLog 25561 SHA256 cc0d303bf83b888b4b59239ff4fd304efefdbdc582a760ecc0d922cc1532ab15 SHA512 1a5063ff2eb80046e635ab68b88c945006c3e940a4ccf14f7a36f3a55398f396b4bb2f2895dfdf803dcd91686cea6cd645714629af2227116ea5d8266d6571d1 WHIRLPOOL b02d0edfbda0ef9a9a865128f774552b26476b7e6807fa4103768249ed3ab867680bed3215af326dbdb672bcc597e17b0f854522fd6c97ed7e30382cb6eddb69
+EBUILD rsyslog-8.7.0-r1.ebuild 10744 SHA256 e5d5a539c5d0fb527f9e8a185e2b98c458fe6304ef57b5840f4aa6913edae3c3 SHA512 6fac3ec853310e755a1c1da833cefeb4e6745d340bc5c4001874e6c7d334ba4ba00eaa3524edbc27e7ea73850bd54f4b9fa7cd956c7ad74b67fd36be56185eaa WHIRLPOOL e5b7dd2546986617973a2b318d5c0b9b0fcee885eff985cf4163bf65ac15f2610ca29bd65ef2e0488b5c064892d6d6a5e5a5548e3c4cd0131ec273a77c346a58
+MISC ChangeLog 25772 SHA256 50a542c2b417b123f8d5c207b65d519427789cba82105cd41da4258cd7afaaf6 SHA512 4747a77b875cb77ed7f8ea83c4262d888097ad4c6cf45638d3871b57ce5c3f60da5e9a231f25642a88fea55eb9deb8dc189bcdbf0f375da7fa515555d499668e WHIRLPOOL 406458619ed1467988ae1a9b92b0697e044106b2e530021fa0514079ace1a70272bad04676bb7c8e250560231d5e741420fd2827b8e2a3cf87e6939fc832d251
 MISC metadata.xml 2907 SHA256 34ee0914c446e0c687bf670dd78f9a5d622db4e119717e6ac2a0376202a7dc68 SHA512 4dadaaaf210a50813311bfa8b25136bb39ef963f19120ed006e49eb91ef81941790dd51394f13fd9f84fba5bf2e42d456ecac3083cdd7124d1ed1cbd32e2e770 WHIRLPOOL bd06001a2a33427ac323c95c4dda9de66e19b81645ac4c9f428d9cedaa7ba95c819db1208c4ff0d39540c9117f958dc268da55402004a0d4d3262c485d4f2a2b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlTrPS8ACgkQKiQSS7ZY+hOBIwEArjar0ATzgt3PhuVn19TgDR84
-7tXlqH5j6fPFzngmxGMA/j5MtK2jsOo4LGiowrMq92d+ZV7VpDd4kxHDVd5irbS1
-=ZXDM
+iF4EAREIAAYFAlUP/LAACgkQKiQSS7ZY+hMocgD9Gorbzk+rEXsski3FVzTQv+xu
+3zjRki0rwwkQ3/SYnUYBAIm6pbKXFfdyOWAwv2+TM2DdI23zoMjMYCO/fNWoWjg5
+=cHNN
 -----END PGP SIGNATURE-----

diff --git a/app-admin/rsyslog/rsyslog-8.7.0.ebuild b/app-admin/rsyslog/rsyslog-8.7.0-r1.ebuild
similarity index 97%
rename from app-admin/rsyslog/rsyslog-8.7.0.ebuild
rename to app-admin/rsyslog/rsyslog-8.7.0-r1.ebuild
index 6deca9113983a0b05156abfb818f43ed135f1ac0..f828be357a3b7d6a804387ce08f19d6b2e320e2c 100644 (file)
--- a/app-admin/rsyslog/rsyslog-8.7.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.7.0.ebuild,v 1.1 2015/02/23 14:46:03 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.7.0-r1.ebuild,v 1.1 2015/03/23 11:44:44 ultrabug Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
@@ -22,7 +22,6 @@ if [[ ${PV} == "9999" ]]; then
        "
 
        inherit git-r3
-       KEYWORDS=""
 else
        SRC_URI="
                http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
@@ -52,12 +51,12 @@ RDEPEND="
                >=dev-libs/liblognorm-1.1.0:=
        )
        omudpspoof? ( >=net-libs/libnet-1.1.6 )
-       postgres? ( >=dev-db/postgresql-8.4.20 )
+       postgres? ( >=dev-db/postgresql-8.4.20:= )
        rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0 )
        redis? ( >=dev-libs/hiredis-0.11.0 )
        relp? ( >=dev-libs/librelp-1.2.5 )
        rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-       rfc5424hmac? ( >=dev-libs/openssl-0.9.8y )
+       rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:= )
        snmp? ( >=net-analyzer/net-snmp-5.7.2 )
        ssl? ( >=net-libs/gnutls-2.12.23 )
        systemd? ( >=sys-apps/systemd-208 )
@@ -66,7 +65,7 @@ DEPEND="${RDEPEND}
        virtual/pkgconfig"
 
 if [[ ${PV} == "9999" ]]; then
-       RDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+       DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
 fi
 
 BRANCH="8-stable"
@@ -198,7 +197,7 @@ src_configure() {
 src_compile() {
        autotools-utils_src_compile
 
-       if use doc -a ${PV} == "9999"; then
+       if use doc && [[ "${PV}" == "9999" ]]; then
                einfo "Building documentation ..."
                local doc_dir="${S}/docs"
                cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"