gentoo resync : 20.03.2021

17 files changed, 66 insertions, 381 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 1b6f98773e81..7aa045107bd9 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/adifmerg/Manifest b/media-radio/adifmerg/Manifest
index 9b67e06e992d..a1e6f1095035 100644
--- a/media-radio/adifmerg/Manifest
+++ b/media-radio/adifmerg/Manifest
@@ -1,3 +1,3 @@
 DIST adifmerg31.tgz 47460 BLAKE2B 14bf6a85ba5a22972e1cf1fae068a4eaa92bf0e205904c3e11bcbe83aab800f2da02d9dc4835e75189b49590c005aa3412f19170b8f6abb39d84000d006f7384 SHA512 851a90d4269d79359eb76168d67f980fcbc551ee8ef221e4caaf9ba6fde756aebe03d80670b7cb5e91e20aa5ef81d772ddaedc204b3cf57cfdbb62d593575fa7
 EBUILD adifmerg-31-r1.ebuild 566 BLAKE2B 547dc7779900efaeabfb5dc35c4a08d89d49ed215209dc7c6d9862d89589c92d9137f7501cb7a1e816f728f1f73099b5cec21328d09ec26afaff8a8bd5f92a92 SHA512 f4cd00857128b2a6d5fe9f114b07db83f3633cc522b272ca643bdab9243108c44da00349327dcb95fcc293371dd3b52f3557cd8f0030403fac2b52455d998faf
