gentoo resync : 31.03.2018

6 files changed, 32 insertions, 41 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index d261f3560bcd..e088fa2351ba 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/gwave/Manifest b/sci-electronics/gwave/Manifest
index 9d75a06d5387..2be8fae903a8 100644
--- a/sci-electronics/gwave/Manifest
+++ b/sci-electronics/gwave/Manifest
@@ -9,5 +9,5 @@ AUX gwave-20120229_unistd.patch 802 BLAKE2B 95d5b62714b25e8dfd6f7158303b92fcc2a8
 DIST gwave-code-249-trunk.zip 415799 BLAKE2B d128d9497f05f61e334886f0884a745c2cab624131ff2811162dc4ad0d39a244c4f08783dc7ddb12edde3287466744d8f6f8db6a61f77a493811d887ca611a5d SHA512 351e5db7c65a0ff3ff68785986c3c4f16e2fbf2386c944c8ed63ced4b4714e9e00c2d30a12f7180477bb8f1ac56a09208cf6379b0e0074dc92de71ff483d5d87
 DIST gwave2-20090213.tar.gz 403957 BLAKE2B aeb1db92bfc5977d1a11e0baad89919f4eafd8c9c8ceaf94e29e8a8a6aed29f38f27bec6a340c8610b0acde83c0f8fa3944313417ae3db7d91e155db920fa358 SHA512 9b39ed2923901af18253abe8e3ae1a6f71a660e31181dce31b0d784eb1dd0800a31ff48158b2c68555fcd268029e20295e87626e8e1d4cebc236b3863fe25e8c
 EBUILD gwave-20090213-r1.ebuild 1222 BLAKE2B 7a47107b3011033742fa460e174f05524da9bd4d73551edcd3c50c8cd10bae8d4c0268129f12904a15ee56eb421dab313e2c3098cdd41da73187a24278be852c SHA512 29fb7ac7333112d58ae9d38d35271d58f6a93d4f2803459e8ce600ff1be252a7413735e23119d0ae36a2d9fc64d65f5fef0743b4c46d9e5be1a19624f08b5d9f
-EBUILD gwave-20120229.ebuild 1713 BLAKE2B d3779b9a1340fa3b715122b34801cd3e66b8e31bfffd9ce0061392b031660ffbd7dbfb9cc917a808a7523e93accbeaf0e27c11f5da4a85694c460e5bf85b4fa8 SHA512 d48dba89d368b3908bde8cf5935363d6d2526065b0d40bb77a14fbd13a35ce46f6d231bb3528694183403fb5fce3680f3a9951c4e208d7a091a33f384ab7c3a4
+EBUILD gwave-20120229.ebuild 1712 BLAKE2B afc61db9bcab6944ffb3d9ad659f5119fac3ac40c44cdc44da4f9ba35db45c3c1536218bb8dd21b9a9d0a15c6293959a75b55c413696cd3493e0b354572137e9 SHA512 b7919338caef879a569a317391d556583356cad3f0c63494e027dcbac5bc231ccfd07d822812df1281e4c727a3971ce7cc9d1307a2e25e3222f6667b9ca256d0
 MISC metadata.xml 729 BLAKE2B a7e62f3f754e700c62e9d43f473837302c704b9ca800ece31a152cbfcb56024db78b4ebbdd7b6d68eb31fb026962ea630661b06668d257d1e0cbfcb160c30ecd SHA512 c38f63a842618cfed2e78374219eaabb16a0cd9198ccb339701e1a4a86cf90689d12a70277b19dc781522f9b67a7ab740fdb5475c1eda0d9cdadbe4556ee2966
diff --git a/sci-electronics/gwave/gwave-20120229.ebuild b/sci-electronics/gwave/gwave-20120229.ebuild
index 9b452ec42612..2409fa2235f7 100644
--- a/sci-electronics/gwave/gwave-20120229.ebuild
+++ b/sci-electronics/gwave/gwave-20120229.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 HOMEPAGE="http://gwave.sourceforge.net"
 SRC_URI="https://sourceforge.net/code-snapshots/svn/g/gw/gwave/code/gwave-code-${rev}-trunk.zip"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE="gnuplot plotutils"
 SLOT="0"
 
