commit: c9a5516ba23eeb3a1d31f318d014af75c61f76ff Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Oct 26 07:27:29 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Oct 26 07:38:54 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9a5516b
sci-visualization/nonolith-connect: Remove last-rited pkg Closes: https://bugs.gentoo.org/735558 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> profiles/package.mask | 1 - sci-visualization/nonolith-connect/Manifest | 1 - .../files/1.1-cflags-respect.patch | 70 ---------------------- .../nonolith-connect/files/1.1-gcc6.patch | 14 ----- .../nonolith-connect/files/nonolith-connect.initd | 17 ------ sci-visualization/nonolith-connect/metadata.xml | 12 ---- .../nonolith-connect/nonolith-connect-1.1.ebuild | 53 ---------------- 7 files changed, 168 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 3609048310e..565e3dce965 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -267,7 +267,6 @@ games-strategy/endless-sky games-strategy/glob2 net-vpn/freelan sci-geosciences/mapnik -sci-visualization/nonolith-connect # Michał Górny <[email protected]> (2020-09-25) # PyPy3.7 alpha. Known to break a few packages. Masked until it diff --git a/sci-visualization/nonolith-connect/Manifest b/sci-visualization/nonolith-connect/Manifest deleted file mode 100644 index 63e8816a468..00000000000 --- a/sci-visualization/nonolith-connect/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST nonolith-connect-1.1.tar.bz2 559686 BLAKE2B 5a5a0ee7671e20661d182eaa448b96d3f259773618f473cacd94097b80bfcaa0c28d991271bb587ae2efa425f4ce14938dff56eaeb4164dd6aa98ba24a2def8e SHA512 41fe49a21a2f773c04c8054f322d17958b3eadac82e7013c50ff73c13dc31baa4905d52c02b5270d636fbb5348aff7ca8b064a30a81e970083abd6e69f93aff9 diff --git a/sci-visualization/nonolith-connect/files/1.1-cflags-respect.patch b/sci-visualization/nonolith-connect/files/1.1-cflags-respect.patch deleted file mode 100644 index c6b04c5fe33..00000000000 --- a/sci-visualization/nonolith-connect/files/1.1-cflags-respect.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -uNr nonolith-connect-1.1.ORIG/SConstruct nonolith-connect-1.1/SConstruct ---- nonolith-connect-1.1.ORIG/SConstruct 2012-03-22 10:02:11.398944187 +0000 -+++ nonolith-connect-1.1/SConstruct 2012-03-22 10:05:23.149936839 +0000 -@@ -1,7 +1,21 @@ - import sys, os, shutil -+import SCons.Util - - env = Environment() - -+if os.environ.has_key('CC'): -+ env['CC'] = os.environ['CC'] -+if os.environ.has_key('CFLAGS'): -+ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) -+if os.environ.has_key('CXX'): -+ env['CXX'] = os.environ['CXX'] -+if os.environ.has_key('CXXFLAGS'): -+ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) -+if os.environ.has_key('LDFLAGS'): -+ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) -+if "$CCFLAGS" in env['CXXCOM']: -+ env['CXXCOM'] = env['CXXCOM'].replace("$CCFLAGS","") -+ - opts = Variables() - opts.Add(BoolVariable("mingwcross", "Cross-compile with mingw for Win32", 0)) - opts.Add(BoolVariable("boost_static", "Statically link against Boost", 0)) -@@ -95,8 +109,7 @@ - sources = Glob('*.cpp') + Glob('streaming_device/*.cpp') + ['cee/cee.cpp', 'bootloader/bootloader.cpp'] - - json = env.Library('json', -- Glob('libjson/Source/*.cpp'), -- CCFLAGS = "-c -O3 -ffast-math -fexpensive-optimizations".split() -+ Glob('libjson/Source/*.cpp') - ) - - websocketpp = env.Library('websocketpp', ['websocketpp/src/'+i for i in [ -@@ -107,7 +120,7 @@ - 'websocket_session.cpp', - 'sha1/sha1.cpp', - 'base64/base64.cpp' -- ]], CCFLAGS=['-g', '-O3']) -+ ]]) - - - libusb_cflags = [] -@@ -121,14 +134,22 @@ - libusb_os = ['os/poll_windows.c', 'os/windows_usb.c', 'os/threads_windows.c'] - libusb_cflags += ['-D OS_WINDOWS', '-DPOLL_NFDS_TYPE=unsigned int', '-D WINVER=0x0501'] - --libusb = env.Library('libusb_nonolith', ['libusb/libusb/'+i for i in [ -+env_libusb = env.Clone() -+env_libusb.Append(CPPFLAGS=libusb_cflags) -+env_libusb.Append(CFLAGS=['-Ilibusb', '-Ilibusb/libusb']) -+ -+libusb = env_libusb.Library('libusb_nonolith', ['libusb/libusb/'+i for i in [ - 'core.c', - 'descriptor.c', - 'io.c', - 'sync.c', -- ]+libusb_os], CFLAGS=['-g', '-O3', '-Ilibusb', '-Ilibusb/libusb']+libusb_cflags) -+ ]+libusb_os]) - - - libs += boostlibs - --env.Program('nonolith-connect', sources, LIBS=libs, CCFLAGS=['-Wall', '-g', '-O3', '-Ilibusb', '-Iwebsocketpp/src', '-shared'], FRAMEWORKS=frameworks) -+env_main = env.Clone() -+env_main.Append(CXXFLAGS=['-Ilibusb', '-Iwebsocketpp/src', '-Wall']) -+#env_main.Append(LINKFLAGS=['-shared']) -+env_main.Program('nonolith-connect', sources, LIBS=libs, FRAMEWORKS=frameworks) -+ diff --git a/sci-visualization/nonolith-connect/files/1.1-gcc6.patch b/sci-visualization/nonolith-connect/files/1.1-gcc6.patch deleted file mode 100644 index 815c3ca866c..00000000000 --- a/sci-visualization/nonolith-connect/files/1.1-gcc6.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- nonolith-connect-1.1/websocketpp/src/websocket_server_session.cpp.old 2016-09-25 18:13:31.820474134 -0400 -+++ nonolith-connect-1.1/websocketpp/src/websocket_server_session.cpp 2016-09-25 18:38:52.654567787 -0400 -@@ -41,8 +41,11 @@ - #include <iostream> - #include <sstream> - #include <string> -+ -+#if __cplusplus < 201103L - #include <ext/algorithm> - using __gnu_cxx::copy_n; -+#endif - - using websocketpp::server_session; - diff --git a/sci-visualization/nonolith-connect/files/nonolith-connect.initd b/sci-visualization/nonolith-connect/files/nonolith-connect.initd deleted file mode 100644 index c8a6bd1d041..00000000000 --- a/sci-visualization/nonolith-connect/files/nonolith-connect.initd +++ /dev/null @@ -1,17 +0,0 @@ -#!/sbin/openrc-run - -depend() { - after logger -} - -start() { - ebegin "Starting nonolith-connect" - start-stop-daemon --start --quiet -b -m -p /var/run/nonolith-connect.pid -u nonolithd:usb --exec /usr/bin/nonolith-connect - eend $? -} - -stop() { - ebegin "Stopping nonolith-connect" - start-stop-daemon --stop --quiet -p /var/run/nonolith-connect.pid - eend $? -} diff --git a/sci-visualization/nonolith-connect/metadata.xml b/sci-visualization/nonolith-connect/metadata.xml deleted file mode 100644 index 119bc942807..00000000000 --- a/sci-visualization/nonolith-connect/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Tony Vroon</name> - </maintainer> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Science Project</name> - </maintainer> -</pkgmetadata> diff --git a/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild b/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild deleted file mode 100644 index 955e544fbc6..00000000000 --- a/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit scons-utils toolchain-funcs user - -DESCRIPTION="CEE (Control - Experiment - Explore) analog multitool" -HOMEPAGE="http://www.nonolithlabs.com/cee/"; -SRC_URI="http://apps.nonolithlabs.com/download/source/${P}.tar.bz2"; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-libs/boost - virtual/udev -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PV}-cflags-respect.patch" - "${FILESDIR}/${PV}-gcc6.patch" -) - -pkg_setup() { - tc-export CC CXX - enewuser nonolithd -1 -1 /dev/null usb -} - -src_configure() { - myesconsargs=( - boost_static=0 - ) -} - -src_compile() { - escons -} - -src_install() { - dobin nonolith-connect - newinitd "${FILESDIR}"/nonolith-connect.initd nonolith-connect -} - -pkg_postinst() { - einfo "Consider adding nonolith-connect to the default runlevel." - einfo "Please connect your CEE hardware, start nonolith-connect " - einfo "using the init script provided and then visit:" - einfo "http://apps.nonolithlabs.com/setup"; -}
