Fixes for Python ABIs, #316167

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 15 insertions, 216 deletions

diff --git a/sci-chemistry/arp-warp-bin/ChangeLog b/sci-chemistry/arp-warp-bin/ChangeLog
index f737b3434a5c..652deba273ac 100644
--- a/sci-chemistry/arp-warp-bin/ChangeLog
+++ b/sci-chemistry/arp-warp-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/arp-warp-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/ChangeLog,v 1.4 2010/03/20 18:07:35 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/ChangeLog,v 1.5 2010/04/22 20:03:33 jlec Exp $
+
+  22 Apr 2010; Justin Lecher <jlec@gentoo.org> -files/7.0.1-setup.patch,
+  -files/7.0.1-source-ccp4-if-needed.patch, files/7.1-setup.patch,
+  arp-warp-bin-7.1.ebuild:
+  Fixes for Python ABIs, #316167
 
 *arp-warp-bin-7.1 (20 Mar 2010)
 
diff --git a/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1.ebuild b/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1.ebuild
index 71cdfa661944..f6ea268c5d97 100644
--- a/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1.ebuild
+++ b/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1.ebuild,v 1.1 2010/03/20 18:07:35 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1.ebuild,v 1.2 2010/04/22 20:03:33 jlec Exp $
 
 EAPI="3"
 
@@ -36,9 +36,15 @@ pkg_nofetch(){
 	elog "and place ${A} in ${DISTDIR}"
 }
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-setup.patch
 	eprefixify "${S}"/share/arpwarp_setup_base.*
