Add Makefile.qmail.

Package-Manager: portage-2.1.1_pre1-r5

4 files changed, 21 insertions, 12 deletions

diff --git a/mail-mta/netqmail/ChangeLog b/mail-mta/netqmail/ChangeLog
index a7d7578a9c65..700f41aeef8b 100644
--- a/mail-mta/netqmail/ChangeLog
+++ b/mail-mta/netqmail/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for mail-mta/netqmail
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/ChangeLog,v 1.13 2006/07/01 11:07:40 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/ChangeLog,v 1.14 2006/07/01 19:38:14 hansmi Exp $
 
   01 Jul 2006; Michael Hanselmann <hansmi@gentoo.org>
-  netqmail-1.05-r4.ebuild:
-  Stable on ppc, x86.
+  +files/tcprules.d-Makefile.qmail, netqmail-1.05-r4.ebuild:
+  Add Makefile.qmail. Stable on ppc, x86.
 
   17 Jun 2006; Michael Hanselmann <hansmi@gentoo.org>
   -netqmail-1.05-r3.ebuild, netqmail-1.05-r4.ebuild:
diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index ea5f706d2c3a..de1d79cac833 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -106,18 +106,22 @@ AUX tcp.smtp.sample 3585 RMD160 9f6e1d529e40a1ba06e8eb5e85135321334627c0 SHA1 40
 MD5 ab8e1f0ae6b685ef461847c8c4a15a94 files/tcp.smtp.sample 3585
 RMD160 9f6e1d529e40a1ba06e8eb5e85135321334627c0 files/tcp.smtp.sample 3585
 SHA256 4f6e2ccfef548c2bfee249299335fa9c9b47e06be84eb8bb8ba564b45868c9ad files/tcp.smtp.sample 3585
+AUX tcprules.d-Makefile.qmail 132 RMD160 275cf670b111f0673be05c5bb6362943af34e1f2 SHA1 176f82b43e224b8d8aae22bc9bb458b263d17325 SHA256 505e202a5a28a036669e51d3fb51d3c02a3a35d76764c5e3f4fa0c43564a89d6
+MD5 6ca7a3cdbfa79a51ee627c059319041d files/tcprules.d-Makefile.qmail 132
+RMD160 275cf670b111f0673be05c5bb6362943af34e1f2 files/tcprules.d-Makefile.qmail 132
+SHA256 505e202a5a28a036669e51d3fb51d3c02a3a35d76764c5e3f4fa0c43564a89d6 files/tcprules.d-Makefile.qmail 132
 DIST big-todo.103.patch 5546 RMD160 a16a429796d869b8217e42b7ddb607c95d9bbcd8 SHA1 ba5c3923ff972a4f3ddd5ae1519938a4716612d1 SHA256 afa0a249e3271badd442f0bdae39997d9fe536157d8a0d62b6706f3dfcd11a72
 DIST netqmail-1.05-tls-smtpauth-20060105.patch 147837 RMD160 18a3edd3ea7e7a8e4d6cadbd3c0bd5e8cb041caa SHA1 1a0fb2367504a4c0f2196e13f753437f47d4b621 SHA256 326af9647e752e158f7672ca3fb592fe23c5f44502ddfcd6b5b6bc6c7ecf4c27
 DIST netqmail-1.05.tar.gz 252264 RMD160 e5bd8557c58a2686233449254b146e74389a7652 SHA1 fe4cbe97bd2f18a5ca1b36e4fbbd6c524256a829 SHA256 59788abf252e2da224542c1c8b727311335c61d990f24f4edf28f6eb5483f676
 DIST qmail-spp-0.42.tar.gz 18689 RMD160 5511722c52346692488a63bca53106d580a004c7 SHA1 76a94051b017dd331d8c791e466bb2a936ceba41 SHA256 1518e7e82d10fbbb8ecc520f51daf503edeb9c3a9fb935be65a8185e7b53808d
