stable 2.2.10, remove old version.

6 files changed, 11 insertions, 46 deletions

diff --git a/dev-libs/cyrus-imap-dev/ChangeLog b/dev-libs/cyrus-imap-dev/ChangeLog
index e77d8c2f53bd..0d8512aaed8e 100644
--- a/dev-libs/cyrus-imap-dev/ChangeLog
+++ b/dev-libs/cyrus-imap-dev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/cyrus-imap-dev
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/ChangeLog,v 1.25 2004/10/29 23:29:41 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/ChangeLog,v 1.26 2004/11/24 17:30:00 langthang Exp $
+
+  24 Nov 2004; Tuan Van <langthang@gentoo.org>
+  -files/cyrus-imapd-2.2.8-db4.patch, -cyrus-imap-dev-2.2.8.ebuild:
+  stable 2.2.10, remove old version.
 
   29 Oct 2004; Tuan Van <langthang@gentoo.org> -files/2.1.14-db4.patch,
   -files/cyrus-imap-dev-2.1.12-libwrap.patch,
diff --git a/dev-libs/cyrus-imap-dev/Manifest b/dev-libs/cyrus-imap-dev/Manifest
index a923c6aa5d79..1d504b3b481a 100644
--- a/dev-libs/cyrus-imap-dev/Manifest
+++ b/dev-libs/cyrus-imap-dev/Manifest
@@ -1,16 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5f66346eaba6442a0f480ed61f2a5563 ChangeLog 4055
-MD5 dbdd229f17b9aa32ab1e8d10135d7827 cyrus-imap-dev-2.2.8.ebuild 2254
+MD5 32423d335602a83284511a5ed7523d3b cyrus-imap-dev-2.2.10.ebuild 2255
+MD5 11b4d74e81e71dbccce3f288716a2d6f ChangeLog 4208
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 6453c70342b78c99a073a06292b7e757 files/digest-cyrus-imap-dev-2.2.8 70
-MD5 fe1bbab93ddd6cf3a9c4aacc111154d4 files/cyrus-imapd-2.2.8-db4.patch 1604
+MD5 5a1c49cf6018aa400e8836ee03238140 files/digest-cyrus-imap-dev-2.2.10 71
 MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imapd-libwrap.patch 494
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBgtJw5FrxP71izLARAoaaAJ9Mf/PPbAQi8xuBCJwHtZVdvycTIACgzAan
-nkK3Hxql6E0p7ob/HjBWAyc=
-=YDlY
------END PGP SIGNATURE-----
diff --git a/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.8.ebuild b/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.10.ebuild
index 70758a1afc83..6d32836fca92 100644
--- a/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.8.ebuild
+++ b/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.8.ebuild,v 1.4 2004/10/29 20:50:23 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.10.ebuild,v 1.1 2004/11/24 17:30:00 langthang Exp $
 
 inherit eutils gnuconfig
 
@@ -39,7 +39,7 @@ src_unpack() {
 	fi
 
 	# DB4 detection and versioned symbols.
-	epatch "${FILESDIR}/cyrus-imapd-${PV}-db4.patch" || die "patch failed."
+	#epatch "${FILESDIR}/cyrus-imapd-${PV}-db4.patch" || die "patch failed."
 
 	# Recreate configure.
 	export WANT_AUTOCONF="2.5"
diff --git a/dev-libs/cyrus-imap-dev/files/cyrus-imapd-2.2.8-db4.patch b/dev-libs/cyrus-imap-dev/files/cyrus-imapd-2.2.8-db4.patch
deleted file mode 100644
index ace2f28ea8e1..000000000000
--- a/dev-libs/cyrus-imap-dev/files/cyrus-imapd-2.2.8-db4.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.2.10 b/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.2.10
new file mode 100644
index 000000000000..0afa5f0cc941
--- /dev/null
+++ b/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.2.10
@@ -0,0 +1 @@
+MD5 f3159efa2ffb9856ab79c35c7b002184 cyrus-imapd-2.2.10.tar.gz 1946803
diff --git a/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.2.8 b/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.2.8
deleted file mode 100644
index 71e992ff60ac..000000000000
--- a/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.2.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7e6cb571e1d9b648725aa579077f6f8d cyrus-imapd-2.2.8.tar.gz 1937828