gentoo resync : 19.01.2018

7 files changed, 35 insertions, 48 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 3baea8f41b7c..07849df65517 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/cqrlog/Manifest b/media-radio/cqrlog/Manifest
index c9a72b36f4c8..207473e2a27c 100644
--- a/media-radio/cqrlog/Manifest
+++ b/media-radio/cqrlog/Manifest
@@ -1,4 +1,4 @@
 AUX 2.1.0-makefile.patch 523 BLAKE2B 8a0143b80422ee19a0bdf8637de065d3af6b4aded30e3437b8ff3b05b5704426e9f890d915ba5e50429ebba9f4f77da9b15865d6a3b8e8233976c0b165e8dd09 SHA512 26da9c578cab7f2fadebf6818f323967e28383fe3e2429d3ef614c43bcd50155bdf1607f353beedd91c27b45045dff1787ee9d2844ffa800f7da53e04b045de8
 DIST cqrlog-2.1.0.tar.gz 8732858 BLAKE2B 926934b70dcd53d48ed6443994a295efdee7e34d968337f409988f269fe01faeace5dbfa02307d04ba41fb72205925b9a56fa1f75472f018cd85a408edf1265a SHA512 df5f9a197600762ef0fc60e25f67cf7968829cf0241e7e63849faa1152a0d002e0f373d33528ba7285764c19460f572090f57ac7bd5f2dc2d178862003cb812e
-EBUILD cqrlog-2.1.0-r1.ebuild 930 BLAKE2B 0bb53b1c36eb08137ebea622b78953e6b67cc0a57e2560edbc3cfc462a7a099382f0f44b7601952734c1271906a6932b022aa1c05e42ba186b39a13ce59f0cca SHA512 e5e320050cd87c0bf2611a8d774c480afa888d83fa6042441c5b0529bc046cde3421f52471cc60d216d0f927b9b3f6f8827f089e4ec2804d1307b918ef7166af
+EBUILD cqrlog-2.1.0-r2.ebuild 931 BLAKE2B 2761e013d14817aeb3079ef7afe6c7cef0d11188558256848d9506d999aa7ba127ec5401b81de88058db80f69a1d862328a6327f83c34533d82ad9ea6717dcb8 SHA512 4817a6c632709b903be464a2f07206bf1b27ee3fbdbf4f9e2f6e3ac7943578da49d8f0521b6eb358f3c2de9e08a35b29cda4b92fdc73ae96573e87d11a692a8d
 MISC metadata.xml 260 BLAKE2B 335b17c5caf184829c6ba6888aaf7fd0379cf7f44b7e26428dbcb787480a07b220332e3517dcee95587783b27aff5a13ec860f5da3f8822f3f7365888fb8f400 SHA512 2c76889690fda1bf4d4e81d9a0a0159faadf34138f9b5744bd0833df3f73d8d4acee020f6953504cb4f319612e69d6d3e26e7f22ef1285e61765882a8b1678bb
diff --git a/media-radio/cqrlog/cqrlog-2.1.0-r1.ebuild b/media-radio/cqrlog/cqrlog-2.1.0-r2.ebuild
index 9c1070160164..6e07afef90a5 100644
--- a/media-radio/cqrlog/cqrlog-2.1.0-r1.ebuild
+++ b/media-radio/cqrlog/cqrlog-2.1.0-r2.ebuild
@@ -20,7 +20,7 @@ DEPEND=">=dev-lang/lazarus-1.6.4
 		>=dev-lang/fpc-3.0.2"
 
 RDEPEND="${DEPEND}
-		dev-db/mysql[server]
+		virtual/mysql[server]
 		dev-libs/atk
 		dev-libs/glib
 		x11-libs/cairo
