use QMAIL_HOME from qmail.eclass

Package-Manager: portage-2.1.4.4

3 files changed, 23 insertions, 30 deletions

diff --git a/mail-filter/simscan/ChangeLog b/mail-filter/simscan/ChangeLog
index abbb4c1fd495..7865b2448f68 100644
--- a/mail-filter/simscan/ChangeLog
+++ b/mail-filter/simscan/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-filter/simscan
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/simscan/ChangeLog,v 1.9 2008/08/23 06:00:38 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/simscan/ChangeLog,v 1.10 2008/09/01 06:34:17 hollow Exp $
+
+  01 Sep 2008; Benedikt Böhm <hollow@gentoo.org> simscan-1.4.0-r2.ebuild:
+  use QMAIL_HOME from qmail.eclass
 
   23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/mail-filter/simscan/Manifest b/mail-filter/simscan/Manifest
index 86e3ecb7c69f..8aa225500361 100644
--- a/mail-filter/simscan/Manifest
+++ b/mail-filter/simscan/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX simscan-1.3.1-destdir.patch 935 RMD160 d5db9529ae9c00f22674a14ac5163f6e2b678d66 SHA1 0923a2a9e31c50f7d02b4951282195bcb3ddce29 SHA256 3b1e2ba3b5c6e69f25d079857c42960b591b3641a184d54bb55c7ecbda158936
 AUX simscan-1.3.1-printf.patch 328 RMD160 4d21f6479403818d70feef6d04f5ae6010d33365 SHA1 6333e8f55fe27549d3cf969eda67a7f01c744e87 SHA256 edc1ffb01ee4188ece0ce4b9c48c7e816e3d58ebde1ea9ee883253f3c84c995b
 DIST simscan-1.3.1.tar.gz 276310 RMD160 a5f33b2d9d06cf2cd0752048577e715f4b71807a SHA1 6562b30e4cf609ca7d77aefbe3163bc5297d8a7b SHA256 1ad31a0d8df9115d091e60fa2bb0c8d8fdd39bb12ac85dfcf69b851a8efe7f0a
 DIST simscan-1.4.0.tar.gz 271617 RMD160 c32c54a6d16381bc0b2d28892506dfc2b8c51d56 SHA1 af6a81741d5eb34431434ea33069f03f74f246d1 SHA256 b89d145206ad26420cfbf2f5b25ebf52e236f8ac00cd70ae449e72f3ec935781
 EBUILD simscan-1.3.1.ebuild 2802 RMD160 4cc541c1cd9bc402c15777f119a18fa890a65f31 SHA1 317d4bdee71524201ee39959676a0944cab9eab7 SHA256 19713b125a709fdeb55dcbed3c74c4b1a7100c120f6b46feedaf026e7f550718
 EBUILD simscan-1.4.0-r1.ebuild 2938 RMD160 4a21d3af525b7830ce53effdd837e3553b898c76 SHA1 063c7c97fa3709bd35e98ac0d550d26a9ae28201 SHA256 91b5fdeffcb7f0f5b9f43588f5b2d0fff5acf8ca8e1e99ad86574b02bb9e74a4
-EBUILD simscan-1.4.0-r2.ebuild 3114 RMD160 ed9d17f3d020a2e516020c01fd1afb9540109543 SHA1 61ba6788e49b072239d1ab4f5860440852b0575a SHA256 3d1f5d4504d1abb5a2d1de2bc97c49c601de193112a3e775554a71f0e6f464b9
+EBUILD simscan-1.4.0-r2.ebuild 3165 RMD160 2511757ca1564f649d9ea29c0de3cbe6bdb202ee SHA1 c0adebed9baab85b8b9a34045945e8f4e304c082 SHA256 0ddd62a62c315d9e9eaefa3349a6737199be755592918cc444dea6c66d7d4b2c
 EBUILD simscan-1.4.0.ebuild 2788 RMD160 546f25c3e7d0e1b34c2e52f90f4fe7deef5a3d70 SHA1 3b759057ad389b1bfa2f250bb66b84fd5d15b5c1 SHA256 962ff2af0e75f176999c3c51b490b5f24e03fe6fc364179471930b8e4d62daf9
