[patch] 1.2.0_pre20170131 version bump, drop 1.1.1

osqoop-qt5.patch (text/plain), 5.03 KB, created by Andreas Sturmlechner on 2018-03-03 22:42:29 UTC

From 20dba67ffe8b84a9ddb05cb01a5a14e358cfa31a Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <[e-mail]>
Date: Sat, 3 Mar 2018 23:34:57 +0100
Subject: [PATCH 1/2] sci-electronics/osqoop: Add snapshot from upstream Qt5-PR

Using PR-branch to save the need for a separate patch.
No upstream commits since then.

Bug: https://bugs.gentoo.org/644482
Package-Manager: Portage-2.3.24, Repoman-2.3.6
---
 sci-electronics/osqoop/Manifest                    |  1 +
 .../osqoop/osqoop-1.2.0_pre20170131.ebuild         | 27 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 sci-electronics/osqoop/osqoop-1.2.0_pre20170131.ebuild

diff --git a/sci-electronics/osqoop/Manifest b/sci-electronics/osqoop/Manifest
index e3e0d4db4d4..f39563071a6 100644
--- a/sci-electronics/osqoop/Manifest
+++ b/sci-electronics/osqoop/Manifest
@@ -1 +1,2 @@
 DIST osqoop-1.1.1.tar.gz 419778 BLAKE2B d07b486b800af1d4a0373f0564ed2d1f7b4c742c30f4d099f809e1ab087951acd837b6c5d82e2fdf246931e54686431b82793f8b6a781afedb0fe268aafb0b5d SHA512 137817419926708feba47fd063d5944a1ca6e50bd2e0a2119bad4d3fb0dc7c78128c9523c61ef21e9ee37afbc1273410a3418cbb8ba07bb6ca7b13a217fe3242
+DIST osqoop-1.2.0_pre20170131.tar.gz 426915 BLAKE2B 18b1e6df5b76f7a9691c991a431cc1147c67c771cd7a44757bfd6f458f8c8edc6ce707a9adb1c5ed8d674b289c9d228745045929b09771fcf14d440f0431c79f SHA512 e2ced1195c2dda0164761b5f4a928db2bcdff566d3cc05a11460ff570dbd2b7696a30545dd1252930b9544794879d9c89cf7ddf784ddfdbd5e2a0754478f7d60
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 00000000000..9bac71de0ad
--- /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}"
-- 
2.16.2


From bed1d79fa6117fd781be9e02620e6818d491c076 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <[e-mail]>
Date: Sat, 3 Mar 2018 23:36:35 +0100
Subject: [PATCH 2/2] sci-electronics/osqoop: Drop old

Closes: https://bugs.gentoo.org/644482
Package-Manager: Portage-2.3.24, Repoman-2.3.6
---
 sci-electronics/osqoop/Manifest            |  1 -
 sci-electronics/osqoop/osqoop-1.1.1.ebuild | 36 ------------------------------
 2 files changed, 37 deletions(-)
 delete mode 100644 sci-electronics/osqoop/osqoop-1.1.1.ebuild

diff --git a/sci-electronics/osqoop/Manifest b/sci-electronics/osqoop/Manifest
index f39563071a6..7fe16c53b77 100644
--- a/sci-electronics/osqoop/Manifest
+++ b/sci-electronics/osqoop/Manifest
@@ -1,2 +1 @@
-DIST osqoop-1.1.1.tar.gz 419778 BLAKE2B d07b486b800af1d4a0373f0564ed2d1f7b4c742c30f4d099f809e1ab087951acd837b6c5d82e2fdf246931e54686431b82793f8b6a781afedb0fe268aafb0b5d SHA512 137817419926708feba47fd063d5944a1ca6e50bd2e0a2119bad4d3fb0dc7c78128c9523c61ef21e9ee37afbc1273410a3418cbb8ba07bb6ca7b13a217fe3242
 DIST osqoop-1.2.0_pre20170131.tar.gz 426915 BLAKE2B 18b1e6df5b76f7a9691c991a431cc1147c67c771cd7a44757bfd6f458f8c8edc6ce707a9adb1c5ed8d674b289c9d228745045929b09771fcf14d440f0431c79f SHA512 e2ced1195c2dda0164761b5f4a928db2bcdff566d3cc05a11460ff570dbd2b7696a30545dd1252930b9544794879d9c89cf7ddf784ddfdbd5e2a0754478f7d60
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 b3952e56288..00000000000
--- 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
-}
-- 
2.16.2