11 files changed, 157 insertions, 25 deletions
diff --git a/net-libs/c-client/ChangeLog b/net-libs/c-client/ChangeLog
index 66f72f4c3820..152a3634811e 100644
--- a/net-libs/c-client/ChangeLog
+++ b/net-libs/c-client/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/c-client
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/ChangeLog,v 1.19 2004/11/03 06:31:55 psi29a Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/ChangeLog,v 1.20 2005/02/01 15:33:05 cryos Exp $
+
+*c-client-2004a-r1 (01 Feb 2005)
+
+  01 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/c-client-2004a-amd64-so-fix.patch, +c-client-2004a-r1.ebuild:
+  Patched Makefile to build a shared library for amd64, allowing PHP 5 with imap
+  to compile. Also fixed the symlinking of c-client.a for multilib archs.
 
   03 Nov 2004; Bret Curtis <psi29a@gentoo.org> :
   Addeing to ~mips for testing
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
index 7e22ce0801e0..39bd99315fa6 100644
--- a/net-libs/c-client/Manifest
+++ b/net-libs/c-client/Manifest
@@ -1,15 +1,28 @@
-MD5 44079b46669e8e96f2b7bd1f5149b82a ChangeLog 2542
-MD5 9cf6c167a8006a1b40e857e863e082df c-client-2002d.ebuild 1855
-MD5 16d735011ca6e1fba4e704b9a9e17637 c-client-2002e.ebuild 1896
-MD5 edc992cc694f676c505dd1b67ba08fed c-client-2004a.ebuild 2183
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e7bce4b8478b1128e86efb8bf43a7d08 c-client-2002e-r2.ebuild 2039
+MD5 1f17131717d381fea23ce8a065acf1a2 c-client-2004a.ebuild 2182
+MD5 81f0f9656a107854fa3ddf25217525a6 c-client-2002e-r1.ebuild 1974
+MD5 5fb5acd5c2e0b78dbaca4aa75cb36b74 c-client-2002e.ebuild 1893
+MD5 47ac744573c05e8e5c5dc6b471bde3fa c-client-2002d-r1.ebuild 1869
+MD5 4f41fccb86faf1807f69e9e7695866a8 c-client-2004a-r1.ebuild 2589
+MD5 63e9e9e6c33eb4037c6357e7686273fa ChangeLog 2854
 MD5 6b964abdc013cf2bb64040e8e33215ae metadata.xml 242
-MD5 15c2baad3ad73ff964dbcbc021aa4e1d c-client-2002d-r1.ebuild 1872
-MD5 a5b3bc4a1a6c7920f7e9db3fc87e54d8 c-client-2002e-r1.ebuild 1977
-MD5 e33976d27203c3df41d14113cd0a4ea5 c-client-2002e-r2.ebuild 2039
-MD5 c8cf618ac210e06a1641871b30550e8f files/2002d-Makefile.patch 2174
-MD5 1fc1132a6fb90046b701e9196e7a96b0 files/digest-c-client-2002d 62
-MD5 27b9eec6a66d66ef07109f82da8f10ce files/digest-c-client-2002e 62
-MD5 86da98c03bc68723a437d2cf135b0775 files/digest-c-client-2004a 62
+MD5 cc926ec2e710759c314acd92cd84b770 c-client-2002d.ebuild 1853
 MD5 1fc1132a6fb90046b701e9196e7a96b0 files/digest-c-client-2002d-r1 62
 MD5 27b9eec6a66d66ef07109f82da8f10ce files/digest-c-client-2002e-r1 62
 MD5 27b9eec6a66d66ef07109f82da8f10ce files/digest-c-client-2002e-r2 62
