Security-wise cleanup. See bug #140514.

(Portage version: 2.1.1)
 (Signed Manifest commit)

7 files changed, 15 insertions, 469 deletions

diff --git a/mail-mta/xmail/Manifest b/mail-mta/xmail/Manifest
index 9a987b271f71..6c61de8e7dbc 100644
--- a/mail-mta/xmail/Manifest
+++ b/mail-mta/xmail/Manifest
@@ -1,66 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 15xmail 24 RMD160 a756268e37cbdd188a502d3576c0ca5ff3852d7d SHA1 2d9cf706a23aae2d048bcad5cbdc00300748cc1d SHA256 6c72de94a699d62ef739e22436e7437b0303ba1a4b40046936ce72018b064975 size 24
+AUX 15xmail 24 RMD160 a756268e37cbdd188a502d3576c0ca5ff3852d7d SHA1 2d9cf706a23aae2d048bcad5cbdc00300748cc1d SHA256 6c72de94a699d62ef739e22436e7437b0303ba1a4b40046936ce72018b064975
 MD5 e00a488aecb141a34c5ec43eac58b9a9 files/15xmail 24
 RMD160 a756268e37cbdd188a502d3576c0ca5ff3852d7d files/15xmail 24
 SHA256 6c72de94a699d62ef739e22436e7437b0303ba1a4b40046936ce72018b064975 files/15xmail 24
-AUX xmail.confd 409 RMD160 2cf30115bcc0b013e43b2038312a8d24b5416597 SHA1 8f64b3164715fbac8343e670d529ad086237d4b2 SHA256 071618249229a7842132211603e43a94be5914f9f166fdc6ff2c689b719d07b8 size 409
+AUX xmail.confd 409 RMD160 2cf30115bcc0b013e43b2038312a8d24b5416597 SHA1 8f64b3164715fbac8343e670d529ad086237d4b2 SHA256 071618249229a7842132211603e43a94be5914f9f166fdc6ff2c689b719d07b8
 MD5 8f93bde743cf3f7a77f27bcf602aa4dc files/xmail.confd 409
 RMD160 2cf30115bcc0b013e43b2038312a8d24b5416597 files/xmail.confd 409
 SHA256 071618249229a7842132211603e43a94be5914f9f166fdc6ff2c689b719d07b8 files/xmail.confd 409
-AUX xmail.initd 2802 RMD160 90a4c9336f59a69c14199df90d4b821f4dd5ebba SHA1 4be3c0825190092e7bd39bfaf9ffb1d0a37816ad SHA256 96c75cd53053978e2faccb79e442bc2b1fceab763be4214fc59f930d0a157efa size 2802
+AUX xmail.initd 2802 RMD160 90a4c9336f59a69c14199df90d4b821f4dd5ebba SHA1 4be3c0825190092e7bd39bfaf9ffb1d0a37816ad SHA256 96c75cd53053978e2faccb79e442bc2b1fceab763be4214fc59f930d0a157efa
 MD5 e3d8c8b19f80d10a348f2d10f33e1cc6 files/xmail.initd 2802
 RMD160 90a4c9336f59a69c14199df90d4b821f4dd5ebba files/xmail.initd 2802
 SHA256 96c75cd53053978e2faccb79e442bc2b1fceab763be4214fc59f930d0a157efa files/xmail.initd 2802
-AUX xmailwizard 2299 RMD160 513eb4b212c7aa469115f17beee9e2975194955a SHA1 87153804c243157aa27633c5da548a3cb8a159c4 SHA256 2373801cb55185483f5aeb143e2f475c5d6c913645f132f23b1bd600ee66309b size 2299
+AUX xmailwizard 2299 RMD160 513eb4b212c7aa469115f17beee9e2975194955a SHA1 87153804c243157aa27633c5da548a3cb8a159c4 SHA256 2373801cb55185483f5aeb143e2f475c5d6c913645f132f23b1bd600ee66309b
 MD5 722274fd9ffd32da5477fb703d3f657c files/xmailwizard 2299
 RMD160 513eb4b212c7aa469115f17beee9e2975194955a files/xmailwizard 2299
 SHA256 2373801cb55185483f5aeb143e2f475c5d6c913645f132f23b1bd600ee66309b files/xmailwizard 2299