+	sed "s:PYVER:$(python_get_version):g" -i "${S}"/share/arpwarp_setup_base.*
+	python_convert_shebangs $(python_get_version) flex-wARP-src-354/*py
 }
 
 src_install(){
diff --git a/sci-chemistry/arp-warp-bin/files/7.0.1-setup.patch b/sci-chemistry/arp-warp-bin/files/7.0.1-setup.patch
deleted file mode 100644
index 23dda9760bae..000000000000
--- a/sci-chemistry/arp-warp-bin/files/7.0.1-setup.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff -Nu -Nu -uarN arp_warp_7.0.1.orig/share/arpwarp_setup_base.bash arp_warp_7.0.1/share/arpwarp_setup_base.bash
---- arp_warp_7.0.1.orig/share/arpwarp_setup_base.bash	2007-10-21 21:46:13.000000000 +0200
-+++ arp_warp_7.0.1/share/arpwarp_setup_base.bash	2008-04-06 13:33:05.000000000 +0200
-@@ -13,10 +13,10 @@
-     identifier=${nameprocessor}'-'${namesystem}
- fi
- #
--arpwarphome="$1X"
-+arpwarphome="/opt/arp-warp-bin"
- #
- export warpbin=${arpwarphome}/bin/bin-${identifier}
--export warpdoc=${arpwarphome}/manual
-+export warpdoc=/usr/share/doc/arp-warp-bin-7.0.1/html/
- export PATH=${warpbin}:${PATH}
- #
- testccp='0'
-@@ -49,7 +49,7 @@
-     fi
- 
- ##    2. Complement by other potential places for python :
--    search_list="${search_list} /usr/local/bin/python /usr/bin/python"
-+    search_list="${search_list} /usr/bin/python"
-     flex_wARP_python="/dev/null"
- 
- ##    3. Pick up the first one of the list which seems reasonable :
-@@ -73,30 +73,6 @@
-             export flex_wARP_bin=${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2}
-             break
-         fi
--#        3.c Otherwise, we should be able to create the byte-code using the python.
--        /bin/mkdir -p ${arpwarphome}/byte-code/python-${pythonvrs1}.${pythonvrs2} 1> /dev/null 2>&1
--        if [ 0 != $? ] ; then
--            /bin/mkdir -p ${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2} 1> /dev/null 2>&1
--            export flex_wARP_bin=${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2}
--        else
--            export flex_wARP_bin=${arpwarphome}/byte-code/python-${pythonvrs1}.${pythonvrs2}
--        fi
--        pushd ${flex_wARP_bin} 1> /dev/null 2>&1
--        if [ 0 != $? ] ; then 
--            export flex_wARP_bin=${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2}
--            /bin/mkdir -p ${flex_wARP_bin} 1> /dev/null 2>&1
--            pushd ${flex_wARP_bin} 1> /dev/null 2>&1
--        fi
--        /bin/cp -p ${arpwarphome}/flex-wARP-src/*.py .
--        ${python_to_test} ./compile.py
--        /bin/rm -f *.py
--        popd 1> /dev/null 2>&1
--        if [ -e ${flex_wARP_bin}/CPyWARP.pyc ] ; then
--            export flex_wARP_python=${python_to_test}
--            echo "Created a new set of flex-wARP byte code in the directory :"
--            echo "  '${flex_wARP_bin}'"
--            break
--        fi
-     done
- ##    4. If nothing is available, print out a message.
-     if [ "/dev/null" != ${flex_wARP_python} ] ; then
-@@ -107,6 +83,7 @@
-         echo "WARNING while setting up ARP/wARP"
-         echo "No valid 'python' command was found"
-         echo "flex-warp ('ARP/wARP Expert System' in the GUI) will not be available."
-+	echo "Did you upgrade your python? Please run 'emerge sci-chemistry/arp-warp-bin!'"
-         echo
-         export flex_wARP_warpbin="Unavailable"
-         export flex_wARP_cbin="Unavailable"
-@@ -115,17 +92,3 @@
-     fi
- fi
- 
--#
--# Setting up library path for SGI
--if [[ "${namesystem}" = 'IRIX64' || "${namesystem}" = 'IRIX' ]]; then
--    if test "$LD_LIBRARY_PATH"; then
--        export LD_LIBRARY_PATH=${warpbin}:${LD_LIBRARY_PATH}
--    else
--        export LD_LIBRARY_PATH=${warpbin}
--    fi
--fi
--#   echo
--#   echo 'ARP/wARP Version 7.0.1 has been setup'
--#
--
--
-diff -Nu -Nu -uarN arp_warp_7.0.1.orig/share/arpwarp_setup_base.csh arp_warp_7.0.1/share/arpwarp_setup_base.csh
---- arp_warp_7.0.1.orig/share/arpwarp_setup_base.csh	2007-10-21 21:46:13.000000000 +0200
-+++ arp_warp_7.0.1/share/arpwarp_setup_base.csh	2008-04-06 13:32:48.000000000 +0200
-@@ -13,10 +13,10 @@
-     set identifier = ${nameprocessor}'-'${namesystem}
- endif
- #
--set arpwarphome = '$1X'
-+set arpwarphome = '/opt/arp-warp-bin'
- #
- setenv warpbin ${arpwarphome}/bin/bin-${identifier}
--setenv warpdoc ${arpwarphome}/manual
-+setenv warpdoc /usr/share/doc/arp-warp-bin-7.0.1/html/
- set path = ( $warpbin $path )
- #
- # Settings for python
-@@ -47,7 +47,7 @@
- endif
- 
- ##    2. Complement by other potential places for python :
--set search_list = "${search_list} /usr/local/bin/python /usr/bin/python"
-+set search_list = "${search_list} /usr/bin/python"
- setenv flex_wARP_python "/dev/null"
- 
- ##    3. Pick up the first one of the list which seems reasonable :
-@@ -71,30 +71,6 @@
-         setenv flex_wARP_bin ${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2}
-         break
-     endif
--#        3.c Otherwise, we should be able to create the byte-code using the python.
--    /bin/mkdir -p ${arpwarphome}/byte-code/python-${pythonvrs1}.${pythonvrs2} >& /dev/null
--    if ( 0 != $status ) then
--        /bin/mkdir -p ${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2} >& /dev/null
--        setenv flex_wARP_bin ${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2}
--    else
--        setenv flex_wARP_bin ${arpwarphome}/byte-code/python-${pythonvrs1}.${pythonvrs2}
--    endif
--    pushd ${flex_wARP_bin} >& /dev/null
--    if ( 0 != $status ) then
--        setenv flex_wARP_bin ${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2}
--        /bin/mkdir -p ${flex_wARP_bin} >& /dev/null
--        pushd ${flex_wARP_bin} >& /dev/null
--    endif
--    /bin/cp -p ${arpwarphome}/flex-wARP-src/*.py .
--    ${python_to_test} ./compile.py
--    /bin/rm -f *.py
--    popd >& /dev/null
--    if ( -e ${flex_wARP_bin}/CPyWARP.pyc ) then
--        setenv flex_wARP_python ${python_to_test}
--        echo "Created a new set of flex-wARP byte code in the directory :"
--        echo "  '${flex_wARP_bin}'"
--        break
--    endif
- end
- ##    4. If nothing is available, print out a message.
- if ( "/dev/null" != ${flex_wARP_python} ) then
-@@ -105,22 +81,13 @@
-     echo "WARNING while setting up ARP/wARP"
-     echo "No valid 'python' command was found"
-     echo "flex-warp ('ARP/wARP Expert System' in the GUI) will not be available."
-+    echo "Did you upgrade your python? Please run 'emerge sci-chemistry/arp-warp-bin!'"
-     echo
-     setenv flex_wARP_warpbin "Unavailable"
-     setenv flex_wARP_cbin "Unavailable"
-     setenv flex_wARP_python "/dev/null"
-     setenv flex_wARP_bin "Unavailable"
- endif
--
--#
--# Setting up library path for SGI
--if ( ${namesystem} == 'IRIX64' || ${namesystem} == 'IRIX' ) then
--    if ( ${?LD_LIBRARY_PATH} ) then
--        setenv LD_LIBRARY_PATH ${warpbin}:${LD_LIBRARY_PATH}
--    else
--        setenv LD_LIBRARY_PATH ${warpbin}
--    endif
--endif
- #
- goto endsetup
- #
-@@ -132,7 +99,4 @@
- #
- endsetup:
- #
--#echo
--#echo 'ARP/wARP Version 7.0.1 has been setup'
--#
- 
diff --git a/sci-chemistry/arp-warp-bin/files/7.0.1-source-ccp4-if-needed.patch b/sci-chemistry/arp-warp-bin/files/7.0.1-source-ccp4-if-needed.patch
deleted file mode 100644
index aa6f67f845f2..000000000000
--- a/sci-chemistry/arp-warp-bin/files/7.0.1-source-ccp4-if-needed.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- share.orig/arpwarp_setup_base.bash	2008-08-03 16:50:03.000000000 -0700
-+++ share/arpwarp_setup_base.bash	2008-08-03 16:51:20.000000000 -0700
-@@ -23,11 +23,13 @@
- #
- # Checks for CBIN variable
- if [ "$CBIN" = "" ]; then
--    echo
--    echo "Cannot setup ARP/wARP"
--    echo 'Variable $CBIN is not defined'
--    echo "Please install CCP4 first"
--    testccp='1'
-+    if [ "$CBIN" = "" ]; then
-+        echo
-+        echo "Cannot setup ARP/wARP"
-+        echo 'Variable $CBIN is not defined'
-+        echo "Please install CCP4 first"
-+        testccp='1'
-+    fi
- fi
- if [ "$testccp" = '0' ]; then
-     if [ ! -d $CBIN ]; then
---- share.orig/arpwarp_setup_base.csh	2008-08-03 16:50:06.000000000 -0700
-+++ share/arpwarp_setup_base.csh	2008-08-03 16:52:03.000000000 -0700
-@@ -22,11 +22,13 @@
- # Settings for python
- # Checks for CBIN variable
- if ( ! $?CBIN ) then
--    echo
--    echo 'Cannot setup ARP/wARP'
--    echo 'Variable $CBIN is not defined'
--    echo 'Please install CCP4 first'
--    goto errorsetup
-+    if ( ! $?CBIN ) then
-+        echo
-+        echo 'Cannot setup ARP/wARP'
-+        echo 'Variable $CBIN is not defined'
-+        echo 'Please install CCP4 first'
-+        goto errorsetup
-+    endif
- endif
- if ( ! -d $CBIN ) then
-     echo
diff --git a/sci-chemistry/arp-warp-bin/files/7.1-setup.patch b/sci-chemistry/arp-warp-bin/files/7.1-setup.patch
index 9ccc816732bb..639e6621ad81 100644
--- a/sci-chemistry/arp-warp-bin/files/7.1-setup.patch
+++ b/sci-chemistry/arp-warp-bin/files/7.1-setup.patch
@@ -20,7 +20,7 @@ index 29e769c..0b8a51e 100644
  
  ##    2. Complement by other potential places for python :
 -    search_list="${search_list} /usr/local/bin/python /usr/bin/python"
-+    search_list="${search_list} @GENTOO_PORTAGE_EPREFIX@/usr/bin/python"
++    search_list="${search_list} @GENTOO_PORTAGE_EPREFIX@/usr/bin/pythonPYVER"
      flex_wARP_python="/dev/null"
  
  ##    3. Pick up the first one of the list which seems reasonable :
@@ -101,7 +101,7 @@ index 41b11e9..a4edcff 100644
  
  ##    2. Complement by other potential places for python :
 -set search_list = "${search_list} /usr/local/bin/python /usr/bin/python"
-+set search_list = "${search_list} @GENTOO_PORTAGE_EPREFIX@/usr/bin/python"
++set search_list = "${search_list} @GENTOO_PORTAGE_EPREFIX@/usr/bin/pythonPYVER"
  setenv flex_wARP_python "/dev/null"
  
  ##    3. Pick up the first one of the list which seems reasonable :