[gentoo-commits] repo/gentoo:master commit in: net-libs/libetpan/files/, net-libs/libetpan/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     688ff0a0502de09115e883dc1a551ab6da13ae23
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  5 15:56:55 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Nov  5 15:56:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=688ff0a0

net-libs/libetpan: Bump to version 1.9.4

Attempt to fix berkdb detection

Bug: https://bugs.gentoo.org/519846
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-libs/libetpan/Manifest                         |  1 +
 .../files/libetpan-1.9.4-berkdb_lookup.patch       | 28 ++++++++
 .../libetpan-1.9.4-pkgconfig_file_no_ldflags.patch | 24 +++++++
 net-libs/libetpan/libetpan-1.9.4.ebuild            | 77 ++++++++++++++++++++++
 4 files changed, 130 insertions(+)

diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
index f27bf806618..d37beb8e3f4 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -1 +1,2 @@
 DIST libetpan-1.9.3.tar.gz 5000049 BLAKE2B 1664d93b112410a86935438aae5ff40202a9c10675701d40b60edf81e4f8bac45fb1f407e03714a37465c41a22c1b9fcbbc517d76dc47f812e154c932e05e600 SHA512 66e504fbf82445819845a3f1dcb8dc48ad2440993134d43752c754463cee2434a30080718687cd05c579f0da8df6b0f6dfc7572f2882d0dd9dfd327b4ae11fd6
+DIST libetpan-1.9.4.tar.gz 5000025 BLAKE2B dd98169134b7448d3dd129814d8011a3fa915b16f4763344230a89d02626b64ddea57495b4c21fd8f651164c36c95ad98ee9db073273b230e6af403b845aa681 SHA512 7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f

diff --git a/net-libs/libetpan/files/libetpan-1.9.4-berkdb_lookup.patch b/net-libs/libetpan/files/libetpan-1.9.4-berkdb_lookup.patch
new file mode 100644
index 00000000000..cfe0e8b5dc8
--- /dev/null
+++ b/net-libs/libetpan/files/libetpan-1.9.4-berkdb_lookup.patch
@@ -0,0 +1,28 @@
+From 1978a0d16bf7f14b863b208d55699b9f46918b7c Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 5 Nov 2019 16:31:53 +0100
+Subject: [PATCH] configure.ac: Only check reasonable berkdb versions
+
+https://bugs.gentoo.org/519846
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 542f3bb..8f1edba 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -414,7 +414,7 @@ dnl Look for db3 or superior with db_create call
+   case "$DBVERS" in
+     3)
+     AC_MSG_RESULT([version 3.x or above])
+-    for lib in db-6.0 db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db-3.2 db-3 db3 db; do
++    for lib in db-6.2 db-6.1 db-6.0 db-5.3 db-5.1 db-5.0 db-4.8 db; do
+       if test "x$DBLINKED" = "x0"; then
+ dnl        AC_CHECK_LIB($lib, db_create, [DBLIB="-l$lib"; DBLINKED=1], [])
+ dnl installations of libdb4 function names are defined in db.h
+-- 
+2.24.0
+

diff --git a/net-libs/libetpan/files/libetpan-1.9.4-pkgconfig_file_no_ldflags.patch b/net-libs/libetpan/files/libetpan-1.9.4-pkgconfig_file_no_ldflags.patch
new file mode 100644
index 00000000000..8dcb7fd1dc5
--- /dev/null
+++ b/net-libs/libetpan/files/libetpan-1.9.4-pkgconfig_file_no_ldflags.patch
@@ -0,0 +1,24 @@
+From 92bbf41fee9b88bd76377bbeed98fdb848f4af09 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 5 Nov 2019 16:37:14 +0100
+Subject: [PATCH] libetpan.pc.in: Don't put user LDFLAGS into Libs
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ libetpan.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libetpan.pc.in b/libetpan.pc.in
+index cbc1d2c..e0dc774 100644
+--- a/libetpan.pc.in
++++ b/libetpan.pc.in
+@@ -6,5 +6,5 @@ libdir=@libdir@
+ Name: libetpan
+ Description: Libetpan C library.
+ Version: @VERSION@
+-Libs: -L${libdir} -letpan@LIBSUFFIX@ @LDFLAGS@ @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
++Libs: -L${libdir} -letpan@LIBSUFFIX@ @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
+ Cflags: -I${includedir}
+-- 
+2.24.0
+

diff --git a/net-libs/libetpan/libetpan-1.9.4.ebuild b/net-libs/libetpan/libetpan-1.9.4.ebuild
new file mode 100644
index 00000000000..373a43129b3
--- /dev/null
+++ b/net-libs/libetpan/libetpan-1.9.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A portable, efficient middleware for different kinds of mail access"
+HOMEPAGE="http://libetpan.sourceforge.net/"
+SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs"
+
+# BerkDB is only supported up to version 6.0
+DEPEND="sys-libs/zlib
+	!lmdb? ( berkdb? ( sys-libs/db:= ) )
+	lmdb? ( dev-db/lmdb )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	liblockfile? ( net-libs/liblockfile )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-nonnull.patch
+	"${FILESDIR}"/${PN}-1.9.4-berkdb_lookup.patch #519846
+	"${FILESDIR}"/${PN}-1.9.4-pkgconfig_file_no_ldflags.patch
+)
+
+pkg_pretend() {
+	if use gnutls && ! use ssl ; then
+		ewarn "You have \"gnutls\" USE flag enabled but \"ssl\" USE flag disabled!"
+		ewarn "No ssl support will be available in ${PN}."
+	fi
+
+	if use berkdb && use lmdb ; then
+		ewarn "You have \"berkdb\" _and_ \"lmdb\" USE flags enabled."
+		ewarn "Using lmdb as cache DB!"
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# 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}
+	local myeconfargs=(
+		# --enable-debug simply injects "-O2 -g" into CFLAGS
+		--disable-debug
+		$(use_enable ipv6)
+		$(use_enable liblockfile lockfile)
+		$(use_enable static-libs static)
+		$(use_with sasl)
+		$(usex lmdb '--enable-lmdb --disable-db' "$(use_enable berkdb db) --disable-lmdb")
+		$(usex ssl "$(use_with gnutls) $(use_with !gnutls openssl)" '--without-gnutls --without-openssl')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}