--- /usr/portage/net-libs/c-client/c-client-2004a.ebuild	2004-11-03 06:36:57.000000000 +0000
+++ /usr/local/portage/net-libs/c-client/c-client-2004a.ebuild	2005-01-29 23:17:43.000000000 +0000
@@ -33,7 +33,7 @@
 	# generally should be built with it anyway.
 	append-flags -fPIC
 
-	# Modifications so we can build it optimially and correctly
+	# Modifications so we can build it optimally and correctly
 	sed \
 		-e "s:BASECFLAGS=\".*\":BASECFLAGS=\"${CFLAGS}\":g" \
 		-e 's:SSLDIR=/usr/local/ssl:SSLDIR=/usr:g' \
@@ -44,6 +44,10 @@
 	EPATCH_OPTS="${EPATCH_OPTS} -d ${S}" \
 	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 ${S}/Makefile
 	elibtoolize
@@ -66,8 +70,18 @@
 
 	# Library binary
 	dolib.a c-client/c-client.a
-	dosym /usr/lib/c-client.a /usr/lib/libc-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 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