-MISC metadata.xml 328 BLAKE2B 578fbe7a61b751e3b4f2bf9c247b11c685fcc346e8a8874227b301ec9bf4e8407156e5108e847458f59e666075c730b749ae1497603b18853d06c2193ae65932 SHA512 9b80ab0dc1d5409d09e1a11002770f0c22658bf7ddd513f648ab10a74687409a21f9bb882329b2bf42e154e5bea7f1f2f9b064261499dc0be286cf259bf5802f
+MISC metadata.xml 328 BLAKE2B a0089b49edd24a23f3e5a8b9e32a1ecdd80bec9cc9913aa6aabeab3452bf762acee5a8441ff1faddcc5c30cc444f96c0b798e8f4dc64370ec2967eeba12c7c6b SHA512 43e9be1bf9f65f039d047cbfb370860a7c3f6e70e17df13ce5fcff0c1a92846b3acbca61817098cb414c078fead77e49640aaba10e637434303a312b10c08a2e
diff --git a/media-radio/adifmerg/metadata.xml b/media-radio/adifmerg/metadata.xml
index 1023d5962205..515c722308d1 100644
--- a/media-radio/adifmerg/metadata.xml
+++ b/media-radio/adifmerg/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/media-radio/cqrlog/Manifest b/media-radio/cqrlog/Manifest
index 170c0e4d2d2e..07dedb731df8 100644
--- a/media-radio/cqrlog/Manifest
+++ b/media-radio/cqrlog/Manifest
@@ -1,12 +1,4 @@
-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.1.0-r2.ebuild b/media-radio/cqrlog/cqrlog-2.1.0-r2.ebuild
deleted file mode 100644
index 6e07afef90a5..000000000000
--- a/media-radio/cqrlog/cqrlog-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="CQRLOG is an advanced ham radio logger based on MySQL database."
-HOMEPAGE="https://www.cqrlog.com/"
-SRC_URI="https://github.com/ok2cqr/cqrlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-#RESTRICT="strip"
-
-DEPEND=">=dev-lang/lazarus-1.6.4
-		>=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"
-
-#S=${WORKDIR}/${P}
-
-LazarusDir=/usr/share/lazarus/
-
-src_prepare() {
-# add --lazarusdir=/usr/share/lazarus to command line
-# fix tmpdir
-	eapply_user
-	epatch "${FILESDIR}/${PV}-makefile.patch"
-}
-
-pkg_postist() {
-	elog "This package optionally supports media-libs/hablib"
-	elog "for monitoring radio settings."
-}
diff --git a/media-radio/cqrlog/cqrlog-2.3.0-r1.ebuild b/media-radio/cqrlog/cqrlog-2.3.0-r1.ebuild
deleted file mode 100644
index 43d58b5490bd..000000000000
--- a/media-radio/cqrlog/cqrlog-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="CQRLOG is an advanced ham radio logger based on MySQL database."
-HOMEPAGE="https://www.cqrlog.com/"
-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"
-
-LazarusDir=/usr/share/lazarus/
-
-src_prepare() {
-	eapply_user
-	epatch "${FILESDIR}/${PV}-makefile.patch"
-	epatch "${FILESDIR}/${PV}-database-connection-refactoring.patch"
-}
-
-pkg_postist() {
-	elog "This package optionally supports media-libs/hablib"
-	elog "for monitoring radio settings."
-}
diff --git a/media-radio/cqrlog/cqrlog-2.3.0.ebuild b/media-radio/cqrlog/cqrlog-2.3.0.ebuild
deleted file mode 100644
index 3b72a623578a..000000000000
--- a/media-radio/cqrlog/cqrlog-2.3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="CQRLOG is an advanced ham radio logger based on MySQL database."
-HOMEPAGE="https://www.cqrlog.com/"
-SRC_URI="https://github.com/ok2cqr/cqrlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-#RESTRICT="strip"
-
-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"
-
-#S=${WORKDIR}/${P}
-
-LazarusDir=/usr/share/lazarus/
-
-src_prepare() {
-# add --lazarusdir=/usr/share/lazarus to command line
-# fix tmpdir
-# remove strip call
-	eapply_user
-	epatch "${FILESDIR}/${PV}-makefile.patch"
-}
-
-pkg_postist() {
-	elog "This package optionally supports media-libs/hablib"
-	elog "for monitoring radio settings."
-}
diff --git a/media-radio/cqrlog/files/2.1.0-makefile.patch b/media-radio/cqrlog/files/2.1.0-makefile.patch
deleted file mode 100644
index 8499213fbd53..000000000000
--- a/media-radio/cqrlog/files/2.1.0-makefile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Makefile.orig b/Makefile
-index 4edf8cf..1ec6262 100644
---- a/Makefile.orig
-+++ b/Makefile
-@@ -3,10 +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
-+	$(CC) --ws=gtk2 --lazarusdir=/usr/share/lazarus --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
- 	$(ST) src/cqrlog
- 	gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
- 
diff --git a/media-radio/cqrlog/files/2.3.0-database-connection-refactoring.patch b/media-radio/cqrlog/files/2.3.0-database-connection-refactoring.patch
deleted file mode 100644
index 810bc5b5ba97..000000000000
--- a/media-radio/cqrlog/files/2.3.0-database-connection-refactoring.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From b26102b097ef6353a20d18ccdaf7a3a6a30185c7 Mon Sep 17 00:00:00 2001
-From: ok2cqr <petr@petrhlozek.cz>
-Date: Sat, 15 Sep 2018 07:12:30 +0200
-Subject: [PATCH] database connection refactoring
-
----
- src/dData.pas | 126 +++++++-------------------------------------------
- 1 file changed, 17 insertions(+), 109 deletions(-)
-
-diff --git a/src/dData.pas b/src/dData.pas
-index 9d72d27..bb56598 100644
---- a/src/dData.pas
-+++ b/src/dData.pas
-@@ -162,7 +162,6 @@ type
-     function  FindLib(const Path,LibName : String) : String;
-     function  GetMysqldPath : String;
-     function  TableExists(TableName : String) : Boolean;
--    function  GetMySQLLib : String;
-     function  GetDebugLevel : Integer;
- 
-     procedure CreateDBConnections;
-@@ -267,6 +266,7 @@ type
-     function  RbnCallExistsInLog(callsign,band,mode,LastDate,LastTime : String) : Boolean;
-     function  CallNoteExists(Callsign : String) : Boolean;
-     function  GetNewLogNumber : Integer;
-+    function  getNewMySQLConnectionObject : TMySQL57Connection;
- 
-     procedure SaveQSO(date : TDateTime; time_on,time_off,call : String; freq : Currency;mode,rst_s,
-                       rst_r, stn_name,qth,qsl_s,qsl_r,qsl_via,iota,pwr : String; itu,waz : Integer;
-@@ -1092,49 +1092,6 @@ begin
-     Writeln('   ',DLLUtilName)
-   end;
- 
--  lib := GetMySQLLib;
--  if fDebugLevel>=1 then Writeln('Loading libmysqlclient: ',lib);
--  if lib <> '' then
--    InitialiseMySQL(lib);
--
--  try try
--    c := TConnectionName.Create(nil);
--    MySQLVer := copy(c.ClientInfo,1,3);
--
--    if fDebugLevel>=1 then
--    begin
--      Writeln('**************************');
--      Writeln('MySQL version: ',MySQLVer);
--      Writeln('**************************')
--    end;
--
--    if MySQLVer = '10.' then
--      MySQLVer := '5.6';
--    if MySQLVer = '10.1' then
--      MySQLVer := '5.7'
--
--  except
--    on E : Exception do
--    begin
--      Writeln('FATAL ERROR: Can not get MySQL client library version version!',LineEnding,
--              'Setting to default version (5.1)');
--      MySQLVer := '5.1'
--    end
--  end
--  finally
--    FreeAndNil(c)
--  end;
--
--  if not TryStrToCurr(MySQLVer,fMySQLVersion) then
--    fMySQLVersion := 5.6;
--
--  if fDebugLevel>=1 then
--  begin
--    Writeln('**********************************');
--    Writeln('MySQL version assigned: ',FloatToStr(fMySQLVersion));
--    Writeln('**********************************')
--  end;
--
-   CreateDBConnections;
- 
-   MainCon.KeepConnection := True;
-@@ -1148,13 +1105,11 @@ begin
-   end;
- 
-   //special connection for band map thread
--  BandMapCon.KeepConnection := True;
-   BandMapCon.Transaction    := trBandMapFil;
-   qBandMapFil.Transaction   := trBandMapFil;
-   qBandMapFil.DataBase      := BandMapCon;
-   trBandMapFil.DataBase     := BandMapCon;
- 
--  RbnMonCon.KeepConnection := True;
-   RbnMonCon.Transaction    := trRbnMon;
-   qRbnMon.Transaction      := trRbnMon;
-   qRbnMon.DataBase         := RbnMonCon;
-@@ -1194,7 +1149,6 @@ begin
-     Writeln('ZIP code directory:     ',fZipCodeDir);
-     Writeln('Binary dir:             ',ExtractFilePath(Paramstr(0)));
-     Writeln('Share dir:              ',fShareDir);
--    Writeln('TConnection to MySQL:   ',FloatToStr(fMySQLVersion));
-     Writeln('*')
-   end;
- 
-@@ -4166,70 +4120,13 @@ end;
- 
- procedure TdmData.CreateDBConnections;
- begin
--  if fMySQLVersion < 5.5 then
--  begin
--    MainCon      := TMySQL51Connection.Create(self);
--    BandMapCon   := TMySQL51Connection.Create(self);
--    RbnMonCon    := TMySQL51Connection.Create(self);
--    LogUploadCon := TMySQL51Connection.Create(self);
--    dbDXC        := TMySQL51Connection.Create(self)
--  end
--  else  if fMySQLVersion < 5.6 then
--  begin
--    MainCon      := TMySQL55Connection.Create(self);
--    BandMapCon   := TMySQL55Connection.Create(self);
--    RbnMonCon    := TMySQL55Connection.Create(self);
--    LogUploadCon := TMySQL55Connection.Create(self);
--    dbDXC        := TMySQL55Connection.Create(self)
--  end
--  else begin
--    if fMySQLVersion < 5.7 then
--    begin
--      MainCon      := TMySQL56Connection.Create(self);
--      BandMapCon   := TMySQL56Connection.Create(self);
--      RbnMonCon    := TMySQL56Connection.Create(self);
--      LogUploadCon := TMySQL56Connection.Create(self);
--      dbDXC        := TMySQL56Connection.Create(self)
--    end
--    else begin
--      MainCon      := TMySQL57Connection.Create(self);
--      BandMapCon   := TMySQL57Connection.Create(self);
--      RbnMonCon    := TMySQL57Connection.Create(self);
--      LogUploadCon := TMySQL57Connection.Create(self);
--      dbDXC        := TMySQL57Connection.Create(self)
--    end
--  end
-+  MainCon      := getNewMySQLConnectionObject();
-+  BandMapCon   := getNewMySQLConnectionObject();
-+  RbnMonCon    := getNewMySQLConnectionObject();
-+  LogUploadCon := getNewMySQLConnectionObject();
-+  dbDXC        := getNewMySQLConnectionObject();
- end;
- 
--function TdmData.GetMySQLLib : String;
--var
--  lib : String;
--  Paths : TStringList;
--begin
--  Result := '';
--  Paths := TStringList.Create;
--  try
--    Paths.Add('/usr/lib64/');
--    Paths.Add('/lib64/');
--    Paths.Add('/usr/lib/x86_64-linux-gnu/');
--    Paths.Add('/usr/lib64/mysql/');
--    Paths.Add('/lib/x86_64-linux-gnu/');
--
--    Paths.Add('/usr/lib/i386-linux-gnu/');
--    Paths.Add('/lib/i386-linux-gnu/');
--    Paths.Add('/usr/lib/');
--    Paths.Add('/lib/');
--    Paths.Add('/usr/lib/mysql/');
--
--    Result := MyFindFile('libmariadbclient.so*', Paths);
--    if (Result='') then
--    begin
--      Result := MyFindFile('libmysqlclient.so*', Paths)
--    end
--  finally
--    FreeAndNil(Paths)
--  end
--end;
- 
- function TdmData.GetDebugLevel : Integer;
- var
-@@ -4315,5 +4212,16 @@ begin
-     QSOColorDate := now
- end;
- 
-+function TdmData.getNewMySQLConnectionObject : TMySQL57Connection;
-+var
-+  Connection : TMySQL57Connection;
-+begin
-+  Connection := TMySQL57Connection.Create(self);
-+  Connection.SkipLibraryVersionCheck := True;
-+  Connection.KeepConnection := True;
-+
-+  result := Connection
-+end;
-+
- end.
- 
--- 
-2.18.1
-
diff --git a/media-radio/cqrlog/files/2.3.0-makefile.patch b/media-radio/cqrlog/files/2.3.0-makefile.patch
deleted file mode 100644
index da6ac782c488..000000000000
--- a/media-radio/cqrlog/files/2.3.0-makefile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/Makefile.orig b/Makefile
-index 0b1d1ef..8d6eb2f 100644
---- a/Makefile.orig
-+++ 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) --ws=gtk2 --lazarusdir=/usr/share/lazarus --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
- 	gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
- 
- clean:
diff --git a/media-radio/direwolf/Manifest b/media-radio/direwolf/Manifest
index 1b4e17391070..7ea5abaca187 100644
--- a/media-radio/direwolf/Manifest
+++ b/media-radio/direwolf/Manifest
@@ -6,5 +6,6 @@ AUX direwolf.service 154 BLAKE2B 1284b0f93085f5e8a8cd8452b86c0ddf4b8abf9c01496bf
 DIST direwolf-1.4.tar.gz 17554878 BLAKE2B a8eea6777df93d66d67c993c23eba86f37ff1e23d95df842b17be1a9a0b83c4bb0b7b14b97f43a1756512d060e50136712d1d9d499b2567eabbe1092a2f5edf0 SHA512 597b0652e910642d5a3c538297e4306f9317c29b3629e7fd96cc33b92b2f09d743cea8b8a0cc6451347dc0877fcf1f3933a420ae58e33ad7be7d899f80036eb3
 DIST direwolf-1.5.tar.gz 17996557 BLAKE2B 6860075b764248f1e0ff06e2a533e2e31f65851ea45d74fb0aca11827940c6df0a8bab4b6b78aa98847ee54b2b344d3c5fc8da6947f9113d2fac6d3ea427d68b SHA512 c23e2ccebd47235f76a9583e14cf8e8df299b8f7456a6388534536e7b1114b3d9b9efee43da2c1708e01a0b9534db0ed93314368e20e9002bfcd5b3a2855d8a5
 EBUILD direwolf-1.4.ebuild 1588 BLAKE2B 636e95a3e21fdccde9e0593cb47fd013941d1cdfdda74881cf145e43638359144585e3c99b24c877e45343a3ec0ebfa522694abd8c929a42816688d1a56b0840 SHA512 c66ce7a380bb9a767605094936d3b74269551d1fdf41e5cbad32d534595535019e6918c7616b3a1e0e74439b418364f96e526b4002af79d1eeb48844a7a97431
