5.4.30-r1 stable on amd64 wrt #285213; add support for spamassassin wrt #315643

Package-Manager: portage-2.2_rc67/cvs/Linux i686

9 files changed, 44 insertions, 898 deletions

diff --git a/net-mail/vpopmail/ChangeLog b/net-mail/vpopmail/ChangeLog
index a40a9c830572..85ad5b30b6a7 100644
--- a/net-mail/vpopmail/ChangeLog
+++ b/net-mail/vpopmail/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-mail/vpopmail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.94 2010/04/05 17:40:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.95 2010/05/30 06:49:46 hollow Exp $
+
+*vpopmail-5.4.30-r2 (30 May 2010)
+
+  30 May 2010; Benedikt Böhm <hollow@gentoo.org> -vpopmail-5.4.19.ebuild,
+  -vpopmail-5.4.20.ebuild, -vpopmail-5.4.25.ebuild, -vpopmail-5.4.26.ebuild,
+  -vpopmail-5.4.30.ebuild, vpopmail-5.4.30-r1.ebuild,
+  +vpopmail-5.4.30-r2.ebuild, metadata.xml:
+  5.4.30-r1 stable on amd64 wrt #285213; add support for spamassassin wrt
+  #315643
 
   05 Apr 2010; Raúl Porcel <armin76@gentoo.org> vpopmail-5.4.30-r1.ebuild:
   arm/s390/sh/sparc stable wrt #285213
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index e22e5c86d293..44d5fc3dae57 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -4,17 +4,9 @@ AUX vpopmail-Maildir-dotmaildir-fix.sh 1480 RMD160 691f03e6a7eee4597ef7615720618
 AUX vpopmail-double-free.patch 411 RMD160 82594d0ae6618411227fafa136fcedd83b328d37 SHA1 755786c15f8b065db0757cdb4204c5cc835d99ad SHA256 30baf7ccd16af5ab375e03b56764c367f589f0cf1e0535fcc98b5c591829b055
 AUX vpopmail-lazy.patch 324 RMD160 9c65dfd19ed52cbb8e2e828973dfed9ab1d1cb57 SHA1 d24b87cc3ae340f23533390eb0cd41cc26922cb7 SHA256 aa1f8123433b82cdae554c943c8731359e226c598cea22496fdd63a11ab58fc4
 DIST vpopmail-5.4.16.tar.gz 453019 RMD160 de385ee6dbe0edf7ccb2e88c5b967669711d1e2b SHA1 59d158f0e6b9516f242085101a144597fc8bf296 SHA256 c1ea76e404082a116795dc3c49933b26f79cdbb49bca5ebc4fa170403a5e3c7a
-DIST vpopmail-5.4.19a.tar.gz 489109 RMD160 cc4c952b850bee9c6c10429dca59cce681287838 SHA1 fe1cb0e0eecf5a6c41930626e5eb29c361bc44ba SHA256 e124c596645bbdc3924b2b73339558a6d80aa61cfa4a0044939d240bae8ae66e
-DIST vpopmail-5.4.20.tar.gz 500268 RMD160 99379d788c3422a076e95b1ec0064cd7336f6765 SHA1 fc1c98ef3b93d945215f9cdc9f7c9a3041d8eaf2 SHA256 fa564a73007acbf81092c030329eac1394e981484c195a51a5c8bfbf7ed3f97e
-DIST vpopmail-5.4.25.tar.gz 504184 RMD160 57142cca0617bd95ef2e5f4aa74ab5fa0844d6df SHA1 ce62415fbd338b80f1962a477d94276f622756d0 SHA256 41aa61094fd4bb02cca71fa01815b37b470e8e299bb99a64995189e15ff7142b
-DIST vpopmail-5.4.26.tar.gz 523930 RMD160 18208ec2336251011786363daa2a55192824358a SHA1 3236c4fb54ab70c262d0678220a58b8579c0baaf SHA256 6212191b045615c1f2cf8ed3bc6c18326ec6547e30962da07455ab2119f58fb2
 DIST vpopmail-5.4.30.tar.gz 609358 RMD160 83fa5b43e146719953fb16da5b7d0a3780f8f94b SHA1 419f4dc8cc6577a43aa42f67a68f418e5b415adb SHA256 38239ca6f9dda25f70cc46106f3ffe8b9d3b95907ced54c15eb942c2ff387acc
 EBUILD vpopmail-5.4.16.ebuild 7570 RMD160 f47ab2d506ea05a92f7087d57a8002631e4a4773 SHA1 0d420e5593e31810d59270257e3211367dd9d043 SHA256 dc3a8bcadd0a3c9b8ac2f8bef113004fc413078ae0a33712abb6aa6b84862049
