gentoo resync : 18.11.2019

8 files changed, 61 insertions, 127 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 2a0b5284f1fd..c74c6ad11e3d 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/qsstv/Manifest b/media-radio/qsstv/Manifest
index 29f6ce989825..f91bdb0ab818 100644
--- a/media-radio/qsstv/Manifest
+++ b/media-radio/qsstv/Manifest
@@ -1,5 +1,7 @@
 DIST qsstv_9.2.6.tar.gz 11385735 BLAKE2B b7192255a3df32d5fbf07f54e1a8b7a7fd092fc4f7cca794df66d73687342e2169cdf8a2e08e7d665e6c27cefa3e9e4574c10c685cc9647caae1156d5c88522f SHA512 10ad86db8a4db432dc757314375487d4128a612a54496105c2acaadce4f2cba8d044f1c5bf1d38534664ef7c065742606027306b3542ae834673ffce58885557
 DIST qsstv_9.4.2.tar.gz 7409123 BLAKE2B d20c81f8a84ffc21d2afa2f481f2aa5313668beb922fe27e97b8b68f9420edad4544358b6166296183e2b8806f32bba54e25a035ec82481ed24a3dc1c343694e SHA512 e7e5fe925dd925fef4e2fcff15b33634aa0ea1f50ca01db2c2dcdd428b4c4c1f45cf5aaa9ad2c3b9374c588bb6f65bf99924537012ecf2065a03b3f4d1c46db9
+DIST qsstv_9.4.4.tar.gz 7716392 BLAKE2B df285cc26c195dce05e54401de4fce70ea91c3af1f774d90d81b62a366c66c3cde4f0cce5c370bad45b81230ca7c2be624542cde10b94d388785d13b49ed646d SHA512 d206c6c108827b607dfe360e7afe31065518f03ab04609ccca9a9bda16207d12966eb49d486d13eebb814716252c50aa5963d090f1e505e508ccb1b6ccc4728c
 EBUILD qsstv-9.2.6.ebuild 1011 BLAKE2B d24f2e9717a4532f25e7f0428948186cf8f94a1a85c668f944a7450118a35c22a4ce72927b16fd7d94588ddc324ec904b199cd7a87eafd6feb4b588adbc66271 SHA512 26a7cda1fca6b68af89406b4764cc6df62e39d0465f30fc8d95268c63a89dfd700f71be28c2ec30d8e8f6e6041c8440cc6f202ff334e1169503d8a5947872b1a
 EBUILD qsstv-9.4.2.ebuild 1022 BLAKE2B 44dccc88a935574850e264d856b3afacdfe0c8f65e6384b71fa2003691ae52d82a47091ea8fc2def42e10fd2404f9ebc947de07b9c8c93a9e80da50dc7ca87f4 SHA512 4e4016ce9adddef9ff6c34f1ca9dc5a875165800ff1d7ad503023289e79ca0a10929faa895afd80b3bea15e516907a2232b3f65df26c93f55121831138e6c913
+EBUILD qsstv-9.4.4.ebuild 1024 BLAKE2B f348d81601411138e40afacb047bc2f94807970f3ed04364df930e619adb38b63aaee46047c3c6c485159e8475fee247a531b921718886a645133ad63c1e7dd2 SHA512 d7951062d18bcd4505286206146cdaf01f37e85b0efc350f7f6883dc9bc72707dc748774e682f440d8d9c927461a6595076a0386252e5ca966560d0e4fa86b5c
 MISC metadata.xml 410 BLAKE2B ce47d5a977b2b6b76940c5b2c74434ea382d4188f319234935a12fa4927f4b493ea664ec6fca2302aea1a31b8234d20819b585f5e56384085541445f4e8bab2d SHA512 2c6aca4abe5c944966fd5c63f9534024453cd67560f406971d6281604bfed5800f384cee8d1aadb0b85bf636530a2b7eb5c2ba002a499eb41f2670d38a89b69c
