[gentoo-commits] repo/gentoo:master commit in: sci-electronics/osqoop/

2023-02-22 Thread Sam James 
commit: cc7efb833560ab3710dbf78e1ceca647282c5380
Author: Cristian Othón Martínez Vera  cfuga  mx>
AuthorDate: Wed Feb 22 19:47:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 22 19:55:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc7efb83

sci-electronics/osqoop: fix MissingRemoteId for maintainer-needed packages

Signed-off-by: Cristian Othón Martínez Vera  cfuga.mx>
Signed-off-by: Sam James  gentoo.org>

 sci-electronics/osqoop/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sci-electronics/osqoop/metadata.xml 
b/sci-electronics/osqoop/metadata.xml
index 115e9d64a669..25ca9d853448 100644
--- a/sci-electronics/osqoop/metadata.xml
+++ b/sci-electronics/osqoop/metadata.xml
@@ -2,4 +2,7 @@
 https://www.gentoo.org/dtd/metadata.dtd";>
 

+   
+   sandsmark/osqoop
+

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/osqoop/files/, sci-electronics/osqoop/

2021-02-28 Thread Andreas Sturmlechner 
commit: 4a9f2a14d395df2c985f20d042376ec2379e9cf5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb 28 10:42:08 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 28 12:26:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a9f2a14

sci-electronics/osqoop: EAPI-7 bump, switch to cmake.eclass

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../osqoop-1.2.0_pre20170131-cmake-add_library-static.patch  | 11 +++
 sci-electronics/osqoop/osqoop-1.2.0_pre20170131.ebuild   | 12 +---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git 
a/sci-electronics/osqoop/files/osqoop-1.2.0_pre20170131-cmake-add_library-static.patch
 
b/sci-electronics/osqoop/files/osqoop-1.2.0_pre20170131-cmake-add_library-static.patch
new file mode 100644
index 000..8b315cf0c0f
--- /dev/null
+++ 
b/sci-electronics/osqoop/files/osqoop-1.2.0_pre20170131-cmake-add_library-static.patch
@@ -0,0 +1,11 @@
+--- a/processing/lib/CMakeLists.txt2017-02-12 19:13:31.0 +0100
 b/processing/lib/CMakeLists.txt2021-02-28 11:30:50.812028355 +0100
+@@ -4,7 +4,7 @@
+   FeedForwardNeuralNetwork.cpp
+ )
+ include_directories (${CMAKE_BINARY_DIR}/processing/lib)
+-add_library(processing ${processing_SRCS})
++add_library(processing STATIC ${processing_SRCS})
+ target_link_libraries(processing Qt5::Core)
+ if (CMAKE_COMPILER_IS_GNUCC)
+   set_target_properties(processing PROPERTIES COMPILE_FLAGS "-fPIC")

diff --git a/sci-electronics/osqoop/osqoop-1.2.0_pre20170131.ebuild 
b/sci-electronics/osqoop/osqoop-1.2.0_pre20170131.ebuild
index 9bac71de0ad..9e14ed9013b 100644
--- a/sci-electronics/osqoop/osqoop-1.2.0_pre20170131.ebuild
+++ b/sci-electronics/osqoop/osqoop-1.2.0_pre20170131.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 COMMIT=b5bd459dd5c2a180a9a3e5a706ed5039159d7286
-inherit cmake-utils vcs-snapshot
+inherit cmake
 
 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"
+S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,3 +26,8 @@ RDEPEND="
virtual/libusb:0
x11-libs/libXtst"
 DEPEND="${RDEPEND}"
+
+# downstream fix for BUILD_SHARED_LIBS=ON default
+PATCHES=(
+   "${FILESDIR}"/${P}-cmake-add_library-static.patch
+)

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/osqoop/

2018-03-30 Thread Andreas Sturmlechner 
commit: 4f6cc61b2257971bd578f5fb298526ff365675e4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Mar  3 22:36:35 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar 30 19:09:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f6cc61b

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(-)

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..000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/osqoop/

2018-03-30 Thread Andreas Sturmlechner 
commit: d221bdcbba71a4356e0ab06cba89af0a5b1af5d0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar 30 19:05:23 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar 30 19:09:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d221bdcb

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.27, Repoman-2.3.9

 sci-electronics/osqoop/Manifest|  1 +
 .../osqoop/osqoop-1.2.0_pre20170131.ebuild | 27 ++
 2 files changed, 28 insertions(+)

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

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/osqoop/

2018-02-04 Thread Andreas Sturmlechner 
commit: f0b47acf6d4883a1b4de3e23c2523df3d360596a
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Feb  4 19:04:00 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb  4 19:19:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b47acf

sci-electronics/osqoop: fix HOMEPAGE

Closes: https://github.com/gentoo/gentoo/pull/7072

 sci-electronics/osqoop/osqoop-1.1.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-electronics/osqoop/osqoop-1.1.1.ebuild 
b/sci-electronics/osqoop/osqoop-1.1.1.ebuild
index ef02a5592c6..b3952e56288 100644
--- a/sci-electronics/osqoop/osqoop-1.1.1.ebuild
+++ b/sci-electronics/osqoop/osqoop-1.1.1.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
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils toolchain-funcs
 
 DESCRIPTION="multi-platform open source software oscilloscope based on Qt 4"
-HOMEPAGE="http://gitorious.org/osqoop/";
+HOMEPAGE="https://github.com/stephanemagnenat/osqoop";
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/osqoop/

2017-04-04 Thread Michael Weber 
commit: 412f03ca6ba882ed28ddac9531ddcdaf67a7c696
Author: Michael Weber  gentoo  org>
AuthorDate: Wed Apr  5 00:22:32 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Wed Apr  5 00:22:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=412f03ca

sci-electronics/osqoop: DEPEND on x11-libs/libXtst (bug 515038, thanks Patrick 
Lauer and Toralf Förster).

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sci-electronics/osqoop/osqoop-1.1.1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-electronics/osqoop/osqoop-1.1.1.ebuild 
b/sci-electronics/osqoop/osqoop-1.1.1.ebuild
index e90d3c4d0ef..ef02a5592c6 100644
--- a/sci-electronics/osqoop/osqoop-1.1.1.ebuild
+++ b/sci-electronics/osqoop/osqoop-1.1.1.ebuild
@@ -15,7 +15,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-qt/qtgui:4
-   virtual/libusb:0"
+   virtual/libusb:0
+   x11-libs/libXtst"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${PN}-${PN}

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/osqoop/

2017-02-07 Thread Michael Weber 
commit: 0223e6611c47e1fba279c7db5a7a217123e55dca
Author: Michael Weber  gentoo  org>
AuthorDate: Tue Feb  7 22:49:38 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Tue Feb  7 22:50:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0223e661

sci-electronics/osqoop: EAPI=6, call cmake-utils_src_prepare (thanks johu).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-electronics/osqoop/osqoop-1.1.1.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-electronics/osqoop/osqoop-1.1.1.ebuild 
b/sci-electronics/osqoop/osqoop-1.1.1.ebuild
index 3e01da3..4d309cd 100644
--- a/sci-electronics/osqoop/osqoop-1.1.1.ebuild
+++ b/sci-electronics/osqoop/osqoop-1.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 
 inherit cmake-utils toolchain-funcs
 
@@ -22,6 +22,8 @@ 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