gentoo resync : 15.06.2021

4 files changed, 40 insertions, 10 deletions

diff --git a/net-libs/libesmtp/Manifest b/net-libs/libesmtp/Manifest
index 1ef2eddeffd1..241080a9bc82 100644
--- a/net-libs/libesmtp/Manifest
+++ b/net-libs/libesmtp/Manifest
@@ -1,7 +1,8 @@
 AUX libesmtp-1.0.6-openssl-1.1-api-compatibility.patch 2243 BLAKE2B 03cf78375e04d781c1deb15ec76ba35b2800dd2b739c9ad330cfc9a25c05f59b684a5cbe8e436288a98e84b2ebab2c08abfdfd81e000f9a3c4053411254ab89c SHA512 9c5e9ea6d6b09dd48225edc17a9003ea863d91e06ec3856ce22d89b1b908f1c8bfccb7a1090dc5b1ff26a62c35a48806805115000eba3a478cab632181c905a1
+AUX libesmtp-1.1.0-fix-soname.patch 672 BLAKE2B 2bb9a535b94e444af19597f0ca0c06b07aca2c42e0b21510c27aec76c47fa70fa12e5b26656dc6a685b3ca95b40ba630dc93cd205f348224f4c7508ae6f4376d SHA512 881fe2a531f0f50baa449c3b9faa8c99ea4ce6d1bf3a82d5f5f7e8ca530233a5668f8a498390cd91769972420750dd73988db76c53acd4734ec45bb528b9b2af
 DIST libesmtp-1.0.6.tar.bz2 365506 BLAKE2B 9ce8c9f210e6c41c95bba55a7aec79c176c4582f5dafc1aba4fbf9adb411b75ab89d400ac7a12b7d5d24ede414cb8e2ca306299a2e156515e611d074142cf5e8 SHA512 c122fc5995b76771cce2db58c9e59597cc3a76d273feb6fc26b869f118e91bdf98a5721ee2d1de8175c376af018b5806b0379bbeba2f5da95108916028fd8dda
-DIST libesmtp-1.0.6_p20200824.tar.gz 156674 BLAKE2B a78dece0cceb252ca7505b5457a9137c6e3f45c544b9774ab683fb1defed6458ed0d94604aa16df540d3e397738fbe00e1c3b3c649f34b73421e494c35cf2fc1 SHA512 bd0868aa8fb10bd81c18d473acaf1ef94ab2278a6619e5d348a59857f459d2d47a22583d7d533a983518ece436853914420b7189c305d9dab5c399bf26f8a5c0
+DIST libesmtp-1.1.0.tar.gz 169134 BLAKE2B 94ef87c65101557f6d60a6bcd7a8b0de638c24d46536ddf602da05c09858780b0a50f9fd8dae1e54a5e9a7826d45fa6da10bad751a9be50475a8f441c94ad455 SHA512 fc2a9d9922a1807cce8c8cee627ea8fd3a79c33f0987c5a487080b1a1659fd504bc45da2f919d30eced33ab3e950105383a46ecf3365493134adc1183eb99e53
 EBUILD libesmtp-1.0.6-r3.ebuild 957 BLAKE2B 5279f6b740d8edcb07f731eb26041e3b5a229dc5960e38070e1b348d32bb205d667377c347b9714631cb82b385a09716b97dd097f06b25f59e203fa05dc3aef5 SHA512 a7e378fe2263209bb204fae15074eaa0af492e0ddb0a9d8e862120d02622b384cea9730c984b7579ad6870d0491392c4c7456a6328d311ca03b19c9aa4f33fcf
