new and improved

svn path=/ebuilds/; revision=60

3 files changed, 11 insertions, 45 deletions

diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog
index 021ea3d..d44adc9 100644
--- a/mail-mta/nullmailer/ChangeLog
+++ b/mail-mta/nullmailer/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.27 2007/10/28 14:05:21 phreak Exp $
 
+  26 Feb 2008; Thilo Bangert <bangert@gentoo.org> ChangeLog:
+  remove mailwrapper support - minor fixes
+
   22 Feb 2008; Thilo Bangert <bangert@gentoo.org> ChangeLog:
   version bump
 
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index 88205c4..be3c3a1 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -1,29 +1,8 @@
 AUX init.d-nullmailer 1221 RMD160 9e793a57acc9f2123c75e5a27f4b6123ce1d171a SHA1 154b3c92512151d6d4f9dc63125536c44e207f1e SHA256 279dd0519b62b57b4f5f6a7bcbfcd8337dd3d5e6e785de1d443f2005def64d72
-MD5 768cc69776bc3034147bfdc17b8b92f2 files/init.d-nullmailer 1221
-RMD160 9e793a57acc9f2123c75e5a27f4b6123ce1d171a files/init.d-nullmailer 1221
-SHA256 279dd0519b62b57b4f5f6a7bcbfcd8337dd3d5e6e785de1d443f2005def64d72 files/init.d-nullmailer 1221
 AUX mailer.conf 1564 RMD160 e0f712940ee2d15981793cceabf9da7b1a4aa2fc SHA1 3d14fc27ce89ec0d3b0ff898927760fa383828c8 SHA256 011da5dc334c36df2dc951864f11fa0eb6379f854e37c58ccba8595aa83bc52d
-MD5 7c0867f5f1edd79199ff66b95d7a0eb3 files/mailer.conf 1564
-RMD160 e0f712940ee2d15981793cceabf9da7b1a4aa2fc files/mailer.conf 1564
-SHA256 011da5dc334c36df2dc951864f11fa0eb6379f854e37c58ccba8595aa83bc52d files/mailer.conf 1564
 AUX remotes.sample 444 RMD160 00d2f8ccade03f6ba9cca2f3f0a157f42e3b8b98 SHA1 1cc94a1191f4bf20e1bd437fda70b5d40c127f8e SHA256 c3c6b0efc100142ecbe65b9af3e20900f9b21449619f35ef3ba2334dd0888b1f
-MD5 6d7b320c8d40ac0e2b4daca84d975cba files/remotes.sample 444
-RMD160 00d2f8ccade03f6ba9cca2f3f0a157f42e3b8b98 files/remotes.sample 444
-SHA256 c3c6b0efc100142ecbe65b9af3e20900f9b21449619f35ef3ba2334dd0888b1f files/remotes.sample 444
 DIST nullmailer-1.04.tar.gz 176867 RMD160 13deaf37a392dfd7b57ac61b50d496dfdb9c362f SHA1 f3815fec726a776be050a6be59b91e696779f5a9 SHA256 364b7888720469d1494c6084a8de7cd39cfc8f841f3be02dfc417e111572fe8b
 DIST nullmailer_1.04-1.diff.gz 47284 RMD160 0f6ba5985d6b47678f35b090a635630646dbbd14 SHA1 61525c2b5d9297c2a976c7107e1d16dab43d2259 SHA256 daa2a9388e8fa2a93401b9ee060a7f56f2f8e820af57aeba82a8abde838fcd75
-EBUILD nullmailer-1.04.ebuild 4103 RMD160 f95039e50384dd15e4520ade1226ac9e69cb4643 SHA1 7ab464521eb536135278b2a7859c199dc3d74b50 SHA256 9efacb62650e53fcdd0b8f898e38e56bf6e8f73c144377d48b4741e1faf5d351
-MD5 ec103222ec047571db60262d7f88632b nullmailer-1.04.ebuild 4103
-RMD160 f95039e50384dd15e4520ade1226ac9e69cb4643 nullmailer-1.04.ebuild 4103
-SHA256 9efacb62650e53fcdd0b8f898e38e56bf6e8f73c144377d48b4741e1faf5d351 nullmailer-1.04.ebuild 4103
-MISC ChangeLog 6858 RMD160 8a12068710aee19382fba50df023cb473cb5d88b SHA1 2189970caa34ee087f1def5a98bc048ed02cfbe3 SHA256 2ecea3369f4eaae60c5eb117ad425cb56edc381abe07fc28cee3cadf9103c1df
-MD5 070f9ca16654a20a9d2c47b259c35ac7 ChangeLog 6858
-RMD160 8a12068710aee19382fba50df023cb473cb5d88b ChangeLog 6858
-SHA256 2ecea3369f4eaae60c5eb117ad425cb56edc381abe07fc28cee3cadf9103c1df ChangeLog 6858
+EBUILD nullmailer-1.04.ebuild 3510 RMD160 8b3df9e05c22abd9e653e6fcc161d1aeb9aed545 SHA1 0554ba735fe90bc3be7433727726245498c02bf7 SHA256 272fecd8c02fb4dc26b0b66e5a0fa3385800c18f9c76192d0c2360d5ed3913ed
+MISC ChangeLog 6963 RMD160 78dc22993cabd3cef7664d0e42a946c8f48f7fc4 SHA1 bd189c5b15761ba6d1a0d7572cd8508540db0f9c SHA256 c6e02dc9d6634b49d4c050acaed9817b31962e2d72238163016af964333bf80a
 MISC metadata.xml 280 RMD160 9f5cd4ae71c9c7e45161110dd38d67f6604cd7b8 SHA1 4b9a055d510dca2f97d61f7df74fcefbc0cc0a2c SHA256 1e7cf6dbb378d12f4d6569350ba23c49aa55a855240b78b5487532028b0ff540
-MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
-RMD160 9f5cd4ae71c9c7e45161110dd38d67f6604cd7b8 metadata.xml 280
-SHA256 1e7cf6dbb378d12f4d6569350ba23c49aa55a855240b78b5487532028b0ff540 metadata.xml 280
-MD5 9499d8006b11b1a05817f0068a91cea5 files/digest-nullmailer-1.04 500
-RMD160 a51ffab8cf6a44f75010955c8058137565856884 files/digest-nullmailer-1.04 500
-SHA256 8878ccca902018e7a83d3b135e627624543e0d4e38be5c7d91734949ab4da3a7 files/digest-nullmailer-1.04 500
diff --git a/mail-mta/nullmailer/nullmailer-1.04.ebuild b/mail-mta/nullmailer/nullmailer-1.04.ebuild
index 3a63d92..39be4bb 100644
--- a/mail-mta/nullmailer/nullmailer-1.04.ebuild
+++ b/mail-mta/nullmailer/nullmailer-1.04.ebuild
@@ -22,8 +22,6 @@ IUSE="ipv6"
 DEPEND="virtual/libc
 		sys-apps/groff"
 RDEPEND="virtual/libc
-	>=sys-process/supervise-scripts-3.2
-	>=sys-process/daemontools-0.76-r1
 	sys-apps/shadow
 	virtual/logger"
 PROVIDE="virtual/mta"
@@ -31,7 +29,7 @@ PROVIDE="virtual/mta"
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 	EPATCH_OPTS="-d ${S} -p1" \
-	epatch ${DISTDIR}/${DEBIAN_SRC}
+	epatch "${DISTDIR}"/${DEBIAN_SRC}
 	if use ipv6; then
 		EPATCH_OPTS="-d ${S} -p1" \
 		epatch "${S}"/debian/patches/02_ipv6.diff || die "IPV6 patch failed"
@@ -57,15 +55,6 @@ src_compile() {
 
 src_install () {
 	einstall localstatedir="${D}"/var/nullmailer || die "einstall failed"
-	local mailqloc=/usr/bin/mailq
-	if use mailwrapper; then
-		mv "${D}"/usr/sbin/sendmail "${D}"/usr/sbin/sendmail.nullmailer
-		mailqloc=/usr/bin/mailq.nullmailer
-		mv "${D}"/usr/bin/mailq "${D}"/usr/bin/mailq.nullmailer
-		insinto /etc/mail
-		doins "${FILESDIR}"/mailer.conf
-		mailer_install_conf
-	fi
 	dodoc AUTHORS BUGS HOWTO INSTALL NEWS README YEAR2000 TODO
 	# A small bit of sample config
 	insinto /etc/nullmailer
@@ -84,8 +73,8 @@ src_install () {
 	# permissions stuff
 	keepdir /var/log/nullmailer /var/nullmailer/{tmp,queue}
 	fperms 770 /var/log/nullmailer /var/nullmailer/{tmp,queue}
-	fowners nullmail:nullmail /usr/sbin/nullmailer-queue ${mailqloc}
-	fperms 4711 /usr/sbin/nullmailer-queue ${mailqloc}
+	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
+	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq
 	fowners nullmail:nullmail /var/log/nullmailer /var/nullmailer/{tmp,queue,trigger}
 	fperms 660 /var/nullmailer/trigger
 	newinitd "${FILESDIR}"/init.d-nullmailer nullmailer
@@ -100,16 +89,11 @@ pkg_postinst() {
 	elog "To create an initial setup, please do:"
 	elog "emerge --config =${CATEGORY}/${PF}"
 	echo
-	elog "To start nullmailer at boot you have to enable the /etc/init.d/svscan rc file"
-	elog "and create the following link :"
+	elog "To start nullmailer at boot you may use either the nullmailer init.d"
+	elog "script, or emerge sys-process/supervise-scripts, enable the"
+	elog "svscan init.d script and create the following link:"
 	elog "ln -fs /var/nullmailer/service /service/nullmailer"
-	elog "As an alternative, we also provide an init.d script."
-	echo
-	elog "If the nullmailer service is already running, please restart it now,"
-	elog "using 'svc-restart nullmailer' or the init.d script."
 	echo
-	use mailwrapper && \
-		ewarn "Please ensure you have selected nullmailer in your /etc/mail/mailer.conf"
 }
 
 pkg_config() {