-EBUILD vpopmail-5.4.19.ebuild 6889 RMD160 733b9fdf3b5f9f96b5e636f7168ea86c75306a38 SHA1 9486a00a5a4e4e3c2de5c4204cdea43ede5f1192 SHA256 70e278c198dc8f906fa0544196101cbe296d204ea5630176186888795af9830d
-EBUILD vpopmail-5.4.20.ebuild 6888 RMD160 63b857e3e72300f8eee9103c2a25cd87605aaa5d SHA1 610ca8cd14464c95f790db6d2699ce878033f771 SHA256 cee73964df9afc0798c4bb460d6e30500579d253586665bcab28fdd561549989
-EBUILD vpopmail-5.4.25.ebuild 6688 RMD160 6a0f9f87c1f270ad269391c1f47bf484bfe40e6a SHA1 c58add7cc36161fe54fc7ed521a9036ede783569 SHA256 dfca35d3cbd4fba5f47b8d56a9b5df35646aa504214ef5b9951b4883d9dbd8d1
-EBUILD vpopmail-5.4.26.ebuild 6711 RMD160 df2b821e809a30a9d489f8f898f911d076841677 SHA1 7fd0987e6e7d1833e9404569258afe5c7250c542 SHA256 fea3b977385e04259f0b14215cd9312eeca581f54f4d072bf26989640e7911eb
-EBUILD vpopmail-5.4.30-r1.ebuild 7220 RMD160 a4a29f68b9335b485d480c8c3f55c2b5cdf23d97 SHA1 a6a758dca5cba370b31117ad16048d4d00a6a5dd SHA256 4e8e78d12576f8646171bc84ec1ef180c5bf0fd7c400a39985fcb7f2499f70a5
-EBUILD vpopmail-5.4.30.ebuild 6676 RMD160 effc12edd19fa45c675a5f512c6de62565dd1e14 SHA1 71bcbb233dae78e6fe02d3b46953b732afef4296 SHA256 0d6c5a2283a2ce691822079e28284dc15b062ce4ce6d44162551a50825b736b8
-MISC ChangeLog 14832 RMD160 e7c96602f2e2d9b1c2439af609325b6bc549dda3 SHA1 61c0a6d21d1c90773fd45e1aaea4fa1820a39c9f SHA256 ac6464c6ebc7b678cb9fbbe7b3b733c0165336d837a5f2446934005debce4bf9
-MISC metadata.xml 521 RMD160 dd51013ae2492986d9ad9b9c914b2925584a828d SHA1 37925b11a0227e341757f64c00940e6c4898bab7 SHA256 fd6522671f5e83acd6ba619fea68a05b7c335326ce9c41ea1291041e84155b53
+EBUILD vpopmail-5.4.30-r1.ebuild 7218 RMD160 6fb19d6e1d3337ea319ff94b5eb34e77ffaf439c SHA1 d0264cd40d91bbc1f691582223b3467993479edf SHA256 6e7d856c11cb2a0cf2c2dda047bbc780d25beebc0d069baf5ae5e516f142d1a4
+EBUILD vpopmail-5.4.30-r2.ebuild 7307 RMD160 226fe3ad522c40665104d43a47f71ab1e09c81cf SHA1 7b594150347ebd4a126dcf76bad420f79ec73ae7 SHA256 9edb59839a2a4c10410d2feb2fa0c104c6d9ff7641dacc39540111835370da3d
+MISC ChangeLog 15201 RMD160 5ccf18dc3d8fad21d3f2224d68f9329099e4c18b SHA1 f533393b2cbce08fdb21e3c07b587ac762290821 SHA256 3b1478e6dac09949b761fd0bf982fb5b479c6a5ba4072f696990410f32624016
+MISC metadata.xml 611 RMD160 4a7a431633a9a0e9519263dbea8b1e63c1a44afe SHA1 bf260eed5c63dfae007d92c5fbcb9de9bd062c88 SHA256 76e1d28a2463a4ccee26aa6eb6da9ae6a218787aad248e4fa254159677f953aa
diff --git a/net-mail/vpopmail/metadata.xml b/net-mail/vpopmail/metadata.xml
index c9fbea4197d1..cec9a2f1418c 100644
--- a/net-mail/vpopmail/metadata.xml
+++ b/net-mail/vpopmail/metadata.xml
@@ -12,5 +12,7 @@
 		<flag name='ipalias'>Enables enable-ip-alias-domains</flag>
 		<flag name='maildrop'>Enables <pkg>mail-filter/maildrop</pkg> support
 			in vdelivermail</flag>
