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

Package-Manager: portage-2.1.2.12

10 files changed, 168 insertions, 57 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/Manifest b/dev-libs/cyrus-imap-dev/Manifest
index 2391fb51bf7c..f822b1e1d189 100644
--- a/dev-libs/cyrus-imap-dev/Manifest
+++ b/dev-libs/cyrus-imap-dev/Manifest
@@ -1,33 +1,39 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.2.10-imapopts.h.patch 337 RMD160 83fa5ad6a9531c43409671b0e3edf41133777968 SHA1 f62b9f57589e13aa5c26877d58fb3c8397f7dd14 SHA256 d743f40eed52d8808194cc6f002831225ee0b0386819bc00e412ff83f45a6c87
 MD5 e3d9a53cb779205b976a05690e761236 files/2.2.10-imapopts.h.patch 337
 RMD160 83fa5ad6a9531c43409671b0e3edf41133777968 files/2.2.10-imapopts.h.patch 337
 SHA256 d743f40eed52d8808194cc6f002831225ee0b0386819bc00e412ff83f45a6c87 files/2.2.10-imapopts.h.patch 337
+AUX cyrus-imap-dev-2.2-db45.patch 1283 RMD160 e3925988a6c628eb5567aa482351bb6a8ab01113 SHA1 b074166f6092ee58db685038c45382f77479bdb1 SHA256 4d814546280b83cf420855faf067ac95d36818be8b2a9ad9973805f261c1d90e
+MD5 94e33770741d5309d51ba7f4edbe1fc5 files/cyrus-imap-dev-2.2-db45.patch 1283
+RMD160 e3925988a6c628eb5567aa482351bb6a8ab01113 files/cyrus-imap-dev-2.2-db45.patch 1283
+SHA256 4d814546280b83cf420855faf067ac95d36818be8b2a9ad9973805f261c1d90e files/cyrus-imap-dev-2.2-db45.patch 1283
 AUX cyrus-imapd-libwrap.patch 494 RMD160 1c1d21beec263455be254f8cb07920fe034dba78 SHA1 a9c0217cbcf8a863cd6e526f2f945da602c2f15e SHA256 0a009c3263f7e8d35fbe292db774c186d969e3d22952f6889fcf2cf1bb6ea723
 MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imapd-libwrap.patch 494
 RMD160 1c1d21beec263455be254f8cb07920fe034dba78 files/cyrus-imapd-libwrap.patch 494
 SHA256 0a009c3263f7e8d35fbe292db774c186d969e3d22952f6889fcf2cf1bb6ea723 files/cyrus-imapd-libwrap.patch 494
 DIST cyrus-imapd-2.2.10.tar.gz 1946803 RMD160 2cc1bb11af57e77ad701eac7efe85bb396ee350c SHA1 460ff6e9fb9a69190661516a5a2217f14366dd15 SHA256 f592cda734a5060ac82077cb74178fbd9a9d029dcbae6fb5478b5b37319a60eb
 DIST cyrus-imapd-2.2.12.tar.gz 1961161 RMD160 ff4a95e519ea066ed9b21b515b18bdacaf0d1852 SHA1 08adc5dfde1288c0d9e7de44e7ea4d17a7940d06 SHA256 3c6f41255ba15d8b2ea78320dd5e0c98e07fe0b5c3c4b84bc20f503427bd1b7b