+MD5 86da98c03bc68723a437d2cf135b0775 files/digest-c-client-2004a-r1 62
+MD5 1fc1132a6fb90046b701e9196e7a96b0 files/digest-c-client-2002d 62
+MD5 27b9eec6a66d66ef07109f82da8f10ce files/digest-c-client-2002e 62
+MD5 86da98c03bc68723a437d2cf135b0775 files/digest-c-client-2004a 62
+MD5 cde23dc2375a8c33998202c8f0c9ae0e files/c-client-2004a-amd64-so-fix.patch 675
+MD5 c8cf618ac210e06a1641871b30550e8f files/2002d-Makefile.patch 2174
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFB/6FantT9W3vfTuoRAp14AJ0SOOF+lhPM3QRN78JdZbKe17//9QCgqi8W
+mfROganeUfuEVVxlAp+9s9w=
+=hpbO
+-----END PGP SIGNATURE-----
diff --git a/net-libs/c-client/c-client-2002d-r1.ebuild b/net-libs/c-client/c-client-2002d-r1.ebuild
index 677d2e74a075..bca28a5e8505 100644
--- a/net-libs/c-client/c-client-2002d-r1.ebuild
+++ b/net-libs/c-client/c-client-2002d-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002d-r1.ebuild,v 1.7 2004/06/24 23:10:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002d-r1.ebuild,v 1.8 2005/02/01 15:33:05 cryos Exp $
 
 inherit flag-o-matic
 
diff --git a/net-libs/c-client/c-client-2002d.ebuild b/net-libs/c-client/c-client-2002d.ebuild
index ec7c5642cc14..fbf648bb8f6e 100644
--- a/net-libs/c-client/c-client-2002d.ebuild
+++ b/net-libs/c-client/c-client-2002d.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002d.ebuild,v 1.9 2004/06/24 23:10:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002d.ebuild,v 1.10 2005/02/01 15:33:05 cryos Exp $
 
 inherit flag-o-matic
 
diff --git a/net-libs/c-client/c-client-2002e-r1.ebuild b/net-libs/c-client/c-client-2002e-r1.ebuild
index b1c16142f6f4..84193d7de07c 100644
--- a/net-libs/c-client/c-client-2002e-r1.ebuild
+++ b/net-libs/c-client/c-client-2002e-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002e-r1.ebuild,v 1.7 2004/06/24 23:10:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002e-r1.ebuild,v 1.8 2005/02/01 15:33:05 cryos Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/net-libs/c-client/c-client-2002e-r2.ebuild b/net-libs/c-client/c-client-2002e-r2.ebuild
index 24a522efc548..60918cf7cb45 100644
--- a/net-libs/c-client/c-client-2002e-r2.ebuild
+++ b/net-libs/c-client/c-client-2002e-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002e-r2.ebuild,v 1.6 2004/08/19 03:38:56 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002e-r2.ebuild,v 1.7 2005/02/01 15:33:05 cryos Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/net-libs/c-client/c-client-2002e.ebuild b/net-libs/c-client/c-client-2002e.ebuild
index 21501737d2bc..86fd99f304d1 100644
--- a/net-libs/c-client/c-client-2002e.ebuild
+++ b/net-libs/c-client/c-client-2002e.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002e.ebuild,v 1.4 2004/06/24 23:10:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002e.ebuild,v 1.5 2005/02/01 15:33:05 cryos Exp $
 
 inherit flag-o-matic
 