-DIST xmail-1.16.tar.gz 409228 RMD160 342bc898d3c948edae6799373b639ca91f48a5e6 SHA256 a5007c6d5902072235dec2fd99a758b65d7a2fdf3dec44c83e53d9c8255e4354 size 409228
-DIST xmail-1.20.tar.gz 404113 RMD160 59b9ac7ec6993087ddde963f3dfd19761e6c99bc SHA256 15de445d0f55f11e54d8377eb84615bc46fb6f6271ac521107e02ce6a8ca32fd size 404113
-DIST xmail-1.21.tar.gz 413237 RMD160 7b31e8d257f2b456abaefbe0359ea3ab1695d910 SHA256 b66f09635dada88c52ab1e80c76664a51b02fd96ea792e293dc464a4a958ac2d size 413237
-DIST xmail-1.22.tar.gz 416738 RMD160 a5496326ef8b8fa6adc834b2f36727849150ed46 SHA256 bbf4bf4be7fb50c5bb37533370c103e65f4dddb65d0a4885025a7294381adac6 size 416738
-EBUILD xmail-1.16-r1.ebuild 3576 RMD160 c18fec6b11736c954d2610bf9c3d0bf45a4c9b54 SHA1 dfd85216296854832a6376d57bcaf2abed24bf50 SHA256 6ed4202aa7c1c2fbbd1039063549b85598d0453f435462db8a661e8ecdcfa945 size 3576
-MD5 8173d8e19a88a77af422c51254e679a5 xmail-1.16-r1.ebuild 3576
-RMD160 c18fec6b11736c954d2610bf9c3d0bf45a4c9b54 xmail-1.16-r1.ebuild 3576
-SHA256 6ed4202aa7c1c2fbbd1039063549b85598d0453f435462db8a661e8ecdcfa945 xmail-1.16-r1.ebuild 3576
-EBUILD xmail-1.20.ebuild 3494 RMD160 f5c77b57ef94e93bdafde7648366ff9cfa860e1c SHA1 f6fa8a12827a19721102a62ea61665e3d2060415 SHA256 d011566c5333be52d36ad44b77769d1b7cbd88aab47bf84954d31951818fdd44 size 3494
-MD5 78cbe0bb146c693896dbdb2d113e89e4 xmail-1.20.ebuild 3494
-RMD160 f5c77b57ef94e93bdafde7648366ff9cfa860e1c xmail-1.20.ebuild 3494
-SHA256 d011566c5333be52d36ad44b77769d1b7cbd88aab47bf84954d31951818fdd44 xmail-1.20.ebuild 3494
-EBUILD xmail-1.21.ebuild 4407 RMD160 19529c7f78a7c87ef1a9e02db6c01a4038118f53 SHA1 30e28f51c4732ac9e084c9e7610c5754bc47364b SHA256 05dcd4c64ef8be51d6178bc38a50033dece741d356d777d2a7bb88f7ffa4cb9b size 4407
-MD5 551440ed3187349e9ef2f3368991954e xmail-1.21.ebuild 4407
-RMD160 19529c7f78a7c87ef1a9e02db6c01a4038118f53 xmail-1.21.ebuild 4407
-SHA256 05dcd4c64ef8be51d6178bc38a50033dece741d356d777d2a7bb88f7ffa4cb9b xmail-1.21.ebuild 4407
-EBUILD xmail-1.22.ebuild 4407 RMD160 2f19dc418b278061d4f424b9da79b9605247334c SHA1 c0cb43ea3ca5fc7fa107653b5075f06402e45034 SHA256 a9e99f1948259950e918acea17a7753da8aa5c658c81affca24a7bba349c3e00 size 4407
+DIST xmail-1.22.tar.gz 416738 RMD160 a5496326ef8b8fa6adc834b2f36727849150ed46 SHA256 bbf4bf4be7fb50c5bb37533370c103e65f4dddb65d0a4885025a7294381adac6
+EBUILD xmail-1.22.ebuild 4407 RMD160 2f19dc418b278061d4f424b9da79b9605247334c SHA1 c0cb43ea3ca5fc7fa107653b5075f06402e45034 SHA256 a9e99f1948259950e918acea17a7753da8aa5c658c81affca24a7bba349c3e00
 MD5 4999f1a8658d89de9a36716d8e5252a8 xmail-1.22.ebuild 4407
 RMD160 2f19dc418b278061d4f424b9da79b9605247334c xmail-1.22.ebuild 4407
 SHA256 a9e99f1948259950e918acea17a7753da8aa5c658c81affca24a7bba349c3e00 xmail-1.22.ebuild 4407
