gentoo resync : 24.06.2021

3 files changed, 6 insertions, 80 deletions

diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest
index 56eb36569db8..871b1838805c 100644
--- a/media-radio/xlog/Manifest
+++ b/media-radio/xlog/Manifest
@@ -1,7 +1,5 @@
 AUX xlog-2.0.13-desktop-update.patch 1393 BLAKE2B c44070ad106834a89fa2323b33d5df90f2eaab50e0e3d2a03884a2f997f1e9cf0ac4c9e03e819956e7af09dc538729baac0ae8ac612f06f1b4a44929047795c1 SHA512 7e4f9f83eabf9a598e2e1382c6934240991f3743da50eb0da6b7532435d2dce3264e30aded7b6ca32a685b9b7c203f694268c500c89be76175194c0900296865
 AUX xlog-2.0.7-desktop.patch 435 BLAKE2B 56fee116a69c99f5192f1a2e4804821d715dd15f927525694100471b296412675eb97237c7e239cc407a2ffb145dbf779e802c1a1f5914a064d70f73ad269d12 SHA512 5119356e9635ca7b6d028d4bb3be12542636ce5d2967540b20ad9c22d62792b81a1a06fcd8722c7cbe8df706d8113e60b308d1db7c6fa8f3238bea039eb4b4f6
-DIST xlog-2.0.20.tar.gz 11437051 BLAKE2B a6d6618b62d1f5591cf44efe4ce2e3ba8a1f27bc2fe218f0b65d05f26bb2f8abeea69d3ec2c2009f50209257769647bc6fe9307999f5fede5b72cb0ca9259b16 SHA512 50feaede582ea505021c5530efa702915f2ec6f64e4677055657adbaefca92b3b45b6c6fe5af8d65ed2ae38d0d0e4cda6782fa7781516b5263f738c90fb17c89
 DIST xlog-2.0.22.tar.gz 11407849 BLAKE2B 85d2e904d33ef39883cb8ac086eed4dc7e65503cdccb95e8d33f169d12de4f1ed556a28ac2f40e0044e937185bf4d93fe55608088d6e95744617c9c3a051fb55 SHA512 a261f8e28b75aed9380c29b3da69c7615b0d32346eaf84a0ace5cf77c53407372c4985c599078dba5ed92f77bd8052a74c7dca40028b99bca49cc3164d4ec490
-EBUILD xlog-2.0.20.ebuild 1675 BLAKE2B 9fe9b75b047031fffa73c1a02d53ec550419b4f39d6c08b11acca00efef89318647f6ae753d54b9e8e61ecad9d6ec6833370fdd21b4e5f8865c418b61dc8b2ee SHA512 91cdd27e7805063853a08cfcd214a4f1ee57c4dc7dad8d28dc9137ce8979fc49d59cd5c1b1d0fce8a59fab165b847055800d0ac0605196df9903d919057469fe
-EBUILD xlog-2.0.22.ebuild 1702 BLAKE2B 9eee680d2caf57868645c37c655867a01a1f0dfe9c76f2b168715995cb0539878b607193648554b866b353eb4363f18fc7896274d1760c9425678b14fb9c19db SHA512 a8fb75b1e8b2d82c7d815cbe9ad2a0a03f2cff8c427211460c4233730d38512791c86b45eb7cc393924100063026b714a45d46ca7801464b14008a4339d050bc
+EBUILD xlog-2.0.22.ebuild 1888 BLAKE2B bee6934c6a426de22807f032b2ef5706b2014ea3f13cb36cd9229aac625e220209a1a6a1a33bd5f95086415a612770302d2692dcc228d8c0ff642ce53764874c SHA512 8dd97e60010d3abb1985ebb3f3ead50ea5c867528705eca25035e244d3bd4ffee397c6fde5548d87b0918e636cb71476dfc21b2c7a409370764f5577210808d9
 MISC metadata.xml 245 BLAKE2B 1d0fb3b909203735db219043a3b6ad6a2f3fafff1813f9c9caefdb9206262ff73c4ce6b93c0a8ec7d157148cea478b38d0c835ac9948a66d8ed81726f1b4d93f SHA512 9289d414ccbc30198596601b290cf42a583a093bbd7c5f8889c8ac0e81d8570bc4d42dfcbfe210456120edb910ea8572d6806400adec144f4eeb95fa36ae6ef3
diff --git a/media-radio/xlog/xlog-2.0.20.ebuild b/media-radio/xlog/xlog-2.0.20.ebuild
deleted file mode 100644
index 60591aa739b1..000000000000
--- a/media-radio/xlog/xlog-2.0.20.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs xdg-utils
-MY_P=${P/_}
-
-DESCRIPTION="An amateur radio logging program"
-HOMEPAGE="https://www.nongnu.org/xlog"
-SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/hamlib:=
-	dev-libs/glib:2
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	media-libs/libpng:0
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS data/doc/THANKS NEWS README )
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${PN}-2.0.7-desktop.patch"
-
-	# Let portage handle updating mime/desktop databases,
-	eapply -p0 "${FILESDIR}/${PN}-2.0.13-desktop-update.patch"
-	# Drop -Werror
-	sed -i -e "s:-Werror::" configure.ac || die
-	# fix underlinking
-	sed -i -e "s:HAMLIB_LIBS@:HAMLIB_LIBS@ -lm:g" src/Makefile.am || die
-	eautoreconf
-
-	# Fix broken png files<<
-	einfo "Fixing broken png files."
-	pushd "${S}"/data/doc/manual/output/html
-	for png in xlog-clock.png xlog-dropdown.png xlog-editbox.png; do
-		pngfix -q --out=out.png ${png}
-		mv -f out.png "${png}" || die
-	done
-	popd
-	einfo "done ..."
-
-	eapply_user
-}
-
-src_configure() {
-	# mime-update causes file collisions if enabled
-	econf --disable-mime-update --disable-desktop-update
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	docompress -x /usr/share/doc/${PF}/{KEYS,ChangeLog,TODO,BUGS}
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-radio/xlog/xlog-2.0.22.ebuild b/media-radio/xlog/xlog-2.0.22.ebuild
index 7467c2953e50..3b1c9d3c1662 100644
--- a/media-radio/xlog/xlog-2.0.22.ebuild
+++ b/media-radio/xlog/xlog-2.0.22.ebuild
@@ -37,6 +37,11 @@ src_prepare() {
 	sed -i -e "s:HAMLIB_LIBS@:HAMLIB_LIBS@ -lm:g" src/Makefile.am || die
 	eautoconf
 
+	# prepare for media-radio/hamlib-4.2 change of API
+	if has_version '>=media-libs/hamlib-4.2' ; then
+		sed -i -e "s/FILPATHLEN/HAMLIB_FILPATHLEN/g" "${S}"/src/hamlib-utils.c || die
+	fi
+
 	# Fix broken png files<<
 	einfo "Fixing broken png files."
 	pushd "${S}"/data/doc/manual/output/html