-DIST cyrus-imapd-2.3.1.tar.gz 2212999 RMD160 68b40b89f5558afe19886724a8bb8736139254e5 SHA1 6af81e311992a3d89c2f093f00b88ea38708c176 SHA256 79f95ed36160056f5ca60fad312fda8c6c95eafeab44f49b360b4a02790f156c
-EBUILD cyrus-imap-dev-2.2.10.ebuild 2320 RMD160 a554ce28d57cc677c8eccf3d98f0d00d5931c681 SHA1 e8bb92c4a089d71a188ee0763241b4ec749f3e38 SHA256 0f590425f85e13abdaa2df6e7b080adf59d254f511d560d0eb6069afecb640f6
-MD5 e4c2703c107e3fd6d48e0234b8741fbd cyrus-imap-dev-2.2.10.ebuild 2320
-RMD160 a554ce28d57cc677c8eccf3d98f0d00d5931c681 cyrus-imap-dev-2.2.10.ebuild 2320
-SHA256 0f590425f85e13abdaa2df6e7b080adf59d254f511d560d0eb6069afecb640f6 cyrus-imap-dev-2.2.10.ebuild 2320
-EBUILD cyrus-imap-dev-2.2.12.ebuild 2330 RMD160 1d4cd0a68370aebd45f76b75028881596c5d1853 SHA1 81dd1490a1eb7e6432e83555eb015c1db7513322 SHA256 d762d9dff7eecbcdee78ce21cb853ae6240aad22f06825f18e58a6406d5c3802
-MD5 c2fba8dded3c3a691e756bf685b6ea23 cyrus-imap-dev-2.2.12.ebuild 2330
-RMD160 1d4cd0a68370aebd45f76b75028881596c5d1853 cyrus-imap-dev-2.2.12.ebuild 2330
-SHA256 d762d9dff7eecbcdee78ce21cb853ae6240aad22f06825f18e58a6406d5c3802 cyrus-imap-dev-2.2.12.ebuild 2330
-EBUILD cyrus-imap-dev-2.3.1.ebuild 2251 RMD160 8b59aab232c46ce2ef7abb4b4541a6da75853dbe SHA1 f7a0f28ad8af038598e2134350b1470e318f68d9 SHA256 5ba579c6e7b155ee12268e0cb8fcce40b1d4d184f6703b3eda796b0fcde62930
-MD5 fab1b880a6c98e9334919f454b52f1bc cyrus-imap-dev-2.3.1.ebuild 2251
-RMD160 8b59aab232c46ce2ef7abb4b4541a6da75853dbe cyrus-imap-dev-2.3.1.ebuild 2251
-SHA256 5ba579c6e7b155ee12268e0cb8fcce40b1d4d184f6703b3eda796b0fcde62930 cyrus-imap-dev-2.3.1.ebuild 2251
-MISC ChangeLog 5510 RMD160 ed91068db53c55c573de60f4eb03a03093aca79b SHA1 3b58069123a5c5936c3783f9c449b63e81b5db79 SHA256 bc797aefa5df2956fbccb0cc764591eeeaaff5e0f3fd9b048f125f658e62e9ca
-MD5 88bc52c1d897ef616661e44793466c4b ChangeLog 5510
-RMD160 ed91068db53c55c573de60f4eb03a03093aca79b ChangeLog 5510
-SHA256 bc797aefa5df2956fbccb0cc764591eeeaaff5e0f3fd9b048f125f658e62e9ca ChangeLog 5510
+DIST cyrus-imapd-2.2.13.tar.gz 2109770 RMD160 7e8ac84b5ddd9f1206e71d5b659d07d8400f9ac2 SHA1 ba84b67a1cae4c15d5a588d010764031167970c4 SHA256 109e85b901bfcdbdd6a76d7cac83af866aa9c37a40919be7f58813319082d09c
+DIST cyrus-imapd-2.3.9.tar.gz 2272004 RMD160 c9aae3476108c0face06dfe304a136015370b166 SHA1 b95e1de87ff2c7a42d4bec87c839fe439452a79c SHA256 27e6476789788b7c72f09711103f7c4bd0136dbd33ceadd0ae2dc776a17ab437
+EBUILD cyrus-imap-dev-2.2.10.ebuild 2086 RMD160 63b302bf768c99cb57a7b413d46e20d766f2e99a SHA1 db56cb35ae4dc260ed10eaa94a6f14cec6b0af9b SHA256 1b7d53c253bd81625ed771f900fc35021d7ed23820b0bc9411592535a0dff8da
+MD5 98217a904a22bf7235a995b66361349e cyrus-imap-dev-2.2.10.ebuild 2086
+RMD160 63b302bf768c99cb57a7b413d46e20d766f2e99a cyrus-imap-dev-2.2.10.ebuild 2086
+SHA256 1b7d53c253bd81625ed771f900fc35021d7ed23820b0bc9411592535a0dff8da cyrus-imap-dev-2.2.10.ebuild 2086
+EBUILD cyrus-imap-dev-2.2.12.ebuild 2153 RMD160 804e55dda324065c7b575bf15099a609e8405384 SHA1 bc0b796466c78d196d81b3af3e29bd17660312ca SHA256 44630eeb84e0497a95f146a01e8d84ddf9e290c2e6858da593d0064b6bb09b94
+MD5 962db39b87725d39744d12ac2af4edb0 cyrus-imap-dev-2.2.12.ebuild 2153
+RMD160 804e55dda324065c7b575bf15099a609e8405384 cyrus-imap-dev-2.2.12.ebuild 2153
+SHA256 44630eeb84e0497a95f146a01e8d84ddf9e290c2e6858da593d0064b6bb09b94 cyrus-imap-dev-2.2.12.ebuild 2153
+EBUILD cyrus-imap-dev-2.2.13.ebuild 2075 RMD160 8c7d3f43c65b950f02904bb5470ab0885dc8a05e SHA1 be6e32c7ed3dfc726d53091804faef05f2634a1d SHA256 a56e362cb8c46a80e8dbe26852d975d5d714ee1eedcd61288d72a8df4f03592c
+MD5 a9f0771aeb3be7e75714bf6902466a70 cyrus-imap-dev-2.2.13.ebuild 2075
+RMD160 8c7d3f43c65b950f02904bb5470ab0885dc8a05e cyrus-imap-dev-2.2.13.ebuild 2075
+SHA256 a56e362cb8c46a80e8dbe26852d975d5d714ee1eedcd61288d72a8df4f03592c cyrus-imap-dev-2.2.13.ebuild 2075
+EBUILD cyrus-imap-dev-2.3.9.ebuild 2131 RMD160 5ca23ae3aaa6c7ef793ec6f9e8a4d8d3c3370e9d SHA1 8ce7d9df4c5d817bb19862e164396bc31274ccd2 SHA256 7fbd86263956fed2700f763054642b5789c819a8bcb933b100384037fa856dc2
+MD5 e6309c8943c0aa41119ee5c33e505ecf cyrus-imap-dev-2.3.9.ebuild 2131
+RMD160 5ca23ae3aaa6c7ef793ec6f9e8a4d8d3c3370e9d cyrus-imap-dev-2.3.9.ebuild 2131
+SHA256 7fbd86263956fed2700f763054642b5789c819a8bcb933b100384037fa856dc2 cyrus-imap-dev-2.3.9.ebuild 2131
+MISC ChangeLog 5917 RMD160 980b5a3e69fae93762a2905d593b1a28b4ecc841 SHA1 195766b2026d2f802f0e660683c3fb1881ab4f46 SHA256 9727284dfec0f725372e89ee667bab987ac2d6535bdcfd459390653d9aa025fb
+MD5 d4b5b7dbae6bf81a31fbb89cafa8c606 ChangeLog 5917
+RMD160 980b5a3e69fae93762a2905d593b1a28b4ecc841 ChangeLog 5917
+SHA256 9727284dfec0f725372e89ee667bab987ac2d6535bdcfd459390653d9aa025fb ChangeLog 5917
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
@@ -38,13 +44,9 @@ SHA256 58ffe81f7797539bbbb813b8ffec6c2aa54a79bc51207a65fbff3ea76be507b2 files/di
 MD5 8c219986e0c374c302460c7204eb96fe files/digest-cyrus-imap-dev-2.2.12 259
 RMD160 c3b34254e2030756e02decdb2593e4ebb3604994 files/digest-cyrus-imap-dev-2.2.12 259
 SHA256 ad62d41892313174ffa09db9b0f48fdbc5a1feb33e2ba0bf6d9f1b7e06ce62d5 files/digest-cyrus-imap-dev-2.2.12 259
