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

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 108 insertions, 5 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/Manifest b/net-libs/libetpan/Manifest
index ab425898a2cc..545b1a2b1b5a 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libetpan-1.0-ldflags.patch 694 RMD160 0b9d96f55cb1d4bd6f1916171f25af31eb44084c SHA1 e7db87fe3c51e09afd85a64c4de61be8bff6e0e0 SHA256 9b5ff7c76fad34bbf4400e30cc22b6c9bff79450c300bfc370cac0ff52d7a492
 DIST libetpan-0.57.tar.gz 1676498 RMD160 87fbe083db76e2e04acbe2b5a82b886a5ba9d00c SHA1 7c4dfb78614c51e2ff4c9d7082b492f1c697f021 SHA256 1f3fda5c9e2961d1a6298dc8aadae321493d37727d8db45bc2e8d58f20547011
+DIST libetpan-1.0.tar.gz 1669965 RMD160 1b57288f6d31cb410435ac6088090a3fc6651038 SHA1 8c1e8753359ad0ae7e537ef304d65f80c6ff0a19 SHA256 cfe3ef67425bb5ad57c8c23a45eea1adffd3af2e7547932e8d384e3addfcd55e
 EBUILD libetpan-0.57-r1.ebuild 2326 RMD160 46cff2265aa9373035acaf261b712ffdeb14c631 SHA1 212becb2aa43ff6141a6a00ab68cffe018d7ad95 SHA256 84f955cf3b08b35b5a5eab54d051f0a5c3b7bd3a97ebed9db9e3aea798c2a0c3
 EBUILD libetpan-0.57.ebuild 1640 RMD160 7d44bd79d71ea4ff684dd699b5b664e315f0e100 SHA1 5699e244fa6283d96439271595df4d9edb77c418 SHA256 c1db9773ac0a330e56f3d889a26d3c53de29a53c624cee20314173c5dc95187b
-MISC ChangeLog 10025 RMD160 d5ff9eae3ea09b9964789809bb4e422a9f643f89 SHA1 cc036e8b68c055b992f16fa8d779caa6c4e16125 SHA256 66e386b0fc423eeada316977a8ea032e1e527c7ebe0a6591034bb17327bfab3d
+EBUILD libetpan-1.0.ebuild 2179 RMD160 204803e45610aac211ffa0a0e17abd03f76a3bf8 SHA1 bcfed887e8f7396461cdee2e36353fb40cfe0c3a SHA256 ec19805aae3daf9a6c24769aa95b624dd4024d28104870f8ee548408ae76242a
+MISC ChangeLog 10329 RMD160 0d80bdbacbbeb575af9b2c9b1a780634fc8cd120 SHA1 2fe35cf3e17aee8152f69ad64e1bf7da4c90922a SHA256 ee43605bc08edc4ee3fe61772398bb07f7e4865a3d65e1a01e138cceb667ccfc
 MISC metadata.xml 541 RMD160 da4f7052337ef5d1a353b940641a22e7d57da712 SHA1 ce75fc33983f6a12fc37461c60097db5b8643c84 SHA256 1d17d2a7d05f6c493ddec19ece7b586d4e5f7f846bdd7d2ed06a4afd2910e6c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktKIXkACgkQ+tgfDpkAy6DMNQCeNfO8FjKUDE2AjqxhpLXDBz4q
-yNEAn333qApSl7UDakndsKr/hW44hnrK
-=cVvf
+iEYEARECAAYFAkvN9XsACgkQNQqtfCuFneMfxQCfbyQg+8v/1pwblx4Jyi7qDSFq
+Wk8AnjMo7+T4MM+e3JvYgi1shQ7wKh2V
+=Vta6
 -----END PGP SIGNATURE-----
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
+}