diff --git a/media-radio/qsstv/qsstv-9.4.4.ebuild b/media-radio/qsstv/qsstv-9.4.4.ebuild
new file mode 100644
index 000000000000..9df5484486f1
--- /dev/null
+++ b/media-radio/qsstv/qsstv-9.4.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+MY_P=${P/-/_}
+
+DESCRIPTION="Amateur radio SSTV software"
+HOMEPAGE="http://users.telenet.be/on4qz/"
+SRC_URI="http://users.telenet.be/on4qz/qsstv/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/hamlib
+	media-libs/openjpeg:2
+	media-libs/alsa-lib
+	media-sound/pulseaudio
+	media-libs/libv4l
+	sci-libs/fftw:3.0="
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	x11-misc/xdg-utils"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	eapply_user
+	# fix docdirectory, install path and hamlib search path
+	sed -i -e "s:/doc/\$\$TARGET:/doc/${PF}:" \
+		-e "s:-lhamlib:-L/usr/$(get_libdir)/hamlib -lhamlib:g" \
+		qsstv/qsstv.pro || die
+}
+
+src_configure() {
+	eqmake5 PREFIX="/usr"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc README.txt
+}
diff --git a/media-radio/tlf/Manifest b/media-radio/tlf/Manifest
index 0c747148e7c0..7e6650ae0e75 100644
--- a/media-radio/tlf/Manifest
+++ b/media-radio/tlf/Manifest
@@ -1,7 +1,5 @@
-DIST tlf-1.3.0.tar.gz 643783 BLAKE2B 8de41b3414231cf10256225bcd8e080c1c3b20849f8298dcb5df0f3f094c2fa80d93229bd75d14f5f6f75280215744d43f39460dee94ef768169957f8587ef28 SHA512 c2c1f7ce8ff74b94fe0538fb6cd39d2e1b70d392c0e050ce60a107a085406edc83ee54fd18d42a1dcb688859c53072f9918cba4d8001889189b337eded0374c7
-DIST tlf-1.3.1.tar.gz 689531 BLAKE2B 4c56728776493c1a77f85fdf5f3c2abe456043d07d2106cb08f7f04af31bc317507e4589c3e2ae310d184f8ed6103611d936a69df7d55a9575234420bdf29823 SHA512 aa26b87071a85574f2c08b46a3b0d8e030fb4384a38da4f7c97b6b1fb80c6c63b9f1814cf0eced090219e365d67cfcdabf5b71b2feaa39d281e41333bd5afcdb
 DIST tlf-1.3.2.tar.gz 691287 BLAKE2B 130e1e070e2846cfec2989c20716e713b3b9269ba5395f96e19e049c87b321673d5bfd005c887fef0d8945e46db179eca7e7a1e1f96cc5fb0ab7be2cd74185bf SHA512 797afe9d4dcd83c315ff62b07d24d44a76fd08dabb0f081d20eb8181232630cf2a1792dcf4afa0e74a6ca6e3c4cbe0a42958884aecbe8ee31bc8c6f9bd05215c
-EBUILD tlf-1.3.0.ebuild 643 BLAKE2B a06cc0c5caef73f382a51f1e187035a9dc740512ec2711d3e9b4adb63212240191b96aa5ebd5de4242b07a64438a8245aebf46d0bfd56d05168faa609d94131f SHA512 cec320a9268fa4b4df8eeb4e58155898615a7cd372e27e2864af15ad73d489e501ab1d78c372acc705a9eb9ac2bf69b751f91b4ed8d9d7998275da42d0245a95
-EBUILD tlf-1.3.1.ebuild 659 BLAKE2B c4a4fbde3898698e6de47ac3fa9a58bb8c286571791c61efc610c93345c2c16421ab40b57d73d28e276cfbd493825c062ae383662eb782234f912f6a05efa221 SHA512 23892aea13f9adaa673ac3d2afda7fda30050634fd5317168531353bc71c577a1644cd2ad1361c0a15db26f005bc89ea3a252db522630a29d496d1f4516cd2dd
+DIST tlf-1.4.0.tar.gz 702237 BLAKE2B a8e8aaacafe961bc4c33eccca066eaadf86cdca6de6b5585c09b808da9f85d62e704be16feaffaa81748de4a3ccddf04f4f56edde963adcb3bb210f75ba0a054 SHA512 8abf1b3bbabc506cd844d7b9bea5985cd8c73cd4401819bf4144022b41711e5fd58cf792638bb93c2ee52586c953f4115c0055799469f5c1edd157afddae1631
 EBUILD tlf-1.3.2.ebuild 649 BLAKE2B 1361e008a0054614a841bc7f6c1382703634eacead1ce0e953da4e2469840cf0fa150d926bc71194d41a0592acd973f5e49863684770e1d64d53cf65360b89d5 SHA512 8054e82c9c7cdd5fba2369a0f6b0f3888eaac9dc9c2f2ed12f05e42c388d0c25894e1f40b51d946bf4e9e9f0998a7344a2d039db217c0ffe3643f24c1e4e3272