-EBUILD netqmail-1.05-r4.ebuild 12961 RMD160 ad4a514deab8ccfa232fb3802c4a4e5a521a3d22 SHA1 0045264f78dcfca8886a45f52167f5e60c17d5e1 SHA256 4ed346492b461891730e219de9c0ed47f7a3891fc449d2ed09f0dad4c9df90e8
-MD5 af811114c162e4fbe992003c098e8450 netqmail-1.05-r4.ebuild 12961
-RMD160 ad4a514deab8ccfa232fb3802c4a4e5a521a3d22 netqmail-1.05-r4.ebuild 12961
-SHA256 4ed346492b461891730e219de9c0ed47f7a3891fc449d2ed09f0dad4c9df90e8 netqmail-1.05-r4.ebuild 12961
-MISC ChangeLog 2612 RMD160 2d8e6294849c1978f55da588f4b07df7591bbb7f SHA1 af9f6fe39a37c09212f75a15697a531f67afb928 SHA256 8adf87e367f004f5002510fdc74e6625a788943d8ab0672cb1d3a8a3df0d81a2
-MD5 a388ef9ce0d9abca6b4dbd35ba637d34 ChangeLog 2612
-RMD160 2d8e6294849c1978f55da588f4b07df7591bbb7f ChangeLog 2612
-SHA256 8adf87e367f004f5002510fdc74e6625a788943d8ab0672cb1d3a8a3df0d81a2 ChangeLog 2612
+EBUILD netqmail-1.05-r4.ebuild 13039 RMD160 0fddc6c73604f6911b3e957ef1b8dd03a3e3940e SHA1 1da7cee7278da5dcc0e70f4b9d76c6fd9e388514 SHA256 d7f57acea63fb8c033da439b9c53d17cc6336ab5c2c00cd526101242c3c55276
+MD5 c017398485ed276ada7000f9e3108a94 netqmail-1.05-r4.ebuild 13039
+RMD160 0fddc6c73604f6911b3e957ef1b8dd03a3e3940e netqmail-1.05-r4.ebuild 13039
+SHA256 d7f57acea63fb8c033da439b9c53d17cc6336ab5c2c00cd526101242c3c55276 netqmail-1.05-r4.ebuild 13039
+MISC ChangeLog 2666 RMD160 24b9b266f51563a371a09372067d8c8b89ee9bf0 SHA1 31146df253265a36afb63cd674611bf027604bf2 SHA256 00b720188272c2f8f13fcc6fed51cec4071de49042b85978272475b84d0fe637
+MD5 626b3621fb55ee28afeb70a6d48a7d47 ChangeLog 2666
+RMD160 24b9b266f51563a371a09372067d8c8b89ee9bf0 ChangeLog 2666
+SHA256 00b720188272c2f8f13fcc6fed51cec4071de49042b85978272475b84d0fe637 ChangeLog 2666
 MISC metadata.xml 278 RMD160 be877359df23e815e5acd94ecc97df2560671fa7 SHA1 2ea5039fde031f70169844e9ff5bcd4a20e32666 SHA256 0d8d56eeab2c34a34acb9f558c9198d843e4666bdbe061f6ec87ab4396a75d2a
 MD5 1f12f659d2cf9550971387cb78c2f0af metadata.xml 278
 RMD160 be877359df23e815e5acd94ecc97df2560671fa7 metadata.xml 278
diff --git a/mail-mta/netqmail/files/tcprules.d-Makefile.qmail b/mail-mta/netqmail/files/tcprules.d-Makefile.qmail
new file mode 100644
index 000000000000..d10be0f3a87b
--- /dev/null
+++ b/mail-mta/netqmail/files/tcprules.d-Makefile.qmail
@@ -0,0 +1,3 @@
+QMAIL_CDBS = tcp.qmail-pop3.cdb tcp.qmail-qmqp.cdb tcp.qmail-qmtp.cdb tcp.qmail-smtp.cdb
+CDBS += $(QMAIL_CDBS)
+qmail: $(QMAIL_CDBS)
diff --git a/mail-mta/netqmail/netqmail-1.05-r4.ebuild b/mail-mta/netqmail/netqmail-1.05-r4.ebuild
index 8695e917bd9a..6c2f7994c559 100644
--- a/mail-mta/netqmail/netqmail-1.05-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.05-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/netqmail-1.05-r4.ebuild,v 1.4 2006/07/01 11:07:40 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/netqmail-1.05-r4.ebuild,v 1.5 2006/07/01 19:38:14 hansmi Exp $
 
 inherit eutils toolchain-funcs fixheadtails flag-o-matic
 
@@ -29,6 +29,7 @@ IUSE="gencertdaily highvolume mailwrapper noauthcram qmail-spp ssl vanilla"
 RESTRICT="test"
 
 DEPEND="
+	!mail-mta/qmail
 	sys-apps/groff
 	net-mail/queue-repair
 	ssl? ( dev-libs/openssl )
@@ -240,6 +241,7 @@ src_install() {
 
 	dodir ${TCPRULES_DIR}
 	insinto ${TCPRULES_DIR}
+	newins ${FILESDIR}/tcprules.d-Makefile.qmail Makefile.qmail
 	for i in smtp qmtp qmqp pop3; do
 		newins ${FILESDIR}/tcp.${i}.sample tcp.qmail-${i}
 	done