Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: dev-python/ffnet/
Date: Mon, 29 Oct 2012 11:00:46
Message-Id: 1351181753.ee473680a7a92217a65728efe47423026dc67b11.jlec@gentoo
1 commit: ee473680a7a92217a65728efe47423026dc67b11
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 25 16:15:53 2012 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 25 16:15:53 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ee473680
7
8 dev-python/ffnet: Move to EAPI=5; use distutils-r1.eclass; correct usage of fortran-2.eclass
9
10 Package-Manager: portage-2.2.0_alpha141
11
12 ---
13 dev-python/ffnet/ChangeLog | 6 +++++-
14 dev-python/ffnet/ffnet-0.6.2.ebuild | 23 +++++++++++------------
15 dev-python/ffnet/metadata.xml | 10 +++++-----
16 3 files changed, 21 insertions(+), 18 deletions(-)
17
18 diff --git a/dev-python/ffnet/ChangeLog b/dev-python/ffnet/ChangeLog
19 index e5febd3..6157df0 100644
20 --- a/dev-python/ffnet/ChangeLog
21 +++ b/dev-python/ffnet/ChangeLog
22 @@ -1,7 +1,11 @@
23 # ChangeLog for dev-python/ffnet
24 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
25 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
26 # $Header: $
27
28 + 25 Oct 2012; Justin Lecher <jlec@g.o> ffnet-0.6.2.ebuild,
29 + metadata.xml:
30 + Move to EAPI=5; use distutils-r1.eclass; correct usage of fortran-2.eclass
31 +
32 23 Jun 2011; Justin Lecher <jlec@g.o> ffnet-0.6.2.ebuild:
33 Streamlined fortran-2 eclass usage
34
35
36 diff --git a/dev-python/ffnet/ffnet-0.6.2.ebuild b/dev-python/ffnet/ffnet-0.6.2.ebuild
37 index 7795b21..d3e751d 100644
38 --- a/dev-python/ffnet/ffnet-0.6.2.ebuild
39 +++ b/dev-python/ffnet/ffnet-0.6.2.ebuild
40 @@ -1,14 +1,15 @@
41 -# Copyright 1999-2011 Gentoo Foundation
42 +# Copyright 1999-2012 Gentoo Foundation
43 # Distributed under the terms of the GNU General Public License v2
44 # $Header: $
45
46 -EAPI=3
47 +EAPI=5
48
49 PYTHON_DEPEND="2"
50 SUPPORT_PYTHON_ABIS="1"
51 -RESTRICT_PYTHON_ABIS="3.*"
52 +RESTRICT_PYTHON_ABIS="3.* *-pypy-*"
53 +PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
54
55 -inherit distutils flag-o-matic fortran-2 toolchain-funcs
56 +inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs
57
58 DESCRIPTION="Feed-forward neural network for python"
59 HOMEPAGE="http://ffnet.sourceforge.net/"
60 @@ -19,31 +20,29 @@ LICENSE="GPL-2"
61 KEYWORDS="~x86 ~amd64"
62 IUSE="examples graphviz matplotlib"
63
64 -DEPEND="
65 +DEPEND="${PYTHON_DEPS}
66 dev-python/networkx
67 dev-python/numpy
68 sci-libs/scipy
69 - virtual/fortran
70 matplotlib? ( dev-python/matplotlib )
71 graphviz? ( dev-python/pygraphviz )"
72 RDEPEND="${DEPEND}"
73
74 -pkg_setup() {
75 - fortran-2_pkg_setup
76 +src_prepare() {
77 export FCONFIG="config_fc --noopt --noarch"
78 append-ldflags -shared
79 append-fflags -fPIC
80 + distutils-r1_src_prepare
81 }
82
83 src_compile() {
84 - distutils_src_compile ${FCONFIG}
85 + distutils-r1_src_compile ${FCONFIG}
86 }
87
88 src_install() {
89 - distutils_src_install
90 - dodoc README || die
91 + distutils-r1_src_install
92 if use examples; then
93 insinto /usr/share/doc/${PF}
94 - doins -r examples || die
95 + doins -r examples
96 fi
97 }
98
99 diff --git a/dev-python/ffnet/metadata.xml b/dev-python/ffnet/metadata.xml
100 index e1fbe32..d30f481 100644
101 --- a/dev-python/ffnet/metadata.xml
102 +++ b/dev-python/ffnet/metadata.xml
103 @@ -1,12 +1,12 @@
104 <?xml version="1.0" encoding="UTF-8"?>
105 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
106 <pkgmetadata>
107 -<herd>sci</herd>
108 -<longdescription lang="en">
109 + <herd>sci</herd>
110 + <longdescription lang="en">
111 ffnet is a fast and easy-to-use feed-forward neural
112 network training solution for python.
113 </longdescription>
114 -<use>
115 -<flag name="matplotlib">Use matplotlib for drawing</flag>
116 -</use>
117 + <use>
118 + <flag name="matplotlib">Use matplotlib for drawing</flag>
119 + </use>
120 </pkgmetadata>