+EBUILD tlf-1.4.0.ebuild 663 BLAKE2B 4c50f89f105c3abfc9fde23aea42f08fa726ae6e2c945b082021870bf13f2bf7c253a8f723194c9110b996a95866812b9e075c81b91beeaf854cf41c92c6f535 SHA512 c22430cea3bf6edd52fe2f6f6f3f671222d40b9d8558482ae3acb4098ca1f3dd70111beee56e6ee15201247c1c24cd55984aa8ab5345aa8383e349ba25ef3f9d
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/media-radio/tlf/tlf-1.3.0.ebuild b/media-radio/tlf/tlf-1.3.0.ebuild
deleted file mode 100644
index 93c6cfe25047..000000000000
--- a/media-radio/tlf/tlf-1.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="Console-mode amateur radio contest logger"
-HOMEPAGE="http://home.iae.nl/users/reinc/TLF-0.2.html"
-SRC_URI="http://www.hs-mittweida.de/tb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:=
-	dev-libs/glib:2
-	media-libs/hamlib
-	media-sound/sox
-	dev-libs/xmlrpc-c[curl]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	append-ldflags -L/usr/$(get_libdir)/hamlib
-	econf --docdir=/usr/share/doc/${PF} --enable-hamlib --enable-fldigi-xmlrpc
-}
diff --git a/media-radio/tlf/tlf-1.3.1.ebuild b/media-radio/tlf/tlf-1.4.0.ebuild
index 6be0473c0593..5f950b40696f 100644
--- a/media-radio/tlf/tlf-1.3.1.ebuild
+++ b/media-radio/tlf/tlf-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,13 +7,15 @@ inherit flag-o-matic
 
 DESCRIPTION="Console-mode amateur radio contest logger"
 HOMEPAGE="http://home.iae.nl/users/reinc/TLF-0.2.html"
-SRC_URI="http://www.hs-mittweida.de/tb/${P}.tar.gz"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="sys-libs/ncurses:=
 	dev-libs/glib:2
 	media-libs/hamlib
@@ -25,5 +27,5 @@ DEPEND="
 
 src_configure() {
 	append-ldflags -L/usr/$(get_libdir)/hamlib
-	econf --docdir=/usr/share/doc/${PF} --enable-hamlib --enable-fldigi-xmlrpc
+	econf --docdir=/usr/share/doc/${PF} --enable-fldigi-xmlrpc
 }
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index 8b27a6e834ff..6123381ab029 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -3,7 +3,6 @@ AUX xastir-2.0.4-fortify.diff 4404 BLAKE2B 46f9d2adfd70575301e7d5f9874520baf60e0
 AUX xastir-2.0.8-fix-graphicsmagick.diff 1201 BLAKE2B 60c16089c786178b91eb6731b1b95d676fe3a1620d8e55709ccf657a8f3b155d62cebfd141ae41eaac03d8ff26230d6e4f59a0e5bc795db7eb00ea64cf276d1e SHA512 d3ec865bdb2645ef54e555e33659761588f79aafb96261c65112d94a6d17ce3825555dc33cee6b3af1ef45f9c9e588cf8c6f3f67f5587c3a2651886c6869ec11
 AUX xastir-2.0.8-no-builtin-shapelib.diff 2588 BLAKE2B 7de77fa6a75819579084f69ac0aabf4b0d87c7524bedd9b989ecf861949c6c21ce759f40502295f9da41ef1d570087356a9f62ec8545cf2836b98dfea35d0552 SHA512 da7374fd129956887efcf9b21047e75a34d32b391cc5a65416481971dc94722f1c538997ac85c5b47a8b6fb69f85611f04f73859736fe747f41f1edeac53aae6
 AUX xastir-2.0.8-scripts.diff 3398 BLAKE2B 0095733a8c590a76bfbed1596fe6a4bd2faca2070989e703fff6b40ec2e5ee3ad628203de12d321b3e4afd27c6626af5d80453212b9a5b8ba8e2d70178a082a1 SHA512 3e7bf50a1aa0abc67f6c83aa13aceb4478965ad21dea48351ab8d45f72a37e165efda07e822642f1bd1095355823f73a02207f84934ca1fc614a3d4784742dda
