gentoo resync : 29.01.2021

4 files changed, 73 insertions, 0 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 2d7184f99c57..a08cc2064c26 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/cqrlog/Manifest b/media-radio/cqrlog/Manifest
index cfbfe33676e4..170c0e4d2d2e 100644
--- a/media-radio/cqrlog/Manifest
+++ b/media-radio/cqrlog/Manifest
@@ -1,9 +1,12 @@
 AUX 2.1.0-makefile.patch 523 BLAKE2B 8a0143b80422ee19a0bdf8637de065d3af6b4aded30e3437b8ff3b05b5704426e9f890d915ba5e50429ebba9f4f77da9b15865d6a3b8e8233976c0b165e8dd09 SHA512 26da9c578cab7f2fadebf6818f323967e28383fe3e2429d3ef614c43bcd50155bdf1607f353beedd91c27b45045dff1787ee9d2844ffa800f7da53e04b045de8
 AUX 2.3.0-database-connection-refactoring.patch 5985 BLAKE2B e4b68f4e0c9b91aadf6d052726573b3adcba0eede88f81abcc316197844a69bfc60b4377d3833546797ae6ec8a1191dcf5a9668bebb3e63b5dca2039bab8a8ba SHA512 25a3c0fe60dfd6ccac9ca30d82703b2a376c8f58fb09c696431431ffddd17ddc78b5094a60a459fe754598c1093cbed1ff8d6e66d5c6317d3bb2be757df76820
 AUX 2.3.0-makefile.patch 531 BLAKE2B 8860b129afa97fc9c1d444e0356950afa554c25a2cab8bc508a319e5bb85d57df411ec5cf9e813de4b0991f79694b47070b6933e649c4bd32f44d2de4c4400b8 SHA512 a8c724ea250518d701bf0b458114caaee410463fbc954288d8127a743955cff133fb0064561b1a2fb7b077c66f667a1398cb053210b0b21cda3185638baafa7c
+AUX cqrlog-2.4.0-makefile.patch 1651 BLAKE2B 9258aae8d919ce89df3108c7e421463d7e30090eaa2fdbdc9de3d5cee8c890ec58d553992342665287f5133db1ff04ff0dffb772578253934663ef5626673244 SHA512 75ae44d33a2eec6ff00b0845656ea015ca7c4af03de4ceb8c29864e649c6e8427c00e0bddd51bb07966970f7dfc0a590853cf7b752375ca024f01ff2a7586355
 DIST cqrlog-2.1.0.tar.gz 8732858 BLAKE2B 926934b70dcd53d48ed6443994a295efdee7e34d968337f409988f269fe01faeace5dbfa02307d04ba41fb72205925b9a56fa1f75472f018cd85a408edf1265a SHA512 df5f9a197600762ef0fc60e25f67cf7968829cf0241e7e63849faa1152a0d002e0f373d33528ba7285764c19460f572090f57ac7bd5f2dc2d178862003cb812e
 DIST cqrlog-2.3.0.tar.gz 10407716 BLAKE2B d932bb47601b42c940461343df69e82d8e7b8902a7cf959b72ab9a667cbaea1f8a829bfb6b3abfb2a9112f4aeed2adcbed825b1f347ceba640f1ad3903b0c246 SHA512 1e045d194a05248711e6ec43ec65e8f3f24e4fedab887cc89dc1ef6aa6e53ece4d923c9142a6ef89d8e1c46de678a16d108d344f005fa255d008cb9c5e482000
+DIST cqrlog-2.4.0.tar.gz 12361259 BLAKE2B 1779abd8983b66e966b73c157e322b489c3b4005cbc84952af1d708f7d9623efa7f6abc0515ab09f13765523fa373a2829a41da43b4b0f2edaea05e1b182b5a1 SHA512 aec7b43a0d4d1cd5b1af140db149058b4cff4893e6d8ed8d1ced729bedf27baa36b71d9fa7e5312ab94dd692953346d20f7f5a55a05ba91e4eccb17919d6d49a
 EBUILD cqrlog-2.1.0-r2.ebuild 931 BLAKE2B 2761e013d14817aeb3079ef7afe6c7cef0d11188558256848d9506d999aa7ba127ec5401b81de88058db80f69a1d862328a6327f83c34533d82ad9ea6717dcb8 SHA512 4817a6c632709b903be464a2f07206bf1b27ee3fbdbf4f9e2f6e3ac7943578da49d8f0521b6eb358f3c2de9e08a35b29cda4b92fdc73ae96573e87d11a692a8d
 EBUILD cqrlog-2.3.0-r1.ebuild 888 BLAKE2B 620c1c07c29b9347f41a8a0266885fc5a1ac202322e1e1d3741e7eec448d7ccf1f8bde9388b1ce8e266db2ba39d88d1a26b965e101f90d9639504e6c6aceb888 SHA512 ee32b7466b65fd7e6c6160e52d947c1a2331604bc1c3eaf9ceb1c959261f187d62f662b5ba19a486cb1ce75a0e430b50bb74000638619304bfbb8394bd284919
 EBUILD cqrlog-2.3.0.ebuild 951 BLAKE2B 1bd1f5a05104c7d05ede2175c289a478d5bcb71369c8593476899c592d23057865b19a9063324f2b13c11640a45ead03a3133321536d8fcf06d10604aae9c84b SHA512 f21a6559f3ac0dd2ee9c16fde8f34e768171d35cdf19b9aa86053aa97577784cffc3f1cfe0be433d36c1a1c287c1f15a59b979396dd88aa3ff3f896a39c1f78c
