version bump for bug 313097, also fixes respect of LDFLAGS as reported with patch from Kacper Kowalik <xarthisius DOT kk AT gmail DOT com> in bug 310167

(Portage version: 2.1.8.3/cvs/Linux i686)

3 files changed, 101 insertions, 1 deletions

diff --git a/net-libs/libetpan/ChangeLog b/net-libs/libetpan/ChangeLog
index b9501b1c773e..6f84024a85a4 100644
--- a/net-libs/libetpan/ChangeLog
+++ b/net-libs/libetpan/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/libetpan
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libetpan/ChangeLog,v 1.81 2010/01/10 18:50:26 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libetpan/ChangeLog,v 1.82 2010/04/20 18:41:57 fauli Exp $
+
+*libetpan-1.0 (20 Apr 2010)
+
+  20 Apr 2010; Christian Faulhammer <fauli@gentoo.org> +libetpan-1.0.ebuild,
+  +files/libetpan-1.0-ldflags.patch:
+  version bump for bug 313097, also fixes respect of LDFLAGS as reported
+  with patch from Kacper Kowalik <xarthisius DOT kk AT gmail DOT com> in bug
+  310167
 
   10 Jan 2010; Alex Legler <a3li@gentoo.org> libetpan-0.57-r1.ebuild:
   Keyword ~x86-macos
diff --git a/net-libs/libetpan/files/libetpan-1.0-ldflags.patch b/net-libs/libetpan/files/libetpan-1.0-ldflags.patch
new file mode 100644
index 000000000000..215128283f35
--- /dev/null
+++ b/net-libs/libetpan/files/libetpan-1.0-ldflags.patch
@@ -0,0 +1,18 @@
+--- configure.ac.orig	2010-04-20 20:29:01.136283062 +0200
++++ configure.ac	2010-04-20 20:29:45.884283632 +0200
+@@ -455,11 +455,11 @@
+   for flag in "pthreads" "pthread"; do
+     if test "x$checkpthread" = "xyes"; then
+       AC_MSG_CHECKING([for pthread_create with -$flag])
+-      OLDFLAGS="$LDFLAGS"
+-      LDFLAGS="-$flag $LDFLAGS"
+-      AC_TRY_LINK([], [pthread_create();], 
++       OLDLIBS="$LIBS"
++       LIBS="$LIBS -l$flag"
++       AC_TRY_LINK([], [pthread_create();], 
+                       [pthflag=yes; checkpthread=no], 
+-                      [pthflag=no; LDFLAGS="$OLDFLAGS"])
++                      [pthflag=no; LIBS="$OLDLIBS"])
+       AC_MSG_RESULT($pthflag)
+     fi
+   done
diff --git a/net-libs/libetpan/libetpan-1.0.ebuild b/net-libs/libetpan/libetpan-1.0.ebuild
new file mode 100644
index 000000000000..401f319435d4
--- /dev/null
+++ b/net-libs/libetpan/libetpan-1.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libetpan/libetpan-1.0.ebuild,v 1.1 2010/04/20 18:41:57 fauli Exp $
+
+EAPI="2"
+
+inherit autotools eutils
+
+DESCRIPTION="A portable, efficient middleware for different kinds of mail access."
+HOMEPAGE="http://libetpan.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="berkdb debug gnutls ipv6 liblockfile sasl ssl"
+
+DEPEND="berkdb? ( sys-libs/db )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( ssl? ( dev-libs/openssl ) )
+	sasl? ( dev-libs/cyrus-sasl )
+	liblockfile? ( net-libs/liblockfile )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	eautoreconf
+}
+
+src_configure() {
+	local sslconf
+
+	if use ssl; then
+		if use gnutls; then
+			sslconf="--with-gnutls --without-openssl"
+		else
+			sslconf="--without-gnutls --with-openssl"
+		fi
+	else
+		if use gnutls; then
+			sslconf="--with-gnutls --without-openssl"
+		else
+			sslconf="--without-gnutls --without-openssl"
+		fi
+	fi
+
+	# in Prefix emake uses SHELL=${BASH}, export CONFIG_SHELL to the same so
+	# libtool recognises it as valid shell (bug #300211)
+	use prefix && export CONFIG_SHELL=${BASH}
+	# The configure script contains an error, in that it doesn't check the
+	# argument of --enable-{debug,optim}, hence --disable-debug results in
+	# --enable-debug=no, which isn't checked and debugging flags are blindly
+	# injected.  So, avoid passing --disable-debug when we don't need it.
+	econf \
+		$(use debug && echo --enable-debug) \
+		$(use_enable berkdb db) \
+		$(use_with sasl) \
+		$(use_enable ipv6) \
+		$(use_enable liblockfile lockfile) \
+		${sslconf} \
+		|| die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc NEWS ChangeLog || die
+}
+
+pkg_postinst() {
+	echo
+	ewarn "The soname for libetpan has changed after libetpan-1.0."
+	ewarn "If you have upgraded from that or earlier version, it is recommended to run"
+	ewarn "revdep-rebuild to fix any linking errors caused by this change."
+	echo
+}