Version bump, bug #201952

(Portage version: 2.1.4_rc14)

4 files changed, 21 insertions, 14 deletions

diff --git a/net-mail/cyrus-imap-admin/ChangeLog b/net-mail/cyrus-imap-admin/ChangeLog
index 3b93229909d1..bbc99112f081 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.61 2007/10/01 19:01:36 philantrop Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.62 2008/01/02 18:43:07 dertobi123 Exp $
+
+*cyrus-imap-admin-2.3.11 (02 Jan 2008)
+
+  02 Jan 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -cyrus-imap-admin-2.2.12-r1.ebuild, +cyrus-imap-admin-2.3.11.ebuild:
+  Version bump, bug #201952
 
   01 Oct 2007; Wulf C. Krueger <philantrop@gentoo.org>
   cyrus-imap-admin-2.2.13.ebuild:
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.12-r1.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.11.ebuild
index 5cfb2a4b866d..684fa1c99b8a 100644
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.12-r1.ebuild
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.11.ebuild
@@ -1,16 +1,17 @@
-# 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/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.12-r1.ebuild,v 1.9 2007/07/28 15:39:48 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.11.ebuild,v 1.1 2008/01/02 18:43:07 dertobi123 Exp $
 
 inherit autotools perl-app eutils
 
+PIC_PATCH_VER="2.2"
 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="~amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~hppa ~ppc64"
 IUSE="ssl kerberos"
 
 RDEPEND=">=sys-libs/db-3.2
@@ -32,16 +33,16 @@ S="${WORKDIR}/cyrus-imapd-${PV}"
 src_unpack() {
 	unpack ${A} && cd "${S}"
 
-	# When linking with rpm, you need to link with more libraries.
-	sed -e "s:lrpm:lrpm -lrpmio -lrpmdb:" -i configure || die "sed failed"
-
-	epatch "${FILESDIR}/${PN}-2.2-db45.patch"
-	epatch "${FILESDIR}/${PN}-2.2-fPIC.patch"
-	epatch "${FILESDIR}/${P}-gcc4.patch"
+	# Versioned symbols.
+	epatch "${FILESDIR}/${PN}-${PIC_PATCH_VER}-fPIC.patch"
 
 	# Recreate configure.
 	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() {
diff --git a/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.2.12-r1 b/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.2.12-r1
deleted file mode 100644
index 9892eb1bb989..000000000000
--- a/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.2.12-r1
+++ /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/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.3.11 b/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.3.11
new file mode 100644
index 000000000000..25d13e39332f
--- /dev/null
+++ b/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-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