fix bug #40146, move -fPIC to all arches as it's needed for lots of fixes.

4 files changed, 94 insertions, 9 deletions

diff --git a/net-libs/c-client/ChangeLog b/net-libs/c-client/ChangeLog
index 1c714c34c8cf..b4cc23554a12 100644
--- a/net-libs/c-client/ChangeLog
+++ b/net-libs/c-client/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/c-client
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/ChangeLog,v 1.13 2004/02/02 02:45:35 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/ChangeLog,v 1.14 2004/02/06 05:53:12 robbat2 Exp $
+
+*c-client-2002e-r2 (05 Feb 2004)
+
+  05 Feb 2004; Robin H. Johnson <robbat2@gentoo.org> c-client-2002e-r2.ebuild:
+  fix bug #40146, move -fPIC to all arches as it's needed for lots of fixes.
 
   01 Jan 2004; Jon Portnoy <avenj@gentoo.org> c-client-2002e-r1.ebuild :
   AMD64 keywords.
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
index 093df24c1249..56a3f0efd83b 100644
--- a/net-libs/c-client/Manifest
+++ b/net-libs/c-client/Manifest
@@ -1,11 +1,13 @@
-MD5 da6253030632b02d59e16091e54ab20a ChangeLog 1967
-MD5 beb13e673cf0682d1e72327625dbec36 c-client-2002d-r1.ebuild 1882
-MD5 d6981efc8cd1f4734d0a5e3d01f766d3 c-client-2002d.ebuild 1865
-MD5 d3de98952f15459f4e010215147c3491 c-client-2002e-r1.ebuild 1973
-MD5 b4e2aa7133afc41b9e4822640cdc449a c-client-2002e.ebuild 1906
+MD5 2a2f8df787634f0edd268b065c7cb987 c-client-2002e-r2.ebuild 2044
+MD5 b8945f562b9c8ba6b8a992f69d8058ca c-client-2002e-r1.ebuild 1985
+MD5 f36e9cdb7d26ccadc4e1c42d94a4d391 c-client-2002e.ebuild 1905
+MD5 8b229ccfb81c59e125d7a9f86e0030d7 c-client-2002d-r1.ebuild 1881
+MD5 072346416acacf12de823f0c07a98967 ChangeLog 1966
 MD5 6b964abdc013cf2bb64040e8e33215ae metadata.xml 242
-MD5 c8cf618ac210e06a1641871b30550e8f files/2002d-Makefile.patch 2174
-MD5 1fc1132a6fb90046b701e9196e7a96b0 files/digest-c-client-2002d 62
+MD5 7611fd4e22d32670428c9fea05b6ef45 c-client-2002d.ebuild 1864
 MD5 1fc1132a6fb90046b701e9196e7a96b0 files/digest-c-client-2002d-r1 62
-MD5 27b9eec6a66d66ef07109f82da8f10ce files/digest-c-client-2002e 62
 MD5 27b9eec6a66d66ef07109f82da8f10ce files/digest-c-client-2002e-r1 62
+MD5 27b9eec6a66d66ef07109f82da8f10ce files/digest-c-client-2002e-r2 62
+MD5 1fc1132a6fb90046b701e9196e7a96b0 files/digest-c-client-2002d 62
+MD5 27b9eec6a66d66ef07109f82da8f10ce files/digest-c-client-2002e 62
+MD5 c8cf618ac210e06a1641871b30550e8f files/2002d-Makefile.patch 2174
diff --git a/net-libs/c-client/c-client-2002e-r2.ebuild b/net-libs/c-client/c-client-2002e-r2.ebuild
new file mode 100644
index 000000000000..c9137b5f66fc
--- /dev/null
+++ b/net-libs/c-client/c-client-2002e-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/02/06 05:53:12 robbat2 Exp $
+
+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 sparc ppc hppa alpha ia64 amd64"
+IUSE="ssl"
+
+PROVIDE="virtual/imap-c-client"
+RDEPEND="ssl? ( dev-libs/openssl )
+		 !virtual/imap-c-client"
+DEPEND="${RDEPEND}
+		>=sys-libs/pam-0.72"
+
+inherit flag-o-matic eutils
+
+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
+
+	# Modifications so we can build it optimially and correctly
+	sed \
+		-e "s:BASECFLAGS=\".*\":BASECFLAGS=\"${CFLAGS}\":g" \
+		-e 's:SSLDIR=/usr/local/ssl:SSLDIR=/usr:g' \
+		-e 's:SSLCERTS=$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:g' \
+		-i ${S}/src/osdep/unix/Makefile || die "Makefile sed fixing failed"
+
+	# Apply a patch to only build the stuff we need for c-client
+	EPATCH_OPTS="${EPATCH_OPTS} -d ${S}" \
+	epatch ${FILESDIR}/2002d-Makefile.patch || die "epatch failed"
+
+	# Remove the pesky checks about SSL stuff
+	sed -e '/read.*exit/d' -i ${S}/Makefile
+}
+
+src_compile() {
+	local ssltype
+	use ssl && ssltype="unix" || ssltype="none"
+	# no parallel builds supported!
+	make lnp SSLTYPE=${ssltype} || die "make failed"
+}
+
+src_install() {
+	into /usr
+
+	# Library binary
+	dolib.a c-client/c-client.a
+	dosym /usr/lib/c-client.a /usr/lib/libc-client.a
+
+	# 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 CPYRIGHT README docs/*.txt docs/CONFIG docs/RELNOTES
+
+	docinto rfc
+	dodoc docs/rfc/*.txt
+}
diff --git a/net-libs/c-client/files/digest-c-client-2002e-r2 b/net-libs/c-client/files/digest-c-client-2002e-r2
new file mode 100644
index 000000000000..cbbff9d87969
--- /dev/null
+++ b/net-libs/c-client/files/digest-c-client-2002e-r2
@@ -0,0 +1 @@
+MD5 0d246d868f20d8c441d235b77c940676 imap-2002e.tar.Z 2157511