revision bump bug #96101, cleanup

(Portage version: 2.0.51.22-r1)

9 files changed, 26 insertions, 500 deletions

diff --git a/net-mail/vpopmail/ChangeLog b/net-mail/vpopmail/ChangeLog
index 8b163ae23e42..7dabf1d00cc9 100644
--- a/net-mail/vpopmail/ChangeLog
+++ b/net-mail/vpopmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/vpopmail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.58 2005/05/25 22:51:07 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.59 2005/06/21 21:27:41 anarchy Exp $
+
+*vpopmail-5.4.10 (21 Jun 2005)
+
+  21 Jun 2005; <anarchy@gentoo.org> -vpopmail-5.2.2-r1.ebuild,
+  -vpopmail-5.4.9-r1.ebuild, +vpopmail-5.4.10.ebuild,
+  -vpopmail-5.5.0.ebuild:
+  revision bump bug #96101, cleanup
 
   25 May 2005; Jory A. Pratt <anarchy@gentoo.org> vpopmail-5.4.9-r2.ebuild,
   vpopmail-5.5.0.ebuild:
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index 5481f58e6c12..e8884023828d 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -3,19 +3,21 @@ MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 a9c3c67b2737cf350be6e4fe66de5c77 vpopmail-5.2.2-r1.ebuild 7452
 MD5 66dd4d3fc62840431c0e01d9e891c3a1 vpopmail-5.4.6-r1.ebuild 7649
 MD5 ebdc11c77e0972c18e954b43a5a20b30 vpopmail-5.4.9-r1.ebuild 7709
-MD5 8a0f1e2d6d3f83e66d7f176adcf83dea vpopmail-5.5.0.ebuild 7722
 MD5 1f4d3565fad068ad273c1d319d343f06 vpopmail-5.4.9-r2.ebuild 7838
+MD5 8a0f1e2d6d3f83e66d7f176adcf83dea vpopmail-5.5.0.ebuild 7722
+MD5 a1fd1099fbfce52d2f1c2f489cc3f912 vpopmail-5.4.10.ebuild 7845
 MD5 3041a3223960dc956b67ac1230f00db7 files/99vpopmail 86
 MD5 d0bc9f5393a1f0602c71fdee0b3d2cd8 files/digest-vpopmail-5.2.2-r1 134
 MD5 1c75d4c70c599202edf1d9599bf40ef2 files/digest-vpopmail-5.4.6-r1 66
+MD5 aea08e2e6df4cf89a2a32a8817cc7135 files/digest-vpopmail-5.4.9-r1 66
+MD5 aea08e2e6df4cf89a2a32a8817cc7135 files/digest-vpopmail-5.4.9-r2 66
+MD5 8d771dd64d54f0155c257749cbcb8b7a files/digest-vpopmail-5.5.0 66
 MD5 7bdd629eebc8f1ea4ba47e8cd4f3f3eb files/vpopmail-5.2.1-showall.patch 754
 MD5 eb33b7205c4d4d75c4fc3710d7774e07 files/vpopmail-5.4.6-access.violation.patch 918
 MD5 eb33b7205c4d4d75c4fc3710d7774e07 files/vpopmail-5.4.9-access.violation.patch 918
 MD5 8c6ca78a4c32c9a267dd9c3f7e9db5f1 files/vpopmail-Maildir-dotmaildir-fix.sh 1480
-MD5 851f9c731b7d03472a08ee21c046823d files/vpopmail.clearopensmtp 235
-MD5 63284ad7aa0644157e4b754b969a8421 files/vpopmail.conf 466
 MD5 4b9ecca5815031b05bd173888da4d228 files/vpopmail-cdb-Makefile.patch 363
-MD5 aea08e2e6df4cf89a2a32a8817cc7135 files/digest-vpopmail-5.4.9-r1 66
-MD5 8d771dd64d54f0155c257749cbcb8b7a files/digest-vpopmail-5.5.0 66
 MD5 aa40d1572827d929f64cdcdabb71f437 files/vpopmail-fPIC.patch 7397
