Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libesmtp/, net-libs/libesmtp/files/
Date: Thu, 10 Jun 2021 19:27:03
Message-Id: 1623353154.54b8aef1fbab2e718fe4a352a9b55e95ed26bf54.sam@gentoo
1 commit: 54b8aef1fbab2e718fe4a352a9b55e95ed26bf54
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 10 19:25:54 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 10 19:25:54 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54b8aef1
7
8 net-libs/libesmtp: increment subslot
9
10 (See comment in ebuild.)
11
12 Bug: https://bugs.gentoo.org/782532
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 .../libesmtp/files/libesmtp-1.1.0-fix-soname.patch | 19 +++++++++++++++++++
16 ...libesmtp-1.1.0.ebuild => libesmtp-1.1.0-r1.ebuild} | 11 ++++++++++-
17 2 files changed, 29 insertions(+), 1 deletion(-)
18
19 diff --git a/net-libs/libesmtp/files/libesmtp-1.1.0-fix-soname.patch b/net-libs/libesmtp/files/libesmtp-1.1.0-fix-soname.patch
20 new file mode 100644
21 index 00000000000..52e4386dc0f
22 --- /dev/null
23 +++ b/net-libs/libesmtp/files/libesmtp-1.1.0-fix-soname.patch
24 @@ -0,0 +1,19 @@
25 +https://github.com/libesmtp/libESMTP/pull/7
26 +
27 +From 4543d5a6848a752d690150b6987ca9c556d793fc Mon Sep 17 00:00:00 2001
28 +From: "Jeremy T. Bouse" <Jeremy.Bouse@×××××××××.net>
29 +Date: Mon, 7 Jun 2021 20:44:37 -0400
30 +Subject: [PATCH] Update to correct SONAME version
31 +
32 +Pass as version to allow Meson to manage SONAME version.
33 +--- a/meson.build
34 ++++ b/meson.build
35 +@@ -208,7 +208,7 @@ vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfil
36 +
37 + lib = library('esmtp', sources,
38 + link_args : vflag, link_depends : mapfile,
39 +- soversion : libesmtp_so_version,
40 ++ version : libesmtp_so_version,
41 + dependencies : deps,
42 + install : true)
43 +
44
45 diff --git a/net-libs/libesmtp/libesmtp-1.1.0.ebuild b/net-libs/libesmtp/libesmtp-1.1.0-r1.ebuild
46 similarity index 73%
47 rename from net-libs/libesmtp/libesmtp-1.1.0.ebuild
48 rename to net-libs/libesmtp/libesmtp-1.1.0-r1.ebuild
49 index c117af101c9..47acefd3ea3 100644
50 --- a/net-libs/libesmtp/libesmtp-1.1.0.ebuild
51 +++ b/net-libs/libesmtp/libesmtp-1.1.0-r1.ebuild
52 @@ -18,7 +18,12 @@ else
53 fi
54
55 LICENSE="LGPL-2.1 GPL-2"
56 -SLOT="0/7"
57 +# 0/7 was a snapshot before 1.1.0
58 +# The SONAME was fixed just before the 1.1.0 release was made
59 +# ... but a patch was needed to get it exactly right too
60 +# so, we're on 0/8 now, even though ABI compatibility actually remained
61 +# in terms of symbols with the original <1.1.0.
62 +SLOT="0/8"
63 IUSE="ssl static-libs threads"
64
65 RDEPEND="ssl? ( >=dev-libs/openssl-1.1.0:0= )"
66 @@ -26,6 +31,10 @@ DEPEND="${RDEPEND}"
67
68 DOCS=( docs/{authors,bugreport,ChangeLog,faq,NEWS}.md README.md )
69
70 +PATCHES=(
71 + "${FILESDIR}"/${P}-fix-soname.patch
72 +)
73 +
74 src_configure() {
75 local emesonargs=(
76 -Ddefault_library="$(usex static-libs both shared)"