Clean up FILESDIR

(Portage version: 2.1.10.3/cvs/Linux x86_64)

3 files changed, 6 insertions, 105 deletions

diff --git a/net-mail/cyrus-imap-admin/ChangeLog b/net-mail/cyrus-imap-admin/ChangeLog
index 7126fd65be7d..2d9d74c06b48 100644
--- a/net-mail/cyrus-imap-admin/ChangeLog
+++ b/net-mail/cyrus-imap-admin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/cyrus-imap-admin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.99 2011/06/21 06:23:24 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.100 2011/06/22 10:56:40 eras Exp $
+
+  22 Jun 2011; Eray Aslan <eras@gentoo.org>
+  -files/cyrus-imap-admin-2.2-fPIC.patch,
+  -files/cyrus-imap-admin-2.3.14-kolab-annotations.patch:
+  Clean up FILESDIR
 
   21 Jun 2011; Eray Aslan <eras@gentoo.org> metadata.xml:
   Maintainer changed to net-mail with dertobi123's permission
diff --git a/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2-fPIC.patch b/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2-fPIC.patch
deleted file mode 100644
index 58a235584e32..000000000000
--- a/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2-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/cyrus-imap-admin-2.3.14-kolab-annotations.patch b/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.3.14-kolab-annotations.patch
deleted file mode 100644
index 3fd0a906ae12..000000000000
--- a/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.3.14-kolab-annotations.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Allows to use arbitrary annotations with the cyradm tool.
-
-diff -r 639190be2385 doc/man/cyradm.1.html
---- a/doc/man/cyradm.1.html	Mon Oct 27 18:48:18 2008 +0100
-+++ b/doc/man/cyradm.1.html	Mon Oct 27 18:48:25 2008 +0100
-@@ -245,6 +245,13 @@
- <dd>
- <p>Sets an email address to which messages injected into the server via NNTP 
- will be sent.</p>
-+</dd>
-+</li>
-+<dt><strong><a NAME="item__2fexplicit_2fannotation"><code>/explicit/annotation</code></a></strong>
-+
-+<dd>
-+<p>Sets the annotation <em>/explicit/annotation</em>
-+on <em>mailbox</em> to <em>value</em>.</p>
- </dd>
- </li>
- <dt><strong><a name="sharedseen" class="item"><code>sharedseen</code></a></strong>
-diff -r 639190be2385 perl/imap/IMAP/Admin.pm
---- a/perl/imap/IMAP/Admin.pm	Mon Oct 27 18:48:18 2008 +0100
-+++ b/perl/imap/IMAP/Admin.pm	Mon Oct 27 18:48:26 2008 +0100
-@@ -797,11 +797,11 @@
-     return undef;
-   }
- 
--  if(!exists($values{$entry})) {
--    $self->{error} = "Unknown parameter $entry";
-+  if(exists($values{$entry})) {
-+    $entry = $values{$entry};    
-+  } else {
-+    $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/";
-   }
--
--  $entry = $values{$entry};
- 
-   my ($rc, $msg);
- 
-diff -r 639190be2385 perl/imap/IMAP/Shell.pm
---- a/perl/imap/IMAP/Shell.pm	Mon Oct 27 18:48:18 2008 +0100
-+++ b/perl/imap/IMAP/Shell.pm	Mon Oct 27 18:48:26 2008 +0100
-@@ -127,7 +127,7 @@
- 		  [\&_sc_info, '[mailbox]',
- 		   'display mailbox/server metadata'],
- 		mboxcfg =>
--		  [\&_sc_mboxcfg, 'mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value',
-+		  [\&_sc_mboxcfg, 'mailbox [comment|condstore|news2mail|expire|sieve|squat|/<explicit annotation>] value',
- 		   'configure mailbox'],
- 		mboxconfig => 'mboxcfg',
- 		reconstruct =>
-@@ -1437,7 +1437,7 @@
-   while (defined ($opt = shift(@argv))) {
-     last if $opt eq '--';
-     if ($opt =~ /^-/) {
--      die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n";
-+      die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/<explicit annotation>] value\n";
-     }
-     else {
-       push(@nargv, $opt);
-@@ -1446,7 +1446,7 @@
-   }
-   push(@nargv, @argv);
-   if (@nargv < 2) {
--    die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n";
-+    die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/<explicit annotation>] value\n";
-   }
-   if (!$cyrref || !$$cyrref) {
-     die "mboxconfig: no connection to server\n";
-diff -r 639190be2385 perl/imap/cyradm.sh
---- a/perl/imap/cyradm.sh	Mon Oct 27 18:48:18 2008 +0100
-+++ b/perl/imap/cyradm.sh	Mon Oct 27 18:48:26 2008 +0100
-@@ -241,6 +241,10 @@
- 
- Indicates that the mailbox should have a squat index created for it.
- 
-+=item C</explicit/annotation>
-+
-+Sets the annotation I</explicit/annotation> on I<mailbox> to I<value>. 
-+
- =back 
- 
- =item C<renamemailbox> [C<--partition> I<partition>] I<oldname> I<newname>