Symlink shared library - bug #255118. Drop kolab

USE flag. QA fixes.

Package-Manager: portage-2.1.9.48/cvs/Linux x86_64

3 files changed, 134 insertions, 2 deletions

diff --git a/net-libs/c-client/ChangeLog b/net-libs/c-client/ChangeLog
index c34c30df65c4..ff50c4814c8a 100644
--- a/net-libs/c-client/ChangeLog
+++ b/net-libs/c-client/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/c-client
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/ChangeLog,v 1.65 2011/03/16 13:48:15 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/ChangeLog,v 1.66 2011/05/11 10:47:57 eras Exp $
+
+*c-client-2007e-r2 (11 May 2011)
+
+  11 May 2011; Eray Aslan <eras@gentoo.org> +c-client-2007e-r2.ebuild:
+  Symlink shared library - bug #255118. Drop kolab USE flag.
 
   16 Mar 2011; Eray Aslan <eras@gentoo.org> c-client-2007e.ebuild,
   c-client-2007e-r1.ebuild:
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
index 71191083f7e5..ef61241e5cb2 100644
--- a/net-libs/c-client/Manifest
+++ b/net-libs/c-client/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 2002d-Makefile.patch 2174 RMD160 ab95295b15a9f8cceb73a1b2431453ec1e137c0e SHA1 0e7949763126d7cb094048f187c11e249aaabddf SHA256 ff9102e5e3e1498269084ef803d73c0c21bff136b038f13ba648a4248981ca35
 AUX c-client-2006k_GENTOO_Makefile.patch 2441 RMD160 4c1fbe17eadd6dac6aa0b615757cd95b4c688d75 SHA1 4d55c0eea05605a4d42e95f0284be90dbe20ff3c SHA256 6f7bf2d23f346f0f8eed4c4ae61e5b5c95d1a12e15e7fb4192a5a723754255f8
 AUX c-client-2006k_GENTOO_amd64-so-fix.patch 665 RMD160 a2a4747dea49279f4464b99234f338a5f7faf022 SHA1 a858f66db06625a102db0db4b503c64e9a8ad5c0 SHA256 77de7621946c69638295ac11275124d0c405a4c6ba284a068f9a96c4994f3184
@@ -5,6 +8,24 @@ AUX c-client-2006k_KOLAB_Annotations.patch 14551 RMD160 932f866a70f709d980c92a37
 AUX c-client-2007e-ldflags.patch 1651 RMD160 0a810f1944f91e81c7f0aad9460f7d90be926de6 SHA1 a9b9beff9682c4515ef0d9b76d1c7bb97f44b2c1 SHA256 d51a44f180d9c65308894aafc2c332b38a46896704887936e764a7d24d394ed4
 DIST imap-2007e.tar.Z 2789469 RMD160 7d6af203419975f763d7ec17b6a4544c94490b50 SHA1 24c63cad8d0e74aa76e4341fcfa54d24f23a8c70 SHA256 be648d0e1aa62d564d9dbe04b77ea948116ee96ed687cb5d169c99ae28286e59
 EBUILD c-client-2007e-r1.ebuild 3350 RMD160 5ac3bb92d5ea20705d611656ea6ed8ef00485808 SHA1 d71e3c8992ba4032473374080b63a5abba5fb22b SHA256 20d41f0d251a85acdc6f1ead896bc615956655eb3f377233ddde5ecdbc363ece
+EBUILD c-client-2007e-r2.ebuild 3174 RMD160 7c43f78faad86fa3c2f114d3612a48182d5c8a39 SHA1 467723f60d75b9719f6e3da17823bda1b15a3924 SHA256 c874acf6c855f2c4ddca9c3039be4361358c862d089018110affa572d582c1a3
 EBUILD c-client-2007e.ebuild 3155 RMD160 2cf0e674e18462e22a2198728ba76289f7306e9e SHA1 a98a1d315768e8f1aa06d4be69cd77285a8998d1 SHA256 b75aa452fead7ee8287dad647022995e2db2309b25acdc0d5eb5f7a0f4427385