+		<flag name='spamassassin'>Enables <pkg>mail-filter/spamassassin</pkg>
+			support</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-mail/vpopmail/vpopmail-5.4.19.ebuild b/net-mail/vpopmail/vpopmail-5.4.19.ebuild
deleted file mode 100644
index 70dab6bdcb16..000000000000
--- a/net-mail/vpopmail/vpopmail-5.4.19.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.19.ebuild,v 1.2 2007/09/16 08:16:28 hollow Exp $
-
-inherit eutils fixheadtails autotools
-
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers."
-SRC_URI="mirror://sourceforge/${PN}/${P}a.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="clearpasswd ipalias maildrop mysql"
-
-DEPEND="virtual/qmail
-	maildrop? ( mail-filter/maildrop )
-	mysql? ( virtual/mysql )
-"
-
-# This makes sure the variable is set, and that it isn't null.
-VPOP_DEFAULT_HOME="/var/vpopmail"
-
-# qmail home directory
-QMAIL_HOME="/var/qmail"
-
-vpopmail_set_homedir() {
-	VPOP_HOME=$(getent passwd vpopmail | cut -d: -f6)
-	if [[ -z "${VPOP_HOME}" ]]; then
-		ebeep
-		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 -1 ${VPOP_DEFAULT_HOME} vpopmail
-	upgradewarning
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-5.4.9-access.violation.patch
-	epatch "${FILESDIR}"/${PN}-lazy.patch
-
-	# fix maildir paths
-	sed -i -e 's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c || die
-
-	# remove vpopmail advertisement
-	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c || die
-
-	eautoreconf
-	ht_fix_file "${S}"/cdb/Makefile || die "failed to fix file"
-}
-
-src_compile() {
-	vpopmail_set_homedir
-
-	if use mysql; then
-		authopts=" \
-			--enable-auth-module=mysql \
-			--enable-libs=/usr/include/mysql \
-			--enable-libdir=/usr/lib/mysql \
-			--enable-sql-logging \
-			--enable-valias \
-			--disable-mysql-replication \
-			--enable-mysql-limits"
-	else
-		authopts="--enable-auth-module=cdb"
-	fi
-
-	econf ${authopts} \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-non-root-build \
-		--enable-qmaildir=${QMAIL_HOME} \
-		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
-		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
-		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		--enable-many-domains \
-		--enable-file-locking \
-		--enable-file-sync \
-		--enable-md5-passwords \
-		--enable-logging \
-		--enable-auth-logging \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--disable-tcp-rules-prog \
-		--disable-tcpserver-file \
-		--disable-roaming-users \
-		$(use_enable ipalias ip-alias-domains) \
-		$(use_enable clearpasswd clear-passwd) \
-		$(use_enable maildrop) \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	vpopmail_set_homedir
-
-	make DESTDIR="${D}" install || die "make install failed"
-	keepdir "${VPOP_HOME}"/domains
-
-	# install helper script for maildir conversion
-	into /var/vpopmail
-	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	# install documentation
-	dodoc AUTHORS ChangeLog FAQ INSTALL README*
-	dohtml 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
-
-	einfo "Installing env.d entry"
-	dodir /etc/env.d
-	doenvd "${FILESDIR}"/99vpopmail
-
-	einfo "Locking down vpopmail permissions"
-	fowners root:0 -R "${VPOP_HOME}"/{bin,etc,include}
-	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
-	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
-}
-
-pkg_postinst() {
-	einfo "Performing post-installation routines for ${P}"
-
-	if use mysql ; then
-		elog
-		elog "You have 'mysql' turned on in your USE"
-		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		elog
-		elog "First log into mysql as your mysql root user and pass. Then:"
-		elog "> create database vpopmail;"
-		elog "> use mysql;"
-		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		elog "	 vpopmail@localhost identified by 'your password';"
-		elog "> flush privileges;"
-		elog
-		elog "If you have problems with vpopmail not accepting mail properly,"
-		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		elog "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
-
-	elog "The vpopmail DATA will NOT be removed automatically."
-	elog "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."
-	elog
-	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	elog "using net-mail/relay-ctrl instead."
-
-	if use mysql; then
-		elog
-		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
-		elog "MySQL tables:"
-		elog
-		elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,'
-		elog '    ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,'
-		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
-	fi
-}
diff --git a/net-mail/vpopmail/vpopmail-5.4.20.ebuild b/net-mail/vpopmail/vpopmail-5.4.20.ebuild
deleted file mode 100644
index 931acdf6cec3..000000000000
--- a/net-mail/vpopmail/vpopmail-5.4.20.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.20.ebuild,v 1.1 2007/09/16 08:16:28 hollow Exp $
-
-inherit eutils fixheadtails autotools
-
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="clearpasswd ipalias maildrop mysql"
-
-DEPEND="virtual/qmail
-	maildrop? ( mail-filter/maildrop )
-	mysql? ( virtual/mysql )
-"
-
-# This makes sure the variable is set, and that it isn't null.
-VPOP_DEFAULT_HOME="/var/vpopmail"
-
-# qmail home directory
-QMAIL_HOME="/var/qmail"
-
-vpopmail_set_homedir() {
-	VPOP_HOME=$(getent passwd vpopmail | cut -d: -f6)
-	if [[ -z "${VPOP_HOME}" ]]; then
-		ebeep
-		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 -1 ${VPOP_DEFAULT_HOME} vpopmail
-	upgradewarning
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-5.4.9-access.violation.patch
-	epatch "${FILESDIR}"/${PN}-lazy.patch
-
-	# fix maildir paths
-	sed -i -e 's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c || die
-
-	# remove vpopmail advertisement
-	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c || die
-
-	eautoreconf
-	ht_fix_file "${S}"/cdb/Makefile || die "failed to fix file"
-}
-
-src_compile() {
-	vpopmail_set_homedir
-
-	if use mysql; then
-		authopts=" \
-			--enable-auth-module=mysql \
-			--enable-libs=/usr/include/mysql \
-			--enable-libdir=/usr/lib/mysql \
-			--enable-sql-logging \
-			--enable-valias \
-			--disable-mysql-replication \
-			--enable-mysql-limits"
-	else
-		authopts="--enable-auth-module=cdb"
-	fi
-
-	econf ${authopts} \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-non-root-build \
-		--enable-qmaildir=${QMAIL_HOME} \
-		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
-		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
-		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		--enable-many-domains \
-		--enable-file-locking \
-		--enable-file-sync \
-		--enable-md5-passwords \
-		--enable-logging \
-		--enable-auth-logging \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--disable-tcp-rules-prog \
-		--disable-tcpserver-file \
-		--disable-roaming-users \
-		$(use_enable ipalias ip-alias-domains) \
-		$(use_enable clearpasswd clear-passwd) \
-		$(use_enable maildrop) \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	vpopmail_set_homedir
-
-	make DESTDIR="${D}" install || die "make install failed"
-	keepdir "${VPOP_HOME}"/domains
-
-	# install helper script for maildir conversion
-	into /var/vpopmail
-	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	# install documentation
-	dodoc AUTHORS ChangeLog FAQ INSTALL README*
-	dohtml 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
-
-	einfo "Installing env.d entry"
-	dodir /etc/env.d
-	doenvd "${FILESDIR}"/99vpopmail
-
-	einfo "Locking down vpopmail permissions"
-	fowners root:0 -R "${VPOP_HOME}"/{bin,etc,include}
-	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
-	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
-}
-
-pkg_postinst() {
-	einfo "Performing post-installation routines for ${P}"
-
-	if use mysql ; then
-		elog
-		elog "You have 'mysql' turned on in your USE"
-		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		elog
-		elog "First log into mysql as your mysql root user and pass. Then:"
-		elog "> create database vpopmail;"
-		elog "> use mysql;"
-		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		elog "	 vpopmail@localhost identified by 'your password';"
-		elog "> flush privileges;"
-		elog
-		elog "If you have problems with vpopmail not accepting mail properly,"
-		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		elog "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
-
-	elog "The vpopmail DATA will NOT be removed automatically."
-	elog "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."
-	elog
-	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	elog "using net-mail/relay-ctrl instead."
-
-	if use mysql; then
-		elog
-		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
-		elog "MySQL tables:"
-		elog
-		elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,'
-		elog '    ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,'
-		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
-	fi
-}
diff --git a/net-mail/vpopmail/vpopmail-5.4.25.ebuild b/net-mail/vpopmail/vpopmail-5.4.25.ebuild
deleted file mode 100644
index 3c9a043ba6ab..000000000000
--- a/net-mail/vpopmail/vpopmail-5.4.25.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.25.ebuild,v 1.1 2008/04/06 17:37:38 hollow Exp $
-
-inherit autotools eutils fixheadtails qmail
-
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="clearpasswd ipalias maildrop mysql"
-
-DEPEND="virtual/qmail
-	maildrop? ( mail-filter/maildrop )
-	mysql? ( virtual/mysql )
-"
-
-# This makes sure the variable is set, and that it isn't null.
-VPOP_DEFAULT_HOME="/var/vpopmail"
-
-vpopmail_set_homedir() {
-	VPOP_HOME=$(getent passwd vpopmail | cut -d: -f6)
-	if [[ -z "${VPOP_HOME}" ]]; then
-		ebeep
-		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 -1 ${VPOP_DEFAULT_HOME} vpopmail
-	upgradewarning
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-5.4.9-access.violation.patch
-	epatch "${FILESDIR}"/${PN}-lazy.patch
-
-	# fix maildir paths
-	sed -i -e 's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c || die
-
-	# remove vpopmail advertisement
-	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c || die
-
-	eautoreconf
-	ht_fix_file cdb/Makefile
-}
-
-src_compile() {
-	vpopmail_set_homedir
-
-	if use mysql; then
-		authopts=" \
-			--enable-auth-module=mysql \
-			--enable-libs=/usr/include/mysql \
-			--enable-libdir=/usr/lib/mysql \
-			--enable-sql-logging \
-			--enable-valias \
-			--disable-mysql-replication \
-			--enable-mysql-limits"
-	else
-		authopts="--enable-auth-module=cdb"
-	fi
-
-	econf ${authopts} \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-non-root-build \
-		--enable-qmaildir=${QMAIL_HOME} \
-		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
-		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
-		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		--enable-many-domains \
-		--enable-file-locking \
-		--enable-file-sync \
-		--enable-md5-passwords \
-		--enable-logging \
-		--enable-auth-logging \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--disable-tcp-rules-prog \
-		--disable-tcpserver-file \
-		--disable-roaming-users \
-		$(use_enable ipalias ip-alias-domains) \
-		$(use_enable clearpasswd clear-passwd) \
-		$(use_enable maildrop) \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	vpopmail_set_homedir
-
-	make DESTDIR="${D}" install || die "make install failed"
-	keepdir "${VPOP_HOME}"/domains
-
-	# install helper script for maildir conversion
-	into "${VPOP_HOME}"
-	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	dodoc AUTHORS ChangeLog FAQ INSTALL README*
-	dohtml 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
-		dodir /etc
-		mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
-		dosym /etc/vpopmail.conf "${VPOP_HOME}"/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
-
-	einfo "Installing env.d entry"
-	dodir /etc/env.d
-	doenvd "${FILESDIR}"/99vpopmail
-
-	einfo "Locking down vpopmail permissions"
-	fowners root:0 -R "${VPOP_HOME}"/{bin,etc,include}
-	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
-	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog
-		elog "You have 'mysql' turned on in your USE"
-		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		elog
-		elog "First log into mysql as your mysql root user and pass. Then:"
-		elog "> create database vpopmail;"
-		elog "> use mysql;"
-		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		elog "  vpopmail@localhost identified by 'your password';"
-		elog "> flush privileges;"
-		elog
-		elog "If you have problems with vpopmail not accepting mail properly,"
-		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		elog "owned by root:vpopmail"
-		elog
-	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
-
-	elog "The vpopmail DATA will NOT be removed automatically."
-	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	ewarn
-	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 ${VPOP_HOME}/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."
-	ewarn
-
-	elog
-	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	elog "using net-mail/relay-ctrl instead."
-	elog
-
-	if use mysql; then
-		elog
-		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
-		elog "MySQL tables:"
-		elog
-		elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,'
-		elog '    ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,'
-		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
-		elog
-	fi
-}
diff --git a/net-mail/vpopmail/vpopmail-5.4.26.ebuild b/net-mail/vpopmail/vpopmail-5.4.26.ebuild
deleted file mode 100644
index 40329855018d..000000000000
--- a/net-mail/vpopmail/vpopmail-5.4.26.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.26.ebuild,v 1.2 2009/07/14 08:54:16 flameeyes Exp $
-
-inherit autotools eutils fixheadtails qmail
-
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="clearpasswd ipalias maildrop mysql"
-
-DEPEND="virtual/qmail
-	maildrop? ( mail-filter/maildrop )
-	mysql? ( virtual/mysql )
-"
-
-# This makes sure the variable is set, and that it isn't null.
-VPOP_DEFAULT_HOME="/var/vpopmail"
-
-vpopmail_set_homedir() {
-	VPOP_HOME=$(getent passwd vpopmail | cut -d: -f6)
-	if [[ -z "${VPOP_HOME}" ]]; then
-		ebeep
-		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 -1 ${VPOP_DEFAULT_HOME} vpopmail
-	upgradewarning
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-5.4.9-access.violation.patch
-	epatch "${FILESDIR}"/${PN}-lazy.patch
-
-	# fix maildir paths
-	sed -i -e 's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c || die
-
-	# remove vpopmail advertisement
-	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c || die
-
-	eautoreconf
-	ht_fix_file cdb/Makefile
-}
-
-src_compile() {
-	vpopmail_set_homedir
-
-	if use mysql; then
-		authopts=" \
-			--enable-auth-module=mysql \
-			--enable-libs=/usr/include/mysql \
-			--enable-libdir=/usr/lib/mysql \
-			--enable-sql-logging \
-			--enable-valias \
-			--disable-mysql-replication \
-			--enable-mysql-limits"
-	else
-		authopts="--enable-auth-module=cdb"
-	fi
-
-	econf ${authopts} \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-non-root-build \
-		--enable-qmaildir=${QMAIL_HOME} \
-		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
-		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
-		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		--enable-many-domains \
-		--enable-file-locking \
-		--enable-file-sync \
-		--enable-md5-passwords \
-		--enable-logging \
-		--enable-auth-logging \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--disable-tcp-rules-prog \
-		--disable-tcpserver-file \
-		--disable-roaming-users \
-		$(use_enable ipalias ip-alias-domains) \
-		$(use_enable clearpasswd clear-passwd) \
-		$(use_enable maildrop) \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	vpopmail_set_homedir
-
-	# bug #277764
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-	keepdir "${VPOP_HOME}"/domains
-
-	# install helper script for maildir conversion
-	into "${VPOP_HOME}"
-	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	dodoc AUTHORS ChangeLog FAQ INSTALL README*
-	dohtml 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
-		dodir /etc
-		mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
-		dosym /etc/vpopmail.conf "${VPOP_HOME}"/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
-
-	einfo "Installing env.d entry"
-	dodir /etc/env.d
-	doenvd "${FILESDIR}"/99vpopmail
-
-	einfo "Locking down vpopmail permissions"
-	fowners root:0 -R "${VPOP_HOME}"/{bin,etc,include}
-	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
-	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog
-		elog "You have 'mysql' turned on in your USE"
-		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		elog
-		elog "First log into mysql as your mysql root user and pass. Then:"
-		elog "> create database vpopmail;"
-		elog "> use mysql;"
-		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		elog "  vpopmail@localhost identified by 'your password';"
-		elog "> flush privileges;"
-		elog
-		elog "If you have problems with vpopmail not accepting mail properly,"
-		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		elog "owned by root:vpopmail"
-		elog
-	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
-
-	elog "The vpopmail DATA will NOT be removed automatically."
-	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	ewarn
-	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 ${VPOP_HOME}/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."
-	ewarn
-
-	elog
-	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	elog "using net-mail/relay-ctrl instead."
-	elog
-
-	if use mysql; then
-		elog
-		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
-		elog "MySQL tables:"
-		elog
-		elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,'
-		elog '    ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,'
-		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
-		elog
-	fi
-}
diff --git a/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild
index aecd02c01bfd..8e262318a21b 100644
--- a/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild,v 1.3 2010/04/05 17:40:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild,v 1.4 2010/05/30 06:49:46 hollow Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm ~hppa ~ppc s390 sh sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ppc s390 sh sparc x86"
 IUSE="clearpasswd ipalias maildrop mysql"
 
 DEPEND="virtual/qmail
