reinit the tree, so we can have metadata

6 files changed, 174 insertions, 0 deletions

diff --git a/sci-visualization/nonolith-connect/Manifest b/sci-visualization/nonolith-connect/Manifest
new file mode 100644
index 000000000000..1885e0ffe160
--- /dev/null
+++ b/sci-visualization/nonolith-connect/Manifest
@@ -0,0 +1,8 @@
+AUX 1.1-cflags-respect.patch 2622 SHA256 afcabee2fc63188194d62f095a48eb744e50047bcf2164a9023312b15b1678ee SHA512 92591f3b70cbcf175f49fa79f0ffc006ff594eb57669e0abdcd2ab940615ba20d73c191fddf8e8546811954ebae1cf3a796e21e7bcbb32708e80a6f4110f59ea WHIRLPOOL 637711c884fe733d8258c838857781ea179ef9ff61649275ad2b2f10572a09670646971ed69430ea3932bc3d67f3b675c281f55372b37043dbfda17bc41befdd
+AUX 1.1-gcc6.patch 424 SHA256 13044bd12b818051dba9c6d4387433fcc689dcd2c76ba6ba835a5721102dfb2c SHA512 88603392957da2a20c52852b452e62a80a1115a696e91d854529fed8ed8df44c2c4213c4cc39fa738c9ccb4518769363574241bba17597572ad43e603dadb5ea WHIRLPOOL 2d3dc582d23225707347958ed47edd2bc4d9dcca98d91a015081d1a8d328dc170a3bf6632d6d8339dc3b16fbd1e5fc293c85f293d738315a10e15f9a2676634f
+AUX nonolith-connect.initd 353 SHA256 bb829571b0585b21b4874c100a6295cb3cf72359814b32af01c25575e462c607 SHA512 c27852ce9f6529f09b03666dda9416f28cead09e3336ef7cc099e4d84ef65c1449054fc9b72400525db0ebe8ff049db739978010dc4a0dc737786c9bdb9ee23d WHIRLPOOL 0c1d94b2a31a98459465f587e5006e305bf0d9db3ca5b28b49f50ffd64cb51c98b494b2a5d6f32b4279d9cda9875d4e385c9c6d652ea3a24d987e07762c15993
+DIST nonolith-connect-1.1.tar.bz2 559686 SHA256 0cfda84d83df4efea7c2c9765a3576fecf92d04dc4fee76397f3843022c2e749 SHA512 41fe49a21a2f773c04c8054f322d17958b3eadac82e7013c50ff73c13dc31baa4905d52c02b5270d636fbb5348aff7ca8b064a30a81e970083abd6e69f93aff9 WHIRLPOOL 5e8f600708e67deda3580185e627f33c77db920e0c99a53c31b476bcde6f625a6ce909d993075a0643d5b0894625da30b0d398b89ae9195e3c086e53b82b7043
+EBUILD nonolith-connect-1.1.ebuild 1060 SHA256 cd547dc40a236e67c15dc4176a52235c75d7217bf4b4d123da224845b5dfc46b SHA512 0b4b1857fa97bc00778129c7a99a08f2eec1d71f4c6bc90b4381bf39031668ca430792475689ca99f149f929a45545306545abfdb2801c8d45cd151131207f70 WHIRLPOOL ef58e3a0f1e8a75a25df5f7e7481e4351ff731da7cb81a1ceee14f80cb43e354ac178be29e7e39632a474c5310e906ad831748d78274673a2ccc6515d09a3f3a
+MISC ChangeLog 2868 SHA256 a1290f9ad923b1ed274f14b244389f4e2aece6af8efc5c47aa73d7f557daa212 SHA512 9b7343dd3351ca75f0421fb6e9221c4adb13e6ce2308dec3d237437cc4759e0e63043d67b20c8406efd0074b1ec5684215cc105997264ae8ddba5ea4a83d2bc9 WHIRLPOOL 7274c8b64b3b7609626f355f6b12f3b2102edfbefc28fb0fee4e822bf16381401ece55e79e61d4ff7598fced8c928c05ee6942642eeb219839107c9207e7666f
+MISC ChangeLog-2015 1567 SHA256 b256619acb3bc64029099030fc079be01c9472208c052e90e4f6faebbb1bde09 SHA512 606e64d76323b3762fde3afec4314a87ff230e4a0d68cd3dd0916687929b3fa80aedbc59733da9748511c0de9b6185ae09c9a7feeb7951261847b39c2f74da00 WHIRLPOOL 01566915f50d2341331f6273f35e27884eec0cdab0366b5a3b9b7d68d133938b76ed8e0ab371794081c94915a0999caf3d8631549cd2d6031f397fa7292591e5
+MISC metadata.xml 369 SHA256 d7d8f7ea01c35b8807dc7df5b537a13b211ee7c2672c8db5e214b7e70c9d4ca4 SHA512 b8422b3315767f81b2e038409d54bd3fe9aa9e674e1c9ec46e56056ca421e96dfbd12e35329475310f9dc91369dda6a50382132ee111adc012d746b216b51f08 WHIRLPOOL 6af5418a40da218cf75246828b59d8e9dcca222cb2b4688b4f0db8d8289c5cd82db71f0144623e60640f627dbfc01c67fb4842ebd0b4c18f1eb30206df3a73b1
diff --git a/sci-visualization/nonolith-connect/files/1.1-cflags-respect.patch b/sci-visualization/nonolith-connect/files/1.1-cflags-respect.patch
new file mode 100644
index 000000000000..c6b04c5fe339
--- /dev/null
+++ b/sci-visualization/nonolith-connect/files/1.1-cflags-respect.patch
@@ -0,0 +1,70 @@
+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
new file mode 100644
index 000000000000..815c3ca866c7
--- /dev/null
+++ b/sci-visualization/nonolith-connect/files/1.1-gcc6.patch
@@ -0,0 +1,14 @@
+--- 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
new file mode 100644
index 000000000000..c8a6bd1d0414
--- /dev/null
+++ b/sci-visualization/nonolith-connect/files/nonolith-connect.initd
@@ -0,0 +1,17 @@
+#!/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
new file mode 100644
index 000000000000..119bc9428076
--- /dev/null
+++ b/sci-visualization/nonolith-connect/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+<maintainer type="project">
+    <email>sci@gentoo.org</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
new file mode 100644
index 000000000000..955e544fbc61
--- /dev/null
+++ b/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild
@@ -0,0 +1,53 @@
+# 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"
+}