-MD5 aea08e2e6df4cf89a2a32a8817cc7135 files/digest-vpopmail-5.4.9-r2 66
+MD5 851f9c731b7d03472a08ee21c046823d files/vpopmail.clearopensmtp 235
+MD5 63284ad7aa0644157e4b754b969a8421 files/vpopmail.conf 466
+MD5 175cc82c17dfbb2ab785271ff71e8f5c files/digest-vpopmail-5.4.10 67
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.2.2-r1 b/net-mail/vpopmail/files/digest-vpopmail-5.2.2-r1
deleted file mode 100644
index befa612f58c1..000000000000
--- a/net-mail/vpopmail/files/digest-vpopmail-5.2.2-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 57253be349b25bfd5b86083ffcd42283 vpopmail-5.2.2.tar.gz 280075
-MD5 9d12d36935643050617a76c5104c4d28 vpopmail-5.2.1-mysql.diff 5211
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.4.10 b/net-mail/vpopmail/files/digest-vpopmail-5.4.10
new file mode 100644
index 000000000000..548d062c1d92
--- /dev/null
+++ b/net-mail/vpopmail/files/digest-vpopmail-5.4.10
@@ -0,0 +1 @@
+MD5 6709827f515f632424c2223c964698a1 vpopmail-5.4.10.tar.gz 432341
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.4.9-r1 b/net-mail/vpopmail/files/digest-vpopmail-5.4.9-r1
deleted file mode 100644
index cfc2704d5001..000000000000
--- a/net-mail/vpopmail/files/digest-vpopmail-5.4.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cbf3559ac4ac7efce6252a1c77facd80 vpopmail-5.4.9.tar.gz 432503
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.5.0 b/net-mail/vpopmail/files/digest-vpopmail-5.5.0
deleted file mode 100644
index 0fbd9e129f14..000000000000
--- a/net-mail/vpopmail/files/digest-vpopmail-5.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 17e75f05235e7f930d9dd978dc447526 vpopmail-5.5.0.tar.gz 425441
diff --git a/net-mail/vpopmail/vpopmail-5.2.2-r1.ebuild b/net-mail/vpopmail/vpopmail-5.2.2-r1.ebuild
deleted file mode 100644
index 94d2ff052932..000000000000
--- a/net-mail/vpopmail/vpopmail-5.2.2-r1.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.2-r1.ebuild,v 1.11 2005/05/05 22:40:10 swegener Exp $
-
-IUSE="mysql ipalias clearpasswd"
-
-inherit eutils gnuconfig
-
-# TODO: all ldap, sybase support
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail or Postfix mail servers."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mysql? ( http://gentoo.twobit.net/misc/${PN}-5.2.1-mysql.diff )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc"
-DEPEND_COMMON="mail-mta/qmail
-	mysql? ( >=dev-db/mysql-3.23 )"
-DEPEND="sys-apps/sed
-		sys-apps/ucspi-tcp
-		${DEPEND_COMMON}"
-RDEPEND="${DEPEND_COMMON}
-	 	 virtual/cron"
-
-# Define vpopmail home dir in /etc/password if different
-VPOP_DEFAULT_HOME="/var/vpopmail"
-VPOP_HOME="$VPOP_DEFAULT_HOME"
-
-# This makes sure the variable is set, and that it isn't null.
-vpopmail_set_homedir() {
-	VPOP_HOME=`getent passwd vpopmail | cut -d: -f6`
-	if [ -z "$VPOP_HOME" ]; then
-		echo -ne "\a"
-		eerror "vpopmail's home directory is null in passwd data!"
-		eerror "You probably want to check that out."
-		eerror "Continuing with default."
-		ebeep 3
-		VPOP_HOME="${VPOP_DEFAULT_HOME}"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
-
-pkg_setup() {
-	if [ -z `getent group vpopmail` ]; then
-		(groupadd -g 89 vpopmail 2>/dev/null || groupadd vpopmail ) || die "problem adding vpopmail group"
-	fi
-	if [ -z `getent passwd vpopmail` ]; then
-		useradd -g vpopmail -u 89 -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" -s /bin/false -m vpopmail || \
-		useradd -g vpopmail -u `getent group vpopmail | awk -F":" '{ print $3 }'` -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" \
-		-s /bin/false -m vpopmail || die "problem adding vpopmail user"
-	fi
-	upgradewarning
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	epatch ${FILESDIR}/vpopmail-5.2.1-showall.patch
-
-	if use mysql; then
-		einfo "Applying MySQL patch..."
-		# Thanks to Nicholas Jones (carpaski@gentoo.org)
-		epatch ${DISTDIR}/vpopmail-5.2.1-mysql.diff
-	fi
-
-	for i in vchkpw.c vconvert.c vdelivermail.c vpopbull.c vpopmail.c vqmaillocal.c vuserinfo.c; do
-		sed -e 's|Maildir|.maildir|g' -i $i || die "Failed to change s/Maildir/.maildir/g in $i"
-	done
-
-	gnuconfig_update
-
-	# the configure script tries to force root and make directories not using ${D}
-	cp configure configure.orig
-	#sed -e '1282,1289d' -e '1560,1567d' -e '2349d' -e '2107d' -e '2342d' configure > configure.new
-	sed -e '1304,1311d' -e '1582,1589d' -e '2129d' -e '2364d' -e '2371d' -i configure
-}
-
-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 \
-			--enable-mysql-logging=y \
-			--enable-auth-logging=y \
-			--enable-valias=y \
-			--enable-mysql-replication=n" \
-		|| myopts="${myopts} --enable-mysql=n"
-
-	# Bug 20127
-	use clearpasswd &&
-		myopts="${myopts} --enable-clear-passwd=y" ||
-		myopts="${myopts} --enable-clear-passwd=n"
-
-	addpredict /var/vpopmail/etc/lib_deps
-	addpredict /var/vpopmail/etc/inc_deps
-
-	econf ${myopts} --sbindir=/usr/sbin \
-		--bindir=/usr/bin \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-qmaildir=/var/qmail \
-		--enable-qmail-newu=/var/qmail/bin/qmail-newu \
-		--enable-qmail-inject=/var/qmail/bin/qmail-inject \
-		--enable-qmail-newmrh=/var/qmail/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-many-domains=y \
-		--enable-vpopgroup=vpopmail \
-		--enable-file-locking=y \
-		--enable-file-sync=y \
-		--enable-md5-passwords=y \
-		--enable-defaultquota=30000000,1000C \
-		--enable-roaming-users=y --enable-relay-clear-minutes=60 \
-		--enable-tcprules-prog=/usr/bin/tcprules --enable-tcpserver-file=/etc/tcp.smtp \
-		--enable-logging=y \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext || die "econf failed"
-
-	use mysql && echo '#define MYSQL_PASSWORD_FILE "/etc/vpopmail.conf"' >> ${S}/config.h
-
-	emake || die "Make failed."
-}
-
-src_install () {
-	vpopmail_set_homedir
-
-	make DESTDIR=${D} install-strip || die
-
-	into /var/vpopmail
-	dobin ${FILESDIR}/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	# Install documentation.
-	dodoc AUTHORS ChangeLog COPYING FAQ INSTALL NEWS TODO
-	dodoc README README.* RELEASE.NOTES UPGRADE.*
-	dodoc doc/doc_html/* doc/man_html/*
-	rm -rf ${D}/${VPOP_HOME}/doc
-	dosym /usr/share/doc/${PF}/ ${VPOP_HOME}/doc
-
-	# Create /etc/vpopmail.conf
-	if use mysql; then
-		einfo "Installing vpopmail mysql configuration file"
-		dodir /etc
-		insinto /etc
-		doins ${FILESDIR}/vpopmail.conf
-		fowners vpopmail:vpopmail /etc/vpopmail.conf
-		fperms 600 /etc/vpopmail.conf
-	fi
-
-	# Install a proper cronjob instead of the old nastiness
-	einfo "Installing cronjob"
-	dodir /etc/cron.hourly
-	insinto /etc/cron.hourly
-	doins ${FILESDIR}/vpopmail.clearopensmtp
-	fperms +x /etc/cron.hourly/vpopmail.clearopensmtp
-
-	einfo "Installing env.d entry"
-	dodir /etc/env.d
-	insinto /etc/env.d
-	doins ${FILESDIR}/99vpopmail
-
-	# Configure b0rked. We'll do this manually
-	echo "-I${VPOP_HOME}/include" > ${D}/${VPOP_HOME}/etc/inc_deps
-	local libs_extra
-	use mysql && libs_extra="-L/usr/lib/mysql -lmysqlclient -lz" || libs_extra=""
-	echo "-L${VPOP_HOME}/lib -lvpopmail ${libs_extra}" > ${D}/${VPOP_HOME}/etc/lib_deps
-
-	einfo "Locking down vpopmail permissions"
-	# secure things more, i don't want the vpopmail user being able to write this stuff!
-	chown -R root:root ${D}${VPOP_HOME}/{bin,etc,include}
-
-}
-
-pkg_preinst() {
-	vpopmail_set_homedir
-
-	# Keep DATA
-	keepdir ${VPOP_HOME}/domains
-
-	# This is a workaround until portage handles binary packages+users better.
-	pkg_setup
-
-	upgradewarning
-}
-
-pkg_postinst() {
-	einfo "Performing post-installation routines for ${P}."
-
-	if use mysql; then
-		echo
-		einfo "You have 'mysql' turned on in your USE"
-		einfo "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		einfo "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		echo
-		einfo "First log into mysql as your mysql root user and pass. Then:"
-		einfo "> create database vpopmail;"
-		einfo "> use mysql;"
-		einfo "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		einfo "  vpopmail@localhost identified by 'your password';"
-		einfo "> flush privileges;"
-		echo
-		einfo "If you have problems with vpopmail not accepting mail properly,"
-		einfo "please ensure that /etc/vpopmail.conf is chmod 600 and"
-		einfo "owned by vpopmail:vpopmail"
-	fi
-	# do this for good measure
-	if [ -e /etc/vpopmail.conf ]; then
-		chmod 600 /etc/vpopmail.conf
-		chown vpopmail:vpopmail /etc/vpopmail.conf
-	fi
-
-	upgradewarning
-}
-
-pkg_postrm() {
-	vpopmail_set_homedir
-
-	einfo "The vpopmail DATA will NOT be removed automatically."
-	einfo "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
-	ewarn "The internal structure of the mail storage has changed for"
-	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
-	ewarn "script at /var/vpopmail/bin/vpopmail-Maildir-dotmaildir-fix.sh"
-	ewarn "to upgrade your system! (It can do conversions both ways)."
-	ewarn "You should be able to run it right away without any changes."
-}
diff --git a/net-mail/vpopmail/vpopmail-5.4.9-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.10.ebuild
index e31a9ed6dd69..d76ebe016eb1 100644
--- a/net-mail/vpopmail/vpopmail-5.4.9-r1.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.9-r1.ebuild,v 1.6 2005/05/05 22:40:10 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.10.ebuild,v 1.1 2005/06/21 21:27:41 anarchy Exp $
 
-inherit eutils gnuconfig fixheadtails flag-o-matic
+inherit eutils gnuconfig fixheadtails
 
 # TODO: all ldap, sybase support
 #MY_PV=${PV/_/-}
@@ -57,7 +57,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/${P}-access.violation.patch || die "failed to patch."
+	epatch ${FILESDIR}/${PN}-5.4.9-access.violation.patch || die "failed to patch."
+	epatch ${FILESDIR}/${PN}-fPIC.patch || die "failed to patch Makefiles."
 	sed -i \
 		's|Maildir|.maildir|g' \
 		vchkpw.c vconvert.c vdelivermail.c \
@@ -97,8 +98,6 @@ src_compile() {
 		&& myopts="${myopts} --enable-clear-passwd=y" \
 		|| myopts="${myopts} --enable-clear-passwd=n"
 
-	use amd64 && append-flags -fPIC
-
 	econf \
 		${myopts} \
 		--sbindir=/usr/sbin \
@@ -124,7 +123,11 @@ src_compile() {
 	# TCPRULES for relaying is now considered obsolete, use relay-ctrl instead
 	#--enable-tcprules-prog=/usr/bin/tcprules --enable-tcpserver-file=/etc/tcp.smtp \
 	#--enable-roaming-users=y --enable-relay-clear-minutes=60 \
-	#--disable-rebuild-tcpserver-file \	
+	#--disable-rebuild-tcpserver-file \
+
+	# Copy compile from automake-1.6 
+	cp /usr/share/automake-1.6/compile ./ || die "failed to copy file"
+
 	emake || die "Make failed."
 }
 
diff --git a/net-mail/vpopmail/vpopmail-5.5.0.ebuild b/net-mail/vpopmail/vpopmail-5.5.0.ebuild
deleted file mode 100644
index 3082a06e4e1e..000000000000
--- a/net-mail/vpopmail/vpopmail-5.5.0.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.5.0.ebuild,v 1.2 2005/05/25 22:51:07 anarchy Exp $
-
-inherit eutils gnuconfig fixheadtails flag-o-matic
-
-# TODO: all ldap, sybase support
-#MY_PV=${PV/_/-}
-#MY_P=${PN}-${MY_PV}
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail or Postfix mail servers."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-*"
-IUSE="mysql ipalias clearpasswd"
-# vpopmail will NOT build if non-root.
-RESTRICT="nouserpriv"
-DEPEND_COMMON="mail-mta/qmail
-	mysql? ( >=dev-db/mysql-3.23 )"
-DEPEND="sys-apps/sed
-	sys-apps/ucspi-tcp
-	${DEPEND_COMMON}"
-RDEPEND="${DEPEND_COMMON}
-	virtual/cron"
-
-# S="${WORKDIR}/${MY_P}"
-
-# Define vpopmail home dir in /etc/password if different
-VPOP_DEFAULT_HOME="/var/vpopmail"
-VPOP_HOME="$VPOP_DEFAULT_HOME"
-
-# This makes sure the variable is set, and that it isn't null.
-vpopmail_set_homedir() {
-	VPOP_HOME=`getent passwd vpopmail | cut -d: -f6`
-	if [ -z "$VPOP_HOME" ]; then
-		echo -ne "\a"
-		eerror "vpopmail's home directory is null in passwd data!"
-		eerror "You probably want to check that out."
-		eerror "Continuing with default."
-		VPOP_HOME="${VPOP_DEFAULT_HOME}"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
-
-pkg_setup() {
-	enewgroup vpopmail 89
-	enewuser vpopmail 89 /bin/false ${VPOP_DEFAULT_HOME} vpopmail
-	upgradewarning
-}
-
-src_unpack() {
-	# cd ${WORKDIR}
-	# unpack ${MY_P}.tar.gz
-	unpack ${A}
-	cd ${S}
-
-	# Has been applied upstream
-	# epatch ${FILESDIR}/${PN}-5.4.9-access.violation.patch || die "failed to patch."
-	sed -i \
-		's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c \
-		|| die "failed to change Maildir to .maildir"
-	sed -i \
-		'/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c \
-		|| die "failed to remove vpopmail advertisement"
-
-	gnuconfig_update
-	autoconf || die "reconfigure failed."
-	ht_fix_file ${S}/cdb/Makefile || die "failed to fix file"
-	epatch ${FILESDIR}/vpopmail-cdb-Makefile.patch || die "failed to patch Makefile"
-}
-
-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-auth-module=mysql \
-			--enable-libs=/usr/include/mysql \
-			--enable-libdir=/usr/lib/mysql \
-			--enable-sql-logging=y \
-			--enable-auth-logging=y \
-			--enable-valias=y \
-			--enable-mysql-replication=n \
-			--enable-mysql-limits"
-
-	# Bug 20127
-	use clearpasswd \
-		&& myopts="${myopts} --enable-clear-passwd=y" \
-		|| myopts="${myopts} --enable-clear-passwd=n"
-
-	use amd64 && append-flags -fPIC
-
-	econf \
-		${myopts} \
-		--sbindir=/usr/sbin \
-		--bindir=/usr/bin \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-qmaildir=/var/qmail \
-		--enable-qmail-newu=/var/qmail/bin/qmail-newu \
-		--enable-qmail-inject=/var/qmail/bin/qmail-inject \
-		--enable-qmail-newmrh=/var/qmail/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-many-domains=y \
-		--enable-vpopgroup=vpopmail \
-		--enable-file-locking=y \
-		--enable-file-sync=y \
-		--enable-md5-passwords=y \
-		--enable-logging=y \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--enable-domainquotas \
-		--disable-tcp-rules-prog --disable-tcpserver-file --disable-roaming-users \
-		|| die
-
-	# TCPRULES for relaying is now considered obsolete, use relay-ctrl instead
-	#--enable-tcprules-prog=/usr/bin/tcprules --enable-tcpserver-file=/etc/tcp.smtp \
-	#--enable-roaming-users=y --enable-relay-clear-minutes=60 \
-	#--disable-rebuild-tcpserver-file \	
-	emake || die "Make failed."
-}
-
-src_install() {
-	vpopmail_set_homedir
-
-	make DESTDIR=${D} install || die
-	dosed ${VPOP_HOME}/etc/inc_deps
-	dosed ${VPOP_HOME}/etc/lib_deps
-
-	into /var/vpopmail
-	dobin ${FILESDIR}/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	# Install documentation.
-	dodoc AUTHORS ChangeLog FAQ INSTALL README*
-	dodoc doc/doc_html/* doc/man_html/*
-	rm -rf ${D}/${VPOP_HOME}/doc
-	dosym /usr/share/doc/${PF}/ ${VPOP_HOME}/doc
-
-	# Create /etc/vpopmail.conf
-	if use mysql ; then
-		einfo "Installing vpopmail mysql configuration file"
-		dodir /etc
-		#config file position
-		mv ${D}/var/vpopmail/etc/vpopmail.mysql ${D}/etc/vpopmail.conf
-		dosym /etc/vpopmail.conf /var/vpopmail/etc/vpopmail.mysql
-		sed -e '12d' -i ${D}/etc/vpopmail.conf
-		echo '# Read-only DB' >>${D}/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >>${D}/etc/vpopmail.conf
-		echo '# Write DB' >>${D}/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >>${D}/etc/vpopmail.conf
-		# lock down perms
-		fperms 640 /etc/vpopmail.conf
-		fowners root:vpopmail /etc/vpopmail.conf
-	fi
-
-	# Install a proper cronjob instead of the old nastiness
-	#einfo "Installing cronjob"
-	#dodir /etc/cron.hourly
-	#insinto /etc/cron.hourly
-	#doins ${FILESDIR}/vpopmail.clearopensmtp
-	#fperms +x /etc/cron.hourly/vpopmail.clearopensmtp
-
-	einfo "Installing env.d entry"
-	dodir /etc/env.d
-	insinto /etc/env.d
-	doins ${FILESDIR}/99vpopmail
-
-	# Configure b0rked. We'll do this manually
-	#echo "-I${VPOP_HOME}/include" > ${D}/${VPOP_HOME}/etc/inc_deps
-	#local libs_extra
-	#use mysql && libs_extra="-L/usr/lib/mysql -lmysqlclient -lz" || libs_extra=""
-	#echo "-L${VPOP_HOME}/lib -lvpopmail ${libs_extra}" > ${D}/${VPOP_HOME}/etc/lib_deps
-
-	einfo "Locking down vpopmail permissions"
-	# secure things more, i don't want the vpopmail user being able to write this stuff!
-	chown -R root:root ${D}${VPOP_HOME}/{bin,etc,include}
-	chown root:vpopmail ${D}${VPOP_HOME}/bin/vchkpw
-	chmod 4711 ${D}${VPOP_HOME}/bin/vchkpw
-}
-
-pkg_preinst() {
-	vpopmail_set_homedir
-
-	# Keep DATA
-	keepdir ${VPOP_HOME}/domains
-
-	# This is a workaround until portage handles binary packages+users better.
-	pkg_setup
-
-	upgradewarning
-}
-
-pkg_postinst() {
-	einfo "Performing post-installation routines for ${P}."
-
-	if use mysql ; then
-		echo
-		einfo "You have 'mysql' turned on in your USE"
-		einfo "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		einfo "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		echo
-		einfo "First log into mysql as your mysql root user and pass. Then:"
-		einfo "> create database vpopmail;"
-		einfo "> use mysql;"
-		einfo "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		einfo "  vpopmail@localhost identified by 'your password';"
-		einfo "> flush privileges;"
-		echo
-		einfo "If you have problems with vpopmail not accepting mail properly,"
-		einfo "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		einfo "owned by root:vpopmail"
-	fi
-	# do this for good measure
-	if [ -e /etc/vpopmail.conf ] ; then
-		chmod 640 /etc/vpopmail.conf
-		chown root:vpopmail /etc/vpopmail.conf
-	fi
-
-	upgradewarning
-}
-
-pkg_postrm() {
-	vpopmail_set_homedir
-
-	einfo "The vpopmail DATA will NOT be removed automatically."
-	einfo "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
-	ewarn "The internal structure of the mail storage has changed for"
-	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
-	ewarn "script at /var/vpopmail/bin/vpopmail-Maildir-dotmaildir-fix.sh"
-	ewarn "to upgrade your system! (It can do conversions both ways)."
-	ewarn "You should be able to run it right away without any changes."
-	echo
-	einfo "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	einfo "using net-mail/relay-ctrl instead."
-}