diff --git a/net-libs/c-client/c-client-2004a-r1.ebuild b/net-libs/c-client/c-client-2004a-r1.ebuild
new file mode 100644
index 000000000000..6b7c20df66b7
--- /dev/null
+++ b/net-libs/c-client/c-client-2004a-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2004a-r1.ebuild,v 1.1 2005/02/01 15:33:05 cryos Exp $
+
+inherit flag-o-matic eutils libtool
+
+MY_PN=imap
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="UW IMAP c-client library"
+HOMEPAGE="http://www.washington.edu/imap/"
+SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64 ~mips"
+IUSE="ssl pam"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	 !virtual/imap-c-client"
+DEPEND="${RDEPEND}
+	pam? ( >=sys-libs/pam-0.72 )"
+PROVIDE="virtual/imap-c-client"
+
+src_unpack() {
+	unpack ${A}
+
+	# Tarball packed with bad file perms
+	chmod -R ug+w ${S}
+
+	# lots of things need -fPIC, including various platforms, and this library
+	# generally should be built with it anyway.
+	append-flags -fPIC
+
+	cd ${S}
+
+	# Modifications so we can build it optimally and correctly
+	sed \
+		-e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
+		-e 's:SSLDIR=/usr/local/ssl:SSLDIR=/usr:g' \
+		-e 's:SSLCERTS=$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:g' \
+		-i src/osdep/unix/Makefile || die "Makefile sed fixing failed"
+
+	# Apply a patch to only build the stuff we need for c-client
+	epatch ${FILESDIR}/2002d-Makefile.patch || die "epatch failed"
+
+	# Apply this patch conditionally - it adds the compilation of a .so for PHP
+	# on the amd64 platform.
+	use amd64 && epatch ${FILESDIR}/${P}-amd64-so-fix.patch
+
+	# Remove the pesky checks about SSL stuff
+	sed -e '/read.*exit/d' -i Makefile
+	elibtoolize
+	uclibctoolize
+}
+
+src_compile() {
+	local ssltype
+	use ssl && ssltype="unix" || ssltype="none"
+	# no parallel builds supported!
+	if use pam ; then
+		make lnp SSLTYPE=${ssltype} EXTRACFLAGS="${CFLAGS}" || die "make failed"
+	else
+		make lnx SSLTYPE=${ssltype} EXTRACFLAGS="${CFLAGS}" || die "make failed"
+	fi
+}
+
+src_install() {
+	into /usr
+
+	# Library binary
+	dolib.a c-client/c-client.a
+	dosym /usr/$(get_libdir)/c-client.a /usr/$(get_libdir)/libc-client.a
+
+	# Now the shared library created for amd64
+	if use amd64; then
+		dolib.so c-client/libc-client.so*
+		cd ${D}/usr/$(get_libdir)
+		ln -s libc-client.so.1.0.0 libc-client.so.1
+		ln -s libc-client.so.1 libc-client.so
+	fi
+
+	cd ${S}
+
+	# Headers
+	insinto /usr/include/imap
+	doins c-client/*.h
+	doins c-client/linkage.c
+	#exclude these dupes (can't do it before now due to symlink hell)
+	rm ${D}/usr/include/imap/os_*.h
+
+	# Docs
+	dodoc README docs/*.txt docs/CONFIG docs/RELNOTES
+
+	docinto rfc
+	dodoc docs/rfc/*.txt
+}
diff --git a/net-libs/c-client/c-client-2004a.ebuild b/net-libs/c-client/c-client-2004a.ebuild
index 116a174b745e..cd99bfcb0abb 100644
--- a/net-libs/c-client/c-client-2004a.ebuild
+++ b/net-libs/c-client/c-client-2004a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2004a.ebuild,v 1.2 2004/11/03 06:31:55 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2004a.ebuild,v 1.3 2005/02/01 15:33:05 cryos Exp $
 
 inherit flag-o-matic eutils libtool
 
diff --git a/net-libs/c-client/files/c-client-2004a-amd64-so-fix.patch b/net-libs/c-client/files/c-client-2004a-amd64-so-fix.patch
new file mode 100644
index 000000000000..1400fc254c6d
--- /dev/null
+++ b/net-libs/c-client/files/c-client-2004a-amd64-so-fix.patch
@@ -0,0 +1,13 @@
+diff -ruN src/osdep/unix/Makefile src/osdep/unix/Makefile
+--- src/osdep/unix/Makefile	2005-01-29 22:43:25.739341544 +0000
++++ src/osdep/unix/Makefile	2005-01-29 22:43:50.375596264 +0000
+@@ -912,6 +912,9 @@
+ 	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
+ 	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
+ 	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
++	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
++	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
++	 >> ARCHIVE
+ 	echo $(OS) > OSTYPE
+ 	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
+ 	./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
diff --git a/net-libs/c-client/files/digest-c-client-2004a-r1 b/net-libs/c-client/files/digest-c-client-2004a-r1
new file mode 100644
index 000000000000..158d1b2e7ab5
--- /dev/null
+++ b/net-libs/c-client/files/digest-c-client-2004a-r1
@@ -0,0 +1 @@
+MD5 34d2c66271302cd2f926094fb5e8705d imap-2004a.tar.Z 2224181