[gentoo-commits] gentoo-x86 commit in sci-chemistry/arp-warp-bin/files: 7.1-setup-2.patch

[Justin Lecher (jlec)]

jlec        13/06/01 15:47:54

  Added:                7.1-setup-2.patch
  Log:
  sci-chemistry/arp-warp-bin: Bump to new python r1 eclasses
  
  (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

Revision  Changes    Path
1.1                  sci-chemistry/arp-warp-bin/files/7.1-setup-2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/arp-warp-bin/files/7.1-setup-2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/arp-warp-bin/files/7.1-setup-2.patch?rev=1.1&content-type=text/plain

Index: 7.1-setup-2.patch
===================================================================
diff --git a/share/arpwarp_setup_base.bash b/share/arpwarp_setup_base.bash
index 29e769c..0b8a51e 100644
--- a/share/arpwarp_setup_base.bash
+++ b/share/arpwarp_setup_base.bash
@@ -13,10 +13,10 @@ else
     identifier=${nameprocessor}'-'${namesystem}
 fi
 #
-arpwarphome="$1X"
+arpwarphome="@GENTOO_PORTAGE_EPREFIX@/opt/arp-warp-bin"
 #
 export warpbin=${arpwarphome}/bin/bin-${identifier}
-export warpdoc=${arpwarphome}/manual
+export warpdoc=@GENTOO_PORTAGE_EPREFIX@/usr/share/doc/arp-warp-bin-7.1/html/
 export PATH=${warpbin}:${PATH}
 #
 # Checks for existence of $warpbin directory
@@ -59,7 +59,7 @@ if [ "$testccp" = '0' ]; then
     fi
 
 ##    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/EPYTHON"
     flex_wARP_python="/dev/null"
 
 ##    3. Pick up the first one of the list which seems reasonable :
@@ -83,34 +83,6 @@ if [ "$testccp" = '0' ]; then
             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
-        here_now=$(pwd)
-        cd ${flex_wARP_bin}
-        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
-	        cd ${flex_wARP_bin}
-        fi
-        /bin/cp -p ${arpwarphome}/flex-wARP-src/*.py .
-        ${python_to_test} ./compile.py
-        /bin/rm -f *.py
-#        popd 1> /dev/null 2>&1
-		cd ${here_now}
-        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
@@ -130,14 +102,6 @@ if [ "$testccp" = '0' ]; then
 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.1 has been setup'
 #
diff --git a/share/arpwarp_setup_base.csh b/share/arpwarp_setup_base.csh
index 41b11e9..a4edcff 100644
--- a/share/arpwarp_setup_base.csh
+++ b/share/arpwarp_setup_base.csh
@@ -13,7 +13,7 @@ else
     set identifier = ${nameprocessor}'-'${namesystem}
 endif
 #
-set arpwarphome = '$1X'
+set arpwarphome = '@GENTOO_PORTAGE_EPREFIX@/opt/arp-warp-bin'
 #
 setenv warpbin ${arpwarphome}/bin/bin-${identifier}
 #
@@ -27,7 +27,7 @@ if ( ! -e $warpbin ) then
     goto errorsetup
 endif
 #
-setenv warpdoc ${arpwarphome}/manual
+setenv warpdoc @GENTOO_PORTAGE_EPREFIX@/usr/share/doc/arp-warp-bin-7.1/html/
 set path = ( $warpbin $path )
 #
 # Settings for python
@@ -58,7 +58,7 @@ if ( $status == 0 ) then
 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} @GENTOO_PORTAGE_EPREFIX@/usr/bin/EPYTHON"
 setenv flex_wARP_python "/dev/null"
 
 ##    3. Pick up the first one of the list which seems reasonable :
@@ -82,34 +82,6 @@ foreach python_to_test ( ${search_list} )
         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
-	set here_now = `pwd`
-	cd ${flex_wARP_bin}
-    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
-		cd ${flex_wARP_bin}
-    endif
-    /bin/cp -p ${arpwarphome}/flex-wARP-src/*.py .
-    ${python_to_test} ./compile.py
-    /bin/rm -f *.py
-#    popd >& /dev/null
-	cd ${here_now}
-    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
@@ -127,16 +100,6 @@ else
     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
 #
 errorsetup: