Dropped old

(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)

5 files changed, 5 insertions, 207 deletions

diff --git a/sci-chemistry/aria/ChangeLog b/sci-chemistry/aria/ChangeLog
index 80357178204e..fb4a32b09d3c 100644
--- a/sci-chemistry/aria/ChangeLog
+++ b/sci-chemistry/aria/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/aria
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/aria/ChangeLog,v 1.6 2010/07/22 07:08:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/aria/ChangeLog,v 1.7 2010/11/18 17:10:04 jlec Exp $
+
+  18 Nov 2010; Justin Lecher <jlec@gentoo.org> -files/2.2_p2-numpy.patch,
+  -files/2.2_p2-test.patch, -files/sa_ls_cool2.patch, -aria-2.2_p2.ebuild:
+  Dropped old
 
   22 Jul 2010; Justin Lecher <jlec@gentoo.org> aria-2.3.1.ebuild:
   Added clashscore as DEP
diff --git a/sci-chemistry/aria/aria-2.2_p2.ebuild b/sci-chemistry/aria/aria-2.2_p2.ebuild
deleted file mode 100644
index abc2582c2f1c..000000000000
--- a/sci-chemistry/aria/aria-2.2_p2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/aria/aria-2.2_p2.ebuild,v 1.5 2010/03/09 16:18:54 jlec Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_USE_WITH="tk"
-
-inherit base python eutils versionator
-
-MY_P="${PN}$(get_version_component_range 1-2 ${PV})"
-
-DESCRIPTION="Software for automated NOE assignment and NMR structure calculation."
-HOMEPAGE="http://aria.pasteur.fr/"
-SRC_URI="http://aria.pasteur.fr/archives/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="cns"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/numpy
-	dev-python/matplotlib[tk]
-	sci-chemistry/cns[aria,openmp]
-	>=dev-lang/tk-8.3
-	>=dev-python/scientificpython-2.7.3
-	>=sci-chemistry/ccpn-2.0.5
-	>=dev-tcltk/tix-8.1.4"
-DEPEND="${RDEPEND}"
-RESTRICT_PYTHON_ABIS="3.*"
-
-RESTRICT="fetch"
-
-S="${WORKDIR}/${PN}2.2"
-
-src_prepare() {
-	epatch "${FILESDIR}"/sa_ls_cool2.patch
-	epatch "${FILESDIR}"/${PV}-numpy.patch
-	epatch "${FILESDIR}"/${PV}-test.patch
-}
-
-pkg_nofetch(){
-	einfo "Go to ${HOMEPAGE}, download ${A}"
-	einfo "and place it in ${DISTDIR}"
-}
-
-src_test(){
-	test() {
-		export CCPNMR_TOP_DIR="${EPREFIX}"/$(python_get_sitedir)
-		export PYTHONPATH=.:${CCPNMR_TOP_DIR}/ccpn/python
-		$(PYTHON) check.py || die
-	}
-	python_execute_function test
-}
-
-src_install(){
-	installation() {
-		insinto "$(python_get_sitedir)/${PN}"
-		doins -r src aria2.py || die "failed to install ${PN}"
-		insinto "$(python_get_sitedir)/${PN}"/cns
-		doins -r cns/{protocols,toppar,src/helplib} || die "failed to install cns part"
-	}
-	python_execute_function installation
-
-	if use examples; then
-		insinto /usr/share/${P}/
-		doins -r examples
-	fi
-
-	# ENV
-	cat >> "${T}"/20aria <<- EOF
-	ARIA2="${EPREFIX}/$(python_get_sitedir -f)/${PN}"
-	EOF
-
-	doenvd "${T}"/20aria
-
-	# Launch Wrapper
-	cat >> "${T}"/aria <<- EOF
-	#!/bin/sh
-	export CCPNMR_TOP_DIR="${EPREFIX}/$(python_get_sitedir -f)"
-	export PYTHONPATH="${EPREFIX}/$(python_get_sitedir -f)/ccpn/python"
-	exec "$(PYTHON -f)" -O "\${ARIA2}"/aria2.py \$@
-	EOF
-
-	dobin "${T}"/aria || die "failed to install wrapper"
-	dosym aria /usr/bin/aria2
-
-	dodoc README || die
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/aria/files/2.2_p2-numpy.patch b/sci-chemistry/aria/files/2.2_p2-numpy.patch
deleted file mode 100644
index 40d81964d9c2..000000000000
--- a/sci-chemistry/aria/files/2.2_p2-numpy.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -arNu aria2.2/aria2.py aria2.2.new/aria2.py
---- aria2.2/aria2.py	2008-02-14 11:02:31.000000000 +0100
-+++ aria2.2.new/aria2.py	2009-07-14 12:01:02.000000000 +0200
-@@ -427,7 +427,7 @@
-         
- def check_numeric_slice():
- 
--    msg = "\nThe version of Numeric (%s) is known to be incompatible with ARIA.\nConsider reverting to a more stable version (like 23.8).\n"
-+    msg = "\nThe version of Numeric (%s) is known to be incompatible with ARIA.\nSo we are using numpy instead.\n"
-     
-     try:
-         from Numeric import ones, __version__ as NUMERIC_VERSION
-diff -arNu aria2.2/check.py aria2.2.new/check.py
---- aria2.2/check.py	2009-07-14 11:50:54.000000000 +0200
-+++ aria2.2.new/check.py	2009-07-14 12:02:56.000000000 +0200
-@@ -55,18 +55,6 @@
-     failed = 0
-     
-     try:
--        import Numeric
--        msg += 'ok (numeric).'
--        
--    except:
--        #msg =  'could not import Numeric module.'
--        failed = 1
--
--    if not failed:
--        print msg
--        return 'numeric'#, None
--
--    try:
-        import numpy.oldnumeric
-        version = LooseVersion(numpy.oldnumeric.__version__)
- 
-@@ -79,14 +67,14 @@
-            msg += 'version > %s required for Numpy' % str(NUMPY_MIN_VERSION)
-            
-     except:        
--        msg += 'could not import Numeric/Numpy module.'
-+        msg += 'could not import Numpy module.'
- 
-     print msg
-     return None
- 
- def check_numeric_slice():
- 
--    msg = "\nWARNING: This version of Numeric (%s) is known to be incompatible with ARIA.\nConsider reverting to a more stable version (like 23.8).\n"
-+    msg = "\nWARNING: This version of Numeric (%s) is known to be incompatible with ARIA.\nSo we use numpy instead.\n"
-     
-     from Numeric import ones, __version__ as NUMERIC_VERSION
-     if not ones(10)[2:]:
-diff -arNu aria2.2/src/py/Merger.py aria2.2.new/src/py/Merger.py
---- aria2.2/src/py/Merger.py	2007-03-05 16:50:12.000000000 +0100
-+++ aria2.2.new/src/py/Merger.py	2009-07-14 12:06:55.000000000 +0200
-@@ -213,12 +213,9 @@
-                 new_long = []
- 
-                 try:
--                    from RandomArray import permutation
-+                    from numpy.oldnumeric.random_array import permutation
-                 except:
--                    try:
--                        from numpy.oldnumeric.random_array import permutation
--                    except:
--                        return n, []
-+                    return n, []
- 
-                 ids = permutation(len(long_range))
-            
-diff -arNu aria2.2/src/py/N.py aria2.2.new/src/py/N.py
---- aria2.2/src/py/N.py	2007-12-04 17:01:46.000000000 +0100
-+++ aria2.2.new/src/py/N.py	2009-07-14 12:07:16.000000000 +0200
-@@ -1,7 +1,4 @@
- try:
--    from Numeric import *
-+    from numpy.oldnumeric import *
- except:
--    try:
--        from numpy.oldnumeric import *
--    except:
--        pass
-+    pass
diff --git a/sci-chemistry/aria/files/2.2_p2-test.patch b/sci-chemistry/aria/files/2.2_p2-test.patch
deleted file mode 100644
index 991a168ab3a5..000000000000
--- a/sci-chemistry/aria/files/2.2_p2-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/check.py b/check.py
-index 6592951..47772f5 100644
---- a/check.py
-+++ b/check.py
-@@ -170,8 +170,6 @@ if __name__ == '__main__':
-     print 'Checking Python environment...\n'
- 
-     check_python()
--    numeric = check_numeric()
--    check_numeric_slice()
-     scientific = check_scientific()
-     check_tix()
-     check_ccpn()
diff --git a/sci-chemistry/aria/files/sa_ls_cool2.patch b/sci-chemistry/aria/files/sa_ls_cool2.patch
deleted file mode 100644
index d52666a883f9..000000000000
--- a/sci-chemistry/aria/files/sa_ls_cool2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- aria2.2/cns/protocols/sa_ls_cool2.cns.orig	2008-05-07 18:39:59.000000000 +0200
-+++ aria2.2/cns/protocols/sa_ls_cool2.cns	2008-05-07 18:40:29.000000000 +0200
-@@ -33,8 +33,8 @@
-     masym dist &Data.masy_cool2
-     masym hbon &Data.masy_cool2
- 
--    scale ambi &Data.amb_cool2 
-     scale dist &Data.unamb_cool2
-+    scale ambi &Data.amb_cool2 
-     scale hbon &Data.hbond_cool2
- end
-