Bump to version 20030616_p8. Clean up old ebuilds.

9 files changed, 20 insertions, 214 deletions

diff --git a/net-mail/amavisd-new/ChangeLog b/net-mail/amavisd-new/ChangeLog
index 717537d24b23..5e1a4f7083e5 100644
--- a/net-mail/amavisd-new/ChangeLog
+++ b/net-mail/amavisd-new/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/amavisd-new
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/amavisd-new/ChangeLog,v 1.8 2004/03/01 03:47:55 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/amavisd-new/ChangeLog,v 1.9 2004/03/10 04:38:47 max Exp $
+
+*amavisd-new-20030616_p8 (09 Mar 2004)
+
+  09 Mar 2004; Max Kalika <max@gentoo.org> amavisd-new-20030616_p4.ebuild,
+  amavisd-new-20030616_p5.ebuild, amavisd-new-20030616_p6.ebuild,
+  amavisd-new-20030616_p8.ebuild:
+  Bump to version 20030616_p8. Clean up old ebuilds.
 
   29 Feb 2004; Jason Wever <weeve@gentoo.org> amavisd-new-20030616_p7.ebuild:
   squash tested, ~sparc approved.
diff --git a/net-mail/amavisd-new/Manifest b/net-mail/amavisd-new/Manifest
index a66c7b035691..c68d8406e37f 100644
--- a/net-mail/amavisd-new/Manifest
+++ b/net-mail/amavisd-new/Manifest
@@ -1,12 +1,8 @@
+MD5 b7fcb047d6b8f6c9ed891b795089b9f2 amavisd-new-20030616_p8.ebuild 2667
+MD5 b7fcb047d6b8f6c9ed891b795089b9f2 amavisd-new-20030616_p7.ebuild 2667
 MD5 21d1bbdddbba241cf0593bc092006e29 ChangeLog 2722
-MD5 e6b1ceac16c6dbc0d4e984f76b62b987 amavisd-new-20030616_p4.ebuild 2490
-MD5 fd8dc45a97924b894c35641c5dbb89fc amavisd-new-20030616_p5.ebuild 2490
-MD5 cf129673ec295ac40234098f5e2f21be amavisd-new-20030616_p6.ebuild 2565
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 b7fcb047d6b8f6c9ed891b795089b9f2 amavisd-new-20030616_p7.ebuild 2667
 MD5 1f1f4cf9c92f92f966361a8ac08aa543 files/amavisd.rc6 305
-MD5 aaacf14c899eec1d21540060c1998ebe files/digest-amavisd-new-20030616_p4 75
-MD5 3d9eca93d9877f4e54b46205a89577bb files/digest-amavisd-new-20030616_p5 75
-MD5 4af50566468c016f4a33e887ea0c0a8e files/digest-amavisd-new-20030616_p6 75
-MD5 1a92ea74f38290a7e6e27c2bb839345d files/digest-amavisd-new-20030616_p7 75
 MD5 8bae863e2b884ccbdb5fb4d4b28c62e2 files/uid-as-string.patch 630