-MISC ChangeLog 5467 RMD160 49ac2f9c8dd6889a2a45a774bc3767df922a60e3 SHA1 0916c67ba17ea205b8a13119f2a6ad427a96ebfc SHA256 ab60a3ebf326cd9f83f9e13a531ddb088519b609ab468af71317235b91fbf5b6 size 5467
-MD5 d0c75d94b70b59d83d741c153970685d ChangeLog 5467
-RMD160 49ac2f9c8dd6889a2a45a774bc3767df922a60e3 ChangeLog 5467
-SHA256 ab60a3ebf326cd9f83f9e13a531ddb088519b609ab468af71317235b91fbf5b6 ChangeLog 5467
-MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 size 161
+MISC ChangeLog 5607 RMD160 85e2cc966375ddbc362353dafdc81bc42cc39bba SHA1 1d5e780e2802dc46dbee7be9168e390b6bcce007 SHA256 3d3bc70b5d5e5c959239f1813dd1de15ec0977a2fb27564ff3b797f7d720c888
+MD5 f6cce61e9ac9ad1f3e85bd720a9e9858 ChangeLog 5607
+RMD160 85e2cc966375ddbc362353dafdc81bc42cc39bba ChangeLog 5607
+SHA256 3d3bc70b5d5e5c959239f1813dd1de15ec0977a2fb27564ff3b797f7d720c888 ChangeLog 5607
+MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
-MD5 0319efc811488b4036a29f8dee33b7d2 files/digest-xmail-1.16-r1 232
-RMD160 46ac3d92a5ad0483ca3115751b74cf534f79c5b5 files/digest-xmail-1.16-r1 232
-SHA256 5841c116efc8516107e233953b2a42b918ea60a3fe1bea13a38a0c15fb5761ad files/digest-xmail-1.16-r1 232
-MD5 0d9d1d4e0bdabc9918de4c689ab1cb77 files/digest-xmail-1.20 232
-RMD160 872d625a5cd467abff6740bff838e141cad84a88 files/digest-xmail-1.20 232
-SHA256 7b8170378d1137b0d9cd94a26e2c97643aa75d92ad39ef1e23a1a6981ce52a51 files/digest-xmail-1.20 232
-MD5 46d02b37bfe522094cb1d2a00b7bf0ec files/digest-xmail-1.21 232
-RMD160 dcc3dbb077ac7ba0219d7b904c9984eb6ed2a61d files/digest-xmail-1.21 232
-SHA256 2a46c464d4734bd0ce9a7231a2f69f691cbc5a6d317fe4e7f5d306a05057dfd1 files/digest-xmail-1.21 232
 MD5 b18caceb42f049cba6fba4af4ace2be9 files/digest-xmail-1.22 232
 RMD160 e48c17066c6834c63afadc92e74610bb62a78b12 files/digest-xmail-1.22 232
 SHA256 57128895bc8731bb5f4f937f57c6015790ffada912d48c116e203e1a475adf64 files/digest-xmail-1.22 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEUUXZW78445TWHXcRApGRAJ9Sg0hQdmmmOyRlAWi1ioX9fjgNKwCeKsvY
