Use newinitd, newconfd and doenvd. Bug #174266.

Package-Manager: portage-2.1.2.3

3 files changed, 20 insertions, 27 deletions

diff --git a/mail-mta/xmail/ChangeLog b/mail-mta/xmail/ChangeLog
index 0456742a7b14..48a8fd5755c6 100644
--- a/mail-mta/xmail/ChangeLog
+++ b/mail-mta/xmail/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-mta/xmail
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/xmail/ChangeLog,v 1.22 2007/03/18 06:25:47 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/xmail/ChangeLog,v 1.23 2007/04/22 09:08:35 ticho Exp $
+
+  22 Apr 2007; Andrej Kacian <ticho@gentoo.org> xmail-1.22.ebuild:
+  Use newinitd, newconfd and doenvd. Bug #174266.
 
   18 Mar 2007; Marius Mauch <genone@gentoo.org> xmail-1.22.ebuild:
   Replacing einfo with elog
diff --git a/mail-mta/xmail/Manifest b/mail-mta/xmail/Manifest
index 9ead543d5798..45d8da3cdb42 100644
--- a/mail-mta/xmail/Manifest
+++ b/mail-mta/xmail/Manifest
@@ -18,14 +18,14 @@ MD5 722274fd9ffd32da5477fb703d3f657c files/xmailwizard 2299
 RMD160 513eb4b212c7aa469115f17beee9e2975194955a files/xmailwizard 2299
 SHA256 2373801cb55185483f5aeb143e2f475c5d6c913645f132f23b1bd600ee66309b files/xmailwizard 2299
 DIST xmail-1.22.tar.gz 416738 RMD160 a5496326ef8b8fa6adc834b2f36727849150ed46 SHA1 f57d2c01a050eca3cd9de096c071a1658ace6830 SHA256 bbf4bf4be7fb50c5bb37533370c103e65f4dddb65d0a4885025a7294381adac6
-EBUILD xmail-1.22.ebuild 4407 RMD160 a8fc597827cf976689b393ee6b0e2c10c5f34734 SHA1 7b60e46834d2846b283dcb369b2cb0bf94962131 SHA256 a0fbe888a9ec0db409e63b751b201f8078e38326876de20f7e59a3093ba58f2c
-MD5 448686ff76bfdee6eba64b315e8ce7b1 xmail-1.22.ebuild 4407
-RMD160 a8fc597827cf976689b393ee6b0e2c10c5f34734 xmail-1.22.ebuild 4407
-SHA256 a0fbe888a9ec0db409e63b751b201f8078e38326876de20f7e59a3093ba58f2c xmail-1.22.ebuild 4407
-MISC ChangeLog 5796 RMD160 93c37396b3ab948228570433318b6da11c7c7751 SHA1 e1d0f1bcfb7b607c32161fcfd470f3bd89e89b64 SHA256 e6e62c6c67741881a71a82f1d0d2e4daaaa7cdc56111e84506977268d1e87cad
-MD5 d6df1617fd5e8228de097c807885cef5 ChangeLog 5796
-RMD160 93c37396b3ab948228570433318b6da11c7c7751 ChangeLog 5796
-SHA256 e6e62c6c67741881a71a82f1d0d2e4daaaa7cdc56111e84506977268d1e87cad ChangeLog 5796
+EBUILD xmail-1.22.ebuild 4200 RMD160 c2ab8fd7f3b29181b20b29a8d3acffa4dfc77487 SHA1 f2f93aa5cf01999c4fd1539c5cfbea4119588249 SHA256 27b7d1877d5ba40c2a2bcbff10fae02ecaf3ce343547614c3a9ffeca9e6ef70a
+MD5 9d32db198a62efd2f2d79a160c7e69c4 xmail-1.22.ebuild 4200
+RMD160 c2ab8fd7f3b29181b20b29a8d3acffa4dfc77487 xmail-1.22.ebuild 4200
+SHA256 27b7d1877d5ba40c2a2bcbff10fae02ecaf3ce343547614c3a9ffeca9e6ef70a xmail-1.22.ebuild 4200
+MISC ChangeLog 5913 RMD160 2599beeb104462971597e1dddc99c24ff1b6c1b8 SHA1 4f75842d5a934134cbddac8ce302297d64ad718d SHA256 db81cac747a8adfbde2ca749ab2dd1b67587646e2a29468879dd6cdada62f982
+MD5 a46d74cd4505979faae53436e6615293 ChangeLog 5913
+RMD160 2599beeb104462971597e1dddc99c24ff1b6c1b8 ChangeLog 5913
+SHA256 db81cac747a8adfbde2ca749ab2dd1b67587646e2a29468879dd6cdada62f982 ChangeLog 5913
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
@@ -34,9 +34,9 @@ MD5 b18caceb42f049cba6fba4af4ace2be9 files/digest-xmail-1.22 232
 RMD160 e48c17066c6834c63afadc92e74610bb62a78b12 files/digest-xmail-1.22 232
 SHA256 57128895bc8731bb5f4f937f57c6015790ffada912d48c116e203e1a475adf64 files/digest-xmail-1.22 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFF/Nx36J2i8a8J4okRAhB7AJ9dzf9Ss5rOwYIFtpgN4LHd4Z/OkACg268l
-SyincZqzY9eFSM+6bf9NYrw=
-=VSk+
+iD8DBQFGKyYZQlM6RnzZP+IRAlEVAJoCygjrVED1KgmBj7S6gsf1ZE7ZpACdHCyM
+/uEOmaHhZhS6yNdHpgOlguY=
+=cmYq
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/xmail/xmail-1.22.ebuild b/mail-mta/xmail/xmail-1.22.ebuild
index a05325267297..013c6a24d539 100644
--- a/mail-mta/xmail/xmail-1.22.ebuild
+++ b/mail-mta/xmail/xmail-1.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/xmail/xmail-1.22.ebuild,v 1.3 2007/03/18 06:25:47 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/xmail/xmail-1.22.ebuild,v 1.4 2007/04/22 09:08:35 ticho Exp $
 
 inherit eutils linux-info
 
@@ -54,11 +54,6 @@ src_compile() {
 }
 
 src_install() {
-	# create some image directories with default diropts
-	dodir /etc/conf.d
-	dodir /etc/init.d
-	dodir /etc/env.d
-
 	einfo "Setting up directory hierarchy"
 	diropts -m 700 -o xmail -g xmail
 	dodir /etc/xmail
@@ -69,8 +64,6 @@ src_install() {
 	dodir /etc/xmail/spool/local
 	dodir /etc/xmail/spool/temp
 	dodir /etc/xmail/logs
-	dodir /etc/init.d
-	dodir /etc/conf.d
 
 	for i in cmdaliases custdomains domains filters pop3linklocks\
 		pop3links pop3locks userauth
@@ -109,12 +102,9 @@ src_install() {
 
 
 	einfo "Installing the XMail software"
-	insinto /etc/env.d
-	doins ${FILESDIR}/15xmail
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/xmail.initd xmail
-	insinto /etc/conf.d
-	newins ${FILESDIR}/xmail.confd xmail
+	doenvd ${FILESDIR}/15xmail
+	newinitd ${FILESDIR}/xmail.initd xmail
+	newconfd ${FILESDIR}/xmail.confd xmail
 	cd ${S}/bin
 	exeopts -o xmail -g xmail -m 4700
 	exeinto /usr/sbin