diff --git a/net-mail/vpopmail/vpopmail-5.4.30.ebuild b/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild
index 52cf8f78bb46..2c0b9e900583 100644
--- a/net-mail/vpopmail/vpopmail-5.4.30.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.30.ebuild,v 1.4 2010/01/26 17:34:34 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild,v 1.1 2010/05/30 06:49:46 hollow Exp $
+
+EAPI="2"
 
 inherit autotools eutils fixheadtails qmail
 
@@ -10,12 +12,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="clearpasswd ipalias maildrop mysql"
+KEYWORDS="~amd64 ~hppa ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE="clearpasswd ipalias maildrop mysql spamassassin"
 
 DEPEND="virtual/qmail
 	maildrop? ( mail-filter/maildrop )
-	mysql? ( virtual/mysql )"
+	mysql? ( virtual/mysql )
+	spamassassin? ( mail-filter/spamassassin )"
 RDEPEND="${DEPEND}"
 
 # This makes sure the variable is set, and that it isn't null.
@@ -40,12 +43,10 @@ pkg_setup() {
 	upgradewarning
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-5.4.9-access.violation.patch
 	epatch "${FILESDIR}"/${PN}-lazy.patch
+	epatch "${FILESDIR}"/${PN}-double-free.patch
 
 	# fix maildir paths
 	sed -i -e 's|Maildir|.maildir|g' \
@@ -61,7 +62,7 @@ src_unpack() {
 	ht_fix_file cdb/Makefile
 }
 
-src_compile() {
+src_configure() {
 	vpopmail_set_homedir
 
 	if use mysql; then
@@ -98,8 +99,11 @@ src_compile() {
 		$(use_enable ipalias ip-alias-domains) \
 		$(use_enable clearpasswd clear-passwd) \
 		$(use_enable maildrop) \
-		|| die "configure failed"
+		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
+		$(use_enable spamassassin)
+}
 
+src_compile() {
 	emake || die "make failed"
 }
 
@@ -137,6 +141,11 @@ src_install() {
 		fowners root:vpopmail /etc/vpopmail.conf
 	fi
 
+	insinto "${VPOP_HOME}"/etc
+	doins vusagec.conf
+	dosym "${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
+	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf
+
 	einfo "Installing env.d entry"
 	dodir /etc/env.d
 	doenvd "${FILESDIR}"/99vpopmail
@@ -214,4 +223,11 @@ upgradewarning() {
 		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
 		elog
 	fi
+
+	ewarn
+	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
+	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
+	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
+	ewarn "Otherwise mail delivery WILL BREAK"
+	ewarn
 }