-uiLHtwB26dVXrQgyncL5Xyw=
-=6orK
+iD8DBQFFCCK410xuJSrg3/sRAnujAJoDCO3j0HGeN+k7QW/Xg3zW2pl9lQCfYN4o
+/Qx2A1IcSq1rfpmtAOhhpz4=
+=0B8Z
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/xmail/files/digest-xmail-1.16-r1 b/mail-mta/xmail/files/digest-xmail-1.16-r1
deleted file mode 100644
index 10199a9633af..000000000000
--- a/mail-mta/xmail/files/digest-xmail-1.16-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cc02e8aee49c48b9f4e592ba0b0cab71 xmail-1.16.tar.gz 409228
-RMD160 342bc898d3c948edae6799373b639ca91f48a5e6 xmail-1.16.tar.gz 409228
-SHA256 a5007c6d5902072235dec2fd99a758b65d7a2fdf3dec44c83e53d9c8255e4354 xmail-1.16.tar.gz 409228
diff --git a/mail-mta/xmail/files/digest-xmail-1.20 b/mail-mta/xmail/files/digest-xmail-1.20
deleted file mode 100644
index cc1b52261b98..000000000000
--- a/mail-mta/xmail/files/digest-xmail-1.20
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1c9279508957b2c03e024412ade9bb19 xmail-1.20.tar.gz 404113
-RMD160 59b9ac7ec6993087ddde963f3dfd19761e6c99bc xmail-1.20.tar.gz 404113
-SHA256 15de445d0f55f11e54d8377eb84615bc46fb6f6271ac521107e02ce6a8ca32fd xmail-1.20.tar.gz 404113
diff --git a/mail-mta/xmail/files/digest-xmail-1.21 b/mail-mta/xmail/files/digest-xmail-1.21
deleted file mode 100644
index 636dee9ce41c..000000000000
--- a/mail-mta/xmail/files/digest-xmail-1.21
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c6417c5b66cd0b0bff7375767d07235b xmail-1.21.tar.gz 413237
-RMD160 7b31e8d257f2b456abaefbe0359ea3ab1695d910 xmail-1.21.tar.gz 413237
-SHA256 b66f09635dada88c52ab1e80c76664a51b02fd96ea792e293dc464a4a958ac2d xmail-1.21.tar.gz 413237
diff --git a/mail-mta/xmail/xmail-1.16-r1.ebuild b/mail-mta/xmail/xmail-1.16-r1.ebuild
deleted file mode 100644
index 24968f190ae6..000000000000
--- a/mail-mta/xmail/xmail-1.16-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/xmail/xmail-1.16-r1.ebuild,v 1.6 2005/08/23 13:21:44 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="The world's fastest email server"
-HOMEPAGE="http://www.xmailserver.org/"
-SRC_URI="http://www.xmailserver.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=sys-apps/sed-4"
-PROVIDE="virtual/mta"
-
-pkg_setup() {
-	enewgroup xmail
-	enewuser xmail -1 -1 /dev/null xmail
-}
-
-src_compile() {
-	sed -i -e "s:^CFLAGS = -O2:CFLAGS=$CFLAGS:g" Makefile.lnx
-
-	# Makefile does not setup dependencies properly to handle parallel build
-	if use x86 ; then
-		emake -j1 -f Makefile.lnx || die
-	elif use sparc ; then
-		emake -j1 -f Makefile.slx || die
-	fi
-	sed -e "s:/var/MailRoot:/chroot/xmail/var/MailRoot:g" sendmail.sh > sendmail.sh.new
-}
-
-src_install() {
-	# create some image directories with default diropts
-	dodir /etc/conf.d
-	dodir /etc/init.d
-	dodir /etc/env.d
-
-	einfo "Setting up directory hierarchy"
-	diropts -m 700 -o xmail -g xmail
-	dodir /etc/xmail
-	keepdir /chroot/xmail/var/MailRoot/bin
-	dodir /etc/xmail/tabindex
-	dodir /etc/xmail/dnscache/mx
-	dodir /etc/xmail/dnscache/ns
-	dodir /etc/xmail/spool/local
-	dodir /etc/xmail/spool/temp
-	dodir /etc/xmail/logs
-	dodir /etc/init.d
-	dodir /etc/conf.d
-
-	for i in cmdaliases custdomains domains filters pop3linklocks\
-		pop3links pop3locks userauth
-	do
-		keepdir /etc/xmail/${i}
-	done
-
-	for i in pop3 smtp
-	do
-		keepdir /etc/xmail/userauth/${i}
-	done
-	rm -f ${D}/etc/xmail/userauth/.keep
-
-	einfo "Installing the XMail initial configuration"
-	insopts -o xmail -g xmail -m 600
-	cd ${S}/MailRoot
-	insinto /etc/xmail
-	doins server.tab ctrl.ipmap.tab dnsroots finger.ipmap.tab\
-		message.id pop3.ipmap.tab smtp.ipmap.tab\
-		userdef.tab
-
-	for i in mailusers extaliases domains mailusers aliases \
-		aliasdomain extaliases pop3links smtpauth smtpextauth \
-		smtpfwd smtprelay smtpgw spam-address spammers ctrlaccounts \
-		filters.in filters.out
-	do
-		touch ${D}/etc/xmail/${i}.tab
-		fowners xmail:xmail /etc/xmail/${i}.tab
-		fperms 600 /etc/xmail/${i}.tab
-	done
-
-	einfo "Installing the XMail documentation"
-	dodoc ${S}/docs/*
-	dodoc ${S}/gpl.txt
-	dodoc ${S}/ToDo.txt
-
-
-	einfo "Installing the XMail software"
-	insinto /etc/env.d
-	doins ${FILESDIR}/15xmail
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/xmail.initd xmail
-	insinto /etc/conf.d
-	newins ${FILESDIR}/xmail.confd xmail
-	cd ${S}
-	exeopts -o xmail -g xmail -m 4700
-	exeinto /usr/sbin
-	newexe sendmail sendmail.xmail
-	exeopts -o root -g root -m 755
-	newexe sendmail.sh.new sendmail
-	exeopts -o xmail -g xmail -m 700
-	exeinto /chroot/xmail/var/MailRoot/bin
-	doexe CtrlClnt XMail XMCrypt MkUsers
-}
-
-pkg_postinst() {
-	rm -f /etc/xmail/cmdaliases/.keep
-	rm -f /etc/xmail/custdomains/.keep
-	rm -f /etc/xmail/domains/.keep
-	rm -f /etc/xmail/filters/.keep
-	rm -f /etc/xmail/pop3linklocks/.keep
-	rm -f /etc/xmail/pop3links/.keep
-	rm -f /etc/xmail/pop3locks/.keep
-	rm -f /etc/xmail/userauth/pop3/.keep
-	rm -f /etc/xmail/userauth/smtp/.keep
-
-	#read -n 1 -p "Do you want to configure XMail now (y/n)? " YESNO
-	#echo ""
-	#if [ $YESNO == 'Y' -o $YESNO == 'y' ] ; then
-	#	sh ${FILESDIR}/xmailwizard
-	#else
-	#	einfo "You can quickly configure XMail by running ${FILESDIR}/xmailwizard."
-	#fi
-
-	einfo "You can quickly configure XMail by running ${FILESDIR}/xmailwizard."
-
-	ewarn
-	ewarn "Make sure you have iptables/netfilter with connection tracking"
-	ewarn "and the REDIRECT target enabled in your kernel!"
-	ewarn
-}
diff --git a/mail-mta/xmail/xmail-1.20.ebuild b/mail-mta/xmail/xmail-1.20.ebuild
deleted file mode 100644
index c0a8980f9d83..000000000000
--- a/mail-mta/xmail/xmail-1.20.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/xmail/xmail-1.20.ebuild,v 1.7 2005/08/23 13:21:44 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="The world's fastest email server"
-HOMEPAGE="http://www.xmailserver.org/"
-SRC_URI="http://www.xmailserver.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=sys-apps/sed-4"
-PROVIDE="virtual/mta"
-
-pkg_setup() {
-	enewgroup xmail
-	enewuser xmail -1 -1 /dev/null xmail
-}
-
-src_compile() {
-	sed -i -e "s:^CFLAGS = -O2:CFLAGS=$CFLAGS:g" Makefile.lnx
-
-	# Makefile does not setup dependencies properly to handle parallel build
-	emake -j1 -f Makefile.lnx || die
-
-	sed -e "s:/var/MailRoot:/chroot/xmail/var/MailRoot:g" sendmail.sh > sendmail.sh.new
-}
-
-src_install() {
-	# create some image directories with default diropts
-	dodir /etc/conf.d
-	dodir /etc/init.d
-	dodir /etc/env.d
-
-	einfo "Setting up directory hierarchy"
-	diropts -m 700 -o xmail -g xmail
-	dodir /etc/xmail
-	keepdir /chroot/xmail/var/MailRoot/bin
-	dodir /etc/xmail/tabindex
-	dodir /etc/xmail/dnscache/mx
-	dodir /etc/xmail/dnscache/ns
-	dodir /etc/xmail/spool/local
-	dodir /etc/xmail/spool/temp
-	dodir /etc/xmail/logs
-	dodir /etc/init.d
-	dodir /etc/conf.d
-
-	for i in cmdaliases custdomains domains filters pop3linklocks\
-		pop3links pop3locks userauth
-	do
-		keepdir /etc/xmail/${i}
-	done
-
-	for i in pop3 smtp
-	do
-		keepdir /etc/xmail/userauth/${i}
-	done
-	rm -f ${D}/etc/xmail/userauth/.keep
-
-	einfo "Installing the XMail initial configuration"
-	insopts -o xmail -g xmail -m 600
-	cd ${S}/MailRoot
-	insinto /etc/xmail
-	doins server.tab ctrl.ipmap.tab dnsroots finger.ipmap.tab\
-		message.id pop3.ipmap.tab smtp.ipmap.tab\
-		userdef.tab
-
-	for i in mailusers extaliases domains mailusers aliases \
-		aliasdomain extaliases pop3links smtpauth smtpextauth \
-		smtpfwd smtprelay smtpgw spam-address spammers ctrlaccounts \
-		filters.in filters.out
-	do
-		touch ${D}/etc/xmail/${i}.tab
-		fowners xmail:xmail /etc/xmail/${i}.tab
-		fperms 600 /etc/xmail/${i}.tab
-	done
-
-	einfo "Installing the XMail documentation"
-	dodoc ${S}/docs/*
-	dodoc ${S}/gpl.txt
-	dodoc ${S}/ToDo.txt
-
-
-	einfo "Installing the XMail software"
-	insinto /etc/env.d
-	doins ${FILESDIR}/15xmail
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/xmail.initd xmail
-	insinto /etc/conf.d
-	newins ${FILESDIR}/xmail.confd xmail
-	cd ${S}/bin
-	exeopts -o xmail -g xmail -m 4700
-	exeinto /usr/sbin
-	newexe sendmail sendmail.xmail
-	exeopts -o root -g root -m 755
-	newexe ../sendmail.sh.new sendmail
-	exeopts -o xmail -g xmail -m 700
-	exeinto /chroot/xmail/var/MailRoot/bin
-	doexe CtrlClnt XMail XMCrypt MkUsers
-}
-
-pkg_postinst() {
-	rm -f /etc/xmail/cmdaliases/.keep
-	rm -f /etc/xmail/custdomains/.keep
-	rm -f /etc/xmail/domains/.keep
-	rm -f /etc/xmail/filters/.keep
-	rm -f /etc/xmail/pop3linklocks/.keep
-	rm -f /etc/xmail/pop3links/.keep
-	rm -f /etc/xmail/pop3locks/.keep
-	rm -f /etc/xmail/userauth/pop3/.keep
-	rm -f /etc/xmail/userauth/smtp/.keep
-
-	#read -n 1 -p "Do you want to configure XMail now (y/n)? " YESNO
-	#echo ""
-	#if [ $YESNO == 'Y' -o $YESNO == 'y' ] ; then
-	#	sh ${FILESDIR}/xmailwizard
-	#else
-	#	einfo "You can quickly configure XMail by running ${FILESDIR}/xmailwizard."
-	#fi
-
-	einfo "You can quickly configure XMail by running ${FILESDIR}/xmailwizard."
-
-	ewarn
-	ewarn "Make sure you have iptables/netfilter with connection tracking"
-	ewarn "and the REDIRECT target enabled in your kernel!"
-	ewarn
-}
diff --git a/mail-mta/xmail/xmail-1.21.ebuild b/mail-mta/xmail/xmail-1.21.ebuild
deleted file mode 100644
index 69352dcf62b2..000000000000
--- a/mail-mta/xmail/xmail-1.21.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/xmail/xmail-1.21.ebuild,v 1.5 2005/08/23 13:21:44 ticho Exp $
-
-inherit eutils linux-info
-
-DESCRIPTION="The world's fastest email server"
-HOMEPAGE="http://www.xmailserver.org/"
-SRC_URI="http://www.xmailserver.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=sys-apps/sed-4"
-RDEPEND="net-firewall/iptables"
-PROVIDE="virtual/mta"
-
-pkg_setup() {
-
-	linux-info_pkg_setup
-
-	if ! (linux_chkconfig_present NETFILTER); then
-		eerror "${P} requires netfilter/iptables support enabled in kernel!"
-		eerror
-		eerror "Recompile your kernel with CONFIG_NETFILTER and CONFIG_IP_NF_TARGET_REDIRECT"
-		eerror "support enabled and reboot. Then try to emerge ${P} again."
-		die "Kernel without CONFIG_NETFILTER detected!"
-	fi
-
-	if ! (linux_chkconfig_present IP_NF_TARGET_REDIRECT); then
-		eerror "${P} requires CONFIG_IP_NF_TARGET_REDIRECT support to be enabled in kernel!"
-		eerror "Recompile your kernel with netfilter REDIRECT target support enabled."
-		eerror
-		eerror "Reboot will be required if compiled directly into kernel."
-		eerror "If reboot is not desired you should choose a module instead and run"
-		eerror "make modules && make modules_install"
-		die "Kernel without CONFIG_IP_NF_TARGET_REDIRECT detected!"
-	fi
-
-	enewgroup xmail
-	enewuser xmail -1 -1 /dev/null xmail
-}
-
-src_compile() {
-	sed -i -e "s:^CFLAGS = -O2:CFLAGS=$CFLAGS:g" Makefile.lnx
-
-	# Makefile does not setup dependencies properly to handle parallel build
-	emake -j1 -f Makefile.lnx || die
-
-	sed -e "s:/var/MailRoot:/chroot/xmail/var/MailRoot:g" sendmail.sh > sendmail.sh.new
-}
-
-src_install() {
-	# create some image directories with default diropts
-	dodir /etc/conf.d
-	dodir /etc/init.d
-	dodir /etc/env.d
-
-	einfo "Setting up directory hierarchy"
-	diropts -m 700 -o xmail -g xmail
-	dodir /etc/xmail
-	keepdir /chroot/xmail/var/MailRoot/bin
-	dodir /etc/xmail/tabindex
-	dodir /etc/xmail/dnscache/mx
-	dodir /etc/xmail/dnscache/ns
-	dodir /etc/xmail/spool/local
-	dodir /etc/xmail/spool/temp
-	dodir /etc/xmail/logs
-	dodir /etc/init.d
-	dodir /etc/conf.d
-
-	for i in cmdaliases custdomains domains filters pop3linklocks\
-		pop3links pop3locks userauth
-	do
-		keepdir /etc/xmail/${i}
-	done
-
-	for i in pop3 smtp
-	do
-		keepdir /etc/xmail/userauth/${i}
-	done
-	rm -f ${D}/etc/xmail/userauth/.keep
-
-	einfo "Installing the XMail initial configuration"
-	insopts -o xmail -g xmail -m 600
-	cd ${S}/MailRoot
-	insinto /etc/xmail
-	doins server.tab ctrl.ipmap.tab dnsroots finger.ipmap.tab\
-		message.id pop3.ipmap.tab smtp.ipmap.tab\
-		userdef.tab
-
-	for i in mailusers extaliases domains mailusers aliases \
-		aliasdomain extaliases pop3links smtpauth smtpextauth \
-		smtpfwd smtprelay smtpgw spam-address spammers ctrlaccounts \
-		filters.in filters.out
-	do
-		touch ${D}/etc/xmail/${i}.tab
-		fowners xmail:xmail /etc/xmail/${i}.tab
-		fperms 600 /etc/xmail/${i}.tab
-	done
-
-	einfo "Installing the XMail documentation"
-	dodoc ${S}/docs/*
-	dodoc ${S}/gpl.txt
-	dodoc ${S}/ToDo.txt
-
-
-	einfo "Installing the XMail software"
-	insinto /etc/env.d
-	doins ${FILESDIR}/15xmail
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/xmail.initd xmail
-	insinto /etc/conf.d
-	newins ${FILESDIR}/xmail.confd xmail
-	cd ${S}/bin
-	exeopts -o xmail -g xmail -m 4700
-	exeinto /usr/sbin
-	newexe sendmail sendmail.xmail
-	exeopts -o root -g root -m 755
-	newexe ../sendmail.sh.new sendmail
-	exeopts -o xmail -g xmail -m 700
-	exeinto /chroot/xmail/var/MailRoot/bin
-	doexe CtrlClnt XMail XMCrypt MkUsers
-}
-
-pkg_postinst() {
-	rm -f /etc/xmail/cmdaliases/.keep
-	rm -f /etc/xmail/custdomains/.keep
-	rm -f /etc/xmail/domains/.keep
-	rm -f /etc/xmail/filters/.keep
-	rm -f /etc/xmail/pop3linklocks/.keep
-	rm -f /etc/xmail/pop3links/.keep
-	rm -f /etc/xmail/pop3locks/.keep
-	rm -f /etc/xmail/userauth/pop3/.keep
-	rm -f /etc/xmail/userauth/smtp/.keep
-
-	#read -n 1 -p "Do you want to configure XMail now (y/n)? " YESNO
-	#echo ""
-	#if [ $YESNO == 'Y' -o $YESNO == 'y' ] ; then
-	#	sh ${FILESDIR}/xmailwizard
-	#else
-	#	einfo "You can quickly configure XMail by running ${FILESDIR}/xmailwizard."
-	#fi
-
-	einfo "You can quickly configure XMail by running ${FILESDIR}/xmailwizard."
-
-	ewarn
-	ewarn "Make sure you have iptables/netfilter with connection tracking"
-	ewarn "and the REDIRECT target enabled in your kernel!"
-	ewarn
-}