-AUX xastir-2.1.0-scripts.diff 3506 BLAKE2B 64dcad59b08bb50a558e80b889eb25fec2c3677f9bc2d1d2d19d728df47f977b546fcddac036eb42b086f7bb73394269175dd3a8e13aeac9fe4ceac8de85bd01 SHA512 28d74029262de2ec58805ca8e042d100436369d330667574c01507a1085d96aa15c5e7ee84c200ccca869941acfe73f46959919c4f205608233505138c80aa8f
 AUX xastir-2.1.2-scripts.diff 3766 BLAKE2B fbad015655864f26dfed1b50ea6c1399fc70088ff092a2cdd1a173879db4bdbba43aea9107cc961890012682d0e265f888b908d553c50018d34ea040dc08243e SHA512 aef4410c53aa3d80c4f3ea48a50759a9a1813801d18fb6dd0cf4e90b8e49358c9f6040cca964b5ce4eefcea2966f197207b25e67dd1b69e1bbd5cf0ba640ae46
 DIST xastir-2.0.8.tar.gz 2697256 BLAKE2B 12a12219885d7923e3262494ac39b7b7f200118953b1e47ae25917f3f1732a1cff931de06462de7d5f1216c9b61561f8090fc49e18b40380eaa58b3559c5f123 SHA512 fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f
 DIST xastir-2.1.4.tar.gz 2694124 BLAKE2B 90fd8ef340fc5bad43c9501c6530dcd4bd60eaab9c04638c68f80add46f0df24c45db334549915edaee95cbdcc9b7580d6343d81d84cb819f4ef5a76c9f79242 SHA512 e96f9de52499615cfe88708656d111d417e0d0e08f798b2d97f6a270db3e639c4fb5219767f8fd399fe75f51f02391ace87ae7175ae9a44cb5a4056ab7b573b1