+EBUILD direwolf-1.5-r1.ebuild 2100 BLAKE2B deb75671e19dc27cc43e32e903034502ba0db6fdeb9707eb5a629ad3eec26966267252e01679429122e3ba49400e8aa7313f9e544d700fa54278a47772a4a975 SHA512 2334e2bf6f07f30379a167bcf199a0c1384ce14602f57abf9542309830ad37ad418a6e68226e6f15f8c2fff0edfa542ac5e2ea52584066b07b569150953a92dd
 EBUILD direwolf-1.5.ebuild 2098 BLAKE2B c9a37621af73c18f4ce33dec0a530b65096fb3016224e35677807e59a3be277ffdfa6b0f5fc056a1cbfbafd71118a56c5cdf23df39d7b0f6abfa5aa8679e2482 SHA512 ceb9e5067d5b00044c713d6a06a806a37c456c5dbade6e3cd5bf41be197b736c08b75982a5d5ac78be0334aa90fc750ceda3c8e5a976dd74bb340121338e12ec
 MISC metadata.xml 404 BLAKE2B 597de8502b1c38246c0bf473f69767d8ba0a9c45942d790718f7065677768f175143d5eb0428baf07697263beb6abc77d0147ee814132ac9ea0863e832fb4122 SHA512 a27e29158ac2305c89b2c64cd08618a9d3f655604ce8ceca49494d7c82e030e0294eaaa70c84c7105768e6d308b57bea336d9f036b64eadd146c765a9697b92c
