Added ipalias. Closes #17684.

3 files changed, 14 insertions, 12 deletions

diff --git a/net-mail/vpopmail/ChangeLog b/net-mail/vpopmail/ChangeLog
index f44bc2c6f611..326963cad2df 100644
--- a/net-mail/vpopmail/ChangeLog
+++ b/net-mail/vpopmail/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-mail/vpopmail
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.12 2003/04/04 08:28:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.13 2003/05/22 22:56:31 mholzer Exp $
+
+  23 May 2003; Martin Holzer <mholzer@gentoo.org> vpopmail-5.2.1-r5.ebuild:
+  Added ipalias. Closes #17684.
 
 *vpopmail-5.2.1-r5 (02 Apr 2003)
   02 Apr 2003; Robin Johnson <robbat2@gentoo.org> vpopmail-5.2.1-r5.ebuild,
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index 2dbb41f784d9..db1b9e5cb47b 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -1,5 +1,5 @@
-MD5 f97b704e6e990a08f8876556345425a3 ChangeLog 2095
-MD5 f8c674748391f00d1bee16c065a3fcd0 vpopmail-5.2.1-r5.ebuild 5932
+MD5 96fd4a92dca19ab79ac86bbf74f3a12e ChangeLog 2204
+MD5 384c0474695d2b10997d3a6ace64b0b9 vpopmail-5.2.1-r5.ebuild 6040
 MD5 78bfb4b023bf0ac233ceea999da2ab0a files/vpopmail.conf 417
 MD5 9aeca181f86314f09d9cfe99ebe8b7d0 files/vpopmail.diff 2101
 MD5 d388c60820d1ce87e90cbc46a89c6a77 files/digest-vpopmail-5.2.1-r5 327
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild
index 6e27dee9093c..2c5714e2211c 100644
--- a/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild,v 1.1 2003/04/04 08:28:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild,v 1.2 2003/05/22 22:56:31 mholzer Exp $
+
+IUSE="mysql ipalias"
 
 inherit eutils
 
 # TODO: all ldap, sybase support
 HOMEPAGE="http://www.inter7.com/vpopmail"
 DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail or Postfix mail servers."
-SRC_URI="http://www.inter7.com/vpopmail/${P}.tar.gz
-	mysql? ( http://gentoo.twobit.net/misc/vpopmail-5.2.1-mysql.diff )"
+SRC_URI="http://www.inter7.com/${PN}/${P}.tar.gz
+	mysql? ( http://gentoo.twobit.net/misc/{P}-mysql.diff )"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc"
-IUSE="mysql"
 DEPEND="sys-apps/sed
 	sys-apps/ucspi-tcp
 	mysql? ( >=dev-db/mysql-3.23* )"
@@ -51,7 +52,6 @@ pkg_setup() {
 }
 
 src_unpack() {
-
 	cd ${WORKDIR}
 	unpack ${P}.tar.gz
 	cd ${S}
@@ -65,12 +65,14 @@ src_unpack() {
 	# Thanks to Vadim Berezniker (vadim@berezniker.com)
 	# This patch backports a bug fix from the devel version re: logons
 	epatch ${FILESDIR}/vpopmail.diff
-
 }
 
 src_compile() {
 	vpopmail_set_homedir
 
+	use ipalias && myopts="${myopts} --enable-ip-alias-domains=y" \
+		|| myopts="${myopts} --enable-ip-alias-domains=n"
+
 	use mysql && myopts="${myopts} --enable-mysql=y \
 			--enable-libs=/usr/include/mysql \
 			--enable-sqllibdir=/usr/lib/mysql \
@@ -108,7 +110,6 @@ src_compile() {
 	[ "`use mysql`" ] && echo '#define MYSQL_PASSWORD_FILE "/etc/vpopmail.conf"' >> config.h
 
 	emake || die "Make failed."
-
 }
 
 src_install () {
@@ -171,12 +172,10 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-
 	vpopmail_set_homedir
 
 	sed "/^40.*\/usr\/bin\/clearopensmtp.*null$/d" /var/spool/cron/crontabs/root > /var/spool/cron/crontabs/root.new
 	mv --force /var/spool/cron/crontabs/root.new /var/spool/cron/crontabs/root
 	einfo "The vpopmail DATA will NOT be removed automatically."
 	einfo "You can delete them manually by removing the ${VPOP_HOME} directory."
-
 }