gentoo resync : 29.12.2022

4 files changed, 13 insertions, 32 deletions

diff --git a/media-radio/tqsl/Manifest b/media-radio/tqsl/Manifest
index b69c3fb84623..31eff6832d12 100644
--- a/media-radio/tqsl/Manifest
+++ b/media-radio/tqsl/Manifest
@@ -1,6 +1,5 @@
-AUX tqsl-2.5.9-lib_suffix.patch 372 BLAKE2B 49eef5accc1cd3400d1bfcedcb60b37cb505ac42b401446cb11db952d9aa285d4e5cade25398b4c5c81d92ce8e84887337ec3c1334e87b75fea083b322aadbf7 SHA512 92fe9941ec12a24b656f20e503887b83fb0cb3c964aa9a45c6152d6a18a9c84d9fb6b276ab8dbca451993c14fa4329ca4692175538ce7090e87020523af20408
-DIST tqsl-2.5.1.tar.gz 4462202 BLAKE2B f62afe6003b782e5e092fbd99a90a79cc4b020004092f958dad6f7c695d125e31b28b47e7945ccee1fd88c87b290f93145592cac1bd9c52501c34de901f78d74 SHA512 7578572f64c269a41f3fa62ebe526baee4ac382fac81549e79d676da5dc4f3dd3d2a4ce31bc741b43a07eaf164a33beeb1987dd61df1a92ede7b762a8df532f3
-DIST tqsl-2.5.9.tar.gz 3677621 BLAKE2B dc367eb9206665d5cf3126715c04e9a718b5cf54915082c0de088767f646f0d2b40d16fda7ae77e5cddf66034f49f3400a30b00e300454fbe794532b8bf674ea SHA512 feb6bc94d801c5e698df0ea206d9cd5df79c2cba066bc0420ac96f75254e7989eb5d03237e50f31b2d58b921818a3bfc1d8e1a449d5fa5c4869525bf16173118
-EBUILD tqsl-2.5.1.ebuild 657 BLAKE2B 0af55d3464c48f2c8170e5f40ca7a033296130484cfa157ec8b8fa62b10ee57593315b8443c579f5128551cc64a74a608fbef0e1df883103a093e87e1e3c131a SHA512 cc59b5e71285feb782e94ba58e4c97e8973f186da72af4e7bc144f0dd527b7fd4110ff572ac7795f27d162f6047f4106585f338290aaf21f2b513c5f7f206683
-EBUILD tqsl-2.5.9.ebuild 668 BLAKE2B d24518bf0ccadf459d71e3b57aef1b07f36b388df8d05cefeedafde5df2c9a36090edeee0ee4bca9ba16f7d72949a1f7e04bf4d0eab27fee9f326321b7a146df SHA512 c17bc9ba4fe9e8ffd6607e815f3b9a51e870f3ad2bf95e45a3b735e53a9711f5af0e04b71b397268b1f34cee6476dbdfbed9d509eb13d051f9cb64c13f42b5b6
+DIST tqsl-2.6.3.tar.gz 3516151 BLAKE2B 34df7d322404aba9ccf64b55c97799b4a02f9a3b1032e59a72dff7f9a6c118ebafab0316b5bd763fb981d813e9360df130179532af98f695a48e15530cb6fe6a SHA512 e6308cda39177b74ebb30eee481ed52f9231916a1c6dfaef2d42eaa758bc247ff46319b29d9d61fa7b1503164392b365f5e8bdbfac622281646c630034ff88e2
+DIST tqsl-2.6.4.tar.gz 3517633 BLAKE2B 9c43ba01186a1a2396b223a33797377735d48e020ddee879232f3bf4bcce9cbec89dfd71aea5422a353a3908f38ce9c3f3619725677612c911bf19278d1740fa SHA512 0a0f94ae95f91280ea03a35007bfa4e278f17a98496f4cfb25a841d2f519a92d7820e1a4f48394ba6caf1e99d4bcafdf4686a6b0f85ddc3640f936c58b907a1e
+EBUILD tqsl-2.6.3.ebuild 611 BLAKE2B 2d6ebf6c4ab6aa758d5f478773ac0d1f5ee33ee3236ee38d1d5c96a07b3552084bd6a783c9d917cf744209f4626592a965e68633990239a379e7e930116cbefb SHA512 4f3cf63ffd36318dc72018aac110b8f547aa29de6effeeebd261ab83cc134d5d641f5a8656235b60f0262e534abbffc7fb7142df12157305a40a409ccdcacc55
+EBUILD tqsl-2.6.4.ebuild 611 BLAKE2B 2d6ebf6c4ab6aa758d5f478773ac0d1f5ee33ee3236ee38d1d5c96a07b3552084bd6a783c9d917cf744209f4626592a965e68633990239a379e7e930116cbefb SHA512 4f3cf63ffd36318dc72018aac110b8f547aa29de6effeeebd261ab83cc134d5d641f5a8656235b60f0262e534abbffc7fb7142df12157305a40a409ccdcacc55
 MISC metadata.xml 291 BLAKE2B c8f0e0ebc3b625eac2168e41e2d9772e0b03fa293a5c057209b3b1a0485f3d882810ff4a8eb060efb4d6739f265f268a3f8a35777071c2e4102d8c7578e66b26 SHA512 1e2ab60b78d6a013be338bea0565d133fcc8f9433e2e4191e56722691a2b5ed78c9566f3c85987685eb84c5d6425d0fd6fc0fff2945e7de38c7f7eca5013ae8a