-MISC ChangeLog 1440 RMD160 84a1c3e129e88d12b604ee3565eca0115db36702 SHA1 57720be5cabfde8dbb1cb0e31138d71a929585fb SHA256 acfdc8dc308f5962c3bdd15989123bbb8b8949c93b48db30b5b9a6a98d230397
+MISC ChangeLog 1552 RMD160 90d9ee14679f4d6caa378f1b7de16aa4d2670102 SHA1 d47a980aba8ebe04b77a17feab32c9c5a9327b48 SHA256 37660e8acc08974840942874ff3351ed2a4f40318be6220283855eadb669240d
 MISC metadata.xml 1071 RMD160 a2c18db63b45f8d7a62e50df09405f9555ab6191 SHA1 6bb6032c3428d056ea59f179c3f62e10ee467456 SHA256 9ca0f98cdec5dd14e0eb4f0ac6f1d5ba7c58234ddb68d2236efdb8ad6a9e4582
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkivp4wACgkQoeSe8B0zEfyB1QCfXGnbHUqFD7dmuwsimizT8D5P
-tYcAn3kjXs6FVVnCNEQFlZrC6mAB92AB
-=yQ64
------END PGP SIGNATURE-----
diff --git a/mail-filter/simscan/simscan-1.4.0-r2.ebuild b/mail-filter/simscan/simscan-1.4.0-r2.ebuild
index b28ba28b287e..56dd752b9e17 100644
--- a/mail-filter/simscan/simscan-1.4.0-r2.ebuild
+++ b/mail-filter/simscan/simscan-1.4.0-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/simscan/simscan-1.4.0-r2.ebuild,v 1.1 2008/03/14 23:52:31 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/simscan/simscan-1.4.0-r2.ebuild,v 1.2 2008/09/01 06:34:17 hollow Exp $
 
-inherit autotools toolchain-funcs eutils fixheadtails flag-o-matic
+inherit autotools toolchain-funcs eutils fixheadtails flag-o-matic qmail
 
 DESCRIPTION="Simscan, a qmail scanner"
 HOMEPAGE="http://inter7.com/?page=simscan"
@@ -51,8 +51,8 @@ src_unpack() {
 
 src_compile() {
 	econf \
-		--enable-qmaildir=/var/qmail \
-		--enable-qmail-queue=/var/qmail/bin/qmail-queue \
+		--enable-qmaildir=${QMAIL_HOME} \
+		--enable-qmail-queue=${QMAIL_HOME}/bin/qmail-queue \
 		$(use_enable attachment attach) \
 		$(use_enable clamav) \
 		$(use_enable clamav clamdscan /usr/bin/clamdscan) \
@@ -64,7 +64,7 @@ src_compile() {
 		$(use_enable spamc-user) \
 		$(use_enable spam-auth-user) \
 		$(use_enable passthru spam-passthru) \
-		$(use_enable quarantine quarantinedir /var/qmail/quarantine) \
+		$(use_enable quarantine quarantinedir ${QMAIL_HOME}/quarantine) \
 		$(use_enable regex) \
 		$(use_enable custom-smtp-reject) \
 		$(use_enable received) \
@@ -77,30 +77,30 @@ src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog README TODO
 
-	keepdir /var/qmail/control
-	keepdir /var/qmail/simscan
+	keepdir ${QMAIL_HOME}/control
+	keepdir ${QMAIL_HOME}/simscan
 
 	# Set directory permission for clamav to do its work
-	fowners simscan:simscan /var/qmail/simscan
-	fperms 2750 /var/qmail/simscan
+	fowners simscan:simscan ${QMAIL_HOME}/simscan
+	fperms 2750 ${QMAIL_HOME}/simscan
 
 	if use clamav; then
-		echo -n ":clam=yes," > "${D}"/var/qmail/control/simcontrol
+		echo -n ":clam=yes," > "${D}${QMAIL_HOME}"/control/simcontrol
 	else
-		echo -n ":clam=no," > "${D}"/var/qmail/control/simcontrol
+		echo -n ":clam=no," > "${D}${QMAIL_HOME}"/control/simcontrol
 	fi
 
 	if use spamassassin; then
-		echo "spam=yes,spam_hits=${SIMSCAN_HITS}" >> "${D}"/var/qmail/control/simcontrol
+		echo "spam=yes,spam_hits=${SIMSCAN_HITS}" >> "${D}${QMAIL_HOME}"/control/simcontrol
 	else
-		echo "spam=no" >> "${D}"/var/qmail/control/simcontrol
+		echo "spam=no" >> "${D}${QMAIL_HOME}"/control/simcontrol
 	fi
 }
 
 pkg_postinst() {
 	ewarn "Updating simscan configuration files ..."
-	/var/qmail/bin/simscanmk
-	use received && /var/qmail/bin/simscanmk -g
+	${QMAIL_HOME}/bin/simscanmk
+	use received && ${QMAIL_HOME}/bin/simscanmk -g
 
 	ewarn
 	ewarn "You have to do that every time you update clamav or spamassassin"
@@ -108,8 +108,8 @@ pkg_postinst() {
 
 	einfo
 	einfo "In order use simscan update the QMAILQUEUE environment variable"
-	einfo "and point it to /var/qmail/bin/simscan"
+	einfo "and point it to ${QMAIL_HOME}/bin/simscan"
 	einfo
-	einfo "Read the documentation and customize /var/qmail/control/simcontrol"
+	einfo "Read the documentation and customize ${QMAIL_HOME}/control/simcontrol"
 	einfo
 }