EAPI bump. Add static-libs USE flag. Fix header install.

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

3 files changed, 130 insertions, 17 deletions

diff --git a/net-libs/c-client/ChangeLog b/net-libs/c-client/ChangeLog
index 9d7f57bf056c..ae2249fd5008 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.79 2011/11/20 20:20:10 eras Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/ChangeLog,v 1.80 2012/02/20 12:38:26 eras Exp $
+
+*c-client-2007f-r1 (20 Feb 2012)
+
+  20 Feb 2012; Eray Aslan <eras@gentoo.org> +c-client-2007f-r1.ebuild:
+  EAPI bump. Add static-libs USE flag. Fix header install.
 
 *c-client-2007f (20 Nov 2011)
 
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
index 45aa9878c6e7..f065220f4faa 100644
--- a/net-libs/c-client/Manifest
+++ b/net-libs/c-client/Manifest
@@ -9,23 +9,24 @@ AUX c-client-2007e-ldflags.patch 1635 RMD160 d1b8cea2b3f555db8429d5d190cdac201a4
 DIST imap-2007e.tar.Z 2789469 RMD160 7d6af203419975f763d7ec17b6a4544c94490b50 SHA1 24c63cad8d0e74aa76e4341fcfa54d24f23a8c70 SHA256 be648d0e1aa62d564d9dbe04b77ea948116ee96ed687cb5d169c99ae28286e59
 DIST imap-2007f.tar.Z 2793529 RMD160 14f40284e9e164c0ed7677f1e5d8e3309c7c58c1 SHA1 1c9935e5a261baec85dadcbc0c514b66fa3ce0a5 SHA256 870e95f6bd19265832a88fd89b77c54c841c59022fd21e69254050c8b1005e3c
 EBUILD c-client-2007e-r2.ebuild 3368 RMD160 dd5b4a9cc565a9eada36d6640900bdd4dd38095b SHA1 465c639d7b141cafbde5db21febbcf41bc51f5b0 SHA256 61c6fd80427560b66e2cf35d193a1942b279f6a2d0c4cd0f5455e5c534ff4166
+EBUILD c-client-2007f-r1.ebuild 3149 RMD160 59af28245aaecdd51c03a4300a37701f5e58b014 SHA1 f1d323a9f7b4ade8d21a15cc2627525005b1dc10 SHA256 a3bbe252003cea0b3d4a1a66baf12886d068178344f6f0fa17d648505c866679
 EBUILD c-client-2007f.ebuild 3176 RMD160 0dd45af88a648422b95c23ac3e7b9f3c36890dcd SHA1 4db27f1a4f95d0bd35ff1ebbec3434d55e5a3d3c SHA256 5d9b5a14ed713edb01009d28e3e931ddb8b301c22073a8ceb8cfad625415777f