-MISC ChangeLog 8935 RMD160 16d41dab6ff1ceb8a2cf43959cbf8390bb5ad646 SHA1 a431f233b51c61d16999ce6475296e9c3fa12283 SHA256 c8dd3b92fe3437d102590b6e5345ad9ecce87c74939b37af5703cb72213d8c69
+MISC ChangeLog 9102 RMD160 6005ea9b3c6db1451f0be1fdf2a314f09b8b95d1 SHA1 6ffa65766ce1385bb6220f12910250e8637fe93c SHA256 2232683110b8057dac41d5c3b582d7edcb957a7b97566931abc110f86e2df348
 MISC metadata.xml 235 RMD160 f4321297652cea09baaafb300aeba2d8c2744e00 SHA1 ab2e8ef3058ceaabd7fbcb52b524502b8de0d6d1 SHA256 52bdb2e9321c82e6ecec49b9cbd88c0fe21bbd7135c5bf28af450620a4860f06
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNymlqAAoJEHfx8XVYajsfKX4P/jNI4GC4eQgt55ANApI6NhTc
+iETs9NlLSejUV9Kv8TXGW1P5FzQcvd9zKdvyHAp7Wh80gA/JJ9e8rk7yE/srrsfO
+l4hioOJMaJr5FEBm184Fvt7tBFwAzhUDaKW0fs8C6vl8PNX2D95V8QAf7P9/fzhK
+N//o01C+e74jdazWlrzHcvG33ws8mKosMxUHnZe+kx3U8BZkNg5kIZd/BLywHnPG
+a6NB251fSPWCPzwxIVlm13irztkYf9RzSE9IQMNOnntKBL6AuVsDioCWwWwxaSjh
+VMzT5TVkSnCeVzshgfXYgLjC4SppdnpmJ19v+NNUH3XmRA7wdqG8EH/I2oK7k2u/
+bjvWJcfvo/6kCnyPmlG2NOZ1UMWGBazIHjjlzBkXJ75bNWxJOJdHF8gSKSMQRv5q
+eC5JQb6ZNVBcOxpMwyWz9RODskHVsjxsW3L3ZJXzBnFcJ7LtN9EFd63e5ewxCSF0
+HzEClqjha40fYEe0+LntRpQPpXHQzYhhmZ255405xkRxIDu0s3cONGs532w8iQ6Z
+6HJHe7NgCOQOTKBAqgkjVfuAAe3cIozvyd9QMgiJA4f4lcgftX362t6H2rmz/+TW
+seea5d5lOd1ofIId0ZZa9f78EKfMKVWw9DSS9y3BW3xRC52QSa2LmXejDPMnhWAJ
+MCZ/ls9riBy/txeW1xRR
+=g+wI
+-----END PGP SIGNATURE-----
diff --git a/net-libs/c-client/c-client-2007e-r2.ebuild b/net-libs/c-client/c-client-2007e-r2.ebuild
new file mode 100644
index 000000000000..4570114951d0
--- /dev/null
+++ b/net-libs/c-client/c-client-2007e-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2007e-r2.ebuild,v 1.1 2011/05/11 10:47:57 eras Exp $
+
+EAPI="2"
+
+inherit flag-o-matic eutils libtool toolchain-funcs
+
+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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc kernel_linux kernel_FreeBSD pam ssl"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	!net-mail/uw-imap"
+DEPEND="${RDEPEND}
+	kernel_linux? ( pam? ( >=sys-libs/pam-0.72 ) )"
+
+src_prepare() {
+	# Tarball packed with bad file perms
+	chmod -R u+rwX,go-w .
+
+	# 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 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"
+
+	# Targets should use the Gentoo (ie linux) fs
+	sed -e '/^bsf:/,/^$/ s:ACTIVEFILE=.*:ACTIVEFILE=/var/lib/news/active:g' \
+		-i src/osdep/unix/Makefile || die "Makefile sex fixing failed for FreeBSD"
+
+	# Apply a patch to only build the stuff we need for c-client
+	epatch "${FILESDIR}"/${PN}-2006k_GENTOO_Makefile.patch || die "epatch failed"
+
+	# Apply patch to add the compilation of a .so for PHP
+	# This was previously conditional, but is more widely useful.
+	epatch "${FILESDIR}"/${PN}-2006k_GENTOO_amd64-so-fix.patch
+
+	# Remove the pesky checks about SSL stuff
+	sed -e '/read.*exit/d' -i Makefile
+
+	# Respect LDFLAGS
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	sed -e "s/CC=cc/CC=$(tc-getCC)/" \
+		-e "s/ARRC=ar/ARRC=$(tc-getAR)/" \
+		-e "s/RANLIB=ranlib/RANLIB=$(tc-getRANLIB)/" \
+		-i src/osdep/unix/Makefile || die "Respecting build flags"
+
+	elibtoolize
+}
+
+src_compile() {
+	local ssltype target
+	use ssl && ssltype="unix" || ssltype="none"
+	if use kernel_linux ; then
+		use pam && target=lnp || target=lnx
+	elif use kernel_FreeBSD ; then
+		target=bsf
+	fi
+	# no parallel builds supported!
+	emake -j1 SSLTYPE=${ssltype} $target EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="${LDFLAGS}" || die "make failed"
+}
+
+src_install() {
+	# Library binary
+	dolib.a c-client/c-client.a || die
+	dosym c-client.a /usr/$(get_libdir)/libc-client.a
+
+	# Now the shared library
+	dolib.so c-client/libc-client.so.1.0.0 || die
+
+	cd "${D}"/usr/$(get_libdir)
+	ln -s libc-client.so.1.0.0 libc-client.so.1
+	ln -s libc-client.so.1.0.0 libc-client.so
+	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/BUILD docs/CONFIG docs/RELNOTES docs/SSLBUILD
+	if use doc; then
+		docinto rfc
+		dodoc docs/rfc/*.txt
+		docinto draft
+		dodoc docs/draft/*
+	fi
+}