diff --git a/media-radio/xastir/files/xastir-2.1.0-scripts.diff b/media-radio/xastir/files/xastir-2.1.0-scripts.diff
deleted file mode 100644
index de8a461bceab..000000000000
--- a/media-radio/xastir/files/xastir-2.1.0-scripts.diff
+++ /dev/null
@@ -1,92 +0,0 @@
-# patch scripts location (bug #407185). partially backported from upstream.
-diff -u Xastir-Release-2.1.0/scripts.orig/Makefile.am Xastir-Release-2.1.0/scripts/Makefile.am
---- Xastir-Release-2.1.0/scripts.orig/Makefile.am	2018-12-08 12:14:51.881373754 +0100
-+++ Xastir-Release-2.1.0/scripts/Makefile.am	2018-12-08 12:15:53.206401168 +0100
-@@ -45,10 +45,8 @@
-     waypoint-get.pl \
-     wms.pl \
-     wxnowsrv.pl \
--    xastir-fixcfg.sh \
--    xastir-migrate.sh \
-     Xastir_tigerpoly.py
- 
- install-data-hook:
- 	cd $(DESTDIR)$(scriptsdir) && \
--	chmod a+x *.sh *.pl *.py get-* gpx2* *.bash
-+	chmod a+x *.pl *.py get-* gpx2* *.bash
-diff -Nur -u xastir-2.0.0.orig/scripts/coord-convert.pl xastir-2.0.0/scripts/coord-convert.pl
---- xastir-2.0.0.orig/scripts/coord-convert.pl	2010-07-03 22:09:48.000000000 +0000
-+++ xastir-2.0.0/scripts/coord-convert.pl	2012-03-07 15:46:01.000000000 +0000
-@@ -26,7 +26,7 @@
- #
- 
- 
--use lib "${prefix}/lib";
-+use lib /usr/share/xastir/scripts;
- use Coordinate;         # WE7U's Coordinate.pm module
- 
- 
-diff -Nur -u xastir-2.0.0.orig/scripts/permutations.pl xastir-2.0.0/scripts/permutations.pl
---- xastir-2.0.0.orig/scripts/permutations.pl	2010-07-03 22:09:48.000000000 +0000
-+++ xastir-2.0.0/scripts/permutations.pl	2012-03-07 15:42:34.000000000 +0000
-@@ -34,7 +34,7 @@
- #
- 
- 
--use lib "/usr/local/lib";
-+use lib "/usr/share/xastir/scripts";
- use Coordinate;         # WE7U's Coordinate.pm module
- 
- 
-diff -Nur -u xastir-2.0.0.orig/scripts/test_coord.pl xastir-2.0.0/scripts/test_coord.pl
---- xastir-2.0.0.orig/scripts/test_coord.pl	2010-01-31 02:12:23.000000000 +0000
-+++ xastir-2.0.0/scripts/test_coord.pl	2012-03-07 15:42:34.000000000 +0000
-@@ -33,7 +33,7 @@
- 
- #------------------------------------------------------------------------------------------------
- 
--use lib "/usr/local/lib";
-+use lib "/usr/share/xastir/scripts";
- use Coordinate;		# Snag WE7U's Coordinate module
- 
- 
-diff -Nur -u xastir-2.0.0.orig/scripts/toporama250k.pl xastir-2.0.0/scripts/toporama250k.pl
---- xastir-2.0.0.orig/scripts/toporama250k.pl	2010-01-31 02:12:23.000000000 +0000
-+++ xastir-2.0.0/scripts/toporama250k.pl	2012-03-07 15:46:49.000000000 +0000
-@@ -28,14 +28,14 @@
- # map files for the whole of Canada!
- #
- #
--# - "cd /usr/local/share/xastir/maps"
-+# - "cd /usr/share/xastir/maps"
- #
- # - Assure you have write privileges in the directory above either
- #   by becoming root using the "su" command, using "sudo", or
- #   temporarily changing ownership and/or privileges on the
- #   "maps" directory.
- #
--# - "/usr/local/lib/xastir/toporama250k.pl"
-+# - "/usr/share/xastir/scripts/toporama250k.pl"
- #
- # - The script will create/populate this directory heirarchy:
- #   .../maps/toporama/images/
-diff -Nur -u xastir-2.0.0.orig/scripts/toporama50k.pl xastir-2.0.0/scripts/toporama50k.pl
---- xastir-2.0.0.orig/scripts/toporama50k.pl	2010-01-31 02:12:23.000000000 +0000
-+++ xastir-2.0.0/scripts/toporama50k.pl	2012-03-07 15:47:01.000000000 +0000
-@@ -27,14 +27,14 @@
- # map files for the whole of Canada!
- #
- #
--# - "cd /usr/local/share/xastir/maps"
-+# - "cd /usr/share/xastir/maps"
- #
- # - Assure you have write privileges in the directory above either
- #   by becoming root using the "su" command, using "sudo", or
- #   temporarily changing ownership and/or privileges on the
- #   "maps" directory.
- #
--# - "/usr/local/lib/xastir/toporama50k.pl"
-+# - "/usr/share/xastir/scripts/toporama50k.pl"
- #
- # - The script will create/populate this directory heirarchy:
- #   .../maps/toporama/images/