diff --git a/media-radio/tqsl/files/tqsl-2.5.9-lib_suffix.patch b/media-radio/tqsl/files/tqsl-2.5.9-lib_suffix.patch
deleted file mode 100644
index 2a35736ae83d..000000000000
--- a/media-radio/tqsl/files/tqsl-2.5.9-lib_suffix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This definition causes the following tests to effectively turn no-op,
-resulting in strict-multilib violations on amd64.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,8 +18,6 @@
-     SET(LINUX TRUE)
- ENDIF ()
- 
--SET (LIB_SUFFIX "")
--
- # Pre-set LIB_SUFFIX for 64-bit Linux platforms
- IF (LINUX AND CMAKE_SHARED_LIBRARY_PREFIX STREQUAL "lib64")
-   SET (LIB_SUFFIX "64")
diff --git a/media-radio/tqsl/tqsl-2.5.9.ebuild b/media-radio/tqsl/tqsl-2.6.3.ebuild
index 22cc02985616..ee19a35410f7 100644
--- a/media-radio/tqsl/tqsl-2.5.9.ebuild
+++ b/media-radio/tqsl/tqsl-2.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,15 +18,11 @@ RDEPEND="
 	dev-libs/expat:=
 	dev-libs/openssl:0=
 	net-misc/curl:=
-	sys-libs/db:=
+	dev-db/lmdb:=
 	sys-libs/zlib:=
 	x11-libs/wxGTK:${WX_GTK_VER}="
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.9-lib_suffix.patch
-)
-
 DOCS=( AUTHORS.txt INSTALL README )
 HTML_DOCS=( html/. )
 
diff --git a/media-radio/tqsl/tqsl-2.5.1.ebuild b/media-radio/tqsl/tqsl-2.6.4.ebuild
index 479817e6c433..ee19a35410f7 100644
--- a/media-radio/tqsl/tqsl-2.5.1.ebuild
+++ b/media-radio/tqsl/tqsl-2.6.4.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-WX_GTK_VER="3.0"
-inherit cmake wxwidgets vcs-snapshot
+WX_GTK_VER="3.0-gtk3"
+inherit cmake wxwidgets
 
 DESCRIPTION="ARRL Logbook of the World"
-HOMEPAGE="http://www.arrl.org/tqsl-download"
-SRC_URI="https://github.com/rich0/trustedqsl-tqsl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.arrl.org/tqsl-download"
+SRC_URI="https://www.arrl.org/${PN}/${P}.tar.gz"
 
 LICENSE="LOTW"
 SLOT="0"
@@ -18,7 +18,7 @@ RDEPEND="
 	dev-libs/expat:=
 	dev-libs/openssl:0=
 	net-misc/curl:=
-	sys-libs/db:=
+	dev-db/lmdb:=
 	sys-libs/zlib:=
 	x11-libs/wxGTK:${WX_GTK_VER}="
 DEPEND="${RDEPEND}"