-EBUILD libesmtp-1.0.6_p20200824.ebuild 1114 BLAKE2B 55e1664aa2cf50aa3d3a4c7dbbd550eecddce4db8e50dfda843ae612714cdde686744c1d981d0f8d38187b69fcf6f91a7fa0090825c6b2616416fb4be49a1bde SHA512 5e2a16730e159258d13997c8949e2ed4ed97f4ee55e3dd2cae4950e5f24e6d87fa3a2f7022737d4908818dfee070c3f753df4635344e1290d52001a2d0680c24
-EBUILD libesmtp-9999.ebuild 940 BLAKE2B c70c6f65ae3363723850c7f573352d004a60357955c198568c4f281505ec13220e0b0aeebdddb3380eeffc2fce2b2010fee9fb49869de07a02c824d33e158417 SHA512 2dd5f8dad7923bea7f7dd128a088a5aabc56828f8a6ce98457a8f0c1b930ced0a9be3db848486a48562a525e3c4bbd2fc96ed26df4251df227b29bf1ba4f2b8b
+EBUILD libesmtp-1.1.0-r1.ebuild 1284 BLAKE2B 0ad61dc8cc8cd29c866715ff239391e71bb8eafdff3db21edc106c8878dd55e42ca026c267d4405b22f21aafd5d2ef41d061c20c3690a86848796c93a40efa33 SHA512 3f1308ac91d42e83606090a17d7a042157b16cd5e48d76d88b73d3ba7a2e6b9b7ffcd20b08c645988baa2dc773e680967931a7ab540e1174958bd0a02da09e52
+EBUILD libesmtp-9999.ebuild 961 BLAKE2B bf1d5b91f7d31f016aa779b13821dc47af17a926c3457e6ea20455dfc6159654f455c648ca11375d0b38469fe5279bfdabdf04aa4ec398eecb386aa1f12ca7f2 SHA512 01375e20aa83e2f0732891d609c9b55df0b116d7a9b36a2e4a1022326aa75133890276faf13fba046369fa981d892f1891f2c02b5262f652f25d3b7985c57b2d
 MISC metadata.xml 330 BLAKE2B 960a34feef0d9e57b37adc3e5776686215c7476dc5331f39b247786ecec58407e74aae1898d60d54209e00573e5486e3b042ebabfb686d4840172371ed1d5509 SHA512 97671749440b8ca99218706c398b65e45fdd0c6a4529877aafad2deb0598c7a7fdd7b6aa84079b194c345b4eee550551aa5d2af60216f95fa0701f6b4ac3c1d6
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
new file mode 100644
index 000000000000..52e4386dc0f7
--- /dev/null
+++ b/net-libs/libesmtp/files/libesmtp-1.1.0-fix-soname.patch
@@ -0,0 +1,19 @@
+https://github.com/libesmtp/libESMTP/pull/7
+
+From 4543d5a6848a752d690150b6987ca9c556d793fc Mon Sep 17 00:00:00 2001
+From: "Jeremy T. Bouse" <Jeremy.Bouse@UnderGrid.net>
+Date: Mon, 7 Jun 2021 20:44:37 -0400
+Subject: [PATCH] Update to correct SONAME version
+
+Pass as version to allow Meson to manage SONAME version.
+--- a/meson.build
++++ b/meson.build
+@@ -208,7 +208,7 @@ vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfil
+ 
+ lib = library('esmtp', sources,
+ 	      link_args : vflag, link_depends : mapfile,
+-	      soversion : libesmtp_so_version,
++	      version : libesmtp_so_version,
+ 	      dependencies : deps,
+ 	      install : true)
+ 
diff --git a/net-libs/libesmtp/libesmtp-1.0.6_p20200824.ebuild b/net-libs/libesmtp/libesmtp-1.1.0-r1.ebuild
index 549485ab84ed..47acefd3ea35 100644
--- a/net-libs/libesmtp/libesmtp-1.0.6_p20200824.ebuild
+++ b/net-libs/libesmtp/libesmtp-1.1.0-r1.ebuild
@@ -5,27 +5,35 @@ EAPI=7
 
 inherit meson
 
-COMMIT="c80e46678e1025f3116bdcc75563364744adbe18"
 DESCRIPTION="Lib that implements the client side of the SMTP protocol"
 HOMEPAGE="https://libesmtp.github.io/"
 if [[ "${PV}" == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/libesmtp/libESMTP.git"
 else
-	#SRC_URI="https://github.com/libesmtp/libESMTP/archive/v${PV/_}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="https://github.com/libesmtp/libESMTP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/libESMTP-${COMMIT}"
+	SRC_URI="https://github.com/libesmtp/libESMTP/archive/v${PV/_}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/libESMTP-${PV}"
+
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/7"
+# 0/7 was a snapshot before 1.1.0
+# The SONAME was fixed just before the 1.1.0 release was made
+# ... but a patch was needed to get it exactly right too
+# so, we're on 0/8 now, even though ABI compatibility actually remained
+# in terms of symbols with the original <1.1.0.
+SLOT="0/8"
 IUSE="ssl static-libs threads"
 
 RDEPEND="ssl? ( >=dev-libs/openssl-1.1.0:0= )"
 DEPEND="${RDEPEND}"
 
-DOCS=( AUTHORS docs/{bugreport,ChangeLog,faq}.md NEWS Notes README.md TODO )
+DOCS=( docs/{authors,bugreport,ChangeLog,faq,NEWS}.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-soname.patch
+)
 
 src_configure() {
 	local emesonargs=(
diff --git a/net-libs/libesmtp/libesmtp-9999.ebuild b/net-libs/libesmtp/libesmtp-9999.ebuild
index 83df4e67b077..c117af101c94 100644
--- a/net-libs/libesmtp/libesmtp-9999.ebuild
+++ b/net-libs/libesmtp/libesmtp-9999.ebuild
@@ -12,6 +12,8 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/libesmtp/libESMTP.git"
 else
 	SRC_URI="https://github.com/libesmtp/libESMTP/archive/v${PV/_}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/libESMTP-${PV}"
+
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
@@ -22,7 +24,7 @@ IUSE="ssl static-libs threads"
 RDEPEND="ssl? ( >=dev-libs/openssl-1.1.0:0= )"
 DEPEND="${RDEPEND}"
 
-DOCS=( AUTHORS docs/{bugreport,ChangeLog,faq}.md NEWS Notes README.md TODO )
+DOCS=( docs/{authors,bugreport,ChangeLog,faq,NEWS}.md README.md )
 
 src_configure() {
 	local emesonargs=(