New upstream release which implements a REST API and adds advanced trigger modes for future use. Udev rule has been removed, not needed due to USB initial group on nonolith-connect user.

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 135 insertions, 5 deletions

diff --git a/sci-visualization/nonolith-connect/ChangeLog b/sci-visualization/nonolith-connect/ChangeLog
index f6611e6cfb1d..e20adbe9a4bf 100644
--- a/sci-visualization/nonolith-connect/ChangeLog
+++ b/sci-visualization/nonolith-connect/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-visualization/nonolith-connect
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/nonolith-connect/ChangeLog,v 1.1 2012/02/21 13:41:48 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/nonolith-connect/ChangeLog,v 1.2 2012/03/22 10:15:45 chainsaw Exp $
+
+*nonolith-connect-1.1 (22 Mar 2012)
+
+  22 Mar 2012; Tony Vroon <chainsaw@gentoo.org>
+  +files/1.1-cflags-respect.patch, +nonolith-connect-1.1.ebuild:
+  New upstream release which implements a REST API and adds advanced trigger
+  modes for future use. Udev rule has been removed, not needed due to USB
+  initial group on nonolith-connect user.
 
 *nonolith-connect-1.0.1 (21 Feb 2012)
 
diff --git a/sci-visualization/nonolith-connect/Manifest b/sci-visualization/nonolith-connect/Manifest
index 43ad506a9c14..17fafdeb70be 100644
--- a/sci-visualization/nonolith-connect/Manifest
+++ b/sci-visualization/nonolith-connect/Manifest
@@ -2,16 +2,19 @@
 Hash: SHA1
 
 AUX 1.0.1-cflags-respect.patch 2468 RMD160 d76c6d47777577399201c4fec0ddad5acb7695d6 SHA1 b0bdd51f2a26272ef41c315b39c2b56ba3644aee SHA256 2651b7e9b72cb3170b8b80611a7681b4825e9403bfddb23c0f22a254718801f9
+AUX 1.1-cflags-respect.patch 2622 RMD160 c1eca1aaa6724ee9985d4d805f858852f4909d00 SHA1 8dde0ea9511b6e42c2af3a20648d8b2d5a9d7a79 SHA256 afcabee2fc63188194d62f095a48eb744e50047bcf2164a9023312b15b1678ee
 AUX 60-nonolith-connect.rules 297 RMD160 b04c24ea473dc6c61d16a312b872e773ac2dcab9 SHA1 1fefe3ce8f4ee8a3d5957fad17231dcc67b829ba SHA256 6d86a4dcaac783fbb57f624619410082c0bd7b7529c2290d05bfd7a90851caf2
 AUX nonolith-connect.initd 352 RMD160 365f2c39868071e266623bc674168ae1fd23b161 SHA1 dd2d48decb7e49c5a3e42a65bfd1aa9d04307680 SHA256 3f54df8a85bc42f958524c5c30518e02d77cc80e44f0a13cd8b5de5b94000311
 DIST nonolith-connect-1.0.1.tar.bz2 560774 RMD160 e92fa4703afdbccba334e0a4985ff761b12be50e SHA1 6a39aea92f8cc687f9a35ef1b441ab3fa2695eec SHA256 47326bfd90cbdb52ce2085a406f5c8ac362e5381e9f7e645025e7b7eb6be221c
+DIST nonolith-connect-1.1.tar.bz2 559686 RMD160 2e7eae34537b87292501a1d853b9a004e1a7280f SHA1 7e6edb4ecdc38f529d64588c6ca32c2e3d6742f2 SHA256 0cfda84d83df4efea7c2c9765a3576fecf92d04dc4fee76397f3843022c2e749
 EBUILD nonolith-connect-1.0.1.ebuild 1230 RMD160 b815afbc4ee4e0feac8e130bde462bdfbf4bd070 SHA1 340f002dcd38830838d3b042360491bf39d44537 SHA256 68e2ac5188ab5e4fafe0fdf4b6ccff010fcdb48f5b10977990ec38c2c6612911
-MISC ChangeLog 704 RMD160 ce5f33c7f19822260ba13f090200a42212f2cacd SHA1 31d04ee873e1636dd961f06ff9c972c0938016d9 SHA256 8a73ac422409d1da4cd63ea6d24fa030e4df8b8d526392812ab55cea4fe4c08e
+EBUILD nonolith-connect-1.1.ebuild 1162 RMD160 f1c9e44cff41414d74e776f7a830481d81d8d770 SHA1 b2dd4f6b6fa7fb6a7071b5be80a2dbced7a6de82 SHA256 8dffa0efbe6031f33dcd09618e28ae5690c71e620952b94901ebc63791cd65be
+MISC ChangeLog 1048 RMD160 5d1bba7c338d7fab944d1bc60de8ea43b1f5c8f1 SHA1 97ada5aaffaff2382f46dc9400baeedadae45e6f SHA256 32ecaea51db51c4929962f4b0b5dfd6f5287c561ac1409d229e96a51196018f9
 MISC metadata.xml 256 RMD160 6299389c645e5c9948ae3804d74c23b2f5f5d2be SHA1 84e6ddc5504f4f7c2e1c24c7393c4862e6229a90 SHA256 7731955bcd1bebf3e752d445e5834c97202dc46c13b598195a34787c429f6b79
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9DnyMACgkQp5vW4rUFj5pQQQCfWcsmH9VrnOKFz81zoQVmzag5
-MWIAn0CupjeIXsenIUmp29hnp4r4654x
-=kf6C
+iEYEARECAAYFAk9q+90ACgkQp5vW4rUFj5ogvgCgs2oWz5lY85GhoyAKjUPYteTp
+NHsAoI63b5T5h5r6cXMZosy7JvvOqOzF
+=KRip
 -----END PGP SIGNATURE-----
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/nonolith-connect-1.1.ebuild b/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild
new file mode 100644
index 000000000000..798b43128391
--- /dev/null
+++ b/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild,v 1.1 2012/03/22 10:15:45 chainsaw Exp $
+
+EAPI=4
+
+inherit base scons-utils toolchain-funcs
+
+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
+	sys-fs/udev"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PV}-cflags-respect.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"
+}