1 |
commit: 688ff0a0502de09115e883dc1a551ab6da13ae23 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 5 15:56:55 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 5 15:56:55 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=688ff0a0 |
7 |
|
8 |
net-libs/libetpan: Bump to version 1.9.4 |
9 |
|
10 |
Attempt to fix berkdb detection |
11 |
|
12 |
Bug: https://bugs.gentoo.org/519846 |
13 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
14 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
15 |
|
16 |
net-libs/libetpan/Manifest | 1 + |
17 |
.../files/libetpan-1.9.4-berkdb_lookup.patch | 28 ++++++++ |
18 |
.../libetpan-1.9.4-pkgconfig_file_no_ldflags.patch | 24 +++++++ |
19 |
net-libs/libetpan/libetpan-1.9.4.ebuild | 77 ++++++++++++++++++++++ |
20 |
4 files changed, 130 insertions(+) |
21 |
|
22 |
diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest |
23 |
index f27bf806618..d37beb8e3f4 100644 |
24 |
--- a/net-libs/libetpan/Manifest |
25 |
+++ b/net-libs/libetpan/Manifest |
26 |
@@ -1 +1,2 @@ |
27 |
DIST libetpan-1.9.3.tar.gz 5000049 BLAKE2B 1664d93b112410a86935438aae5ff40202a9c10675701d40b60edf81e4f8bac45fb1f407e03714a37465c41a22c1b9fcbbc517d76dc47f812e154c932e05e600 SHA512 66e504fbf82445819845a3f1dcb8dc48ad2440993134d43752c754463cee2434a30080718687cd05c579f0da8df6b0f6dfc7572f2882d0dd9dfd327b4ae11fd6 |
28 |
+DIST libetpan-1.9.4.tar.gz 5000025 BLAKE2B dd98169134b7448d3dd129814d8011a3fa915b16f4763344230a89d02626b64ddea57495b4c21fd8f651164c36c95ad98ee9db073273b230e6af403b845aa681 SHA512 7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f |
29 |
|
30 |
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 |
31 |
new file mode 100644 |
32 |
index 00000000000..cfe0e8b5dc8 |
33 |
--- /dev/null |
34 |
+++ b/net-libs/libetpan/files/libetpan-1.9.4-berkdb_lookup.patch |
35 |
@@ -0,0 +1,28 @@ |
36 |
+From 1978a0d16bf7f14b863b208d55699b9f46918b7c Mon Sep 17 00:00:00 2001 |
37 |
+From: Lars Wendler <polynomial-c@g.o> |
38 |
+Date: Tue, 5 Nov 2019 16:31:53 +0100 |
39 |
+Subject: [PATCH] configure.ac: Only check reasonable berkdb versions |
40 |
+ |
41 |
+https://bugs.gentoo.org/519846 |
42 |
+ |
43 |
+Signed-off-by: Lars Wendler <polynomial-c@g.o> |
44 |
+--- |
45 |
+ configure.ac | 2 +- |
46 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
47 |
+ |
48 |
+diff --git a/configure.ac b/configure.ac |
49 |
+index 542f3bb..8f1edba 100644 |
50 |
+--- a/configure.ac |
51 |
++++ b/configure.ac |
52 |
+@@ -414,7 +414,7 @@ dnl Look for db3 or superior with db_create call |
53 |
+ case "$DBVERS" in |
54 |
+ 3) |
55 |
+ AC_MSG_RESULT([version 3.x or above]) |
56 |
+- 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 |
57 |
++ 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 |
58 |
+ if test "x$DBLINKED" = "x0"; then |
59 |
+ dnl AC_CHECK_LIB($lib, db_create, [DBLIB="-l$lib"; DBLINKED=1], []) |
60 |
+ dnl installations of libdb4 function names are defined in db.h |
61 |
+-- |
62 |
+2.24.0 |
63 |
+ |
64 |
|
65 |
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 |
66 |
new file mode 100644 |
67 |
index 00000000000..8dcb7fd1dc5 |
68 |
--- /dev/null |
69 |
+++ b/net-libs/libetpan/files/libetpan-1.9.4-pkgconfig_file_no_ldflags.patch |
70 |
@@ -0,0 +1,24 @@ |
71 |
+From 92bbf41fee9b88bd76377bbeed98fdb848f4af09 Mon Sep 17 00:00:00 2001 |
72 |
+From: Lars Wendler <polynomial-c@g.o> |
73 |
+Date: Tue, 5 Nov 2019 16:37:14 +0100 |
74 |
+Subject: [PATCH] libetpan.pc.in: Don't put user LDFLAGS into Libs |
75 |
+ |
76 |
+Signed-off-by: Lars Wendler <polynomial-c@g.o> |
77 |
+--- |
78 |
+ libetpan.pc.in | 2 +- |
79 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
80 |
+ |
81 |
+diff --git a/libetpan.pc.in b/libetpan.pc.in |
82 |
+index cbc1d2c..e0dc774 100644 |
83 |
+--- a/libetpan.pc.in |
84 |
++++ b/libetpan.pc.in |
85 |
+@@ -6,5 +6,5 @@ libdir=@libdir@ |
86 |
+ Name: libetpan |
87 |
+ Description: Libetpan C library. |
88 |
+ Version: @VERSION@ |
89 |
+-Libs: -L${libdir} -letpan@LIBSUFFIX@ @LDFLAGS@ @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@ |
90 |
++Libs: -L${libdir} -letpan@LIBSUFFIX@ @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@ |
91 |
+ Cflags: -I${includedir} |
92 |
+-- |
93 |
+2.24.0 |
94 |
+ |
95 |
|
96 |
diff --git a/net-libs/libetpan/libetpan-1.9.4.ebuild b/net-libs/libetpan/libetpan-1.9.4.ebuild |
97 |
new file mode 100644 |
98 |
index 00000000000..373a43129b3 |
99 |
--- /dev/null |
100 |
+++ b/net-libs/libetpan/libetpan-1.9.4.ebuild |
101 |
@@ -0,0 +1,77 @@ |
102 |
+# Copyright 1999-2019 Gentoo Authors |
103 |
+# Distributed under the terms of the GNU General Public License v2 |
104 |
+ |
105 |
+EAPI=7 |
106 |
+inherit autotools |
107 |
+ |
108 |
+DESCRIPTION="A portable, efficient middleware for different kinds of mail access" |
109 |
+HOMEPAGE="http://libetpan.sourceforge.net/" |
110 |
+SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
111 |
+ |
112 |
+LICENSE="BSD" |
113 |
+SLOT="0" |
114 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
115 |
+IUSE="berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs" |
116 |
+ |
117 |
+# BerkDB is only supported up to version 6.0 |
118 |
+DEPEND="sys-libs/zlib |
119 |
+ !lmdb? ( berkdb? ( sys-libs/db:= ) ) |
120 |
+ lmdb? ( dev-db/lmdb ) |
121 |
+ ssl? ( |
122 |
+ gnutls? ( net-libs/gnutls:= ) |
123 |
+ !gnutls? ( |
124 |
+ !libressl? ( dev-libs/openssl:0= ) |
125 |
+ libressl? ( dev-libs/libressl:0= ) |
126 |
+ ) |
127 |
+ ) |
128 |
+ sasl? ( dev-libs/cyrus-sasl:2 ) |
129 |
+ liblockfile? ( net-libs/liblockfile )" |
130 |
+RDEPEND="${DEPEND}" |
131 |
+ |
132 |
+PATCHES=( |
133 |
+ "${FILESDIR}"/${PN}-1.0-nonnull.patch |
134 |
+ "${FILESDIR}"/${PN}-1.9.4-berkdb_lookup.patch #519846 |
135 |
+ "${FILESDIR}"/${PN}-1.9.4-pkgconfig_file_no_ldflags.patch |
136 |
+) |
137 |
+ |
138 |
+pkg_pretend() { |
139 |
+ if use gnutls && ! use ssl ; then |
140 |
+ ewarn "You have \"gnutls\" USE flag enabled but \"ssl\" USE flag disabled!" |
141 |
+ ewarn "No ssl support will be available in ${PN}." |
142 |
+ fi |
143 |
+ |
144 |
+ if use berkdb && use lmdb ; then |
145 |
+ ewarn "You have \"berkdb\" _and_ \"lmdb\" USE flags enabled." |
146 |
+ ewarn "Using lmdb as cache DB!" |
147 |
+ fi |
148 |
+} |
149 |
+ |
150 |
+src_prepare() { |
151 |
+ default |
152 |
+ eautoreconf |
153 |
+} |
154 |
+ |
155 |
+src_configure() { |
156 |
+ # in Prefix emake uses SHELL=${BASH}, export CONFIG_SHELL to the same so |
157 |
+ # libtool recognises it as valid shell (bug #300211) |
158 |
+ use prefix && export CONFIG_SHELL=${BASH} |
159 |
+ local myeconfargs=( |
160 |
+ # --enable-debug simply injects "-O2 -g" into CFLAGS |
161 |
+ --disable-debug |
162 |
+ $(use_enable ipv6) |
163 |
+ $(use_enable liblockfile lockfile) |
164 |
+ $(use_enable static-libs static) |
165 |
+ $(use_with sasl) |
166 |
+ $(usex lmdb '--enable-lmdb --disable-db' "$(use_enable berkdb db) --disable-lmdb") |
167 |
+ $(usex ssl "$(use_with gnutls) $(use_with !gnutls openssl)" '--without-gnutls --without-openssl') |
168 |
+ ) |
169 |
+ econf "${myeconfargs[@]}" |
170 |
+} |
171 |
+ |
172 |
+src_install() { |
173 |
+ default |
174 |
+ find "${ED}" -name "*.la" -delete || die |
175 |
+ if ! use static-libs ; then |
176 |
+ find "${ED}" -name "*.a" -delete || die |
177 |
+ fi |
178 |
+} |