From a026bc877308cb1b0cdfafea71afa4d6aa0e497a Mon Sep 17 00:00:00 2001 From: Tobias Scherbaum Date: Fri, 18 Jan 2008 21:22:14 +0000 Subject: Cleanup (Portage version: 2.1.4) --- net-mail/cyrus-imap-admin/ChangeLog | 7 ++- .../cyrus-imap-admin-2.2.13.ebuild | 71 ---------------------- .../files/cyrus-imap-admin-2.2-db45.patch | 29 --------- .../files/cyrus-imap-admin-2.2.12-gcc4.patch | 18 ------ .../files/digest-cyrus-imap-admin-2.2.13 | 3 - 5 files changed, 6 insertions(+), 122 deletions(-) delete mode 100644 net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.13.ebuild delete mode 100644 net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2-db45.patch delete mode 100644 net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2.12-gcc4.patch delete mode 100644 net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.2.13 (limited to 'net-mail/cyrus-imap-admin') diff --git a/net-mail/cyrus-imap-admin/ChangeLog b/net-mail/cyrus-imap-admin/ChangeLog index 0de2e8ad71cb..d6dcf3f0f622 100644 --- a/net-mail/cyrus-imap-admin/ChangeLog +++ b/net-mail/cyrus-imap-admin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-mail/cyrus-imap-admin # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.68 2008/01/14 20:30:37 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.69 2008/01/18 21:22:13 dertobi123 Exp $ + + 18 Jan 2008; Tobias Scherbaum + -files/cyrus-imap-admin-2.2.12-gcc4.patch, + -files/cyrus-imap-admin-2.2-db45.patch, -cyrus-imap-admin-2.2.13.ebuild: + Cleanup 14 Jan 2008; Tobias Scherbaum cyrus-imap-admin-2.3.9.ebuild: diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.13.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.13.ebuild deleted file mode 100644 index 6296bd00ac63..000000000000 --- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.13.ebuild +++ /dev/null @@ -1,71 +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/cyrus-imap-admin/cyrus-imap-admin-2.2.13.ebuild,v 1.8 2007/10/01 19:01:36 philantrop Exp $ - -inherit autotools perl-app eutils - -DESCRIPTION="Utilities and Perl modules to administer a Cyrus IMAP server." -HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/" -SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="amd64 hppa ppc ppc64 sparc x86" -IUSE="ssl kerberos" - -RDEPEND=">=sys-libs/db-3.2 - >=dev-lang/perl-5.6.1 - >=dev-libs/cyrus-sasl-2.1.13 - dev-perl/Term-ReadLine-Perl - dev-perl/TermReadKey - ssl? ( >=dev-libs/openssl-0.9.6 ) - kerberos? ( virtual/krb5 )" - -DEPEND="$RDEPEND - sys-devel/libtool - >=sys-devel/autoconf-2.58 - sys-devel/automake - >=sys-apps/sed-4" - -S="${WORKDIR}/cyrus-imapd-${PV}" - -src_unpack() { - unpack ${A} && cd "${S}" - - # When linking with rpm, you need to link with more libraries. - sed -e "s:lrpm:lrpm -lrpmio -lrpmdb:" -i configure || die "sed failed" - - epatch "${FILESDIR}/${PN}-2.2-db45.patch" - epatch "${FILESDIR}/${PN}-2.2-fPIC.patch" - - # Recreate configure. - WANT_AUTOCONF="2.5" - eautoreconf -} - -src_compile() { - - local myconf - myconf="${myconf} `use_with ssl openssl`" - myconf="${myconf} `use_with kerberos gssapi`" - - econf \ - --disable-server \ - --enable-murder \ - --enable-listext \ - --enable-netscapehack \ - --with-cyrus-group=mail \ - --with-com_err=yes \ - --with-auth=unix \ - --with-perl=/usr/bin/perl \ - --enable-cyradm \ - ${myconf} || die "econf failed" - - emake -C "${S}/lib" all || die "compile problem" - emake -C "${S}/perl" all || die "compile problem" -} - -src_install () { - make -C "${S}/perl" DESTDIR="${D}" install || die "install problem" - fixlocalpod # bug #98122 -} diff --git a/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2-db45.patch b/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2-db45.patch deleted file mode 100644 index c92f957953c8..000000000000 --- a/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2-db45.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- lib.old/cyrusdb_berkeley.c 2007-04-05 01:23:42.518845824 +0200 -+++ lib/cyrusdb_berkeley.c 2007-04-05 01:22:20.000000000 +0200 -@@ -159,7 +159,15 @@ - syslog(LOG_WARNING, - "DBERROR: invalid berkeley_locks_max value, using internal default"); - } else { -+#if DB_VERSION_MAJOR >= 4 -+ r = dbenv->set_lk_max_locks(dbenv, opt); -+ if (!r) -+ r = dbenv->set_lk_max_lockers(dbenv, opt); -+ if (!r) -+ r = dbenv->set_lk_max_objects(dbenv, opt); -+#else - r = dbenv->set_lk_max(dbenv, opt); -+#endif - if (r) { - dbenv->err(dbenv, r, "set_lk_max"); - syslog(LOG_ERR, "DBERROR: set_lk_max(): %s", db_strerror(r)); ---- cmulocal/berkdb.m4.orig 2007-05-01 18:05:00.000000000 +0200 -+++ cmulocal/berkdb.m4 2007-05-01 18:05:17.000000000 +0200 -@@ -212,7 +212,7 @@ - fi - - saved_LIBS=$LIBS -- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - do - LIBS="$saved_LIBS -l$dbname" - AC_TRY_LINK([#include ], diff --git a/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2.12-gcc4.patch b/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2.12-gcc4.patch deleted file mode 100644 index 4a0f89ab0100..000000000000 --- a/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2.12-gcc4.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- tools/config2header.orig 2006-01-30 09:30:16.000000000 -0800 -+++ tools/config2header 2006-01-30 09:31:05.000000000 -0800 -@@ -214,7 +214,6 @@ - print HFILE <