gentoo resync : 31.03.2018

3 files changed, 29 insertions, 38 deletions

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}"