Reworked the solution for the netperf collision, dropped the 'find all executable files' method of installing tools for 'emake install', added missing deps; resolves bug 546566

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)

3 files changed, 188 insertions, 17 deletions

diff --git a/sci-mathematics/snns/ChangeLog b/sci-mathematics/snns/ChangeLog
index d97797f47199..b4607cf9ef85 100644
--- a/sci-mathematics/snns/ChangeLog
+++ b/sci-mathematics/snns/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-mathematics/snns
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/ChangeLog,v 1.27 2015/04/10 20:09:40 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/ChangeLog,v 1.28 2015/04/14 15:10:59 axs Exp $
+
+*snns-4.3-r2 (14 Apr 2015)
+
+  14 Apr 2015; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +files/4.3-snns-netperf.patch, +snns-4.3-r2.ebuild, -snns-4.3-r1.ebuild:
+  Reworked the solution for the netperf collision, dropped the 'find all
+  executable files' method of installing tools for 'emake install', added
+  missing deps; resolves bug 546566
 
   10 Apr 2015; Ian Stakenvicius (_AxS_) <axs@gentoo.org> snns-4.3-r1.ebuild:
   added REQUIRED_USE to properly support the python-optional distutils-r1
diff --git a/sci-mathematics/snns/files/4.3-snns-netperf.patch b/sci-mathematics/snns/files/4.3-snns-netperf.patch
new file mode 100644
index 000000000000..f154a538b2d9
--- /dev/null
+++ b/sci-mathematics/snns/files/4.3-snns-netperf.patch
@@ -0,0 +1,164 @@
+--- a/examples/nettalk.README	2008-04-21 03:55:43.000000000 -0400
++++ b/examples/nettalk.README	2015-04-14 09:38:23.836014999 -0400
+@@ -60,7 +60,7 @@
+ Hints:
+ ======
+ 
+-We usually call nettalk.net from the tool 'netperf', a benchmarking
++We usually call nettalk.net from the tool 'snns-netperf', a benchmarking
+ version of SNNS without graphical user interface but with the full and
+ current SNNS kernel. It is supplied with SNNS in the tools directory.
+ We usually train and test nettalk for 10 cycles. Since convergence is
+--- a/man/man1/snns.1	2008-04-21 03:56:05.000000000 -0400
++++ b/man/man1/snns.1	2015-04-14 09:36:27.406012874 -0400
+@@ -111,7 +111,7 @@
+ .BR netlearn (1)
+ backpropagation test program
+ 
+-.BR netperf (1)
++.BR snns-netperf (1)
+ benchmark program
+ 
+ .BR pat_sel (1)
+@@ -132,4 +132,4 @@
+ yet. 
+ 
+ .SH AUTHOR
+-Guenter W. Mamier 
+\ No newline at end of file
++Guenter W. Mamier 
+--- a/tools/doc/netperf.doc	2008-04-21 03:56:06.000000000 -0400
++++ b/tools/doc/netperf.doc	1969-12-31 19:00:00.000000000 -0500
+@@ -1,49 +0,0 @@
+-                  ===============================
+-                  Description of the tool NETPERF
+-                  ===============================
+-
+-This is a benchmark program for SNNS. Propagtion and
+-backpropagation tests are performed.
+-
+-synopsis: netperf
+-
+-
+-example:
+-
+-unix >netperf
+-
+-produces
+-
+-  SNNS 3D-Kernel V3.1000
+-  -----  Benchmark Test  -----
+-
+-  Filename of the network file: ../../../examples/nettalk.net
+-  Loading the network ...
+-
+-  Network name: nettalk1
+-  No. of units       : 349
+-  No. of input units : 203
+-  No. of output units: 26
+-  No. of sites: 0
+-  No. of links: 27480
+-
+-  Learning function: Std_Backpropagation
+-  Update function  : Topological_Order
+-
+-  Do you want to benchmark
+-  Propagation [1] or
+-  Backpropagation [2] ?
+-  Input: 1
+-
+-  Choose no. of cycles: 100
+-
+-  Begin propagation ...
+-
+-
+-  No. of units updated: 34900
+-  No. of sites updated: 0
+-  No. of links updated: 2748000
+-  CPU Time used: 3.05 seconds
+-
+-  No. of connection per second (CPS): 9.0098e+05
+-
+--- a/tools/doc/snns-netperf.doc	1969-12-31 19:00:00.000000000 -0500
++++ b/tools/doc/snns-netperf.doc	2015-04-14 09:37:21.126013855 -0400
+@@ -0,0 +1,49 @@
++                ====================================
++                Description of the tool SNNS-NETPERF
++                ====================================
++
++This is a benchmark program for SNNS. Propagtion and
++backpropagation tests are performed.
++
++synopsis: snns-netperf
++
++
++example:
++
++unix >snns-netperf
++
++produces
++
++  SNNS 3D-Kernel V3.1000
++  -----  Benchmark Test  -----
++
++  Filename of the network file: ../../../examples/nettalk.net
++  Loading the network ...
++
++  Network name: nettalk1
++  No. of units       : 349
++  No. of input units : 203
++  No. of output units: 26
++  No. of sites: 0
++  No. of links: 27480
++
++  Learning function: Std_Backpropagation
++  Update function  : Topological_Order
++
++  Do you want to benchmark
++  Propagation [1] or
++  Backpropagation [2] ?
++  Input: 1
++
++  Choose no. of cycles: 100
++
++  Begin propagation ...
++
++
++  No. of units updated: 34900
++  No. of sites updated: 0
++  No. of links updated: 2748000
++  CPU Time used: 3.05 seconds
++
++  No. of connection per second (CPS): 9.0098e+05
++
+--- a/tools/sources/Makefile	2015-04-14 09:34:31.386010756 -0400
++++ b/tools/sources/Makefile	2015-04-14 09:35:50.526012201 -0400
+@@ -89,7 +89,7 @@
+ 
+ TOOLS_PRG          = $(TOOLS_SOURCES_C:.c=)
+ KRTOOLS_PRG        = snns2c pat_sel netlearn td_bignet ff_bignet \
+-                     netperf snnsbat feedback-gennet convert2snns \
++                     snns-netperf snnsbat feedback-gennet convert2snns \
+                      isnns linknets
+ BATCH_PRG          = batchman
+ 
+@@ -110,7 +110,7 @@
+ tools:       $(TOOLS_PRG) $(KRTOOLS_PRG) $(BATCH_PRG)
+ 
+ $(TOOLSBINDIR):
+-	-mkdir $(TOOLSBINDIR)
++	-mkdir -p $(TOOLSBINDIR)
+ 
+ install: tools $(TOOLSBINDIR)
+ 	for tooltarget in $(TOOLS_PRG) $(KRTOOLS_PRG) $(BATCH_PRG) ; do \
+@@ -191,8 +191,8 @@
+ ff_bignet: ff_bignet.o $(KERNELLIBS)
+ 	$(CC) $(LDFLAGS) ff_bignet.o $(KERNELALLLIBS) -o ff_bignet
+ 
+-netperf: netperf.o $(KERNELLIBS)
+-	$(CC) $(LDFLAGS) netperf.o $(KERNELALLLIBS) -o netperf
++snns-netperf: netperf.o $(KERNELLIBS)
++	$(CC) $(LDFLAGS) netperf.o $(KERNELALLLIBS) -o snns-netperf
+ 
+ snnsbat: snnsbat.o $(KERNELLIBS)
+ 	$(CC) $(LDFLAGS) snnsbat.o $(KERNELALLLIBS) -o snnsbat
diff --git a/sci-mathematics/snns/snns-4.3-r1.ebuild b/sci-mathematics/snns/snns-4.3-r2.ebuild
index 5c385e6ff90f..f7a025874a08 100644
--- a/sci-mathematics/snns/snns-4.3-r1.ebuild
+++ b/sci-mathematics/snns/snns-4.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/snns-4.3-r1.ebuild,v 1.2 2015/04/10 20:09:40 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/snns-4.3-r2.ebuild,v 1.1 2015/04/14 15:10:59 axs Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -18,14 +18,16 @@ KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 IUSE="X doc python"
 
