Version bump(s), db4.5 fixes, fix broken autotools handling (per Bug #160157)

(Portage version: 2.1.2.12)

9 files changed, 136 insertions, 27 deletions

diff --git a/dev-libs/cyrus-imap-dev/ChangeLog b/dev-libs/cyrus-imap-dev/ChangeLog
index 9f9700243f5a..b674c50660d6 100644
--- a/dev-libs/cyrus-imap-dev/ChangeLog
+++ b/dev-libs/cyrus-imap-dev/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/cyrus-imap-dev
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/ChangeLog,v 1.36 2007/01/05 07:32:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/ChangeLog,v 1.37 2007/09/07 18:58:27 dertobi123 Exp $
+
+*cyrus-imap-dev-2.3.9 (07 Sep 2007)
+*cyrus-imap-dev-2.2.13 (07 Sep 2007)
+
+  07 Sep 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  +files/cyrus-imap-dev-2.2-db45.patch, cyrus-imap-dev-2.2.10.ebuild,
+  cyrus-imap-dev-2.2.12.ebuild, +cyrus-imap-dev-2.2.13.ebuild,
+  -cyrus-imap-dev-2.3.1.ebuild, +cyrus-imap-dev-2.3.9.ebuild:
+  Version bump(s), db4.5 fixes, fix broken autotools handling (per Bug #160157)
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   cyrus-imap-dev-2.2.10.ebuild, cyrus-imap-dev-2.2.12.ebuild,
diff --git a/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.10.ebuild b/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.10.ebuild
index 5da247403c08..75d8c366ccef 100644
--- a/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.10.ebuild
+++ b/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.10.ebuild,v 1.8 2007/01/05 07:32:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.10.ebuild,v 1.9 2007/09/07 18:58:27 dertobi123 Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Developer support for the Cyrus IMAP Server."
 HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
@@ -39,15 +39,10 @@ src_unpack() {
 	fi
 
 	epatch "${FILESDIR}"/${PV}-imapopts.h.patch || die "imapopts.h.patch failed"
-	# DB4 detection and versioned symbols.
-	#epatch "${FILESDIR}/cyrus-imapd-${PV}-db4.patch" || die "patch failed."
 
 	# Recreate configure.
 	export WANT_AUTOCONF="2.5"
-	ebegin "Recreating configure"
-	rm -rf configure config.h.in autom4te.cache || die
-	sh SMakefile &>/dev/null || die "SMakefile failed"
-	eend $?
+	eautoreconf
 
 	# When linking with rpm, you need to link with more libraries.
 	sed -e "s:lrpm:lrpm -lrpmio -lrpmdb:" -i configure || die "sed failed"
diff --git a/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.12.ebuild b/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.12.ebuild
index 5a99146d87e8..798a14171805 100644
--- a/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.12.ebuild
+++ b/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.12.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.12.ebuild,v 1.7 2007/01/05 07:32:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.12.ebuild,v 1.8 2007/09/07 18:58:27 dertobi123 Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Developer support for the Cyrus IMAP Server."
 HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
@@ -33,6 +33,9 @@ S="${WORKDIR}/cyrus-imapd-${PV}"
 src_unpack() {
 	unpack ${A} && cd "${S}"
 
+	# db-4.5 fix
+	epatch "${FILESDIR}/${PN}-2.2-db45.patch"
+
 	# Add libwrap defines as we don't have a dynamicly linked library.
 	if use tcpd ; then
 		epatch "${FILESDIR}/cyrus-imapd-libwrap.patch" || die "patch failed"
@@ -40,15 +43,9 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/2.2.10-imapopts.h.patch || die "imapopts.h.patch failed"
 
-	# DB4 detection and versioned symbols.
-	#epatch "${FILESDIR}/cyrus-imapd-${PV}-db4.patch" || die "patch failed."
-
 	# Recreate configure.
 	export WANT_AUTOCONF="2.5"
-	ebegin "Recreating configure"
-	rm -rf configure config.h.in autom4te.cache || die
-	sh SMakefile &>/dev/null || die "SMakefile failed"
-	eend $?
+	eautoreconf
 
 	# When linking with rpm, you need to link with more libraries.
 	sed -e "s:lrpm:lrpm -lrpmio -lrpmdb:" -i configure || die "sed failed"
diff --git a/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.13.ebuild b/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.13.ebuild
new file mode 100644
index 000000000000..41d5069fd1da
--- /dev/null
+++ b/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.13.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.13.ebuild,v 1.1 2007/09/07 18:58:27 dertobi123 Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="Developer support for the 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 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs kerberos snmp ssl tcpd"
+
+RDEPEND="virtual/libc
+	>=sys-libs/db-3.2
+	>=dev-libs/cyrus-sasl-2.1.12
+	afs? ( >=net-fs/openafs-1.2.2 )
+	kerberos? ( >=app-crypt/mit-krb5-1.2.6 )
+	snmp? ( net-analyzer/net-snmp )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+
+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}"
+
+	# db-4.5 fix
+	epatch "${FILESDIR}/${PN}-2.2-db45.patch"
+
+	# Add libwrap defines as we don't have a dynamicly linked library.
+	if use tcpd ; then
+		epatch "${FILESDIR}/cyrus-imapd-libwrap.patch" || die "patch failed"
+	fi
+
+	# Recreate configure.
+	export WANT_AUTOCONF="2.5"
+	eautoreconf
+
+	# 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 afs`"
+	myconf="${myconf} `use_with ssl openssl`"
+	myconf="${myconf} `use_with snmp ucdsnmp`"
+	myconf="${myconf} `use_with tcpd libwrap`"
+	myconf="${myconf} `use_enable kerberos gssapi`"
+
+	econf \
+		--enable-murder \
+		--enable-listext \
+		--enable-netscapehack \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-auth=unix \
+		--without-perl \
+		--disable-cyradm \
+		${myconf} || die "econf failed"
+
+	emake -C "${S}/lib" all || die "compile problem"
+}
+
+src_install() {
+	dodir /usr/include/cyrus
+
+	make -C "${S}/lib" DESTDIR="${D}" install || die "make install failed"
+	dodoc COPYRIGHT README*
+}
diff --git a/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.3.1.ebuild b/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.3.9.ebuild
index 3d1c06da16d2..cccf91fceae3 100644
--- a/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.3.1.ebuild
+++ b/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.3.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.3.1.ebuild,v 1.2 2007/01/05 07:32:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.3.9.ebuild,v 1.1 2007/09/07 18:58:27 dertobi123 Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Developer support for the Cyrus IMAP Server."
 HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
@@ -43,10 +43,7 @@ src_unpack() {
 
 	# Recreate configure.
 	export WANT_AUTOCONF="2.5"
-	ebegin "Recreating configure"
-	rm -rf configure config.h.in autom4te.cache || die
-	sh SMakefile &>/dev/null || die "SMakefile failed"
-	eend $?
+	eautoreconf
 
 	# When linking with rpm, you need to link with more libraries.
 	sed -e "s:lrpm:lrpm -lrpmio -lrpmdb:" -i configure || die "sed failed"
diff --git a/dev-libs/cyrus-imap-dev/files/cyrus-imap-dev-2.2-db45.patch b/dev-libs/cyrus-imap-dev/files/cyrus-imap-dev-2.2-db45.patch
new file mode 100644
index 000000000000..c92f957953c8
--- /dev/null
+++ b/dev-libs/cyrus-imap-dev/files/cyrus-imap-dev-2.2-db45.patch
@@ -0,0 +1,29 @@
+--- 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 <db.h>],
diff --git a/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.2.13 b/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.2.13
new file mode 100644
index 000000000000..af50da4aeb5a
--- /dev/null
+++ b/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.2.13
@@ -0,0 +1,3 @@
+MD5 3ff679714836d1d7b1e1df0e026d4844 cyrus-imapd-2.2.13.tar.gz 2109770
+RMD160 7e8ac84b5ddd9f1206e71d5b659d07d8400f9ac2 cyrus-imapd-2.2.13.tar.gz 2109770
+SHA256 109e85b901bfcdbdd6a76d7cac83af866aa9c37a40919be7f58813319082d09c cyrus-imapd-2.2.13.tar.gz 2109770
diff --git a/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.3.1 b/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.3.1
deleted file mode 100644
index 0d886946e1f0..000000000000
--- a/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cde15876d5c953bba9ad9f7811aff695 cyrus-imapd-2.3.1.tar.gz 2212999
-RMD160 68b40b89f5558afe19886724a8bb8736139254e5 cyrus-imapd-2.3.1.tar.gz 2212999
-SHA256 79f95ed36160056f5ca60fad312fda8c6c95eafeab44f49b360b4a02790f156c cyrus-imapd-2.3.1.tar.gz 2212999
diff --git a/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.3.9 b/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.3.9
new file mode 100644
index 000000000000..fe6fdcc5eba5
--- /dev/null
+++ b/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.3.9
@@ -0,0 +1,3 @@
+MD5 113433c1fdc777e3b0466b5ce643b8bc cyrus-imapd-2.3.9.tar.gz 2272004
+RMD160 c9aae3476108c0face06dfe304a136015370b166 cyrus-imapd-2.3.9.tar.gz 2272004
+SHA256 27e6476789788b7c72f09711103f7c4bd0136dbd33ceadd0ae2dc776a17ab437 cyrus-imapd-2.3.9.tar.gz 2272004