diff --git a/sci-electronics/osqoop/Manifest b/sci-electronics/osqoop/Manifest
index af4e22edb7b2..0a071c44007b 100644
--- a/sci-electronics/osqoop/Manifest
+++ b/sci-electronics/osqoop/Manifest
@@ -1,3 +1,3 @@
-DIST osqoop-1.1.1.tar.gz 419778 BLAKE2B d07b486b800af1d4a0373f0564ed2d1f7b4c742c30f4d099f809e1ab087951acd837b6c5d82e2fdf246931e54686431b82793f8b6a781afedb0fe268aafb0b5d SHA512 137817419926708feba47fd063d5944a1ca6e50bd2e0a2119bad4d3fb0dc7c78128c9523c61ef21e9ee37afbc1273410a3418cbb8ba07bb6ca7b13a217fe3242
-EBUILD osqoop-1.1.1.ebuild 948 BLAKE2B 656e44c020badd99458d9c1ad67168d4393500793cdf32a8ab0e7088a6e8512bce6b41ee39396191b1fa100677ca68209124ec43d0886f246fccb2b5fef907b4 SHA512 57b1ac30d1fc70d18c40ab280ec9c7b708fc4f4ed5ac5895b377f4f41d1f3b15029a6f43ed26c914aa6f4008eac6d4dafbb26aae1bbd59dd36962f1ab26c8196
+DIST osqoop-1.2.0_pre20170131.tar.gz 426915 BLAKE2B 18b1e6df5b76f7a9691c991a431cc1147c67c771cd7a44757bfd6f458f8c8edc6ce707a9adb1c5ed8d674b289c9d228745045929b09771fcf14d440f0431c79f SHA512 e2ced1195c2dda0164761b5f4a928db2bcdff566d3cc05a11460ff570dbd2b7696a30545dd1252930b9544794879d9c89cf7ddf784ddfdbd5e2a0754478f7d60
+EBUILD osqoop-1.2.0_pre20170131.ebuild 761 BLAKE2B e9f666808f3749d3c447a417018f553435a8b0f71c6a24e17065bb14e376cbef880a6723d4715d9336c8ab7e1319acce526ef6bed21495b07fdb0a5d0a2678f9 SHA512 aff1f50d6db85796c6c43d9b0cd54261df4e1fc785c34aef85dbf5112a360cf976365b95841170ff10880b75ba6a3bf681308b095b8de3fc38cf9c8e42e54609
 MISC metadata.xml 243 BLAKE2B f6898ed42cda5e8c4bb81d5737f88ff6118fe3507e7ddcebf4686fa26effb75d03176ee091289e1011788f1a98cab52d5374e29dc04c2c298112c47a2c336f02 SHA512 efed1be9deecfbfc884a140e4ecb918eb473ec755a7910ab9afd29fa236d3c34c09c8d11454a0f8c26331539cbad1461f4824ff348b7fb7335cc88fb51d3882b
diff --git a/sci-electronics/osqoop/osqoop-1.1.1.ebuild b/sci-electronics/osqoop/osqoop-1.1.1.ebuild
deleted file mode 100644
index b3952e56288b..000000000000
--- a/sci-electronics/osqoop/osqoop-1.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils toolchain-funcs
-
-DESCRIPTION="multi-platform open source software oscilloscope based on Qt 4"
-HOMEPAGE="https://github.com/stephanemagnenat/osqoop"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtgui:4
-	virtual/libusb:0
-	x11-libs/libXtst"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}-${PN}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	for f in $(find datasource processing -name CMakeLists.txt); do
-		sed -e '/install(TARGETS/s:DESTINATION :DESTINATION '$(get_libdir)/${PN}'/:' \
-			-i "${f}" || die
-	done
-	sed -e '/install(TARGETS/s:DESTINATION .:DESTINATION bin:' \
-		-i src/CMakeLists.txt helper/CMakeLists.txt || die
-
-	sed -e '/potentialDirs/s:/usr/share/osqoop/:'${EPREFIX}'/usr/'$(get_libdir)/${PN}'/:' \
-		-i src/OscilloscopeWindow.cpp || die
-}
diff --git a/sci-electronics/osqoop/osqoop-1.2.0_pre20170131.ebuild b/sci-electronics/osqoop/osqoop-1.2.0_pre20170131.ebuild
new file mode 100644
index 000000000000..9bac71de0ad4
--- /dev/null
+++ b/sci-electronics/osqoop/osqoop-1.2.0_pre20170131.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=b5bd459dd5c2a180a9a3e5a706ed5039159d7286
+inherit cmake-utils vcs-snapshot
+
+DESCRIPTION="Multi-platform open source software oscilloscope based on Qt"
+HOMEPAGE="https://github.com/stephanemagnenat/osqoop https://github.com/sandsmark/osqoop"
+# sandsmark/osqoop: PR-branch on top of last commit in stephanemagnenat/osqoop (17-01-31)
+SRC_URI="https://github.com/sandsmark/osqoop/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	sci-libs/fftw:3.0
+	virtual/libusb:0
+	x11-libs/libXtst"
+DEPEND="${RDEPEND}"