-RDEPEND="X? ( x11-libs/libXaw3d )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND=">=sys-devel/bison-1.2.2
-	X? (
+RDEPEND="X? (
+		x11-libs/libX11
 		x11-libs/libXaw3d
-		x11-proto/xproto
+		x11-libs/libXt
 	)"
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xproto )
+	>=sys-devel/bison-1.2.2"
 
+RDEPEND+=" python? ( ${PYTHON_DEPS} )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}/${MY_P}"
@@ -34,6 +36,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/4.3-unstrip.patch
 	epatch "${FILESDIR}"/4.3-bison-version.patch
 	epatch "${FILESDIR}"/4.2-ldflags.patch
+	epatch "${FILESDIR}"/4.3-snns-netperf.patch # bug 248322
 
 	# change all references of Xaw to Xaw3d
 	cd "${S}"/xgui/sources
@@ -41,7 +44,9 @@ src_prepare() {
 		sed -e "s:X11/Xaw/:X11/Xaw3d/:g" -i "${file}"
 	done
 
-	# clean up files that apparently are not removed by any clean rules
+	# clean up the dirty dist sources and remove files that apparently
+	# are not removed by any clean rules
+	emake clean
 	rm -Rf "${S}"/{tools,xgui}/bin \
 		"${S}"/{Makefile.def,config.h} \
 		"${S}"/configuration/config.{guess,log}
@@ -70,9 +75,6 @@ src_compile() {
 	local compileopts=( compile-kernel compile-tools )
 	use X && compileopts+=( compile-xgui )
 
-	# tarball is sometimes left dirty
-	emake clean
-
 	# parallel make sometimes fails (phosphan)
 	# so emake each phase separately (axs)
 	for tgt in "${compileopts[@]}"; do
@@ -87,12 +89,9 @@ src_compile() {
 }
 
 src_install() {
-	for file in `find tools -type f -perm +100`; do
-		dobin $file
-	done
-
-	# bug 248322
-	mv "${ED}"/usr/bin/{,snns-}netperf || die
+	pushd "${S}"/tools/sources > /dev/null || die
+	emake TOOLSBINDIR="${ED}"usr/bin install
+	popd > /dev/null || die
 
 	if use X; then
 		newbin xgui/sources/xgui snns