diff --git a/media-radio/gpredict/Manifest b/media-radio/gpredict/Manifest
index 2d39ca51501b..615239e4a5de 100644
--- a/media-radio/gpredict/Manifest
+++ b/media-radio/gpredict/Manifest
@@ -3,7 +3,9 @@ AUX gpredict-1.3-doc.patch 592 BLAKE2B 67ac50b6d1f99971246f94d9b32ae75c595969af5
 AUX gpredict-2.0-doc.patch 563 BLAKE2B 7c95bb3261774799e7316eaa57b30ad72a9cadb2562103a581339699d7293fa9378aa6e8b224e75930665ec60570a5a60a0367c9a470ec8135c230547f260262 SHA512 04cc303d3bdcd8d312ec9ff99dd7e2f921feef5c50c7d4cd6e20199f7a9caefb5023b6dfdb1cb410ed3693a60f016a6545446e02eff4f678dd2897dc275ecb3e
 DIST gpredict-1.3.tar.gz 4750388 BLAKE2B e67858ea6101d150481012c99fd31fc1428d9c040ced84b3df291cfd8476ee7ec18119d35ba59c3d319b502606d58da707e579d56fd9f7d9d9fd515d49110a22 SHA512 e465e5162d46375e6d8c1ca6b98ec5860f974eec0cbcf8219b65c919ab74ce342e6296886e3fadcb64882c9059da26707e8b10670dac7b1f8146641ed0992f09
 DIST gpredict-2.0.tar.gz 5129500 BLAKE2B 4e0db6166eb91adf558496d3d2e20a92aaf3a61ddb733d68978194b7e3c5c7ee6c6c01d0ce8cec97fe987a8b0f40db344148f3e065776734589846c80a958013 SHA512 9bd9c2350b5ba5acc49c7f4a4a492a3d28ca884a1185925d09de827ea69e3dc4aeaef6f8514672bd4c0f7afcc0cc329047593794a129204ed33eb1df194e5fb5
+DIST gpredict-2.2.tar.bz2 4646331 BLAKE2B 5f07484814cbc3973617e2f161eed4fdc9ead11b9369cd2f6ffacbf60a5a73651e8081c2110ecc7e83a8214d4278a0d7ba9d5b313a9c1bbda7ca3e5c5a6730a9 SHA512 4884459922da4fcbe221252c002e76ac06926bda4745e3eaa480c93c9fdbed9da7a78c7d11a6e7fb5777d8e11cc1f0859c18461fb19f249d924882bfe7ace32c
 EBUILD gpredict-1.3-r1.ebuild 1048 BLAKE2B e3e1479e179c0cce5cb969795e28088e0a8adb28188255c7e093f6d7ec30df4509736a3697e942aacc6fe8eadc5d91724b92c2309a061b5671cdbb48ec85e3de SHA512 703233bf44f1c5a08f20f388633938ffcce752fe2827c83d96d6ea1554104f1b22c9a1fa105d35eca013b34d75d73eb094ded4919c8a955f79bd071b63e8b4a4
 EBUILD gpredict-1.3-r2.ebuild 892 BLAKE2B b9c5aa3dd563c0d2fbf2421d3cb49a7575ea9158acbd18aa494c171fc071444f27bf4a8e60109f7e35a47a7f5bd64a6484f58f728f7d3206119ad720ae56e2ea SHA512 6985cdbbed0f6581ce5782e2bb9f5eb07311e1c0b32ac83ab4bafae48163c70c4c2bdf4affcb87a2d11f476ea90cfdadd5a43f47c4ad2e3d472a69a31c2fefbf
 EBUILD gpredict-2.0.ebuild 849 BLAKE2B 9eb4aaab9de47f9948148c84181613e87187c23296b84db8f44b319e5069e7165b3a4849999eed8569a1b94a021dba08041a8369e0a02741f85b87eff77a951c SHA512 4349bda0355a33c02c9bda83ad89095151fd718c1844579efbface8b82946a6f103b301e955e762fc273bb9de1aa2b9be88d521e9aa2060e52406ca7f2bf9bd9
+EBUILD gpredict-2.2.ebuild 676 BLAKE2B 06046d126159c8a40932c10ae18316ab1ec2abcf9260a81bbdaac465e2a8d1d9c822f3ebdb2536c21dda442d62ba2d837e47be9479540e8af1aeaa24bcbc80bb SHA512 85db5e9edeeb75c3b5e22d09c3fd2dadc74c7ec96b040d5291093105e303b4c280552732d68ba2db773732ccb0f2016b12837dbdc3458a0262afdaa0d51661c2
 MISC metadata.xml 327 BLAKE2B 337b6c3aaf2d60785241601818dcaa4c831b122e339826560343f32712bda042b0f5140f321e9de6f2fc680e66702b39b0148aea2aaac52aa3b3faa7ef5292d4 SHA512 8e461ba4d187a96f1e15e1fab90da3755ec7ad6b24f1182b65eeacffa996375bd0bd905907c329bb53a92b94c22b08283ea936956acc58e5153634e464d9a147
