Vastly cleaned up and rewritten. See cyrus-imapd ChangeLog for more details.

5 files changed, 111 insertions, 2 deletions

diff --git a/net-mail/cyrus-imap-admin/ChangeLog b/net-mail/cyrus-imap-admin/ChangeLog
index e6db050c791c..926836624695 100644
--- a/net-mail/cyrus-imap-admin/ChangeLog
+++ b/net-mail/cyrus-imap-admin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/cyrus-imap-admin
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.19 2004/01/20 18:07:08 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.20 2004/01/20 18:19:59 max Exp $
+
+*cyrus-imap-admin-2.2.3 (20 Jan 2004)
+
+  20 Jan 2004; Max Kalika <max@gentoo.org> cyrus-imap-admin-2.2.3.ebuild,
+  files/cyrus-imapd-2.2.3-db4.patch:
+  Vastly cleaned up and rewritten. See cyrus-imapd ChangeLog for more details.
 
   18 Sep 2003; Max Kalika <max@gentoo.org> cyrus-imap-admin-2.1.11-r1.ebuild,
   cyrus-imap-admin-2.1.11.ebuild, cyrus-imap-admin-2.1.12.ebuild,
diff --git a/net-mail/cyrus-imap-admin/Manifest b/net-mail/cyrus-imap-admin/Manifest
index d4f8ead12f13..6b28aad54985 100644
--- a/net-mail/cyrus-imap-admin/Manifest
+++ b/net-mail/cyrus-imap-admin/Manifest
@@ -1,10 +1,13 @@
 MD5 c553f24a76b6dccbfe38eccae5f224a3 cyrus-imap-admin-2.1.12.ebuild 2729
 MD5 904bf674baf9c6f980da02e356a57caa cyrus-imap-admin-2.1.14.ebuild 3242
 MD5 4db4a7093c61efe314ed3087134ba89a cyrus-imap-admin-2.1.13.ebuild 2747
-MD5 dd725e11cfb7522fe75f9c9499acdc75 ChangeLog 2793
+MD5 3ae508b4937b6efca9a07b902edf48c0 ChangeLog 3023
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 bf82158cbd04243ba15a3497e03e0758 cyrus-imap-admin-2.2.3.ebuild 1845
 MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imap-admin-2.1.12-libwrap.patch 494
+MD5 fe1bbab93ddd6cf3a9c4aacc111154d4 files/cyrus-imapd-2.2.3-db4.patch 1604
 MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
+MD5 6678b1b72838a7ba2cb5045909ea909f files/digest-cyrus-imap-admin-2.2.3 70
 MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
 MD5 a73606d0350e6883a11a4c525af59551 files/digest-cyrus-imap-admin-2.1.12 71
 MD5 d63d317f0f8fa042638be86b663fffc0 files/digest-cyrus-imap-admin-2.1.13 71
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.3.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.3.ebuild
new file mode 100644
index 000000000000..c85c67f03a8c
--- /dev/null
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.3.ebuild,v 1.1 2004/01/20 18:19:59 max Exp $
+
+inherit perl-module 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="~x86"
+IUSE="ssl kerberos"
+
+DEPEND="virtual/glibc
+	sys-devel/libtool
+	sys-devel/autoconf
+	sys-devel/automake
+	>=sys-apps/sed-4
+	>=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 )"
+
+S="${WORKDIR}/cyrus-imapd-${PV}"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	# DB4 detection and versioned symbols.
+	epatch "${FILESDIR}/cyrus-imapd-${PV}-db4.patch"
+
+	# Recreate configure.
+	export WANT_AUTOCONF="2.5"
+	ebegin "Recreating configure"
+	rm -f configure config.h.in
+	sh SMakefile &>/dev/null || die "SMakefile failed"
+	eend $?
+
+	# When linking with rpm, you need to link with more libraries.
+	sed -e "s:lrpm:lrpm -lrpmio -lrpmdb:" -i configure || die "sed failed"
+}
+
+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}
+
+	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"
+}
diff --git a/net-mail/cyrus-imap-admin/files/cyrus-imapd-2.2.3-db4.patch b/net-mail/cyrus-imap-admin/files/cyrus-imapd-2.2.3-db4.patch
new file mode 100644
index 000000000000..ace2f28ea8e1
--- /dev/null
+++ b/net-mail/cyrus-imap-admin/files/cyrus-imapd-2.2.3-db4.patch
@@ -0,0 +1,28 @@
+diff -urN cyrus-imapd-2.2.3/cmulocal/berkdb.m4 cyrus-imapd-2.2.3/cmulocal/berkdb.m4
+--- cyrus-imapd-2.2.3/cmulocal/berkdb.m4	2003-04-15 17:25:41.000000000 -0500
++++ cyrus-imapd-2.2.3/cmulocal/berkdb.m4	2003-07-09 03:17:48.000000000 -0500
+@@ -211,12 +211,21 @@
+ 	    BDB_LIBADD=""
+ 	fi
+ 
+-        for dbname in 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.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, BDB_LIBADD="$BDB_LIBADD -l$dbname";
+-              dblib="berkeley"; break, dblib="no")
++            AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname";
++              dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname";
++               dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4002, BDB_LIBADD="$BDB_LIBADD -l$dbname";
++                dblib="berkeley"; break, dblib="no")))
+           done
+         if test "$dblib" = "no"; then
++          for dbname in 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 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
++            do
++              AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
++                dblib="berkeley"; break, dblib="no")
++            done
++       fi
++        if test "$dblib" = "no"; then
+           AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb";
+             dblib="berkeley"; dbname=db,
+             dblib="no")
diff --git a/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.2.3 b/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.2.3
new file mode 100644
index 000000000000..68980bd5b063
--- /dev/null
+++ b/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.2.3
@@ -0,0 +1 @@
+MD5 32888c5120edeb2867d6283fedbdb7d5 cyrus-imapd-2.2.3.tar.gz 1887717