gentoo resync : 28.04.2021

3 files changed, 15 insertions, 14 deletions

diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest
index 71538ca4953a..af6bd4c91035 100644
--- a/media-radio/xlog/Manifest
+++ b/media-radio/xlog/Manifest
@@ -1,7 +1,7 @@
 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.19.tar.gz 11431541 BLAKE2B 0bfe396167580808344a4b0e0974959930ab577a18c0d71a70c7c020a433a150baf5322f58682fc4604718d739e01004447dffcdd325c3426d776995dd684d39 SHA512 b69e592f97fbfbd989378a2b74036f4a169be3ca1f5b7ba8715e3a5293f1efbdbc431b0c09a305c2ca0190953777010a9d9a9b53caea8eb26609111b4f7da40b
 DIST xlog-2.0.20.tar.gz 11437051 BLAKE2B a6d6618b62d1f5591cf44efe4ce2e3ba8a1f27bc2fe218f0b65d05f26bb2f8abeea69d3ec2c2009f50209257769647bc6fe9307999f5fede5b72cb0ca9259b16 SHA512 50feaede582ea505021c5530efa702915f2ec6f64e4677055657adbaefca92b3b45b6c6fe5af8d65ed2ae38d0d0e4cda6782fa7781516b5263f738c90fb17c89
-EBUILD xlog-2.0.19.ebuild 1673 BLAKE2B 32833a48e0351c595b73f6fe771ae6382321623bad195e62d6e691cdd31bfe8b5dad7f3f75fcd50b138a8d4c758015dd7e59fa9d0f6d1c84134d42d617c74d35 SHA512 7af3c3a52c013447601f6edc023f836999755e030c374f5aa9771e5ee49d3879753e5eaf51fa585daf3d6da260392587d8866c55cd03e85e4bb08cf0196290ee
-EBUILD xlog-2.0.20.ebuild 1677 BLAKE2B 0871e9041fa57796402fd9ffc1e25f67a65a31150b496ff6677d849198df820d2d52664a488bcacba75fe2ea2a199802caca4a51fe4693f721e5985e553a6631 SHA512 3011950454167bfaef91f3f0016a534e0b4e74a20e2a653945d0d34b6fbe6a51fe7047c9481578f7ec9908d0572d0c68f702e31c8670ad2ae4ae9b437ed63052
+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 1704 BLAKE2B 28528457ec57e17ceeaeddc32ec8eb0b8c41a87d31eafaab9561451e54359459be26400d26aec652b8200b528299c7c829178e0835d4c0e4e2055035b420df6d SHA512 55607f0e99e77d3d04cbf548efe5b1504b32d8a37d9b600dcd74cbaac34ec84f82ed9c10b258042e3b6ff11f59218207ee611a845f0825822b97f7e06f93121a
 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
index 0af194321353..60591aa739b1 100644
--- a/media-radio/xlog/xlog-2.0.20.ebuild
+++ b/media-radio/xlog/xlog-2.0.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="media-libs/hamlib:=
diff --git a/media-radio/xlog/xlog-2.0.19.ebuild b/media-radio/xlog/xlog-2.0.22.ebuild
index 37de4d851ef7..b3ac50566f61 100644
--- a/media-radio/xlog/xlog-2.0.19.ebuild
+++ b/media-radio/xlog/xlog-2.0.22.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools toolchain-funcs xdg-utils
 MY_P=${P/_}
@@ -12,10 +12,10 @@ SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="media-libs/hamlib
+RDEPEND="media-libs/hamlib:=
 	dev-libs/glib:2
 	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
@@ -28,15 +28,14 @@ S=${WORKDIR}/${MY_P}
 DOCS=( AUTHORS data/doc/THANKS NEWS README )
 
 src_prepare() {
+	eapply_user
 	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
+	sed -i -e "s:-Werror::g" configure.ac || die
 	# fix underlinking
 	sed -i -e "s:HAMLIB_LIBS@:HAMLIB_LIBS@ -lm:g" src/Makefile.am || die
-	eautoreconf
+	eautoconf
 
 	# Fix broken png files<<
 	einfo "Fixing broken png files."
@@ -48,12 +47,11 @@ src_prepare() {
 	popd
 	einfo "done ..."
 
-	eapply_user
 }
 
 src_configure() {
 	# mime-update causes file collisions if enabled
-	econf --disable-mime-update --disable-desktop-update
+	econf --disable-mime-update
 }
 
 src_compile() {
@@ -62,6 +60,9 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install
+	# build system makes it complicate to inhibit updating desktop
+	# database, so just remove the offending file
+	rm  "${D}"/usr/share/applications/mimeinfo.cache || die
 	docompress -x /usr/share/doc/${PF}/{KEYS,ChangeLog,TODO,BUGS}
 	einstalldocs
 }