+EBUILD cqrlog-2.4.0.ebuild 730 BLAKE2B 5395114fb930a31f0463d7da0e24ebdd15b87d917231ee071aa2ab4e3908b96e70cccf00628093751517bdc574500743eb3368415b1d1bae8a0a584ee3bfbdb4 SHA512 69bc58da810b96dfe1ca225c7e9f2386095e1b2619aa519e118141caa998ab6f509e44874ff072b7d5894063cc25664a4935d6947bb633db9171ca4636581112
 MISC metadata.xml 174 BLAKE2B 1738b3b33ef242919964fb6a498f2215dbd528720bd193469bb20020fbedda0e9102ef85539fa9d2c3924bf2e6c0dd560671134200481054111467ba8e88fcb1 SHA512 281aa8b74dd6915f9856e5e70db000388f8b04bd5393871e67b57cec316374c6986124202dfdf4855ba57dd60f1e2cfc323a1f2cc4c6fbe0f634f67f8fb40b17
diff --git a/media-radio/cqrlog/cqrlog-2.4.0.ebuild b/media-radio/cqrlog/cqrlog-2.4.0.ebuild
new file mode 100644
index 000000000000..a470fe94b73d
--- /dev/null
+++ b/media-radio/cqrlog/cqrlog-2.4.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="CQRLOG is an advanced ham radio logger based on MySQL database"
+HOMEPAGE="https://www.cqrlog.com/ https://github.com/ok2cqr/cqrlog"
+SRC_URI="https://github.com/ok2cqr/cqrlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/lazarus-1.8.0
+	>=dev-lang/fpc-3.0.2"
+
+RDEPEND="${DEPEND}
+	virtual/mysql[server]
+	dev-libs/atk
+	dev-libs/glib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+
+	x11-libs/libX11
+	x11-libs/pango"
+
+PATCHES=(
+	"${FILESDIR}/${P}-makefile.patch"
+)
+
+pkg_postist() {
+	optfeature "monitoring radio settings" media-libs/hamlib
+}
diff --git a/media-radio/cqrlog/files/cqrlog-2.4.0-makefile.patch b/media-radio/cqrlog/files/cqrlog-2.4.0-makefile.patch
new file mode 100644
index 000000000000..52169214b3ee
--- /dev/null
+++ b/media-radio/cqrlog/files/cqrlog-2.4.0-makefile.patch
@@ -0,0 +1,36 @@
+diff --git a/Makefile b/Makefile
+index 0b1d1ef..1b98acf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,11 +3,10 @@ ST=strip
+ datadir  = $(DESTDIR)/usr/share/cqrlog
+ bindir   = $(DESTDIR)/usr/bin
+ sharedir = $(DESTDIR)/usr/share
+-tmpdir   = /tmp
++tmpdir   := $(shell mktemp -d)
+ 
+ cqrlog: src/cqrlog.lpi
+-	$(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
+-	$(ST) src/cqrlog
++	$(CC) -d --ws=gtk2 --max-process-count=1 --lazarusdir=/usr/share/lazarus --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
+ 	gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
+ 
+ clean:
+@@ -38,7 +37,7 @@ install:
+ 	install -d -v         $(sharedir)/pixmaps/cqrlog
+ 	install -d -v         $(sharedir)/icons/cqrlog
+ 	install -d -v         $(sharedir)/applications
+-	install -d -v         $(sharedir)/appdata
++	install -d -v         $(sharedir)/metainfo
+ 	install -d -v         $(sharedir)/man/man1
+ 	install    -v -m 0755 src/cqrlog $(bindir)
+ 	install    -v -m 0755 tools/cqrlog-apparmor-fix $(datadir)/cqrlog-apparmor-fix
+@@ -61,7 +60,7 @@ install:
+ #	install    -v -m 0644 images/icon/256x256/*   $(datadir)/images/icon/256x256/
+ #	install    -v -m 0644 images/*   $(datadir)/images/
+ 	install    -v -m 0644 tools/cqrlog.desktop $(sharedir)/applications/cqrlog.desktop
+-	install    -v -m 0644 tools/cqrlog.appdata.xml $(sharedir)/appdata/cqrlog.appdata.xml
++	install    -v -m 0644 tools/cqrlog.appdata.xml $(sharedir)/metainfo/cqrlog.appdata.xml
+ 	install    -v -m 0644 images/icon/32x32/cqrlog.png $(sharedir)/pixmaps/cqrlog/cqrlog.png
+ 	install    -v -m 0644 images/icon/128x128/cqrlog.png $(sharedir)/icons/cqrlog.png
+ 	install    -v -m 0644 src/changelog.html $(datadir)/changelog.html