[gentoo-commits] repo/gentoo:master commit in: net-libs/paho-mqtt-c/

["Florian Schmaus" <flow@gentoo.org>]

commit:     64ea346891bda2feaf97b3d55afe61d4363dfe8f
Author:     Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com>
AuthorDate: Wed Nov  1 23:50:37 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Nov 14 07:52:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64ea3468

net-libs/paho-mqtt-c: add 1.3.13, drop 1.3.12 update EAPI 7 -> 8

Signed-off-by: Giuseppe Foti <foti.giuseppe <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33637
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-libs/paho-mqtt-c/Manifest                       |  5 ++---
 ...tt-c-1.3.12.ebuild => paho-mqtt-c-1.3.13.ebuild} | 21 +++++++--------------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/net-libs/paho-mqtt-c/Manifest b/net-libs/paho-mqtt-c/Manifest
index aaf25ad26fc3..6b3e38731c3b 100644
--- a/net-libs/paho-mqtt-c/Manifest
+++ b/net-libs/paho-mqtt-c/Manifest
@@ -1,3 +1,2 @@
-DIST paho-mqtt-c-1.3.12-live.tar.gz 3642676 BLAKE2B c20e3bb1b4eae30b268639d30c1e4d72f6759850bef2dc13de424debb7a0785a5ba083af094e28cb80814df519831ac0e1da27d8aa4958361724aabea92c03e5 SHA512 af0f52944c46fe7874203b3b359d8fb8935d5bd6b394045138624b96130c6b756045fb3b486e224b7e55b3cb478197b8a049bbeb01ff7e3d16d0d3f12c521110
-DIST paho-mqtt-c-1.3.12.tar.gz 3622938 BLAKE2B 9eb7bca0367a3001f00122f2056b60ddf3633e0304661a424821c3e2b3370d65e09c51c62f90bb89f0e4ce291640e71ae0d3b093fe600efb87aa3744e431cafe SHA512 3152b557a8ab7c9b9c80277283e0f5e9965ce4c2ebbdaef0f238908d49e6fa1281aa72932ea112a836144b79656e4abe6e0cbd93840429a52e501a2c6b12d313
-DIST paho.mqtt.testing.tar.gz 175845 BLAKE2B 02c284c4e1cfe91bb87735e8fc61f206c3e93adf18c567ff330ae8d1c2bd04b7aa079ba3961610b7c9cc7e22340be000bf56772d5c39d1bc4d1b406bf564da66 SHA512 8328c6a010d76cf62ee2007a849acb61b84cf2dc058525bc967661984fdf26407dd52da83a3f2acda56e3c5d309301ea2a8ed264466d0fb933994dd248dbbe8d
+DIST paho-mqtt-c-1.3.13.tar.gz 3489004 BLAKE2B c835f4e2a741539df900184825b4ce29138f76828ec329d9321c54a845607b8137292330b019e950640f36bb14b0252dfba4906be746742950e3f8f13985608e SHA512 0f436470bcff224461ed3227c8db10914f84bc2dcf76e51b55d4a78b80abaa4e636ac8f7a20e517524625888335c738e975283e5d573ae8d59147aa4de7963fc
+DIST paho.mqtt.testing-a4dc694010217b291ee78ee13a6d1db812f9babd.tar.gz 175858 BLAKE2B 7ba1be3e09740f45907c4ba2a5314830a56c4f6626af3fab15928647b235908429a96ece312e7f5b8fa044583c81e6d8deacc0fbd290e6e08fbc328524dba3f1 SHA512 a20ea68cfac7f2a4e140c9b9ebacf4debd544098151545dedb72fe1e3629b3a495df7e15b0e131d52c4e86fb8d165cb7b2ceee019c15599b0cb5d914da0e7723

diff --git a/net-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild b/net-libs/paho-mqtt-c/paho-mqtt-c-1.3.13.ebuild
similarity index 77%
rename from net-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild
rename to net-libs/paho-mqtt-c/paho-mqtt-c-1.3.13.ebuild
index 63188c99824f..4cb7bd4741a7 100644
--- a/net-libs/paho-mqtt-c/paho-mqtt-c-1.3.12.ebuild
+++ b/net-libs/paho-mqtt-c/paho-mqtt-c-1.3.13.ebuild
@@ -1,23 +1,22 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake python-any-r1 toolchain-funcs
 
-MY_TEST_UTILS="paho.mqtt.testing"
-MY_TEST_COMMIT="577f955352e41205c554d44966c2908e90026345"
-MY_LIVE_COMMIT="7db21329301b1f527c925dff789442db3ca3c1e7"
+TEST_UTILS="paho.mqtt.testing"
+TEST_COMMIT="a4dc694010217b291ee78ee13a6d1db812f9babd"
 
 DESCRIPTION="An Eclipse Paho C client library for MQTT for Windows, Linux and MacOS."
 HOMEPAGE="https://eclipse.org/paho"
 SRC_URI="
 	https://github.com/eclipse/paho.mqtt.c/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/eclipse/paho.mqtt.c/archive/${MY_LIVE_COMMIT}.tar.gz -> ${P}-live.tar.gz
-	https://github.com/eclipse/${MY_TEST_UTILS}/archive/${MY_TEST_COMMIT}.tar.gz -> ${MY_TEST_UTILS}.tar.gz
+	https://github.com/eclipse/${TEST_UTILS}/archive/${TEST_COMMIT}.tar.gz -> ${TEST_UTILS}-${TEST_COMMIT}.tar.gz
 "
+S="${WORKDIR}/paho.mqtt.c-${PV}"
 
 LICENSE="EPL-2.0"
 SLOT="1.3"
@@ -41,18 +40,12 @@ BDEPEND="
 # Tests can be run only if a MQTT broker is available
 RESTRICT="!test? ( test )"
 
-S="${WORKDIR}/paho.mqtt.c-${PV}"
-
 BUILD_DIR="${S}_build"
 
 src_prepare(){
 	cmake_src_prepare
 	if use test; then
-		# removing old certs
-		rm -r "${S}"/test/ssl || die
-		mv "${WORKDIR}"/paho.mqtt.c-"${MY_LIVE_COMMIT}"/test/ssl "${S}"/test/ssl || die
-
-		mv "${WORKDIR}/${MY_TEST_UTILS}-${MY_TEST_COMMIT}" "${WORKDIR}/${MY_TEST_UTILS}" || die
+		mv "${WORKDIR}/${TEST_UTILS}-${TEST_COMMIT}" "${WORKDIR}/${TEST_UTILS}" || die
 	fi
 }
 
@@ -74,7 +67,7 @@ src_test() {
 		return
 	fi
 
-	cd "${WORKDIR}/${MY_TEST_UTILS}/interoperability" || die
+	cd "${WORKDIR}/${TEST_UTILS}/interoperability" || die
 
 	${EPYTHON} startbroker.py -c localhost_testing.conf \
 			   > "${T}/testbroker.log" &