diff --git a/media-radio/direwolf/direwolf-1.5-r1.ebuild b/media-radio/direwolf/direwolf-1.5-r1.ebuild
new file mode 100644
index 000000000000..1bc1ce3d60ee
--- /dev/null
+++ b/media-radio/direwolf/direwolf-1.5-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils systemd
+
+DESCRIPTION="Decoded Information from Radio Emissions for Windows Or Linux Fans"
+HOMEPAGE="https://github.com/wb2osz/direwolf/blob/master/README.md"
+SRC_URI="https://github.com/wb2osz/direwolf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gps hamlib udev"
+
+RDEPEND="
+	media-libs/alsa-lib:=
+	gps? ( sci-geosciences/gpsd )
+	hamlib? ( media-libs/hamlib:= )
+	udev? ( virtual/libudev )
+"
+BDEPEND="hamlib? ( virtual/pkgconfig )"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md README.md doc/2400-4800-PSK-for-APRS-Packet-Radio.pdf doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf doc/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf doc/APRS-Telemetry-Toolkit.pdf doc/APRStt-Implementation-Notes.pdf doc/APRStt-interface-for-SARTrack.pdf doc/APRStt-Listening-Example.pdf doc/Going-beyond-9600-baud.pdf doc/Raspberry-Pi-APRS.pdf doc/Raspberry-Pi-APRS-Tracker.pdf doc/Raspberry-Pi-SDR-IGate.pdf doc/README.md doc/Successful-APRS-IGate-Operation.pdf doc/User-Guide.pdf doc/WA8LMF-TNC-Test-CD-Results.pdf direwolf.conf dw-start.sh sdr.conf telemetry-toolkit/telem-m0xer-3.txt telemetry-toolkit/telem-balloon.conf telemetry-toolkit/telem-volts.conf )
+
+INSTALLDIR="${D}"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PV}-makefile.patch"
+	eapply "${FILESDIR}/direwolf-gpsd-API-9.patch"
+
+	eapply_user
+
+	if use gps ; then
+		sed -i -e 's/#enable_gpsd/enable_gpsd/' Makefile.linux || die "Sed failed!"
+	fi
+
+	if use hamlib; then
+		sed -i -e 's/#enable_hamlib/enable_hamlib/' Makefile.linux || die "Sed failed!"
+	fi
+
+	if use udev ; then
+		sed -i -e 's/#enable_cm108/enable_cm108/' Makefile.linux || die "Sed failed!"
+	fi
+}
+
+src_install() {
+	dodir /usr
+	dodir /usr/bin
+	keepdir /var/log/direwolf
+	emake DESTDIR="${D}" install
+	insinto /etc/direwolf/
+	doins direwolf.conf
+	einstalldocs
+	systemd_dounit "${FILESDIR}"/direwolf.service
+	systemd_dounit "${FILESDIR}"/direwolf-kiss.service
+}
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index bff58d275c9c..f04512225f10 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -5,4 +5,4 @@ DIST flrig-1.3.54.tar.gz 891644 BLAKE2B 9bb87c9a0960a3975cf27c67b0850c3d6ad3ac4e
 EBUILD flrig-1.3.51.ebuild 583 BLAKE2B b106c6f19739f97d709eef5f6400f8d96365eb1bda992ef2a3a5e813bb44a476ab800b8e006a3e874cce2d02bd0964eb38136b276bc80e43ae75be29fd5d1910 SHA512 460255763b871d7f3e6a53c88724e996dd08ecd69cd6e4b87f423832a59e6dcd4b72d87b5b507b1e96dbb53c0e30a9039f7631f99df2a210732bd644c4a393c1
 EBUILD flrig-1.3.53.ebuild 496 BLAKE2B dc5ffe3cbfe399585de2aaeae75343ca3143742cda83b798d4f690a24fd52fc4fee4d0fe4bafccc98669de7aaa1a7dfbd01132e9dcb7caaf7edb422a8e2d1a70 SHA512 0bb2ddb590127ff929650400cfbf43ea2dcd299acece85fb3cf93bd78e6ecc786a2e05c00ef65886c87ed6ac44f481b55bd624c2553dc5c24ddb0442d99fd5a7
 EBUILD flrig-1.3.54.ebuild 496 BLAKE2B 4064896c9153034ae69222521400e4d86cf5569e05470b9676ffd235583ec22700c2a8c9649e749e311fec52fd1a3070b4eb2b8c1c6a536e1d475c69cdaac297 SHA512 a12f538adb54c474e5acb4cfeefd19f432e586aea2be9b8ffb5d2a1b271da98df1c30337d517a8197e7334141ee5a6e295485b31af1d58993d5510b757bda068
