Cleanup, Version bump (Bug #133187), add myself as maintainer

(Portage version: 2.1.3_rc8)

11 files changed, 54 insertions, 109 deletions

diff --git a/net-mail/cyrus-imap-admin/ChangeLog b/net-mail/cyrus-imap-admin/ChangeLog
index 290e62c54f6d..8d7a93c6e998 100644
--- a/net-mail/cyrus-imap-admin/ChangeLog
+++ b/net-mail/cyrus-imap-admin/ChangeLog
@@ -1,6 +1,17 @@
 # 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.50 2007/02/22 01:40:53 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.51 2007/07/21 17:27:10 dertobi123 Exp $
+
+*cyrus-imap-admin-2.2.13 (21 Jul 2007)
+
+  21 Jul 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/cyrus-imap-admin-2.2.10-fPIC.patch,
+  +files/cyrus-imap-admin-2.2-db45.patch,
+  -files/cyrus-imap-admin-2.2.12-fPIC.patch,
+  +files/cyrus-imap-admin-2.2-fPIC.patch, metadata.xml,
+  -cyrus-imap-admin-2.2.10.ebuild, -cyrus-imap-admin-2.2.12.ebuild,
+  cyrus-imap-admin-2.2.12-r1.ebuild, +cyrus-imap-admin-2.2.13.ebuild:
+  Cleanup, Version bump (Bug #133187), add myself as maintainer
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.10.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.10.ebuild
deleted file mode 100644
index 9a1e3e824de4..000000000000
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.10.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2007 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.10.ebuild,v 1.9 2007/01/05 08:55:01 flameeyes Exp $
-
-inherit perl-app eutils
-
-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 sparc x86"
-IUSE="ssl kerberos"
-
-RDEPEND=">=sys-libs/db-3.2
-	>=dev-lang/perl-5.6.1
-	>=dev-libs/cyrus-sasl-2.1.13
-	dev-perl/Term-ReadLine-Perl
-	dev-perl/TermReadKey
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	kerberos? ( virtual/krb5 )"
-
-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}"
-
-	# DB4 detection and versioned symbols.
-	#epatch "${FILESDIR}/cyrus-imapd-${PV}-db4.patch"
-
-	# Recreate configure.
-	export WANT_AUTOCONF="2.5"
-	ebegin "Recreating configure"
-	rm -rf configure config.h.in autom4te.cache
-	sh SMakefile &>/dev/null || die "SMakefile failed"
-	eend $?
-
-	# 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}/${P}-fPIC.patch
-}
-
-src_compile() {
-
-	local myconf
-	myconf="${myconf} `use_with ssl openssl`"
-	myconf="${myconf} `use_with kerberos gssapi`"
-
-	econf \
-		--disable-server \
-		--enable-murder \
-		--enable-listext \
-		--enable-netscapehack \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-auth=unix  \
-		--with-perl=/usr/bin/perl \
-		--enable-cyradm \
-		${myconf} || die "econf failed"
-
-	emake -C "${S}/lib" all || die "compile problem"
-	emake -C "${S}/perl" all || die "compile problem"
-}
-
-src_install () {
-	make -C "${S}/perl" DESTDIR="${D}" install || die "install problem"
-}
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.2.12-r1.ebuild
index 93db80529c4a..af9f7872284c 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.2.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.7 2007/01/05 08:55:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.12-r1.ebuild,v 1.8 2007/07/21 17:27:10 dertobi123 Exp $
 
 inherit perl-app eutils
 
@@ -45,7 +45,8 @@ src_unpack() {
 	# 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}/${P}-fPIC.patch"
+	epatch "${FILESDIR}/${PN}-2.2-db45.patch"
+	epatch "${FILESDIR}/${PN}-2.2-fPIC.patch"
 	epatch "${FILESDIR}/${P}-gcc4.patch"
 }
 
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.12.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.13.ebuild
index 906cf394ed6d..28039a6e56ee 100644
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.12.ebuild
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.ebuild,v 1.6 2007/01/05 08:55:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.13.ebuild,v 1.1 2007/07/21 17:27:10 dertobi123 Exp $
 
 inherit perl-app eutils
 
@@ -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 ~sparc ~ppc ~hppa ppc64"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ssl kerberos"
 
 RDEPEND=">=sys-libs/db-3.2
@@ -45,7 +45,8 @@ src_unpack() {
 	# 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}/${P}-fPIC.patch
+	epatch "${FILESDIR}/${PN}-2.2-db45.patch"
+	epatch "${FILESDIR}/${PN}-2.2-fPIC.patch"
 }
 
 src_compile() {
diff --git a/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2-db45.patch b/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2-db45.patch
new file mode 100644
index 000000000000..c92f957953c8
--- /dev/null
+++ b/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-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/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2.10-fPIC.patch b/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2-fPIC.patch
index 58a235584e32..58a235584e32 100644
--- a/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2.10-fPIC.patch
+++ b/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2-fPIC.patch
diff --git a/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2.12-fPIC.patch b/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2.12-fPIC.patch
deleted file mode 100644
index 58a235584e32..000000000000
--- a/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2.12-fPIC.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib/Makefile.in	2004-03-30 13:11:28.544776470 +0000
-+++ lib/Makefile.in	2004-03-30 13:11:39.242146165 +0000
-@@ -118,7 +118,7 @@
- 	done
- 
- .c.o:
--	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
-+	$(CC) -fPIC -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
- 	$<
- 
- libcyrus.a: $(LIBCYR_OBJS)
---- perl/sieve/lib/Makefile.in	2004-03-30 13:14:38.087172803 +0000
-+++ perl/sieve/lib/Makefile.in	2004-03-30 13:14:47.295908694 +0000
-@@ -74,7 +74,7 @@
- install:
- 
- .c.o:
--	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
-+	$(CC) -fPIC -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
- 
- libisieve.a: $(OBJS)
- 	rm -f libisieve.a
diff --git a/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.2.10 b/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.2.10
deleted file mode 100644
index 3f354c5689eb..000000000000
--- a/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-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/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.2.12 b/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.2.12
deleted file mode 100644
index 9892eb1bb989..000000000000
--- a/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-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/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.2.13 b/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.2.13
new file mode 100644
index 000000000000..af50da4aeb5a
--- /dev/null
+++ b/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-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/net-mail/cyrus-imap-admin/metadata.xml b/net-mail/cyrus-imap-admin/metadata.xml
index 51f94e3fbe0e..0feff246ee31 100644
--- a/net-mail/cyrus-imap-admin/metadata.xml
+++ b/net-mail/cyrus-imap-admin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<maintainer>
+  <email>dertobi123@gentoo.org</email>
+</maintainer>
 <herd>net-mail</herd>
 </pkgmetadata>