[gentoo-commits] proj/sci:master commit in: dev-python/ffnetui/, dev-python/ffnet/

[gentoo-commits] proj/sci:master commit in: dev-python/ffnetui/, dev-python/ffnet/

[Justin Lecher]

commit:     6f5ee6f8ca095ce0c649cd3b55da9899874b9c22
Author:     Marek Wojciechowski <mrkwjc <AT> gmail <DOT> com>
AuthorDate: Tue Mar  1 10:48:04 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 21:42:30 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=6f5ee6f8

dev-python/ffnet: Add new ffnet and ffnetui ebuilds

* Add new ffnet-0.8.3.ebuild.
* Add dev-python/ffnetui - GUI for ffnet
* Update ffnet, ffnetui ebuilds formatting
* Update ffnetui header
* dev-python/ffnet: Switch to EAPI=6 and other repoman suggestions
* dev-python/ffnetui: Switch to EAPI=6 and other repoman suggestions
* dev-python/ffnet: Update inherit line and examples instalation
* dev-python/ffnet: Update metadata
* dev-python/ffnetui: Update metadata
* dev-python/ffnetui: Drop flag-o-matic and toolchain-funcs

 dev-python/ffnet/ffnet-0.7.1.ebuild                | 11 ++++------
 .../{ffnet-0.7.1.ebuild => ffnet-0.8.3.ebuild}     | 22 ++++++++------------
 dev-python/ffnet/metadata.xml                      |  4 ++--
 dev-python/ffnetui/ffnetui-0.8.3.2.ebuild          | 24 ++++++++++++++++++++++
 dev-python/{ffnet => ffnetui}/metadata.xml         |  8 ++------
 5 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/dev-python/ffnet/ffnet-0.7.1.ebuild b/dev-python/ffnet/ffnet-0.7.1.ebuild
index 6e11d3d..0eb1e12 100644
--- a/dev-python/ffnet/ffnet-0.7.1.ebuild
+++ b/dev-python/ffnet/ffnet-0.7.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs
+inherit distutils-r1 fortran-2 flag-o-matic
 
 DESCRIPTION="Feed-forward neural network for python"
 HOMEPAGE="http://ffnet.sourceforge.net/"
@@ -38,8 +38,5 @@ src_compile() {
 
 python_install_all() {
 	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
+	use examples && dodoc -r examples
 }

diff --git a/dev-python/ffnet/ffnet-0.7.1.ebuild b/dev-python/ffnet/ffnet-0.8.3.ebuild
similarity index 59%
copy from dev-python/ffnet/ffnet-0.7.1.ebuild
copy to dev-python/ffnet/ffnet-0.8.3.ebuild
index 6e11d3d..50d1a39 100644
--- a/dev-python/ffnet/ffnet-0.7.1.ebuild
+++ b/dev-python/ffnet/ffnet-0.8.3.ebuild
@@ -1,28 +1,27 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_{6,7} python3_{3,4} )
 
-inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs
+inherit distutils-r1 fortran-2 flag-o-matic
 
 DESCRIPTION="Feed-forward neural network for python"
 HOMEPAGE="http://ffnet.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="LGPL-3"
 KEYWORDS="~x86 ~amd64"
-IUSE="examples graphviz matplotlib"
+IUSE="examples matplotlib"
 
 DEPEND="${PYTHON_DEPS}
 	dev-python/networkx[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	graphviz? ( dev-python/pygraphviz[${PYTHON_USEDEP}] )"
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
 RDEPEND="${DEPEND}"
 
 python_prepare_all() {
@@ -38,8 +37,5 @@ src_compile() {
 
 python_install_all() {
 	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
+	use examples && dodoc -r examples
 }

diff --git a/dev-python/ffnet/metadata.xml b/dev-python/ffnet/metadata.xml
index 0de1819..e40054c 100644
--- a/dev-python/ffnet/metadata.xml
+++ b/dev-python/ffnet/metadata.xml
@@ -7,12 +7,12 @@
   </maintainer>
   <longdescription lang="en">
   ffnet is a fast and easy-to-use feed-forward neural
-  network training solution for python.
+  network training library for python.
 </longdescription>
   <use>
     <flag name="matplotlib">Use matplotlib for drawing</flag>
   </use>
   <upstream>
-    <remote-id type="sourceforge">ffnet</remote-id>
+    <remote-id type="github">mrkwjc/ffnet</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-python/ffnetui/ffnetui-0.8.3.2.ebuild b/dev-python/ffnetui/ffnetui-0.8.3.2.ebuild
new file mode 100644
index 0000000..9549ca4
--- /dev/null
+++ b/dev-python/ffnetui/ffnetui-0.8.3.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="GUI for ffnet - feed forward neural network for python"
+HOMEPAGE="http://ffnet.sourceforge.net"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-python/ffnet-0.8.3[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-1.4[${PYTHON_USEDEP}]
+	dev-python/traitsui[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"

diff --git a/dev-python/ffnet/metadata.xml b/dev-python/ffnetui/metadata.xml
similarity index 59%
copy from dev-python/ffnet/metadata.xml
copy to dev-python/ffnetui/metadata.xml
index 0de1819..6e1e5f9 100644
--- a/dev-python/ffnet/metadata.xml
+++ b/dev-python/ffnetui/metadata.xml
@@ -6,13 +6,9 @@
     <name>Gentoo Science Project</name>
   </maintainer>
   <longdescription lang="en">
-  ffnet is a fast and easy-to-use feed-forward neural
-  network training solution for python.
+  GUI for ffnet - feed forward neural network for python
 </longdescription>
-  <use>
-    <flag name="matplotlib">Use matplotlib for drawing</flag>
-  </use>
   <upstream>
-    <remote-id type="sourceforge">ffnet</remote-id>
+    <remote-id type="github">mrkwjc/ffnetui</remote-id>
   </upstream>
 </pkgmetadata>