Took over package maintainership and restored 4.3 version to the tree with nod from xarthisius. 4.3-r1 ebuild resolves file parsing bug introduced in 4.2-r9 (bug 546066) and converts to distutils-r1 (bug 544920).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

6 files changed, 169 insertions, 10 deletions

diff --git a/sci-mathematics/snns/ChangeLog b/sci-mathematics/snns/ChangeLog
index a3c6d8692032..34bd1914ef58 100644
--- a/sci-mathematics/snns/ChangeLog
+++ b/sci-mathematics/snns/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-mathematics/snns
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/ChangeLog,v 1.25 2013/07/21 09:45:08 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/ChangeLog,v 1.26 2015/04/10 20:03:20 axs Exp $
+
+*snns-4.3-r1 (10 Apr 2015)
+
+  10 Apr 2015; Ian Stakenvicius (_AxS_) <axs@gentoo.org> +snns-4.3-r1.ebuild,
+  +files/4.3-bison-version.patch, +files/4.3-unstrip.patch, metadata.xml:
+  Took over package maintainership and restored 4.3 version to the tree with
+  nod from xarthisius. 4.3-r1 ebuild resolves file parsing bug introduced in
+  4.2-r9 (bug 546066) and converts to distutils-r1 (bug 544920).
 
   21 Jul 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due #473480
diff --git a/sci-mathematics/snns/Manifest b/sci-mathematics/snns/Manifest
index 0996f3e935f1..29157c7241e8 100644
--- a/sci-mathematics/snns/Manifest
+++ b/sci-mathematics/snns/Manifest
@@ -3,21 +3,25 @@ Hash: SHA256
 
 AUX 4.2-fPIC-python.patch 498 SHA256 175ae2fa3ceebb288d5a634b2f65f778f6cced9f35f369b0dbda20011fb3c8c6 SHA512 49969f9ef6d7da2c7175afdfbc03d95bf2973c3af67002e56cd146792fc2c85b68592e69e1d3e6a27d75a0741be7ce488d8c762e74d5b761b3d6ce9aad92d48d WHIRLPOOL f7f81a47433dbd94cca092afde6743338c6fe7f501d33bd9cbdef2b34e6a85b0efb6d983b191706f79f028fb6ee0b4e1eb9ef992d23a7b1c7d847bae38f469f8
 AUX 4.2-ldflags.patch 1109 SHA256 5cebf78bf106ae055bb556004dc285b5ae5362e9a1f4eea296c666be6014265b SHA512 274da0d037922c7bec246cb47a57cf63ca700345073ae0159d5636921a51370e02ed4dd18618e657477c513b2141c87a40c7082abe4fdaeb287ce42b33907033 WHIRLPOOL e206c3e530a17b0548bcb30855691f433e4802cbe1a8e2a2a793c4337281fc3d063485039771091bd1580882819edb075669398a0365ab36ec54f94cf5317e75
+AUX 4.3-bison-version.patch 463 SHA256 db71246207e413f56fbc1e673b61f09a0310d6e1e8a40eb2688da87c772c8e6b SHA512 5ad60b931e1bf79ccc023ca6fdde4ded155cf5d5d47216fec4811dc7689c95b0147dbc3210507c20ca59086f9d0e0df30b5c0a42daada549919c473176338344 WHIRLPOOL bdf02e266680efb9ec690ca19b87583b9fc8217369ace023a0a630dfefbcf7554ab9448dc807e8ce7b83bd1e3f2ade17b2e6d369c041d3ceb33848a6e7e97ae9
+AUX 4.3-unstrip.patch 260 SHA256 4efb6e5fcbb130eb850bc5d0c837db6b37e78466068cf2c472082d8dd8f334d9 SHA512 9fb6826160850c4de977367a16ebfcd49667ee5bb5647a3a0441a32e58ce5e7649e25c03d4c43b71eab037ad13bdefe1668bedde691fc9883ed2e5e743856b16 WHIRLPOOL 462ad2fc58d837b92a6fafe9d7c8a34e539ae39a3074396ae0665dc6b3be846df5b6fc62a0fb95186cd0f84f715b8e76189a62e3aca47bf2ab490391caaf31a7
 DIST PySNNS-20040605.tar.gz 20158 SHA256 c2dff5a88faa756546dac1c850d5196d8bba39f793537c5ebcaa61e21f0db317
 DIST PythonFunctionSupport-20050210.patch.gz 15728 SHA256 c507c70aa158ffb1422aeef693d45f2e8486b1fc7056142736796dd4273f4869
 DIST SNNSv4.2.Manual.pdf 2103861 SHA256 ffed74a4d63f78b8bf8a400a18ce32c3e8d8b3e89682394cc6af122c097aba62