-MISC ChangeLog 10579 RMD160 65ff74663f889d7f6c13b9cd471af9a3ccf7eb54 SHA1 9743be21ea4fc047c5111a382d3a795ed6ba8732 SHA256 df2dde63bd141a0aa07a1b436dea45ddafc50f31fb46322277f52655a70789ba
+MISC ChangeLog 10744 RMD160 6e0a075ece0ee9d8850aa96e85381036af955c77 SHA1 be62051ba896c93c1a1dd1fecf055b1f4b298bf4 SHA256 d554cc190918b2ac6f5aa49754297f0a8dbb8801319bceb6bddbcb1834576057
 MISC metadata.xml 235 RMD160 f4321297652cea09baaafb300aeba2d8c2744e00 SHA1 ab2e8ef3058ceaabd7fbcb52b524502b8de0d6d1 SHA256 52bdb2e9321c82e6ecec49b9cbd88c0fe21bbd7135c5bf28af450620a4860f06
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOyWEAAAoJEHfx8XVYajsfamYQALNJ5wBFtP3kAYohu4BM5B7r
-fFb6pYlCYL70v4ehIqZADenOiCKe6qBA4nca+3yyVENkeqmRpQt58edflNpcrUd4
-3Sxg34w/Ol+1NgHTDhmvVAeiOhgcHfGdFFUYsgGfF5TzYSzr7xmIfLTgNHUfhr7T
-H1NqonK4oP+v/pjcteLEtUluJT/0fqu5Z+TRn7bpxW8gSO9p5b0UR/MvmENvipkD
-fzfqOr+4RHxnHgNIRF5H2Q5JAK3fsIOcXZwlKCDMBAD2xwU8o3khuwR7fe7icG1e
-q0+nhGKbB0OwT6tV80ocBfhN0Fy+foJKNtSOqp1nOZxQalc/tmd4bz7wlU4nnbRt
-l7uL2TdGACpOLTnYiPJMIlNvkFhjFEacJjtrOdfQscGXysJ/qmEtXQZBJhkr2Cqk
-fyUU7ClFjITNbHU8b8qHh3erAFWGRO80uI4m4o0HsnqoDTcKNPaW69GL7cMIlmpf
-6udYss66WJ5WP87ESwtRGtuxg08C5kbpjJB/v6JQEbdjWXatFR09fmlvE+64JgnI
-Y/3JOPmylFwKdATb5VMuQFmCo2iroH7GE73/HWl5s1Av9qao7xDKMzeHRtAVlRAI
-NmweLbb2XbQLJziGsJGlNlLnL+dcJOu1mb3H2EzC9X4BrrxLuWKBLgRalyLWBlSq
-MKvgHkF8OwyQl53iTu26
-=INYw
+iQIcBAEBCAAGBQJPQj7RAAoJEHfx8XVYajsfOG8QAKsQpPwNcQ1rQ99oGUO/hcMG
+8rO4+UfZlua1efEjAUJwcwLfj1+ct2KQK4rNM2NfWStLwbshZ+FNtjiL0YIhtItR
+OGNIc/oGAOQ4AZNrfEeO5zAjeBKujrjwEloFh2i+sd+yN+3rmn1YQw75jWx2Q6Wz
+ehylKtxhhetrWWQRy6BoRzOvl7dXhWLnnptVRJE8pFdNi4nD59+REs8+0ti5sMCI
+8utKdr9D3Nq36bI+EMLbLwSZUyqVRo37bwKQ85UzmOLc2yQpP3qnzx+vsxIh9stw
+yLLDMlUQouRQgd/x1id7+HTvmbXMxWDvXAhsmJG/K+EJ34CqmJ3ptNbYs1ZdOybi
+AET23CTywZKLK/UUydpa7u0gxnJq+6lYSzoswZkeH7YpTW3OwdjJeyiG6CeUQZ4B
+AJG1iRKrWoDhzp6LWKHGqElG4wOb6Q0Nya/hQuRZmdXQ8A514iQehe9EGxLudchn
+BdvbFIQ89CxorvVUYdMxv6ptW/4cB8aLsNH+goF+oLVaJksFRm79TVbzUUWor7fo
+NQV8zSry18kYIPLLaTHuZK/2Xko6DLRBSLRHYVQibUmV1VqLiFztvx/fSqtMJcPL
+O7IGF87McTaNlR6Orsmn26RJSelwOKCZ9MAjvFRhj0JRnuGX/v+nLs64nyE7pfhy
+nQxiBAmq76Wp4vFs9G+A
+=zqDN
 -----END PGP SIGNATURE-----
diff --git a/net-libs/c-client/c-client-2007f-r1.ebuild b/net-libs/c-client/c-client-2007f-r1.ebuild
new file mode 100644
index 000000000000..0ffeba118f5f
--- /dev/null
+++ b/net-libs/c-client/c-client-2007f-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2007f-r1.ebuild,v 1.1 2012/02/20 12:38:26 eras Exp $
+
+EAPI=4
+
+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 static-libs"
+
+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
+
+	# 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 || die
+
+	# Respect LDFLAGS
+	epatch "${FILESDIR}"/${PN}-2007e-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}"
+}
+
+src_install() {
+	if use static-libs; then
+		# Library binary
+		dolib.a c-client/c-client.a
+		dosym c-client.a /usr/$(get_libdir)/libc-client.a
+	fi
+
+	# Now the shared library
+	dolib.so c-client/libc-client.so.1.0.0
+
+	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so
+	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so.1
+
+	# Headers
+	insinto /usr/include/imap
+	doins src/osdep/unix/*.h
+	doins src/c-client/*.h
+	doins c-client/linkage.h
+	doins c-client/linkage.c
+	doins c-client/osdep.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
+}