diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2013-07-18 11:22:38 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2013-07-18 11:22:38 +0000 |
| commit | 6310918d2a7a8838953c67e1d5afc7a0e984dd7e (patch) | |
| tree | 8af1fe30373cd91cf2bd7eee9ff0d29214e721be /sci-chemistry/sparky/files | |
| parent | Add a patch to replace AM_CONFIG_HEADER #467818 (diff) | |
| download | gentoo-2-6310918d2a7a8838953c67e1d5afc7a0e984dd7e.tar.gz gentoo-2-6310918d2a7a8838953c67e1d5afc7a0e984dd7e.tar.bz2 gentoo-2-6310918d2a7a8838953c67e1d5afc7a0e984dd7e.zip | |
sci-chemistry/sparky: Bump to new python eclass
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'sci-chemistry/sparky/files')
| -rw-r--r-- | sci-chemistry/sparky/files/3.115-wrapper-r1.patch | 41 | ||||
| -rw-r--r-- | sci-chemistry/sparky/files/fix-install.patch | 2 |
2 files changed, 42 insertions, 1 deletions
diff --git a/sci-chemistry/sparky/files/3.115-wrapper-r1.patch b/sci-chemistry/sparky/files/3.115-wrapper-r1.patch new file mode 100644 index 000000000000..d83b5b8510cc --- /dev/null +++ b/sci-chemistry/sparky/files/3.115-wrapper-r1.patch @@ -0,0 +1,41 @@ +diff --git a/bin/sparky b/bin/sparky +index 8b51212..270723a 100644 +--- a/bin/sparky ++++ b/bin/sparky +@@ -4,18 +4,6 @@ + # + + # ----------------------------------------------------------------------------- +-# Figure out Sparky installation directory from $0. +-# +-set sparky_exe = "$0" +-while (-l "$sparky_exe") +- set ls_sparky_exe = `ls -l "$sparky_exe"` +- set sparky_exe = `echo "$ls_sparky_exe" | sed 's/.* -> //'` +-end +-set sparky_bin = `dirname "$sparky_exe"` +-set sparky_bin = `cd "$sparky_bin"; pwd` +-set sparky_inst = `dirname "$sparky_bin"` +- +-# ----------------------------------------------------------------------------- + # Sparky uses the SPARKY_INSTALL environment variable to find its + # application resource file and print prolog file. + # +@@ -25,7 +13,7 @@ setenv SPARKY_INSTALL "$sparky_inst" + # If Python is available start Sparky as a Python extension. + # Otherwise the standalone version of Sparky is started. + # +-set PYTHON = "$SPARKY_INSTALL/python2.5/bin/python2.5" ++set PYTHON = GENTOO_PYTHON + if (! -e "$PYTHON") then + set PYTHON = python2.5 + endif +@@ -79,7 +67,7 @@ if ($status == 0) then + # --------------------------------------------------------------------------- + # Add the Sparky package and Tkinter to the Python path + # +- set SPARKY_PYTHONPATH = "$SPARKY_INSTALL/python:$SPARKY_INSTALL/python/lib-tk" ++ set SPARKY_PYTHONPATH = "$SPARKY_INSTALL/python:$SPARKY_INSTALL/python/sparky" + if ($?PYTHONPATH) then + setenv PYTHONPATH "${SPARKY_PYTHONPATH}:$PYTHONPATH" + else diff --git a/sci-chemistry/sparky/files/fix-install.patch b/sci-chemistry/sparky/files/fix-install.patch index 869064a33a0b..4eefaa891f99 100644 --- a/sci-chemistry/sparky/files/fix-install.patch +++ b/sci-chemistry/sparky/files/fix-install.patch @@ -253,7 +253,7 @@ diff -ur -x make-sparky sparky.orig/python/spingraph.py sparky/python/spingraph. 'sizes, and text label positions. Sparky provides a\n' + 'default layout file\n' + - '\n\t/usr/local/sparky/python/spinlayout.py\n\n' + -+ '\n\t/usr/lib/python2.4/site-packages/sparky/python/spinlayout.py\n\n' + ++ '\n\t/usr/lib/python*/site-packages/sparky/python/spinlayout.py\n\n' + 'You override this file by making your own copy\n' + '\n\t~/Sparky/Python/spinlayout.py\n\n' + 'You can create the desired template on the screen\n' |