10 files changed, 16 insertions, 329 deletions
diff --git a/sci-mathematics/snns/ChangeLog b/sci-mathematics/snns/ChangeLog
index 2c76eea713a8..2aff2c07df57 100644
--- a/sci-mathematics/snns/ChangeLog
+++ b/sci-mathematics/snns/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/snns
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/ChangeLog,v 1.8 2006/01/20 14:35:02 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/ChangeLog,v 1.9 2006/01/25 14:23:49 phosphan Exp $
+
+  25 Jan 2006; Patrick Kursawe <phosphan@gentoo.org> -snns-4.2-r4.ebuild,
+  -snns-4.2-r6.ebuild, snns-4.2-r7.ebuild, -snns-4.2-r8.ebuild:
+  Big cleanup
 
 *snns-4.2-r8 (20 Jan 2006)
 
diff --git a/sci-mathematics/snns/Manifest b/sci-mathematics/snns/Manifest
index a849ab29c95c..ed5ae96c9172 100644
--- a/sci-mathematics/snns/Manifest
+++ b/sci-mathematics/snns/Manifest
@@ -1,11 +1,5 @@
 MD5 b65413f0c34f615429236004a043719a ChangeLog 3220
 MD5 e810e01b587c8fc167a868700f105be6 files/4.2-fPIC-python.patch 498
-MD5 409a7ed863845a91ab923aee9873a062 files/digest-snns-4.2-r4 196
-MD5 13bc6c016dc3aa799a25598dead6346e files/digest-snns-4.2-r6 262
-MD5 5ff18c8925d0470f7a9e21fac5aa030e files/digest-snns-4.2-r7 345
-MD5 f268a08e0cf98bde33935553e4378912 files/digest-snns-4.2-r8 345
+MD5 f268a08e0cf98bde33935553e4378912 files/digest-snns-4.2-r7 345
 MD5 c000c0728c9136f1b54cbc3a5fc07644 metadata.xml 220
-MD5 74eb817bd528c04a396576ef594eb643 snns-4.2-r4.ebuild 1640
-MD5 bcd4e2d19956f5e748ad0a349baecefa snns-4.2-r6.ebuild 2603
-MD5 d6c2822f706c971ed4d1eb73d5276c33 snns-4.2-r7.ebuild 2853
-MD5 faa8d39c398f8c4c99c0b5468314a108 snns-4.2-r8.ebuild 2895
+MD5 1eae284b46d02ccd165ed7d4838e57d6 snns-4.2-r7.ebuild 2891
diff --git a/sci-mathematics/snns/files/digest-snns-4.2-r4 b/sci-mathematics/snns/files/digest-snns-4.2-r4
deleted file mode 100644
index 58ea19932b04..000000000000
--- a/sci-mathematics/snns/files/digest-snns-4.2-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4609dfd61714bfbb0842d4e8e905e584 SNNSv4.2.tar.gz 2170375
-MD5 73a999a41bb91a4f8b5653ddddfcc527 snns-4.2-20040227.patch.gz 55476
-MD5 e91242fdc43877013ade3b5f2213659a SNNSv4.2.Manual.pdf 2103861
diff --git a/sci-mathematics/snns/files/digest-snns-4.2-r6 b/sci-mathematics/snns/files/digest-snns-4.2-r6
deleted file mode 100644
index d3e961a5e2c2..000000000000
--- a/sci-mathematics/snns/files/digest-snns-4.2-r6
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 4609dfd61714bfbb0842d4e8e905e584 SNNSv4.2.tar.gz 2170375
-MD5 73a999a41bb91a4f8b5653ddddfcc527 snns-4.2-20040227.patch.gz 55476
-MD5 e91242fdc43877013ade3b5f2213659a SNNSv4.2.Manual.pdf 2103861
-MD5 fd63676eabeab8c633b176c01cbf8d44 PySNNS-20040605.tar.gz 20158
diff --git a/sci-mathematics/snns/files/digest-snns-4.2-r7 b/sci-mathematics/snns/files/digest-snns-4.2-r7
index 4d755504cad0..0e0deb9ed0f1 100644
--- a/sci-mathematics/snns/files/digest-snns-4.2-r7
+++ b/sci-mathematics/snns/files/digest-snns-4.2-r7
@@ -1,5 +1,5 @@
-MD5 4609dfd61714bfbb0842d4e8e905e584 SNNSv4.2.tar.gz 2170375
-MD5 73a999a41bb91a4f8b5653ddddfcc527 snns-4.2-20040227.patch.gz 55476
-MD5 e91242fdc43877013ade3b5f2213659a SNNSv4.2.Manual.pdf 2103861
 MD5 fd63676eabeab8c633b176c01cbf8d44 PySNNS-20040605.tar.gz 20158
 MD5 df45b551a3daaf6fd7974388f81d8917 PythonFunctionSupport-20050210.patch.gz 15728
+MD5 e91242fdc43877013ade3b5f2213659a SNNSv4.2.Manual.pdf 2103861
+MD5 4609dfd61714bfbb0842d4e8e905e584 SNNSv4.2.tar.gz 2170375
+MD5 73a999a41bb91a4f8b5653ddddfcc527 snns-4.2-20040227.patch.gz 55476
diff --git a/sci-mathematics/snns/files/digest-snns-4.2-r8 b/sci-mathematics/snns/files/digest-snns-4.2-r8
deleted file mode 100644
index 0e0deb9ed0f1..000000000000
--- a/sci-mathematics/snns/files/digest-snns-4.2-r8
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 fd63676eabeab8c633b176c01cbf8d44 PySNNS-20040605.tar.gz 20158
-MD5 df45b551a3daaf6fd7974388f81d8917 PythonFunctionSupport-20050210.patch.gz 15728
-MD5 e91242fdc43877013ade3b5f2213659a SNNSv4.2.Manual.pdf 2103861
-MD5 4609dfd61714bfbb0842d4e8e905e584 SNNSv4.2.tar.gz 2170375
-MD5 73a999a41bb91a4f8b5653ddddfcc527 snns-4.2-20040227.patch.gz 55476
diff --git a/sci-mathematics/snns/snns-4.2-r4.ebuild b/sci-mathematics/snns/snns-4.2-r4.ebuild
deleted file mode 100644
index 926fe0cc151d..000000000000
--- a/sci-mathematics/snns/snns-4.2-r4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/snns-4.2-r4.ebuild,v 1.2 2005/01/30 16:07:04 luckyduck Exp $
-
-inherit eutils
-
-MY_P="SNNSv${PV}"
-MYPATCH="${P}-20040227"
-DESCRIPTION="Stuttgart Neural Network Simulator"
-HOMEPAGE="http://www-ra.informatik.uni-tuebingen.de/SNNS/"
-SRC_URI="http://www-ra.informatik.uni-tuebingen.de/downloads/SNNS/${MY_P}.tar.gz
-	http://download.berlios.de/snns-dev/${MYPATCH}.patch.gz
-	doc? ( http://www-ra.informatik.uni-tuebingen.de/downloads/SNNS/${MY_P}.Manual.pdf )"
-
-LICENSE="SNNS-${PV}"
-KEYWORDS="x86 ppc"
-SLOT="0"
-IUSE="X doc"
-
-DEPEND="X? ( virtual/x11
-	x11-libs/Xaw3d )
-	>=sys-apps/sed-4
-	virtual/libc"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	unpack ${MYPATCH}.patch.gz
-	epatch ${MYPATCH}.patch
-}
-
-src_compile() {
-	local myconf="--enable-global"
-	local compileopts="compile-kernel compile-tools"
-
-	if use X ; then
-		myconf="${myconf} --with-x"
-		compileopts="${compileopts} compile-xgui"
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	econf ${myconf} || die "econf failed"
-	emake ${compileopts} || die "emake failed"
-}
-
-src_install() {
-	for file in `find tools -type f -perm +100`; do
-		dobin $file
-	done
-
-	if use X ; then
-		newbin xgui/sources/xgui snns
-
-		dodir /etc/env.d
-		echo XGUILOADPATH=/usr/share/doc/${PF}/ > ${D}/etc/env.d/99snns
-
-		insinto /usr/share/doc/${PF}
-		doins default.cfg help.hdoc
-	fi
-
-	insinto /usr/share/doc/${PF}
-	use doc && doins ${DISTDIR}/${MY_P}.Manual.pdf
-
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/*
-
-	doman man/man*/*
-}
diff --git a/sci-mathematics/snns/snns-4.2-r6.ebuild b/sci-mathematics/snns/snns-4.2-r6.ebuild
deleted file mode 100644
index 7fce3050b78c..000000000000
--- a/sci-mathematics/snns/snns-4.2-r6.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/snns-4.2-r6.ebuild,v 1.3 2005/08/24 16:42:03 phosphan Exp $
-
-inherit eutils python
-
-MY_P="SNNSv${PV}"
-MYPATCH="${P}-20040227"
-MYPYTHONEXT="PySNNS-20040605"
-
-DESCRIPTION="Stuttgart Neural Network Simulator"
-HOMEPAGE="http://www-ra.informatik.uni-tuebingen.de/SNNS/"
-SRC_URI="http://www-ra.informatik.uni-tuebingen.de/downloads/SNNS/${MY_P}.tar.gz
-	http://download.berlios.de/snns-dev/${MYPATCH}.patch.gz
-	doc? ( http://www-ra.informatik.uni-tuebingen.de/downloads/SNNS/${MY_P}.Manual.pdf )
-	python? ( http://download.berlios.de/snns-dev/${MYPYTHONEXT}.tar.gz )"
-
-LICENSE="SNNS-${PV}"
-KEYWORDS="x86 ~amd64"
-SLOT="0"
-IUSE="X doc python"
-
-DEPEND="X? ( virtual/x11
-	x11-libs/Xaw3d )
-	>=sys-apps/sed-4
-	python? ( >=dev-lang/python-2.3 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	unpack ${MYPATCH}.patch.gz
-	epatch ${MYPATCH}.patch
-	if use python; then
-		unpack ${MYPYTHONEXT}.tar.gz
-
-		cd ${S}
-		epatch ${FILESDIR}/${PV}-fPIC-python.patch
-	fi
-}
-
-src_compile() {
-	local myconf="--enable-global"
-	local compileopts="compile-kernel compile-tools"
-
-	if use X; then
-		myconf="${myconf} --with-x"
-		compileopts="${compileopts} compile-xgui"
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	econf ${myconf} || die "econf failed"
-	emake ${compileopts} || die "emake failed"
-
-	if use python; then
-		cd python
-		python setup.py build || die "could not build python extension"
-	fi
-}
-
-src_install() {
-	for file in `find tools -type f -perm +100`; do
-		dobin $file
-	done
-
-	if use X; then
-		newbin xgui/sources/xgui snns
-
-		dodir /etc/env.d
-		echo XGUILOADPATH=/usr/share/doc/${PF}/ > ${D}/etc/env.d/99snns
-
-		insinto /usr/share/doc/${PF}
-		doins default.cfg help.hdoc
-	fi
-
-	if use python; then
-		cd python
-		python setup.py install --prefix=${D}/usr || die "could not install python module"
-		cp -pPR examples ${D}/usr/share/doc/${PF}/python-examples
-		chmod +x ${D}/usr/share/doc/${PF}/python-examples/*.py
-		newdoc README README.python
-		cd ${S}
-	fi
-
-	insinto /usr/share/doc/${PF}
-	use doc && doins ${DISTDIR}/${MY_P}.Manual.pdf
-
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/*
-
-	doman man/man*/*
-}
-
-pkg_postinst() {
-	if use python; then
-		einfo "Pre-compiling Python module"
-		python_version
-		for file in __init__.py util.py; do
-			python_mod_compile \
-				${ROOT}/usr/lib/python${PYVER}/site-packages/snns/${file}
-		done
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		einfo "Cleaning up python stuff"
-		python_mod_cleanup
-	fi
-}
diff --git a/sci-mathematics/snns/snns-4.2-r7.ebuild b/sci-mathematics/snns/snns-4.2-r7.ebuild
index ab8db1f1a854..9aaa5849d1a5 100644
--- a/sci-mathematics/snns/snns-4.2-r7.ebuild
+++ b/sci-mathematics/snns/snns-4.2-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/snns-4.2-r7.ebuild,v 1.4 2005/09/02 20:24:13 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/snns-4.2-r7.ebuild,v 1.5 2006/01/25 14:23:49 phosphan Exp $
 
 inherit eutils python
 
@@ -22,7 +22,10 @@ KEYWORDS="~amd64 ppc x86"
 SLOT="0"
 IUSE="X doc python"
 
-DEPEND="X? ( virtual/x11
+DEPEND="X? ( || (
+					virtual/x11
+					x11-proto/xproto
+				)
 	x11-libs/Xaw3d )
 	>=sys-apps/sed-4
 	python? ( >=dev-lang/python-2.3 )"
diff --git a/sci-mathematics/snns/snns-4.2-r8.ebuild b/sci-mathematics/snns/snns-4.2-r8.ebuild
deleted file mode 100644
index 54420f24dae1..000000000000
--- a/sci-mathematics/snns/snns-4.2-r8.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/snns-4.2-r8.ebuild,v 1.1 2006/01/20 14:35:02 phosphan Exp $
-
-inherit eutils python
-
-MY_P="SNNSv${PV}"
-MYPATCH="${P}-20040227"
-MYPYTHONEXT="PySNNS-20040605"
-MYPYTHONPATCH="PythonFunctionSupport-20050210.patch"
-
-DESCRIPTION="Stuttgart Neural Network Simulator"
-HOMEPAGE="http://www-ra.informatik.uni-tuebingen.de/SNNS/"
-SRC_URI="http://www-ra.informatik.uni-tuebingen.de/downloads/SNNS/${MY_P}.tar.gz
-	http://download.berlios.de/snns-dev/${MYPATCH}.patch.gz
-	doc? ( http://www-ra.informatik.uni-tuebingen.de/downloads/SNNS/${MY_P}.Manual.pdf )
-	python? ( http://download.berlios.de/snns-dev/${MYPYTHONEXT}.tar.gz
-			  http://download.berlios.de/snns-dev/${MYPYTHONPATCH}.gz )"
-
-LICENSE="SNNS-${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-IUSE="X doc python"
-
-DEPEND="X? ( || (
-					virtual/x11
-					x11-proto/xproto
-				)
-	x11-libs/Xaw3d )
-	>=sys-apps/sed-4
-	python? ( >=dev-lang/python-2.3 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	unpack ${MYPATCH}.patch.gz
-	epatch ${MYPATCH}.patch
-	if use python; then
-		unpack ${MYPYTHONEXT}.tar.gz
-
-		cd ${S}
-		epatch ${FILESDIR}/${PV}-fPIC-python.patch
-		cd ${WORKDIR}
-		unpack ${MYPYTHONPATCH}.gz
-		cd ${S}
-		epatch ${WORKDIR}/${MYPYTHONPATCH}
-	fi
-}
-
-src_compile() {
-	local myconf="--enable-global"
-	local compileopts="compile-kernel compile-tools"
-
-	if use X; then
-		myconf="${myconf} --with-x"
-		compileopts="${compileopts} compile-xgui"
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	econf ${myconf} || die "econf failed"
-	# parallel make sometimes fails (phosphan)
-	make ${compileopts} || die "make failed"
-
-	if use python; then
-		cd python
-		python setup.py build || die "could not build python extension"
-	fi
-}
-
-src_install() {
-	for file in `find tools -type f -perm +100`; do
-		dobin $file
-	done
-
-	if use X; then
-		newbin xgui/sources/xgui snns
-
-		dodir /etc/env.d
-		echo XGUILOADPATH=/usr/share/doc/${PF}/ > ${D}/etc/env.d/99snns
-
-		insinto /usr/share/doc/${PF}
-		doins default.cfg help.hdoc
-	fi
-
-	if use python; then
-		cd python
-		python setup.py install --prefix=${D}/usr || die "could not install python module"
-		cp -pPR examples ${D}/usr/share/doc/${PF}/python-examples
-		chmod +x ${D}/usr/share/doc/${PF}/python-examples/*.py
-		newdoc README README.python
-		cd ${S}
-	fi
-
-	insinto /usr/share/doc/${PF}
-	use doc && doins ${DISTDIR}/${MY_P}.Manual.pdf
-
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/*
-
-	doman man/man*/*
-}
-
-pkg_postinst() {
-	if use python; then
-		einfo "Pre-compiling Python module"
-		python_version
-		for file in __init__.py util.py; do
-			python_mod_compile \
-				${ROOT}/usr/lib/python${PYVER}/site-packages/snns/${file}
-		done
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		einfo "Cleaning up python stuff"
-		python_mod_cleanup
-	fi
-}