-MISC metadata.xml 325 BLAKE2B c4c98ed723dff91c8935c44ee552e25a08366edb7b73593d29d790622a49e130ef56137de21e1df16e1f968b1d5a0c984ce6df5b817a39f38523fb71353a3e1f SHA512 ca601e14e79450d08e0679e86827071a323fbc60cdf89412257747490046ca6efb2e78ae27f69c0e3ad449427049a35d478f2a7524a0606658ef9b302d9c0d43
+MISC metadata.xml 325 BLAKE2B 5a0f279d13c08ae0f8f26ccab563978f7aaf5b4919bdd1b4eb0e5ef102f40d86ac46802d43f7303e97106ad6fb3f52256b03222623bea4b1ce1f7c5350dcceb1 SHA512 90a892833f50bb0d2c4cf95887f83f0fa2c1afd4f33c498e72e157ab9713677127511b44e13d9c4146b6aedd0876acde69cc89c6b5a80a0a847a00683945ffca
diff --git a/media-radio/flrig/metadata.xml b/media-radio/flrig/metadata.xml
index f928b39d9611..3abc8c4279ae 100644
--- a/media-radio/flrig/metadata.xml
+++ b/media-radio/flrig/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/media-radio/metadata.xml b/media-radio/metadata.xml
index bfa71f070f00..613bf85c63ff 100644
--- a/media-radio/metadata.xml
+++ b/media-radio/metadata.xml
@@ -30,4 +30,3 @@
 		radiem.
 	</longdescription>
 </catmetadata>
