sci-visualization/nonolith-connect: Punt base.eclass

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

3 files changed, 16 insertions, 57 deletions

diff --git a/sci-visualization/nonolith-connect/ChangeLog b/sci-visualization/nonolith-connect/ChangeLog
index f75b75ecd98c..ae388ce39e55 100644
--- a/sci-visualization/nonolith-connect/ChangeLog
+++ b/sci-visualization/nonolith-connect/ChangeLog
@@ -1,6 +1,10 @@
 # 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.4 2012/12/11 09:48:39 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/nonolith-connect/ChangeLog,v 1.5 2014/01/06 13:31:37 jlec Exp $
+
+  06 Jan 2014; Justin Lecher <jlec@gentoo.org> -nonolith-connect-1.0.1.ebuild,
+  nonolith-connect-1.1.ebuild:
+  Punt base.eclass
 
   11 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
   nonolith-connect-1.0.1.ebuild, nonolith-connect-1.1.ebuild:
diff --git a/sci-visualization/nonolith-connect/nonolith-connect-1.0.1.ebuild b/sci-visualization/nonolith-connect/nonolith-connect-1.0.1.ebuild
deleted file mode 100644
index c41627bdd4c0..000000000000
--- a/sci-visualization/nonolith-connect/nonolith-connect-1.0.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.0.1.ebuild,v 1.3 2012/12/11 09:48:39 ssuominen Exp $
-
-EAPI=4
-
-inherit base scons-utils toolchain-funcs udev 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" )
-
-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
-	udev_dorules "${FILESDIR}"/60-nonolith-connect.rules
-}
-
-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"
-}
diff --git a/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild b/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild
index fb00c1b0686c..e20f6d136018 100644
--- a/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild
+++ b/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 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.3 2012/12/11 09:48:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild,v 1.4 2014/01/06 13:31:37 jlec Exp $
 
-EAPI=4
+EAPI=5
 
-inherit base scons-utils toolchain-funcs user
+inherit eutils scons-utils toolchain-funcs user
 
 DESCRIPTION="CEE (Control - Experiment - Explore) analog multitool"
 HOMEPAGE="http://www.nonolithlabs.com/cee/"
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND="dev-libs/boost
+RDEPEND="
+	dev-libs/boost
 	virtual/udev"
 DEPEND="${RDEPEND}"
 
@@ -26,6 +27,10 @@ pkg_setup() {
 	enewuser nonolithd -1 -1 /dev/null usb
 }
 
+src_prepare() {
+	epatch ${PATCHES[@]}
+}
+
 src_configure() {
 	myesconsargs=(
 		boost_static=0