+MD5 1a92ea74f38290a7e6e27c2bb839345d files/digest-amavisd-new-20030616_p7 75
+MD5 0c677a1cb17705ea75841cabd5d14634 files/digest-amavisd-new-20030616_p8 75
diff --git a/net-mail/amavisd-new/amavisd-new-20030616_p4.ebuild b/net-mail/amavisd-new/amavisd-new-20030616_p4.ebuild
deleted file mode 100644
index ae1bca45e395..000000000000
--- a/net-mail/amavisd-new/amavisd-new-20030616_p4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/amavisd-new/amavisd-new-20030616_p4.ebuild,v 1.8 2004/01/14 19:53:04 max Exp $
-
-inherit eutils
-
-DESCRIPTION="High-performance interface between the MTA and content checkers."
-HOMEPAGE="http://www.ijs.si/software/amavisd/"
-SRC_URI="http://www.ijs.si/software/amavisd/${PN}-${PV/_/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="ldap mysql postgres milter"
-
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="${DEPEND}
-	>=sys-apps/coreutils-5.0-r3
-	app-arch/gzip
-	app-arch/bzip2
-	app-arch/arc
-	app-arch/lha
-	app-arch/unarj
-	app-arch/unrar
-	app-arch/zoo
-	dev-perl/Archive-Tar
-	dev-perl/Archive-Zip
-	dev-perl/Compress-Zlib
-	dev-perl/Convert-TNEF
-	dev-perl/Convert-UUlib
-	dev-perl/MIME-Base64
-	dev-perl/MIME-tools
-	>=dev-perl/MailTools-1.58
-	dev-perl/net-server
-	>=dev-perl/libnet-1.12
-	dev-perl/Digest-MD5
-	dev-perl/IO-stringy
-	dev-perl/Time-HiRes
-	dev-perl/Unix-Syslog
-	dev-perl/Mail-SpamAssassin
-	ldap? ( dev-perl/perl-ldap )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	virtual/antivirus
-	virtual/mta"
-
-S="${WORKDIR}/${PN}-${PV/_*/}"
-
-src_compile() {
-	if [ -n "`use milter`" ] ; then
-		cd "${S}/helper-progs"
-
-		econf --with-runtime-dir=/var/run/amavis \
-			--with-sockname=/var/run/amavis/amavisd.sock \
-			--with-user=amavis
-		emake || die "compile problem"
-
-		cd "${S}"
-	fi
-}
-
-src_install() {
-	enewgroup amavis
-	enewuser amavis -1 /bin/false /var/lib/amavis amavis
-
-	dosbin amavisd
-
-	insinto /etc
-	doins amavisd.conf
-	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '/var/run/amavis';:" \
-		/etc/amavisd.conf
-	dosed "s:^#\\?\\\$daemon_user[^;]*;:\$daemon_user = 'amavis';:" \
-		/etc/amavisd.conf
-	dosed "s:^#\\?\\\$daemon_group[^;]*;:\$daemon_group = 'amavis';:" \
-		/etc/amavisd.conf
-	if [ "$(domainname)" = "(none)" ] ; then
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
-			/etc/amavisd.conf
-	else
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(domainname)';:" \
-			/etc/amavisd.conf
-	fi
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/amavisd.rc6" amavisd
-
-	keepdir /var/spool/amavis /var/run/amavis
-	fowners amavis:amavis /var/spool/amavis /var/run/amavis
-	fperms 0750 /var/spool/amavis /var/run/amavis
-
-	dodoc AAAREADME.first INSTALL LICENSE MANIFEST RELEASE_NOTES README_FILES/*
-	docinto samples
-	dodoc test-messages/*
-
-	if [ -n "`use milter`" ] ; then
-		cd "${S}/helper-progs"
-		einstall
-	fi
-}
diff --git a/net-mail/amavisd-new/amavisd-new-20030616_p5.ebuild b/net-mail/amavisd-new/amavisd-new-20030616_p5.ebuild
deleted file mode 100644
index f25c512f8358..000000000000
--- a/net-mail/amavisd-new/amavisd-new-20030616_p5.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/amavisd-new/amavisd-new-20030616_p5.ebuild,v 1.8 2004/01/14 19:53:04 max Exp $
-
-inherit eutils
-
-DESCRIPTION="High-performance interface between the MTA and content checkers."
-HOMEPAGE="http://www.ijs.si/software/amavisd/"
-SRC_URI="http://www.ijs.si/software/amavisd/${PN}-${PV/_/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="ldap mysql postgres milter"
-
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="${DEPEND}
-	>=sys-apps/coreutils-5.0-r3
-	app-arch/gzip
-	app-arch/bzip2
-	app-arch/arc
-	app-arch/lha
-	app-arch/unarj
-	app-arch/unrar
-	app-arch/zoo
-	dev-perl/Archive-Tar
-	dev-perl/Archive-Zip
-	dev-perl/Compress-Zlib
-	dev-perl/Convert-TNEF
-	dev-perl/Convert-UUlib
-	dev-perl/MIME-Base64
-	dev-perl/MIME-tools
-	>=dev-perl/MailTools-1.58
-	dev-perl/net-server
-	>=dev-perl/libnet-1.12
-	dev-perl/Digest-MD5
-	dev-perl/IO-stringy
-	dev-perl/Time-HiRes
-	dev-perl/Unix-Syslog
-	dev-perl/Mail-SpamAssassin
-	ldap? ( dev-perl/perl-ldap )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	virtual/antivirus
-	virtual/mta"
-
-S="${WORKDIR}/${PN}-${PV/_*/}"
-
-src_compile() {
-	if [ -n "`use milter`" ] ; then
-		cd "${S}/helper-progs"
-
-		econf --with-runtime-dir=/var/run/amavis \
-			--with-sockname=/var/run/amavis/amavisd.sock \
-			--with-user=amavis
-		emake || die "compile problem"
-
-		cd "${S}"
-	fi
-}
-
-src_install() {
-	enewgroup amavis
-	enewuser amavis -1 /bin/false /var/lib/amavis amavis
-
-	dosbin amavisd
-
-	insinto /etc
-	doins amavisd.conf
-	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '/var/run/amavis';:" \
-		/etc/amavisd.conf
-	dosed "s:^#\\?\\\$daemon_user[^;]*;:\$daemon_user = 'amavis';:" \
-		/etc/amavisd.conf
-	dosed "s:^#\\?\\\$daemon_group[^;]*;:\$daemon_group = 'amavis';:" \
-		/etc/amavisd.conf
-	if [ "$(domainname)" = "(none)" ] ; then
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
-			/etc/amavisd.conf
-	else
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(domainname)';:" \
-			/etc/amavisd.conf
-	fi
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/amavisd.rc6" amavisd
-
-	keepdir /var/spool/amavis /var/run/amavis
-	fowners amavis:amavis /var/spool/amavis /var/run/amavis
-	fperms 0750 /var/spool/amavis /var/run/amavis
-
-	dodoc AAAREADME.first INSTALL LICENSE MANIFEST RELEASE_NOTES README_FILES/*
-	docinto samples
-	dodoc test-messages/*
-
-	if [ -n "`use milter`" ] ; then
-		cd "${S}/helper-progs"
-		einstall
-	fi
-}
diff --git a/net-mail/amavisd-new/amavisd-new-20030616_p6.ebuild b/net-mail/amavisd-new/amavisd-new-20030616_p8.ebuild
index eb3f023bee11..8c5bae7e7848 100644
--- a/net-mail/amavisd-new/amavisd-new-20030616_p6.ebuild
+++ b/net-mail/amavisd-new/amavisd-new-20030616_p8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/amavisd-new/amavisd-new-20030616_p6.ebuild,v 1.5 2004/01/14 19:53:04 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/amavisd-new/amavisd-new-20030616_p8.ebuild,v 1.1 2004/03/10 04:38:47 max Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.ijs.si/software/amavisd/${PN}-${PV/_/-}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86 ~amd64 ~sparc"
 IUSE="ldap mysql postgres milter"
 
 DEPEND=">=sys-apps/sed-4"
@@ -48,6 +48,11 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${PN}-${PV/_*/}"
 
