Version bump, bug #201952

(Portage version: 2.1.4_rc14)

7 files changed, 17 insertions, 114 deletions

diff --git a/dev-libs/cyrus-imap-dev/ChangeLog b/dev-libs/cyrus-imap-dev/ChangeLog
index 03f5ed4c39dd..045d65152255 100644
--- a/dev-libs/cyrus-imap-dev/ChangeLog
+++ b/dev-libs/cyrus-imap-dev/ChangeLog
@@ -1,6 +1,13 @@
 # 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.41 2007/11/16 15:17:59 beandog Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/ChangeLog,v 1.42 2008/01/02 18:48:02 dertobi123 Exp $
+
+*cyrus-imap-dev-2.3.11 (02 Jan 2008)
+
+  02 Jan 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/2.2.10-imapopts.h.patch, -cyrus-imap-dev-2.2.10.ebuild,
+  -cyrus-imap-dev-2.2.12.ebuild, +cyrus-imap-dev-2.3.11.ebuild:
+  Version bump, bug #201952
 
   16 Nov 2007; Steve Dibb <beandog@gentoo.org> cyrus-imap-dev-2.2.13.ebuild:
   amd64 stable, bug 194797
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
deleted file mode 100644
index 798a14171805..000000000000
--- a/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.12.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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.8 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
-
-	epatch "${FILESDIR}"/2.2.10-imapopts.h.patch || die "imapopts.h.patch failed"
-
-	# 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.2.10.ebuild b/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.3.11.ebuild
index 75d8c366ccef..5b17bfe28b29 100644
--- a/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.10.ebuild
+++ b/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.3.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.9 2007/09/07 18:58:27 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.3.11.ebuild,v 1.1 2008/01/02 18:48:02 dertobi123 Exp $
 
 inherit eutils autotools
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 amd64 ppc ~sparc"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~ppc64"
 IUSE="afs kerberos snmp ssl tcpd"
 
 RDEPEND="virtual/libc
@@ -38,7 +38,8 @@ src_unpack() {
 		epatch "${FILESDIR}/cyrus-imapd-libwrap.patch" || die "patch failed"
 	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"
diff --git a/dev-libs/cyrus-imap-dev/files/2.2.10-imapopts.h.patch b/dev-libs/cyrus-imap-dev/files/2.2.10-imapopts.h.patch
deleted file mode 100644
index 12357eac1047..000000000000
--- a/dev-libs/cyrus-imap-dev/files/2.2.10-imapopts.h.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- lib/imapopts.h.orig	2006-12-20 21:33:37.000000000 +0100
-+++ lib/imapopts.h	2006-12-20 21:34:08.000000000 +0100
-@@ -178,10 +178,6 @@
- 
- };
- 
--extern struct imapopt_s imapopts[];
--
--
--
- enum enum_value {
- 
-   IMAP_ENUM_ZERO = 0,
-@@ -236,5 +232,7 @@
- 
- };
- 
-+extern struct imapopt_s imapopts[];
-+
- #endif /* INCLUDED_IMAPOPTIONS_H */
- 
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
deleted file mode 100644
index 3f354c5689eb..000000000000
--- a/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.2.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f3159efa2ffb9856ab79c35c7b002184 cyrus-imapd-2.2.10.tar.gz 1946803
-RMD160 2cc1bb11af57e77ad701eac7efe85bb396ee350c cyrus-imapd-2.2.10.tar.gz 1946803
-SHA256 f592cda734a5060ac82077cb74178fbd9a9d029dcbae6fb5478b5b37319a60eb cyrus-imapd-2.2.10.tar.gz 1946803
diff --git a/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.2.12 b/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.2.12
deleted file mode 100644
index 9892eb1bb989..000000000000
--- a/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.2.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 70b3bba526a8d36d3bb23a87d37e9188 cyrus-imapd-2.2.12.tar.gz 1961161
-RMD160 ff4a95e519ea066ed9b21b515b18bdacaf0d1852 cyrus-imapd-2.2.12.tar.gz 1961161
-SHA256 3c6f41255ba15d8b2ea78320dd5e0c98e07fe0b5c3c4b84bc20f503427bd1b7b cyrus-imapd-2.2.12.tar.gz 1961161
diff --git a/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.3.11 b/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.3.11
new file mode 100644
index 000000000000..25d13e39332f
--- /dev/null
+++ b/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.3.11
@@ -0,0 +1,3 @@
+MD5 df632eb2a89e36e6296e4abd687435ed cyrus-imapd-2.3.11.tar.gz 2275173
+RMD160 34727e08cc25f3cb6e0ea0195b96de942de10f48 cyrus-imapd-2.3.11.tar.gz 2275173
+SHA256 87ce58b28ed1f8974118c02ac009377bb3de62adccd699a67f0100158106d842 cyrus-imapd-2.3.11.tar.gz 2275173