diff options
author | Sam James <sam@gentoo.org> | 2021-03-16 19:31:00 +0000 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2021-03-16 19:55:50 +0000 |
commit | cbf13937b2da55606431e02c7f3f2123f5c75892 (patch) | |
tree | 04162a6dbb67e3cada1fc6aa5e74c02109e213a7 | |
parent | media-libs/libnspsl: drop 0.1.3-r2, 0.1.5-r1 (diff) | |
download | gentoo-cbf13937b2da55606431e02c7f3f2123f5c75892.tar.gz gentoo-cbf13937b2da55606431e02c7f3f2123f5c75892.tar.bz2 gentoo-cbf13937b2da55606431e02c7f3f2123f5c75892.zip |
media-radio/cqrlog: drop 2.1.0-r2, 2.3.0, 2.3.0-r1
Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r-- | media-radio/cqrlog/Manifest | 2 | ||||
-rw-r--r-- | media-radio/cqrlog/cqrlog-2.1.0-r2.ebuild | 46 | ||||
-rw-r--r-- | media-radio/cqrlog/cqrlog-2.3.0-r1.ebuild | 41 | ||||
-rw-r--r-- | media-radio/cqrlog/cqrlog-2.3.0.ebuild | 47 | ||||
-rw-r--r-- | media-radio/cqrlog/files/2.1.0-makefile.patch | 17 | ||||
-rw-r--r-- | media-radio/cqrlog/files/2.3.0-database-connection-refactoring.patch | 197 | ||||
-rw-r--r-- | media-radio/cqrlog/files/2.3.0-makefile.patch | 18 |
7 files changed, 0 insertions, 368 deletions
diff --git a/media-radio/cqrlog/Manifest b/media-radio/cqrlog/Manifest index 71d7189177bf..c9c0e486e36b 100644 --- a/media-radio/cqrlog/Manifest +++ b/media-radio/cqrlog/Manifest @@ -1,3 +1 @@ -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 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: |