+src_unpack() {
+	unpack ${A} && cd "${S}"
+	epatch "${FILESDIR}/uid-as-string.patch"
+}
+
 src_compile() {
 	if [ "`use milter`" ] ; then
 		cd "${S}/helper-progs"
diff --git a/net-mail/amavisd-new/files/digest-amavisd-new-20030616_p4 b/net-mail/amavisd-new/files/digest-amavisd-new-20030616_p4
deleted file mode 100644
index fe40d25cd164..000000000000
--- a/net-mail/amavisd-new/files/digest-amavisd-new-20030616_p4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fc313599e0fb4b91030b7b661d90794d amavisd-new-20030616-p4.tar.gz 287607
diff --git a/net-mail/amavisd-new/files/digest-amavisd-new-20030616_p5 b/net-mail/amavisd-new/files/digest-amavisd-new-20030616_p5
deleted file mode 100644
index 0e1bd8934911..000000000000
--- a/net-mail/amavisd-new/files/digest-amavisd-new-20030616_p5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 13c76432e957ccd302856f64526483a2 amavisd-new-20030616-p5.tar.gz 291067
diff --git a/net-mail/amavisd-new/files/digest-amavisd-new-20030616_p6 b/net-mail/amavisd-new/files/digest-amavisd-new-20030616_p6
deleted file mode 100644
index 240ee8b5d625..000000000000
--- a/net-mail/amavisd-new/files/digest-amavisd-new-20030616_p6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a611af8b952707977b9851dc8fc81640 amavisd-new-20030616-p6.tar.gz 314076
diff --git a/net-mail/amavisd-new/files/digest-amavisd-new-20030616_p8 b/net-mail/amavisd-new/files/digest-amavisd-new-20030616_p8
new file mode 100644
index 000000000000..7e4aded4e501
--- /dev/null
+++ b/net-mail/amavisd-new/files/digest-amavisd-new-20030616_p8
@@ -0,0 +1 @@
+MD5 5b55cef4ef4cc717b9ee1ed204a1ed96 amavisd-new-20030616-p8.tar.gz 328420