diff --git a/media-radio/gpredict/gpredict-2.2.ebuild b/media-radio/gpredict/gpredict-2.2.ebuild
new file mode 100644
index 000000000000..84a46c32d57e
--- /dev/null
+++ b/media-radio/gpredict/gpredict-2.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Real-time satellite tracking and orbit prediction application"
+HOMEPAGE="http://gpredict.oz9aec.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gdk-pixbuf[jpeg]
+	x11-libs/gtk+:3
+	x11-libs/goocanvas:2.0
+	net-misc/curl"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	eapply_user
+	# remove wrong doc location
+	eapply -p0 "${FILESDIR}/${PN}-2.0-doc.patch"
+}
diff --git a/media-radio/qsstv/Manifest b/media-radio/qsstv/Manifest
index ed3961f4190c..ee96572b87bd 100644
--- a/media-radio/qsstv/Manifest
+++ b/media-radio/qsstv/Manifest
@@ -1,5 +1,3 @@
-DIST qsstv_9.2.4.tar.gz 11883587 BLAKE2B 028805eb2486208d72fb0bd16909b2923a2d95d8e6e28d84d564488cedd2da570d0e6c4178101141a4374979958ba97b26c252da67ced3b3be0059c865c6d235 SHA512 a354fcc086c08b5bea69416d9d5f9ad7bde5ff496edeecf6403249c77d8f27176b6928dc9885c924a8f61db087a4c8286f1b6f26a73034b72723ba390ce8a9fd
 DIST qsstv_9.2.6.tar.gz 11385735 BLAKE2B b7192255a3df32d5fbf07f54e1a8b7a7fd092fc4f7cca794df66d73687342e2169cdf8a2e08e7d665e6c27cefa3e9e4574c10c685cc9647caae1156d5c88522f SHA512 10ad86db8a4db432dc757314375487d4128a612a54496105c2acaadce4f2cba8d044f1c5bf1d38534664ef7c065742606027306b3542ae834673ffce58885557
-EBUILD qsstv-9.2.4.ebuild 1085 BLAKE2B d78b6c47ddb06766aea981020a22aa6d07f0f68629044b079c0f028b4db5d5f32b4cec5ea5d00642b80e4f6acda4ed7fcf87d0cc04d39a76d7f706f5cb2103b0 SHA512 67a9e4165e110d171079460ad2296c21315a2a4de6434c5e17497770a4201acc6ccb20d71d4a205297b22bb3d1bf931f65fadaadc4a5a0d21adc5b076857fcde
 EBUILD qsstv-9.2.6.ebuild 1016 BLAKE2B c2a4ea58071a1229b74209b67ef5cea8518c2230154700a105edcd09174ed8c38dea34b1273fc2dcc2a98873e42bbd89d6de66f36f265cde656ef7ee0f4cfe42 SHA512 8570f5f85dc8f5602da75ef69d45eeb3651db64f1d94e5b343e3af19382ac16a251c50b89521f0c6c3d5f132fdbce4e52d44f01b56d39ba584248b86e2b907b4
 MISC metadata.xml 410 BLAKE2B ce47d5a977b2b6b76940c5b2c74434ea382d4188f319234935a12fa4927f4b493ea664ec6fca2302aea1a31b8234d20819b585f5e56384085541445f4e8bab2d SHA512 2c6aca4abe5c944966fd5c63f9534024453cd67560f406971d6281604bfed5800f384cee8d1aadb0b85bf636530a2b7eb5c2ba002a499eb41f2670d38a89b69c
diff --git a/media-radio/qsstv/qsstv-9.2.4.ebuild b/media-radio/qsstv/qsstv-9.2.4.ebuild
deleted file mode 100644
index 69a97bf2e753..000000000000
--- a/media-radio/qsstv/qsstv-9.2.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qt4-r2
-
-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:4[qt3support]
-	dev-qt/qtgui:4
-	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() {
-	# 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
-
-	# fix hardcoded path to openjpeg headers
-	sed -i -e "s:openjpeg-2.1/::" qsstv/utils/color.cpp ||die
-	sed -i -e "s:/usr/include/openjpeg-2.1:$(pkg-config --cflags-only-I libopenjp2):" \
-		-e "s:-I/usr:/usr:" qsstv/qsstv.pro ||die
-}