Add app-admin/rsyslog as syslog dependency. Bug #421301

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

4 files changed, 30 insertions, 19 deletions

diff --git a/sys-apps/syslog-notify/ChangeLog b/sys-apps/syslog-notify/ChangeLog
index 2692ed4ef995..ec86fd4e3e45 100644
--- a/sys-apps/syslog-notify/ChangeLog
+++ b/sys-apps/syslog-notify/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/syslog-notify
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/syslog-notify/ChangeLog,v 1.6 2012/04/23 17:28:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/syslog-notify/ChangeLog,v 1.7 2012/07/12 19:12:10 hwoarang Exp $
+
+  12 Jul 2012; Markos Chandras <hwoarang@gentoo.org> syslog-notify-0.1.ebuild,
+  syslog-notify-0.2.ebuild:
+  Add app-admin/rsyslog as syslog dependency. Bug #421301
 
   23 Apr 2012; Michał Górny <mgorny@gentoo.org> syslog-notify-0.1.ebuild:
   Use mirror:// in SRC_URI.
@@ -29,4 +33,3 @@
   +syslog-notify-0.1.ebuild, +metadata.xml:
   Initial commit of syslog-notify application. Fixes bug #304159. Thanks to
   dfrkp <bugzilla@mhhs.de> for the initial ebuild
