Closing #45810.

4 files changed, 43 insertions, 12 deletions

diff --git a/net-mail/cyrus-imap-admin/ChangeLog b/net-mail/cyrus-imap-admin/ChangeLog
index 5712ebbfc68a..234f31275103 100644
--- a/net-mail/cyrus-imap-admin/ChangeLog
+++ b/net-mail/cyrus-imap-admin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/cyrus-imap-admin
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.21 2004/02/22 16:14:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.22 2004/03/30 13:17:28 aliz Exp $
+
+  30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> cyrus-imap-admin-2.2.3.ebuild,
+  files/cyrus-imap-admin-2.2.3-fPIC.patch:
+  Adding amd64 keyword. Closing #45810.
 
   22 Feb 2004; Aron Griffis <agriffis@gentoo.org>
   cyrus-imap-admin-2.1.12.ebuild, cyrus-imap-admin-2.1.13.ebuild,
diff --git a/net-mail/cyrus-imap-admin/Manifest b/net-mail/cyrus-imap-admin/Manifest
index 3ad00ee3064f..1ee6af5fba6d 100644
--- a/net-mail/cyrus-imap-admin/Manifest
+++ b/net-mail/cyrus-imap-admin/Manifest
@@ -1,14 +1,15 @@
-MD5 f1ba58247689def7f359ef72c7f07a6a ChangeLog 3201
-MD5 76c819f3857ea06baae1299356f489ac cyrus-imap-admin-2.2.3.ebuild 1862
 MD5 1592b0a8d1af2733aaaf5deaffc1ff5d cyrus-imap-admin-2.1.12.ebuild 2733
-MD5 1ca670bf57d054056b95ceda9c9cfb5b cyrus-imap-admin-2.1.13.ebuild 2751
 MD5 42ebb3f0f419edd216bf9b19e6ee109c cyrus-imap-admin-2.1.14.ebuild 3246
+MD5 1ca670bf57d054056b95ceda9c9cfb5b cyrus-imap-admin-2.1.13.ebuild 2751
+MD5 cbf0e1d1abef9c95f037188666d7b286 ChangeLog 3360
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 a73606d0350e6883a11a4c525af59551 files/digest-cyrus-imap-admin-2.1.12 71
-MD5 6678b1b72838a7ba2cb5045909ea909f files/digest-cyrus-imap-admin-2.2.3 70
+MD5 25184fc1b668517b84bec6902688a4bb cyrus-imap-admin-2.2.3.ebuild 1931
 MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imap-admin-2.1.12-libwrap.patch 494
-MD5 d63d317f0f8fa042638be86b663fffc0 files/digest-cyrus-imap-admin-2.1.13 71
-MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
+MD5 fe1bbab93ddd6cf3a9c4aacc111154d4 files/cyrus-imapd-2.2.3-db4.patch 1604
 MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
+MD5 3c48192c623e37c0e7847ba62ede8750 files/cyrus-imap-admin-2.2.3-fPIC.patch 616
+MD5 6678b1b72838a7ba2cb5045909ea909f files/digest-cyrus-imap-admin-2.2.3 70
+MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
+MD5 a73606d0350e6883a11a4c525af59551 files/digest-cyrus-imap-admin-2.1.12 71
+MD5 d63d317f0f8fa042638be86b663fffc0 files/digest-cyrus-imap-admin-2.1.13 71
 MD5 aa678d0f596367397edeea90763ab29e files/digest-cyrus-imap-admin-2.1.14 155
-MD5 fe1bbab93ddd6cf3a9c4aacc111154d4 files/cyrus-imapd-2.2.3-db4.patch 1604
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.3.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.3.ebuild
index 76efc90a5454..0040e282a0e5 100644
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.3.ebuild
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.3.ebuild,v 1.2 2004/01/30 07:04:05 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.2.3.ebuild,v 1.3 2004/03/30 13:17:28 aliz Exp $
 
-inherit perl-module eutils
+inherit perl-module eutils gnuconfig
 
 DESCRIPTION="Utilities and Perl modules to administer a Cyrus IMAP server."
 HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
@@ -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"
+KEYWORDS="~x86 ~amd64"
 IUSE="ssl kerberos"
 
 RDEPEND=">=sys-libs/db-3.2
@@ -44,9 +44,13 @@ 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
 }
 
 src_compile() {
+	gnuconfig_update
+
 	local myconf
 	myconf="${myconf} `use_with ssl openssl`"
 	myconf="${myconf} `use_with kerberos gssapi`"
diff --git a/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2.3-fPIC.patch b/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2.3-fPIC.patch
new file mode 100644
index 000000000000..51e26a94285e
--- /dev/null
+++ b/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.2.3-fPIC.patch
@@ -0,0 +1,22 @@
+--- lib/Makefile.in	2004-03-30 13:11:28.544776470 +0000
++++ lib/Makefile.in	2004-03-30 13:11:39.242146165 +0000
+@@ -114,7 +114,7 @@
+ 	done
+ 
+ .c.o:
+-	$(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
++	$(CC) -fPIC -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(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
+@@ -72,7 +72,7 @@
+ install:
+ 
+ .c.o:
+-	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
++	$(CC) -fPIC -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
+ 
+ libisieve.a: $(OBJS)
+ 	rm -f libisieve.a