Cleanup

(Portage version: 2.2_rc67/cvs/Linux x86_64)

6 files changed, 7 insertions, 384 deletions

diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog
index 92bed57f2c86..f9cf634508c7 100644
--- a/mail-filter/maildrop/ChangeLog
+++ b/mail-filter/maildrop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/maildrop
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.101 2010/03/11 19:16:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.102 2010/04/10 12:48:11 tove Exp $
+
+  10 Apr 2010; Torsten Veller <tove@gentoo.org>
+  -files/maildrop-1.8.0-db4-r1.patch, -files/maildrop-2.0.4-makedat.patch,
+  -files/maildrop-2.1.0-db4.patch, -maildrop-2.2.0.ebuild,
+  -maildrop-2.4.1.ebuild:
+  Cleanup
 
   11 Mar 2010; Raúl Porcel <armin76@gentoo.org> maildrop-2.4.2.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #308043
diff --git a/mail-filter/maildrop/files/maildrop-1.8.0-db4-r1.patch b/mail-filter/maildrop/files/maildrop-1.8.0-db4-r1.patch
deleted file mode 100644
index 574355fdc9eb..000000000000
--- a/mail-filter/maildrop/files/maildrop-1.8.0-db4-r1.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- bdbobj/configure.in.orig	2001-09-18 18:26:28.000000000 -0700
-+++ bdbobj/configure.in	2004-08-20 22:55:04.468505515 -0700
-@@ -21,15 +21,19 @@
- dnl Checks for libraries.
- 
- saveLIBS="$LIBS"
--AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
--	AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
--	AC_CHECK_LIB(db, db_env_create, [ LIBDB=-ldb; LIBS="-ldb $LIBS"])
--	))
-+for dbname in db-4.4 db-4.3 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
-+  do
-+        AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+          AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+            AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+              AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
- 
-+  done
- FOUND_DB=0
--AC_CHECK_FUNC(dbopen, FOUND_DB=1)
--AC_CHECK_FUNC(db_open, FOUND_DB=1)
--AC_CHECK_FUNC(db_env_create, FOUND_DB=1)
-+AC_CHECK_FUNC(db_create, FOUND_DB=1)
-+AC_CHECK_FUNC(db_create_4002, FOUND_DB=1)
-+AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
-+AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
- 
- LIBS="$saveLIBS"
- 
---- configure.in.orig	2004-07-26 18:36:40.000000000 -0700
-+++ configure.in	2004-08-20 22:52:27.419757049 -0700
-@@ -80,18 +80,21 @@
- 	MAILBOT=mailbot
- 	;;
- db)
--	AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
--		AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
--		AC_CHECK_LIB(db, db_env_create,
--					[ LIBDB=-ldb; LIBS="-ldb $LIBS"])
--		))
--
--	AC_CHECK_FUNC(dbopen, HAVE_BDB=1)
--	AC_CHECK_FUNC(db_open, HAVE_BDB=1)
--	AC_CHECK_FUNC(db_env_create, HAVE_BDB=1)
-+  for dbname in db-4.4 db-4.3 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
-+    do
-+	AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+ 	  AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+ 	    AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+ 	      AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
-+    done
-+  AC_CHECK_FUNC(db_create, HAVE_BDB=1)
-+  AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1)
-+  AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
-+  AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
-+
- 	if test "$HAVE_BDB" != "1"
- 	then
--		AC_MSG_ERROR(GDBM library not found)
-+		AC_MSG_ERROR(DB library not found)
- 	fi
- 	MAILBOT=mailbot
- 	;;
diff --git a/mail-filter/maildrop/files/maildrop-2.0.4-makedat.patch b/mail-filter/maildrop/files/maildrop-2.0.4-makedat.patch
deleted file mode 100644
index 2b3953926a20..000000000000
--- a/mail-filter/maildrop/files/maildrop-2.0.4-makedat.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 988867e..8b39d6b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -127,7 +127,6 @@ install-maildrop:
- 	$(INSTALL_PROGRAM) maildir/maildirmake $(DESTDIR)$(bindir)/maildirmake
- 	$(INSTALL_PROGRAM) rfc2045/reformime $(DESTDIR)$(bindir)/reformime
- 	$(INSTALL_PROGRAM) rfc2045/makemime $(DESTDIR)$(bindir)/makemime
--	$(INSTALL_PROGRAM) makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog
- 	$(INSTALL_SCRIPT)  makedat/makedat     $(DESTDIR)$(bindir)/makedat
- 	. maildrop/uidgid ; test -z "$$gid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop lockmail
- 	. maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop lockmail && chmod 755 maildrop lockmail
-diff --git a/makedat/Makefile.am b/makedat/Makefile.am
-index 360d1fa..626e5bd 100644
---- a/makedat/Makefile.am
-+++ b/makedat/Makefile.am
-@@ -5,7 +5,7 @@
- 
- AUTOMAKE = srcdir=${srcdir} @SHELL@ ${srcdir}/../automake.fix @AUTOMAKE@
- 
--noinst_PROGRAMS=@makedatprog_target@
-+bin_PROGRAMS=@makedatprog_target@
- 
- EXTRA_PROGRAMS=makedatprog
- 
diff --git a/mail-filter/maildrop/files/maildrop-2.1.0-db4.patch b/mail-filter/maildrop/files/maildrop-2.1.0-db4.patch
deleted file mode 100644
index 9f7fedc18da3..000000000000
--- a/mail-filter/maildrop/files/maildrop-2.1.0-db4.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -ur maildrop-2.1.0-orig/bdbobj/configure.in maildrop-2.1.0/bdbobj/configure.in
---- maildrop-2.1.0-orig/bdbobj/configure.in	2009-02-15 22:50:45.000000000 +0100
-+++ maildrop-2.1.0/bdbobj/configure.in	2009-05-15 22:02:53.000000000 +0200
-@@ -23,15 +23,19 @@
- dnl Checks for libraries.
- 
- saveLIBS="$LIBS"
--AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
--	AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
--	AC_CHECK_LIB(db, db_env_create, [ LIBDB=-ldb; LIBS="-ldb $LIBS"])
--	))
-+for dbname in db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
-+  do
-+        AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+          AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+            AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+              AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
- 
-+  done
- FOUND_DB=0
--AC_CHECK_FUNC(dbopen, FOUND_DB=1)
--AC_CHECK_FUNC(db_open, FOUND_DB=1)
--AC_CHECK_FUNC(db_env_create, FOUND_DB=1)
-+AC_CHECK_FUNC(db_create, FOUND_DB=1)
-+AC_CHECK_FUNC(db_create_4002, FOUND_DB=1)
-+AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
-+AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
- 
- LIBS="$saveLIBS"
- 
-Only in maildrop-2.1.0/bdbobj: configure.in.orig
-diff -ur maildrop-2.1.0-orig/configure.in maildrop-2.1.0/configure.in
---- maildrop-2.1.0-orig/configure.in	2009-05-10 15:03:10.000000000 +0200
-+++ maildrop-2.1.0/configure.in	2009-05-15 22:03:39.000000000 +0200
-@@ -99,21 +99,24 @@
- 	USE_GDBM=1
- 	;;
- db)
--	AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
--		AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
--		AC_CHECK_LIB(db, db_env_create,
--					[ LIBDB=-ldb; LIBS="-ldb $LIBS"])
--		))
--
--	AC_CHECK_FUNC(dbopen, HAVE_BDB=1)
--	AC_CHECK_FUNC(db_open, HAVE_BDB=1)
--	AC_CHECK_FUNC(db_env_create, HAVE_BDB=1)
-+  for dbname in db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
-+    do
-+	AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+ 	  AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+ 	    AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
-+ 	      AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
-+    done
-+  AC_CHECK_FUNC(db_create, HAVE_BDB=1)
-+  AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1)
-+  AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
-+  AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
-+
- 	if test "$HAVE_BDB" != "1"
- 	then
--		AC_MSG_ERROR(GDBM library not found)
-+		AC_MSG_ERROR(DB library not found)
- 	fi
- 	dblibrary=bdbobj/libbdbobj.la
--	USE_GDBM=0
-+	USE_DB=1
- 	;;
- *)
- 	;;
-Only in maildrop-2.1.0: configure.in.orig
diff --git a/mail-filter/maildrop/maildrop-2.2.0.ebuild b/mail-filter/maildrop/maildrop-2.2.0.ebuild
deleted file mode 100644
index 57dc4a2cd638..000000000000
--- a/mail-filter/maildrop/maildrop-2.2.0.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.2.0.ebuild,v 1.7 2009/11/18 18:24:27 armin76 Exp $
-
-EAPI=2
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="Mail delivery agent/filter"
-[[ -z ${PV/?.?/}   ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[[ -z ${PV/?.?.?/} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[[ -z ${SRC_URI}   ]] && SRC_URI="http://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/maildrop/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
-IUSE="berkdb debug fam gdbm ldap mysql postgres authlib"
-
-DEPEND="!mail-mta/courier
-	net-mail/mailbase
-	dev-libs/libpcre
-	gdbm?     ( >=sys-libs/gdbm-1.8.0 )
-	mysql?    ( net-libs/courier-authlib )
-	postgres? ( net-libs/courier-authlib )
-	ldap?     ( net-libs/courier-authlib )
-	authlib?  ( net-libs/courier-authlib )
-	fam?      ( virtual/fam )
-	!gdbm? (
-		berkdb? (
-			>=sys-libs/db-3
-		)
-	)"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-PROVIDE="virtual/mda"
-
-S=${WORKDIR}/${P%%_pre}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.4-makedat.patch
-
-	# Prefer gdbm over berkdb
-	if use gdbm ; then
-		use berkdb && elog "Both gdbm and berkdb selected. Using gdbm."
-	elif use berkdb ; then
-			epatch "${FILESDIR}"/${PN}-2.2.0-db4.patch
-	fi
-
-	if ! use fam ; then
-		epatch "${FILESDIR}"/${PN}-1.8.1-disable-fam.patch
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	local mytrustedusers="apache dspam root mail fetchmail \
-		daemon postmaster qmaild mmdf vmail alias"
-
-	# These flags make maildrop cry
-	replace-flags -Os -O2
-	filter-flags -fomit-frame-pointer
-
-	if use gdbm ; then
-		myconf="${myconf} --with-db=gdbm"
-	elif use berkdb ; then
-		myconf="${myconf} --with-db=db"
-	else
-		myconf="${myconf} --without-db"
-	fi
-
-	if ! use mysql && ! use postgres && ! use ldap && ! use authlib ; then
-		myconf="${myconf} --disable-authlib"
-	fi
-
-	econf \
-		$(use_enable fam) \
-		--disable-dependency-tracker \
-		--with-devel \
-		--disable-tempdir \
-		--enable-syslog=1 \
-		--enable-use-flock=1 \
-		--enable-maildirquota \
-		--enable-use-dotlock=1 \
-		--enable-restrict-trusted=1 \
-		--enable-trusted-users="${mytrustedusers}" \
-		--enable-maildrop-uid=root \
-		--enable-maildrop-gid=mail \
-		--with-default-maildrop=./.maildir/ \
-		--enable-sendmail=/usr/sbin/sendmail \
-		--cache-file="${S}"/configuring.cache \
-		${myconf}
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	fperms 4755 /usr/bin/maildrop
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README \
-		README.postfix UPGRADE maildroptips.txt || die
-
-	dodir /usr/share/doc/${PF}
-	mv "${D}"/usr/share/maildrop/html "${D}"/usr/share/doc/${PF}/
-
-	dohtml {INSTALL,README,UPGRADE}.html || die
-
-	insinto /etc
-	doins "${FILESDIR}"/maildroprc || die
-}
diff --git a/mail-filter/maildrop/maildrop-2.4.1.ebuild b/mail-filter/maildrop/maildrop-2.4.1.ebuild
deleted file mode 100644
index 63d025a479e9..000000000000
--- a/mail-filter/maildrop/maildrop-2.4.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.4.1.ebuild,v 1.1 2010/02/16 11:07:42 tove Exp $
-
-EAPI=2
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="Mail delivery agent/filter"
-[[ -z ${PV/?.?/}   ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[[ -z ${PV/?.?.?/} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[[ -z ${SRC_URI}   ]] && SRC_URI="http://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/maildrop/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="berkdb debug fam gdbm ldap mysql postgres authlib"
-
-DEPEND="!mail-mta/courier
-	net-mail/mailbase
-	dev-libs/libpcre
-	net-dns/libidn
-	gdbm?     ( >=sys-libs/gdbm-1.8.0 )
-	mysql?    ( net-libs/courier-authlib )
-	postgres? ( net-libs/courier-authlib )
-	ldap?     ( net-libs/courier-authlib )
-	authlib?  ( net-libs/courier-authlib )
-	fam?      ( virtual/fam )
-	!gdbm? (
-		berkdb? (
-			>=sys-libs/db-3
-		)
-	)"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-PROVIDE="virtual/mda"
-
-S=${WORKDIR}/${P%%_pre}
-
-src_prepare() {
-#	epatch "${FILESDIR}"/${PN}-2.0.4-makedat.patch
-
-	# Prefer gdbm over berkdb
-	if use gdbm ; then
-		use berkdb && elog "Both gdbm and berkdb selected. Using gdbm."
-	elif use berkdb ; then
-		epatch "${FILESDIR}"/${PN}-2.2.0-db4.patch
-	fi
-
-	if ! use fam ; then
-		epatch "${FILESDIR}"/${PN}-1.8.1-disable-fam.patch
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	local mytrustedusers="apache dspam root mail fetchmail \
-		daemon postmaster qmaild mmdf vmail alias"
-
-	# These flags make maildrop cry
-	replace-flags -Os -O2
-	filter-flags -fomit-frame-pointer
-
-	if use gdbm ; then
-		myconf="${myconf} --with-db=gdbm"
-	elif use berkdb ; then
-		myconf="${myconf} --with-db=db"
-	else
-		myconf="${myconf} --without-db"
-	fi
-
-	if ! use mysql && ! use postgres && ! use ldap && ! use authlib ; then
-		myconf="${myconf} --disable-authlib"
-	fi
-
-	econf \
-		$(use_enable fam) \
-		--disable-dependency-tracker \
-		--with-devel \
-		--disable-tempdir \
-		--enable-syslog=1 \
-		--enable-use-flock=1 \
-		--enable-use-dotlock=1 \
-		--enable-restrict-trusted=1 \
-		--enable-trusted-users="${mytrustedusers}" \
-		--enable-maildrop-uid=root \
-		--enable-maildrop-gid=mail \
-		--with-default-maildrop=./.maildir/ \
-		--enable-sendmail=/usr/sbin/sendmail \
-		--cache-file="${S}"/configuring.cache \
-		${myconf}
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	fperms 4755 /usr/bin/maildrop
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README \
-		README.postfix UPGRADE maildroptips.txt || die
-
-	dodir /usr/share/doc/${PF}
-	mv "${D}"/usr/share/maildrop/html "${D}"/usr/share/doc/${PF}/
-
-	dohtml {INSTALL,README,UPGRADE}.html || die
-
-	insinto /etc
-	doins "${FILESDIR}"/maildroprc || die
-}