-DIST SNNSv4.2.tar.gz 2170375 SHA256 13a36eb7e7838cc7df92a2eaa36c955579a99007c2936d85c20ec0c6a3036c38
+DIST SNNSv4.2.tar.gz 2170375 SHA256 13a36eb7e7838cc7df92a2eaa36c955579a99007c2936d85c20ec0c6a3036c38 SHA512 1e7943204783f742048182cc2ea90fcf31f54c9ce868aef0c48baed68056ded2300f86bb0f2f3219fd9e2a6bab1e65aa3101734c0476a95af97e12cffc379614 WHIRLPOOL eb7c49e5039056e56bed3de10cb88f4d90cc65f89e7fe87747aea2b361f72dff04e78a06f8d8ade79de0da67031af1efb148e18a4a7a5935da4d07760d5bea04
+DIST SNNSv4.3.tar.gz 5076669 SHA256 54bf92d23e9198f9030a3c3d2b741472e9b8660b27d3b419ade6393b1ebf6f62 SHA512 a057dc946b581eee01334956c33d6870b8b994d1b835834d58c37ae3a8585dfb1206f3082b17a49ee97b22f4c07c0efb47e4e3ae5aeb37e97f69472da3e21f0b WHIRLPOOL 29e1afc09a6e5ba7de5fc21d2a995f7f093e02e9f6125831ce29dfeaddd125241f440b362b97af5fe0933a21455b4002f606ecdce7b13f24046d20167bd5ad7d
 DIST python.patch.gz 52650 SHA256 de4b97a208bf7a9a1ee40256e153fbd142aa612822e1451d50fd36cbd3ecc1d9
-DIST snns-4.2-20040227.patch.gz 55476 SHA256 08a5fa51552b33e5e981d68cbf05792d40d6d0015abad090697b6f88544d3468
+DIST snns-4.2-20040227.patch.gz 55476 SHA256 08a5fa51552b33e5e981d68cbf05792d40d6d0015abad090697b6f88544d3468 SHA512 29378fead9c59c5c3341e03aa08009230b805ce910a95932c34a9c0f6eaf31ef978410add7e79249fe302992890e693567e32d6686589f2d939efae7d0bc32b0 WHIRLPOOL 64f1283979a06e86d25cd2a750ff53978bc47e8fd5df708d416be3886288ebae6534b10d1a2a6eec3931c81b39ab9b5322c2602094b3b62c3397d7d41671eff8
 DIST snns-4.2-patched.tar.gz 2188658 SHA256 d0fc25dcb82979a46bfdfd24a090ec113b039d0f144f8f7c10404775acd129a7
 EBUILD snns-4.2-r8.ebuild 2884 SHA256 9757e21c848595dd87e937f0210732cdbdda90aca67f50403ef51c479095b3d3 SHA512 66486c9c3fc4f9263e47cf7e77dd7a34e98526e751ecbbc8ada750830b444596c398931cf727b26264cfb8dc3bd06356ef97bb3fb14531b9a6a9fd1b29794a2a WHIRLPOOL 3f7d7aa234f92c140dd4fe64671cc9cb052e56c9a5c6bd07f39b7834b1ce3035cb43af0be44e47734ca114e96e7c5af2c7ec4ca75634549acc037b8ed87bf919
 EBUILD snns-4.2-r9.ebuild 2463 SHA256 0c91a05b6aa5a8fd51378843b0e7edf855887c199ec1222e2feaa42d74b43517 SHA512 b586d06836b45c7d59d714259f36d44cc4340fa22362a5241663037b8100bcb07da83117a83173a2ac0b38c365fbe08c040087109603eda419319086c8f9b6a0 WHIRLPOOL 52c3adffbe6d695cac4d032f50fe0d96a9358a9350ab1619c57646eee29c5c15975aa010c93fa4f8b99cf45edbed1eef9f31e3fe4fdf5b1cc8efa6de86738784