-
diff --git a/sys-apps/syslog-notify/Manifest b/sys-apps/syslog-notify/Manifest
index be7017c2f2cb..e80d35467199 100644
--- a/sys-apps/syslog-notify/Manifest
+++ b/sys-apps/syslog-notify/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX syslog-notify-0.1-libnotify-0.7.patch 608 RMD160 ed6daa4839cd31748e407b754bb3d4247c91e0e8 SHA1 0965c991956fe608fc6888b8c91bbd7581ce8096 SHA256 e5b7f3e35e6a19adac6d00aa544e8c1d4f346eb336b91ca4f2481384dba6822b
-DIST syslog-notify-0.1.tar.bz2 77714 RMD160 2ea60e7c8af640c44d9143c2165b3d535eb26e10 SHA1 03e137b1ab629cce1b9352f034394582636b371f SHA256 c3fb1a25b9d3ca0a46c4e8be06bf20b108ddb929fd1f168cdfa094dc98bd5d57
-DIST syslog-notify-0.2.tar.bz2 77178 RMD160 5d0ca611f956bb21a4d03399c473859883922dea SHA1 9049a5934c027bb4bb5635a5fff558bf67e59fc8 SHA256 d554e1cd5c5e5399e313674e8f296185cd2f33877d4b2b63a4e4a57ce27fa159
-EBUILD syslog-notify-0.1.ebuild 1129 RMD160 147bdf4d4158a0de9465eae783d352183412c36c SHA1 bd62071b00d75c023f17a5e35ae79bac962330f5 SHA256 d17c097ca6ad3658d35beeed59f3b758beee8956395ee06c94a460c56cd61151
-EBUILD syslog-notify-0.2.ebuild 1027 RMD160 d67669be09310ac7cb0d04ba66e52c8cc758a3ad SHA1 c49701884dacc747075d3bd9f88928fdddffeff0 SHA256 63e25f8ed4f90fa42e67eb8ad1fd7a6e2d7c9410951d3e4eda4440d77db6a46e
-MISC ChangeLog 1114 RMD160 79e8bee996a90e32fcb2083af6636cb35b038271 SHA1 f9816fa45001d9fb1ba43fed3a5c5edc80d71172 SHA256 2978c1f31b0b964dd0ddc61211be4452e396e64541229314b531f93cf7caa896
-MISC metadata.xml 278 RMD160 85ae612f4b725d8857a7fe0808090691c0e58fbd SHA1 c97840692a46e7d54f22bfcfd0a564a8d08033dd SHA256 07a0afc4dfc12865b213ef6815169e0524357989b213ac40bc9436dea94c3160
+AUX syslog-notify-0.1-libnotify-0.7.patch 608 SHA256 e5b7f3e35e6a19adac6d00aa544e8c1d4f346eb336b91ca4f2481384dba6822b SHA512 4904f72d56bbc065ee52d48a3e4a563191d32de8969ff4230df2471f68f2c14828e4ec3576c309a39fc4eb5bdc696b3e4827cfe1a4fc90da8640e44f04566507 WHIRLPOOL 2b5141860b922cce34ba2cffd95587dde0f46296a18d0e17fa79f4c56ae080577bbec8571cd367a850f93b0d0badf7bfcc19cecca7b5b9f283971a52a44c9b6b
+DIST syslog-notify-0.1.tar.bz2 77714 SHA256 c3fb1a25b9d3ca0a46c4e8be06bf20b108ddb929fd1f168cdfa094dc98bd5d57
+DIST syslog-notify-0.2.tar.bz2 77178 SHA256 d554e1cd5c5e5399e313674e8f296185cd2f33877d4b2b63a4e4a57ce27fa159
+EBUILD syslog-notify-0.1.ebuild 1156 SHA256 a0cdb857b1ae14f4eee34daccb4add096148eb85b23c4741e06cb6c8d8b9ed46 SHA512 618f74c454ac93bfd2e6ccf22dcea9b3362156ede2329ebe7e8d8f3e617280f81c728e6601f7f2cb09b7fd511befe1d608637b6f68e51d9541e879f0429c56d5 WHIRLPOOL 91c9c53a879ba79d73da44df91c7ff6e6f22267a3328c3af2e755455b38eaea96277f81f8a575d4c1bef251bf89c2a5a8bf5b940d2a9238a2ae3fa18456757ff
+EBUILD syslog-notify-0.2.ebuild 1051 SHA256 928c962724bacd1597e3b787199de066f79ef22684049ff70a5742aa5cdd32a8 SHA512 b2dc2d154412e48a9ad4e9c4f8ff95586d56dae53d6971c2158f745e4cd3e29bf0d3823bc20a35bd181d3941bc8b5b871481db1578df29b4b42c8f37da554714 WHIRLPOOL 1b0f382b4aaaf4549cf663a3e7f1d75913a6071b78f81da557027949d9b6d922a49737672f6dacb00f4f86f815ca483b5ffb345ffc47b14b1c6c6dbb61e702f0
+MISC ChangeLog 1281 SHA256 7dde7f77f1c09e8ebdbfeeddc23f37cb1c41e9d6bad078b82f8b30fb893b9350 SHA512 acfa62af308ca06ffc71c5805cabc0900cc1461127bae02523f3344e6f7043fb6c5a54aa0cb2d7f93353e4a66d04f3dcac588d2ba0ae8d3701c9504c3277e50f WHIRLPOOL 1996ed79ad3db1b3baa8e8fce392e440fba9134ddc98ab619dfdca9048c02e063dd10709c443fdac3292ffd1f5e25c710b2a3e64cced3dcd8aed2c13f3cc5c5a
+MISC metadata.xml 278 SHA256 07a0afc4dfc12865b213ef6815169e0524357989b213ac40bc9436dea94c3160 SHA512 c47ad7b85f6516eec5bc86f26785d8731544436f25fce07093a7c51de184ddfeca02253022c54fb88c1b75645350d8d23de7fc1d8c62e8050e1288b4d6ebaba6 WHIRLPOOL 5fc748443c6e622808acfb4f906cc41bac88b04718771a678462d1079185b74de2840d3dfe1c0949ad96c5b8d2a278f7587af8b1381cddf72c92b9b3099b40c8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk+VkVIACgkQfXuS5UK5QB25vQQArTjio2n10vxESjdXMrkOHSfN
-824p2aD2BIAXcZnMkddrrlOtjwuWkOMfmqAcs5SJRofj9Gg5wbU0EpmJ3pHdz5G4
-php4d6lBCVfhowVy3uXWNkF3Awq/ZCODD7vGXjLTuLJWqw28qyE0X9uUOe7TDrlR
-iOj8eB5RZijGE0ZDekI=
-=qXUh
+iQIcBAEBCgAGBQJP/yGPAAoJEPqDWhW0r/LCbPkP/2+w2lZq9mgM/F7pt9sB4akP
+VGmJ2K805ajmI0aoHmWKWXQrRCqYbMoCkyia/Ukgbb9nqtnu0njEStAbbRHJ7vFA
+l2oqFy3vCyVCGeRYx5rpmx5h6FX7tYyNU1iEamWFAjjVa6t4K0kD0s19q9jsBEHF
+rF2mSl1uQssKT2KUMxy4bx8F/Z3k7gwkVs+3jmMvkiPGns0GQ55+fcqBUCiqnJRn
+SXx/wC9elk4k7kY7PJ/Jxdp23VIONFvRKsBizyf/jrk1Qezt5uVxA/g1G4j/bd0c
+XfFNHMHrESrv2BD54yK2mqujJ+8ftk8Et4AHz56VUEX/eH/3FhdJbB1b3tN0rOg1
+f5MYs0PqNn5FXuog3c6OfLWFRzDj2CDTof9//+6yDscOnV3kQf1nz8WcmMOK9eMO
+rt28KrBZ5FzipIQSZdj93NNBXPKe865H6Q+ruKgibPE9MZEUT+87CQsj5l5s2MJ+
+np8P3itR7Vfnvr3k4MCpeEdF0TrIWgQkoWCwuTCx8+uEnPgRZVMjxZqe5kzWxLz/
+dULVjDeFAoN3Thfuf6rbmtFIhlg3334GPznTlaXtdllbYMBNdmPZzyvilQPOx2hn
+0JUqEmJZLhFDvL6bjL8n5douGcu8p3nUxmJ1bRWDl/LQorw+7C23AexCj6LVKPcA
+JxlXDhS6eNhVp/Jv6UU4
+=qJFn
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/syslog-notify/syslog-notify-0.1.ebuild b/sys-apps/syslog-notify/syslog-notify-0.1.ebuild
index 317ad5875a4b..adfe88008f31 100644
--- a/sys-apps/syslog-notify/syslog-notify-0.1.ebuild
+++ b/sys-apps/syslog-notify/syslog-notify-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/syslog-notify/syslog-notify-0.1.ebuild,v 1.5 2012/04/23 17:28:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/syslog-notify/syslog-notify-0.1.ebuild,v 1.6 2012/07/12 19:12:10 hwoarang Exp $
 
 EAPI=2
 inherit eutils
@@ -16,7 +16,7 @@ IUSE=""
 
 DEPEND="x11-libs/libnotify"
 RDEPEND="${DEPEND}
-	app-admin/syslog-ng"
+	|| ( app-admin/syslog-ng app-admin/rsyslog )"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
diff --git a/sys-apps/syslog-notify/syslog-notify-0.2.ebuild b/sys-apps/syslog-notify/syslog-notify-0.2.ebuild
index 517422d1e751..4b09de3afa46 100644
--- a/sys-apps/syslog-notify/syslog-notify-0.2.ebuild
+++ b/sys-apps/syslog-notify/syslog-notify-0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/syslog-notify/syslog-notify-0.2.ebuild,v 1.1 2012/02/22 18:54:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/syslog-notify/syslog-notify-0.2.ebuild,v 1.2 2012/07/12 19:12:10 hwoarang Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ IUSE=""
 
 DEPEND=">=x11-libs/libnotify-0.7"
 RDEPEND="${DEPEND}
-	app-admin/syslog-ng"
+	|| ( app-admin/syslog-ng app-admin/rsyslog )"
 
 DOCS="AUTHORS CHANGELOG HACKING README"