-
diff --git a/media-radio/svxlink/Manifest b/media-radio/svxlink/Manifest
index 2475657eebf8..e32b56681091 100644
--- a/media-radio/svxlink/Manifest
+++ b/media-radio/svxlink/Manifest
@@ -8,4 +8,4 @@ DIST svxlink-17.12.1.tar.gz 1621559 BLAKE2B 8a1d9498f451a730ee8d961d4ebd548f34f9
 DIST svxlink-17.12.2.tar.gz 1622039 BLAKE2B f67e74605d371f37bddc06f2092d7c9c355a549df2dcfcda3e48e3238dd38d57e195f2fe7edf390e3d48324ef8ab4accf18975ead9216259e484d96597275937 SHA512 cace3894da3b94ae8bd41c47c76c9c6203cb7eaaca6d2c847509b733ed4a6a1dc9ca8c4c16c060dfb0d9ee2982f2a0a2746aa06a5507640d5ed9c9b4fdf90f7e
 EBUILD svxlink-17.12.1.ebuild 1672 BLAKE2B a78139f14e1a4d8d8351a7367230df9f5522d3c92124f5c21e4e3f19b181c42ce28d0f52f99398e7ba4a851d7068faa1c54627cb7f4987e258b4329b0b614950 SHA512 bdd8c8ce8841d96fc1ed63287d0f9bf0e8c07b0918449a231bb87debbe1820c890fc64864c41fb0cf07b15393e5cb5034b0e655f4200fb93144f08f4237ee1a3
 EBUILD svxlink-17.12.2.ebuild 1795 BLAKE2B b46352f97710784cf73ecd7e4abbfc0f6087b503bd7c23d5cd295a83579b155048b7e15d62e8632b8dc09d9f81ba3897a38c035cf85082b7b23103c72400dd1c SHA512 4bca680ce3c89d77f0491f31f43f2436fe40e17e433735b71493c70ff299671eec036393f90c0f45ceb0979906d3e5c92598cdc7405dfa777af631a2596d6f67
-MISC metadata.xml 696 BLAKE2B 51be8858bc950793e0044d7d8dfa695f3f4c1fa0f373be8908d00c0fdc73ee0fbbe06b118a28da147978ad204d63f2eb02183c961123d71c078fcaa9cc8306f0 SHA512 8e514fc2f15af5d7520a371ab802aa2a024276514d184f31b00b96c09b06e7b7c69904a0ea256f17fbe9e97f8da4cd908a91072284b274ba6488982e92182bc5
+MISC metadata.xml 696 BLAKE2B 6bf4c1b0c6be3993885cf24eff479637cb6b99a6bc7b5c671637d12115c125fc63be37753bcaa4abe029504da13f5ed023a7de238ce1b386b4be3baf6944c72f SHA512 fcf27a9ed0fe5b05a6053a8ef965eb9e5a43c9c2510d59fdf14aa0144291ddff290e5a55c08403deffc31d1b5b43db1fb8d2fc92b4784c119341f7778052d4d2
diff --git a/media-radio/svxlink/metadata.xml b/media-radio/svxlink/metadata.xml
index 8b69810841ee..3b8f3022aaf5 100644
--- a/media-radio/svxlink/metadata.xml
+++ b/media-radio/svxlink/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">