-MISC ChangeLog 5582 SHA256 5bb66e09838d6c5befe56cac8ac9a036be202d91eb00c75023d9dd9ded568894 SHA512 5737268141f4b7284280456a1f1275f5178c6774d6703b862b82882f06c2e0535e67b830f7fb948c73cc5dddd0e667bb050d22d79b161836b18d7bf83e7aa13e WHIRLPOOL bd09b493b07658dfcca78df9ee805e9844b3135ed2f70bbbf8a1f9cc0f2129364c1a589ef7c2bc89fd0e30651ed11fe1db3c1f3c9f738c89c7afc5c951e301fd
-MISC metadata.xml 168 SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9 SHA512 376430dcb1b1cd15e11aa6dee3a7193baaa8e54e1c5e8193597af76ad9e0eb00956b7e2ff96a8618dc89a9baffb813111913b88aa191cc85f0b2e435d3408d95 WHIRLPOOL 5c6d93bb81b33731d41a2c476e0054a4dcf49a19272e6508048b601d27fd1a84cd38649d57a03a15c1547208eb7ffc4c87133bd6880deec0000675c2c14589ad
+EBUILD snns-4.3-r1.ebuild 2785 SHA256 ada6c3b3d4e63584eb2d57833abfe00475b4ae65dea438e4b9f6cbd10f519990 SHA512 979671d04e7a0cb166558210bde31015fdee412d0d4b736d0afb6eec0fafbb7b8d1921d05e2d2e4abea34369fc005cff9b150f4d284ece22d128910a8d2ca317 WHIRLPOOL b852d88d28775ba4db6873f707dca82b961fe814b5e3e566ca6bd444d3fa66ec06ba255eaf875ff184cc2549b5e699b05ed96d0eb5afb45b8ae5088401ace989
+MISC ChangeLog 5980 SHA256 89e8f7fd0692f105b9ca2e891ba71fc2b88b1d74f889ffde2c91443a9c68fadb SHA512 ace9be85d804ce6d5e750b98c27ffa8afa9555f0b416498221eb702d4bdcf479b0f7bc4ed828dd3cdf3d6ebd97893e173e1709b07048d2a0ce7a99eab70e100b WHIRLPOOL af6bc741191c77f165ca16f3365032bf44522be7e233f59c564385ae7110f40e8464954616ea66f98dce7505c409958f9122dd35479da65c88579f0437b2bc87
+MISC metadata.xml 257 SHA256 d3f26a7e161752ba8d618621c4b35de7071842e19e89b551f151fab5b2828c61 SHA512 fd666ef2ec77fe174951826bf8dbcbee21eae3bb79ee3a23e712501db1809ec2d0810c0c20d841b2cbe9831741939ce7da3c48275c2dc882ecdfd5669babf35b WHIRLPOOL d5499683a990792452d6b65cb2d9e74fd86ee8946645ae3b5b55489fe12cc110e754594a36bc9b55bb074e0a02d30ecc080c355874bfbe49c453bbe0a7b52547
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlHrraYACgkQCaWpQKGI+9RxEACghV+XRsvl8XHJQa9ql2SrOjv/
-wRoAnj/88qaMtCPsypwHv4+XuPry35GU
-=iico
+iF4EAREIAAYFAlUoLJUACgkQ2ugaI38ACPAzMwEAsVYcaqeBSVc0VJSUtKr4HHDM
+SzGKsmupM/HwF+XF+60BAL6y0zPZqOXO9ZsRz/5NCMyeNJv9UBahWVQP5g/TAEzl
+=aDyx
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/snns/files/4.3-bison-version.patch b/sci-mathematics/snns/files/4.3-bison-version.patch
new file mode 100644
index 000000000000..73da70187254
--- /dev/null
+++ b/sci-mathematics/snns/files/4.3-bison-version.patch
@@ -0,0 +1,11 @@
+--- configure.old	2015-04-08 16:27:05.000000000 -0400
++++ configure	2015-04-08 16:26:41.000000000 -0400
+@@ -5071,7 +5071,7 @@
+ else
+     { echo "$as_me:$LINENO: checking for version of bison" >&5
+ echo $ECHO_N "checking for version of bison... $ECHO_C" >&6; }
+-    bison_version=`$BISON --version`
++    bison_version=`$BISON --version |head -n 1`
+     { echo "$as_me:$LINENO: result: $bison_version" >&5
+ echo "${ECHO_T}$bison_version" >&6; }
+     warn_bison=yes
diff --git a/sci-mathematics/snns/files/4.3-unstrip.patch b/sci-mathematics/snns/files/4.3-unstrip.patch
new file mode 100644
index 000000000000..4f36040e2218
--- /dev/null
+++ b/sci-mathematics/snns/files/4.3-unstrip.patch
@@ -0,0 +1,11 @@
+--- a/configuration/install-sh	2008-04-21 03:55:33.000000000 -0400
++++ b/configuration/install-sh	2015-04-08 16:59:32.000000000 -0400
+@@ -79,7 +79,7 @@
+ 	    shift
+ 	    continue;;
+ 
+-	-s) stripcmd="$stripprog"
++	-s) stripcmd=""
+ 	    shift
+ 	    continue;;
+ 
diff --git a/sci-mathematics/snns/metadata.xml b/sci-mathematics/snns/metadata.xml
index 5a2f1c7b832e..601be9594b9b 100644
--- a/sci-mathematics/snns/metadata.xml
+++ b/sci-mathematics/snns/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci-mathematics</herd>
+<maintainer>
+	<email>axs@gentoo.org</email>
+	<name>Ian Stakenvicius</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sci-mathematics/snns/snns-4.3-r1.ebuild b/sci-mathematics/snns/snns-4.3-r1.ebuild
new file mode 100644
index 000000000000..a73da91c7eee
--- /dev/null
+++ b/sci-mathematics/snns/snns-4.3-r1.ebuild
@@ -0,0 +1,121 @@
+# 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.1 2015/04/10 20:03:20 axs Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+inherit distutils-r1 eutils
+
+MY_P="SNNSv${PV}"
+DESCRIPTION="Stuttgart Neural Network Simulator"
+HOMEPAGE="http://sourceforge.net/projects/snns/"
+SRC_URI="http://www.ra.cs.uni-tuebingen.de/downloads/SNNS/${MY_P}.tar.gz
+	doc? ( http://www.ra.cs.uni-tuebingen.de/downloads/SNNS/SNNSv4.2.Manual.pdf )"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE="X doc python"
+
+RDEPEND="X? ( x11-libs/libXaw3d )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	>=sys-devel/bison-1.2.2
+	X? ( x11-proto/xproto )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/4.3-unstrip.patch
+	epatch "${FILESDIR}"/4.3-bison-version.patch
+	epatch "${FILESDIR}"/4.2-ldflags.patch
+
+	# change all references of Xaw to Xaw3d
+	cd "${S}"/xgui/sources
+	for file in *.c; do
+		sed -e "s:X11/Xaw/:X11/Xaw3d/:g" -i "${file}"
+	done
+
+	# clean up files that apparently are not removed by any clean rules
+	rm -Rf "${S}"/{tools,xgui}/bin \
+		"${S}"/{Makefile.def,config.h} \
+		"${S}"/configuration/config.{guess,log}
+
+	epatch_user
+
+	if use python; then
+		pushd "${S}"/python > /dev/null || die
+		distutils-r1_src_prepare
+		popd > /dev/null || die
+	fi
+}
+
+src_configure() {
+	econf --enable-global \
+		$(use_with X x)
+
+	if use python; then
+		pushd python > /dev/null || die
+		distutils-r1_src_configure
+		popd > /dev/null || die
+	fi
+}
+
+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
+		emake ${tgt}
+	done
+
+	if use python; then
+		pushd python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	for file in `find tools -type f -perm +100`; do
+		dobin $file
+	done
+
+	# bug 248322
+	mv "${ED}"/usr/bin/{,snns-}netperf || die
+
+	if use X; then
+		newbin xgui/sources/xgui snns
+
+		echo XGUILOADPATH=/usr/share/doc/${PF} > "${T}"/99snns
+		doenvd "${T}"/99snns
+
+		docompress -x /usr/share/doc/${PF}/{default.cfg,help.hdoc}
+		insinto /usr/share/doc/${PF}
+		doins default.cfg help.hdoc
+	fi
+
+	if use python; then
+		pushd python > /dev/null || die
+		distutils-r1_src_install
+		insinto /usr/share/doc/${PF}/python-examples
+		doins examples/*
+		newdoc README README.python
+		popd > /dev/null || die
+	fi
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins "${DISTDIR}"/${MY_P}.Manual.pdf
+	fi
+
+	insinto /usr/share/doc/${PF}/examples
+	doins examples/*
+	doman man/man*/*
+}