-MD5 93d83f89eac20b8472804d5efd683085 files/digest-cyrus-imap-dev-2.3.1 256
-RMD160 638c120e1b2c594c7da309bf510cd465513a2454 files/digest-cyrus-imap-dev-2.3.1 256
-SHA256 4d61da839f65dbe4cac1298b447f92a4033ac70d94acd1e1d537af3b67a05253 files/digest-cyrus-imap-dev-2.3.1 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFnf8OAiZjviIA2XgRAhMAAJ98G4edrCuvRBvUgpqlF12OgA3xeQCghisN
-rELb7ilC+n5GScc2b1E7QTM=
-=aSQo
------END PGP SIGNATURE-----
+MD5 557d07d40c036efbbd10ef852a0b6c57 files/digest-cyrus-imap-dev-2.2.13 259
+RMD160 232835b5f24ede499731cb761b501e47d4c884be files/digest-cyrus-imap-dev-2.2.13 259
+SHA256 7afc422d893280bcc49f9e7bf45d2292f6560132160d5c7f98d35782a6167291 files/digest-cyrus-imap-dev-2.2.13 259
+MD5 ce8a6932994d83555f467857bbb5c8ed files/digest-cyrus-imap-dev-2.3.9 256
+RMD160 06eb2b84052666cdcb4ee0bf2b223234197ff20b files/digest-cyrus-imap-dev-2.3.9 256
+SHA256 aa94208b1a095eae225c35413bfe3f8f4115fc63942e96435b7d298ce9d95cb9 files/digest-cyrus-imap-dev-2.3.9 256
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