Block >sys-apps/logwatch-7.4.0 when USE=logwatch in postfix/amavis-logwatch.

diff --git a/net-mail/amavis-logwatch/Manifest b/net-mail/amavis-logwatch/Manifest
index f8478d16ba4188468ff9659124694b3fda09bcf5..17a35a068ca13e65410bd21f450ac72c27da25c6 100644 (file)
--- a/net-mail/amavis-logwatch/Manifest
+++ b/net-mail/amavis-logwatch/Manifest
@@ -1,3 +1,3 @@
 DIST amavis-logwatch-1.51.02.tgz 86314 SHA256 bdbb1c59d4ba08c1d8f2ff4a340d55f1063b4b7044158259cd7fc50cbde8b0fc SHA512 af1153dab6d01b47cd625358dead1ca3cd7b71aca00b43f65a822140b1dfdc9f5bb99d23a5908544f3ccd850a32e0d5600c87d1101b747ddf6600c67cae9019c WHIRLPOOL 2117bf9cc790a2c6bddf587b88f3275fb3f1204f6ec99db94228516becff639c8e720e8204773e4240f055a24cfbe7e9128c067bc52214a4b81ec368b760726e
-EBUILD amavis-logwatch-1.51.02.ebuild 1772 SHA256 a0ea1ba9c3f3888a5fd315b75bddd9f37669c64070dd57b2a6dd1f96834c9344 SHA512 bee5345a38fa0ed4de99cb990bea36fd19221073346b9e5dae2681d4f94838d91a38c17f8695edc270ab0f3ba38235c6fb038237a657ad57a11d32b5878120fd WHIRLPOOL 18c70f00c151bb5f1c825372b76dba8ac4fc383b7d8be3363f811329be421b89627b12c4f58869487ac382fa1565a25dab44b70025bc1fe68e74d3ef9ab36d61
+EBUILD amavis-logwatch-1.51.02.ebuild 1807 SHA256 3826931daad312cd9b6a5b761cfde8c472f8bcc49b2dc6a6bae0c42171f09985 SHA512 dc398cae38733ef46d259b11ec52a0449d9b4cc138e369f43dcd38954ae86ad0c048fdccad503f931b10a1e646fbd599144fa90cb200c1d810aa51a42c52d243 WHIRLPOOL 0415a9152395ffe63cf519cf26399ff4c610ea04458cb35768230daf66895e499e00348887447b541b1826b693578762b7423f947141102e3245eb3f25896273
 MISC metadata.xml 305 SHA256 d26b2b1ced185340a913e1e12a211c68edc8f5e563e7db2724637955147a791f SHA512 5dfdc3bc4e8be9ffb3695b59ea6ef330ef185185a9737d79fd2c067a2cf861dfc10b24a4b712774bdb240ac28ac4ef591d683d8c1e30a887b3476d5947105b97 WHIRLPOOL 4c6896d05e15a6f64d53d3cd8353c3df88ce9c8dd294fee0510fea71743783ec7958df2519eb4a209d31a50bb3b63e95ec91d509419fe05c69239b65335ef7f7

diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.02.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.02.ebuild
index 3a1ee81ea8bd79c97f23a3b1e7348888c1adfdb7..7619c4b2bca3793f2b7a2822fdcf4333618495c9 100644 (file)
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.02.ebuild
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.02.ebuild
@@ -12,11 +12,12 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-# >=sys-apps/logwatch-7.4.0_p170 ships our logwatch scripts and will
+# >sys-apps/logwatch-7.4.0 ships our logwatch scripts and will
 # thus obsolete this use flag.
 IUSE="logwatch"
 
-RDEPEND="dev-lang/perl"
+RDEPEND="dev-lang/perl
+       logwatch? ( !>sys-apps/logwatch-7.4.0 )"
 
 src_prepare() {
        # Replace the default config file location with ours.

diff --git a/net-mail/postfix-logwatch/Manifest b/net-mail/postfix-logwatch/Manifest
index 2c0ffa1428058cfe6f2da8484b3085c86d8b71b1..57fb1a3ebbd11a360966c9f8b93b10f8d8249b34 100644 (file)
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -1,3 +1,3 @@
 DIST postfix-logwatch-1.40.00.tgz 107441 SHA256 d72a9a91a6871606810485b342ca684a2e8724897b9c906cc27d3df7a15b2616 SHA512 c388cfefceeefcc19bc987865dbe0312ef0f470524ebd8af33abe639137cce699ad79f33b2b64168d2d572981372a9af58e60f6cdfbc661fc56ab64f1c19be03 WHIRLPOOL 027af839c2118eb4abb00c9417ecd4c612a8f6ed81d26461c6025df4effe644b9a809c57d90474f8d515326b3528f6b0311c7b9626fa655e158cfa4712d1abd8
-EBUILD postfix-logwatch-1.40.00.ebuild 1787 SHA256 5a45048c409d7c243e2ffe8f0297612b9dbc590c7359d36d2a2a06ba9d4ecb73 SHA512 977e042d140083c6c895f1f301bbe8a08fe45ae725240d530c4e96dc4709a36fdccbaae3d4e18a18eba3d4ccbe99c49596e1d0d5f6d3ac26842de0dafd7a2510 WHIRLPOOL b41ef6cc4419212542f3ba6460af71a6209240c95eebb6e1329b13b81c7618293523f23505f29f4f42bf67e54b922f612b8813ba81f11d0e0fd803e054297690
+EBUILD postfix-logwatch-1.40.00.ebuild 1822 SHA256 4f744abd1dc01d111daf4da0d2f52e523ba449fe1c9c33eff5653289c8b7c97d SHA512 6b2a12ebee73598b4037d2a01ab407f3ce51ae1b402a9eea0cd6878412c0328ee3b7ead44564892fb952298641def79ad38bc25574d6e3604e2e977c9063794e WHIRLPOOL d9f6db30c6abf4ef59307e6a27323b2c1315f21c2ced59ac485200506d21cefb7b5916f4eaddfad7f18a7a401cc1337040be53711c4533dc46e2fb3adcf662f8
 MISC metadata.xml 305 SHA256 d26b2b1ced185340a913e1e12a211c68edc8f5e563e7db2724637955147a791f SHA512 5dfdc3bc4e8be9ffb3695b59ea6ef330ef185185a9737d79fd2c067a2cf861dfc10b24a4b712774bdb240ac28ac4ef591d683d8c1e30a887b3476d5947105b97 WHIRLPOOL 4c6896d05e15a6f64d53d3cd8353c3df88ce9c8dd294fee0510fea71743783ec7958df2519eb4a209d31a50bb3b63e95ec91d509419fe05c69239b65335ef7f7

diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.00.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.00.ebuild
index fb7b1a2e99bc7e8a3f5549c5eeca98a29e49a376..c800b65410c053d7674a8e2d99fa8014a6d5ae80 100644 (file)
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.00.ebuild
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.00.ebuild
@@ -12,11 +12,12 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-# >=sys-apps/logwatch-7.4.0_p170 ships our logwatch scripts and will
+# >sys-apps/logwatch-7.4.0 ships our logwatch scripts and will
 # thus obsolete this use flag.
 IUSE="logwatch"
 
-RDEPEND="dev-lang/perl"
+RDEPEND="dev-lang/perl
+       logwatch? ( !>sys-apps/logwatch-7.4.0 )"
 
 src_prepare() {
        # Replace the default config file location with ours.