sci-chemistry/sparky: Bump to new python eclass

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

6 files changed, 199 insertions, 22 deletions

diff --git a/sci-chemistry/sparky/ChangeLog b/sci-chemistry/sparky/ChangeLog
index 5b083cbfdfca..e3f4b9fcd283 100644
--- a/sci-chemistry/sparky/ChangeLog
+++ b/sci-chemistry/sparky/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/sparky
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/sparky/ChangeLog,v 1.17 2012/05/29 17:55:43 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/sparky/ChangeLog,v 1.18 2013/07/18 11:22:37 jlec Exp $
+
+*sparky-3.115-r1 (18 Jul 2013)
+
+  18 Jul 2013; Justin Lecher <jlec@gentoo.org> +sparky-3.115-r1.ebuild,
+  +files/3.115-wrapper-r1.patch, files/fix-install.patch, metadata.xml:
+  Bump to new python eclass
 
   29 May 2012; Justin Lecher <jlec@gentoo.org> sparky-3.115.ebuild,
   metadata.xml:
diff --git a/sci-chemistry/sparky/Manifest b/sci-chemistry/sparky/Manifest
index 78e11967bc4d..a301cef88c65 100644
--- a/sci-chemistry/sparky/Manifest
+++ b/sci-chemistry/sparky/Manifest
@@ -1,21 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX 3.115-fpic.patch 1307 RMD160 00ad5fac11fb321a4428a3221bbb1db982943c9e SHA1 0ea5be64db56504b5ce17132ce29dcc7f5bf85fb SHA256 4756b8a535fddac5439d3e5316da84a912b5d27d558c1a6d59251c6e43cb756f
-AUX 3.115-ldflags.patch 2713 RMD160 66fa72d1567ec4c2c0a550c334ea618c13cd5532 SHA1 db3d84cbb4d755283d1b4b53ede101d0f6da2e87 SHA256 227c4ca0deb0a98a6ce40f03065c68a8ac433772ef3d318adb6d69705fedfefe
-AUX 3.115-makefile.patch 580 RMD160 aee913b824dcb6de540b5b5e7bad1ac328684164 SHA1 c3e1a187b068c572a99979e7bdf9a7dd14720adf SHA256 c265b6114c826c8c88b7e7256ef281cfefba00997f8c719146000f95017139a5
-AUX 3.115-paths.patch 415 RMD160 6286f1a9dd63ba9c34b18d471b78381b537a9c7f SHA1 dfc97d9dad9cb63b757f4a56679aefd9d1858c07 SHA256 8a38226eb0b6cbf1cd5af9d4aad2a17da11897e8c8c027bfb18d9dac24d87b47
-AUX 3.115-wrapper.patch 1546 RMD160 e97a89ab4f04edd4bf2c8cd25e0a2d20641fe650 SHA1 8216c5637f4858e131488eec3e87838f91044e28 SHA256 f0a7d5bde3b3b8ec9fb7128d59fe69271753161c00917c37bf7a519d5683bc2d
-AUX fix-install.patch 10230 RMD160 29e5b5bd332bc0f8191f89c89e3c62f6a95ae87a SHA1 6f5cecf8594ae6d839508db02d682845eac4a19e SHA256 aab5ea9751a6cf20563cfdc0407d02b26fefe27ae075c0e649a0301f7a0ef1d2
-DIST sparky-source-3.115.tar.gz 4103686 RMD160 59ba7c64c98f86506ae1417e9272ef3d79c8605e SHA1 57eb3d6b9b4f406095f6b601c47339f06c73e1e0 SHA256 c187546aaec3d6489c533c3a778e1fe6fa634a931dcaf245c1e13f5720a002b6
-EBUILD sparky-3.115.ebuild 3506 RMD160 58198967833a27589d4b48d812c013893a251a17 SHA1 a6ff57b8b64caa40762b8ba2a45e353ffb50a489 SHA256 cc80c1e1a9699a8ff2b72ccdaec4e521776dd8d9ec346bb47dc8140e5d2b4cbc
-MISC ChangeLog 3081 RMD160 677c2bb6412796a22a049c8e951fceef17feefe3 SHA1 8486f4d23b5b1637d690e90224b42abbfa1299b7 SHA256 b3e20a302eff1554b1c5a8c3562f6c5f18a50255d4ffa093a2db6cd03b37f855
-MISC metadata.xml 229 RMD160 e5d681054ef371ecfe4d6828e8b722b716968b37 SHA1 e91b223d4c687993ccca1be424e4feedad208570 SHA256 0f110645272f37341c3729c03cf88dbb871ed82db98c8b0dbda8734343b88567
+AUX 3.115-fpic.patch 1307 SHA256 4756b8a535fddac5439d3e5316da84a912b5d27d558c1a6d59251c6e43cb756f SHA512 bf199ba08b204620520b70af036b26dc1ed4c8c6dccfed2a6e81975d7cb3d268b04232b4c21f88679db0fc67d88e8c99c1804d3b9dc19562f845de0b2351094c WHIRLPOOL 5851431602425d2317c1d53062a0ce9e7d744e06abe24563fcb5bc5c2c4269dbddb48442df2fc382d21e497e5cabf2a8564ea6c6ba9fc771e6f5b7ddd23791cd
+AUX 3.115-ldflags.patch 2713 SHA256 227c4ca0deb0a98a6ce40f03065c68a8ac433772ef3d318adb6d69705fedfefe SHA512 1c439cc04af3e8e403257ccd45eecb16f0e36d4b51a28ab5ddda269bde271d23a20bb453cda48e03f58c31a9a614d4b19ca2b6aa7f75bdfec1f79b70e8c361de WHIRLPOOL d5d96703d1450abfca4a70c5dae6971664bc9e844d869d83928b1e21f4da4bce2093b9478c4d23ac47f711d0a412a85c13c4c55f02eeabfdb0b6a91fff37cf49
+AUX 3.115-makefile.patch 580 SHA256 c265b6114c826c8c88b7e7256ef281cfefba00997f8c719146000f95017139a5 SHA512 9ddd99de93656301f307aabb3284e86fe68f4c7957f0b5ff81da4615f850fc36b686908de84816f0ff8a3d75169ccd0d4d7cb5bb8afd88d96c913f766e7ee19a WHIRLPOOL ac85d055252a82373b781ebb60eca7cf33e3d40e248c866238bb9395555679d20e88a81b307962e89654660a24290274fac45e5257a1fb915be6437e62919c8c
+AUX 3.115-paths.patch 415 SHA256 8a38226eb0b6cbf1cd5af9d4aad2a17da11897e8c8c027bfb18d9dac24d87b47 SHA512 44c44c99cf2c5c51c8e506267efc4efc50eb2277ccdab362943da0c45c63f9e797ae699e99eda3ce6ca0b4e0a886393d1917ce8614eea3086e97446fc3c0c674 WHIRLPOOL d7f1fad28bb51b03c30e61a6fbde8725cfb9602f78f3e494184beee1398d177b9d48ef024cd024554066e13eefbe5397221aff245e62f6fa11848a0f7f972ec2
+AUX 3.115-wrapper-r1.patch 1518 SHA256 e99acd1e5d735ee027361fda5d4c0652c729e2a02eedc80253fbc8b3654e89ea SHA512 be2c18a40ceabdb1c25a7849e1ee00438092f264c486e93b3bfb412fc417902a3b22b672d28a6cc104fedc5477ea2c0de66bc40dd5d4d607ed0201eee4d368a7 WHIRLPOOL 731d9511f3224399db3f108b9c8de8dfdda30a333389766d67610eb15c0196cda26464bc164aff3757c5af0bcb0414cf50b73b49dc9027bedae67360a46e395e
+AUX 3.115-wrapper.patch 1546 SHA256 f0a7d5bde3b3b8ec9fb7128d59fe69271753161c00917c37bf7a519d5683bc2d SHA512 6028c3d22907cc45cd4c29447cf3d569f2629b50ab4358599bc9d5295ce3099abf0f08b4626a25a20a146a67a0c81511b859d9001297def1123612fdebeeee88 WHIRLPOOL 2d17b489909c479dd6afd4b40b6b0bdf67fab05d6218bc2a19cb635cccafdb2be1c8e9df1846c4ced26eb91b77a22eca2c312a6f673ffcb1fb35216fc4a10d44
+AUX fix-install.patch 10228 SHA256 c206c33e1c77e4dfa9bf42c168f6735688ff12c6234fae2f163a9433f1c8b847 SHA512 a386ed900e97104db7ae58d93a035ecb1b7c8ec86129688379babe320d9f54831c0084dad6f89ada44a95698491c142e1d9aaddc3c6ea7e618308bcd95c31598 WHIRLPOOL aa32906b75824505aa01d6c5551b3daedae12d20b34a64ac48f756c6a5093bf6c812364dad83c1b64d8d651152319078488cc3c4cb5251e2586313ddd00e7db9
+DIST sparky-source-3.115.tar.gz 4103686 SHA256 c187546aaec3d6489c533c3a778e1fe6fa634a931dcaf245c1e13f5720a002b6 SHA512 33b0fd368f15bf4d091d7152a189f57279aea54fb89a12f15314f2a1414b073f7bd282afedeb72e79192195b0b6ac212ca74da3def513592af5400c118ac8e89 WHIRLPOOL 8557a525eab51150da437f78cb8e404adad4f41ed0884498601887e832f78bb316e4847cc3b3a7147ec66bcddd4e06064323bb2ce76452b37d504a809feee7ff
+EBUILD sparky-3.115-r1.ebuild 3263 SHA256 3207d2dd01063a6f708094b30ae35fe48b80c2fb25c90e550aa26d6d3da88dc7 SHA512 d522615b996a6f08e57d4a3d33afb008a63ed0053730fef3496a8a0333ac16f5bbfa682268e2833e4e8e84dc8f174ab73f7485f67881f5506ed1ac22a0f97ede WHIRLPOOL 57e7eef9bde0b94cdb4492ee644bbc5539072d3aaaf31f6672cb1ad238b62fed58c69b50306ebc1655f665bf32c7852d6e735c8356055fd29ff84623226ee088
+EBUILD sparky-3.115.ebuild 3506 SHA256 cc80c1e1a9699a8ff2b72ccdaec4e521776dd8d9ec346bb47dc8140e5d2b4cbc SHA512 d4d701184f6b024ba26c765346445e476c9e6ae8b49ae9820981c788d524ac4d5c511ca7faefc7c99dcdcb63ac7792e07b1da25be686081bd4ac902336091ff0 WHIRLPOOL d44b4de44f8ac563b2e389c8cb2c1b5985b6fee39cf229d6b6ac947635b1def3f149d6ff65e318a8ee227e4125710ebd1a3fa60f6401735b2e8e42375fa121da
+MISC ChangeLog 3286 SHA256 78eac7629bd83d8d7154ed63135c78100307c9bcd97abbe3868b8c20dff44963 SHA512 862f660f2d3e7654dbbc71a199e8d4447a89c01da42e5c84e868bbd0bebd8284ed9711bbc77113bdd585c54de9b11dd5db1fb31c03dce3b852b32503d3f5a8ee WHIRLPOOL c2a09a911da1897d377b9c2bf04ff5d4e4b266c80e55688eda24ff7278c47b25585852b09f93cce3e0422caa70bef3075fe348adefe670ca7f58eb58a3e0e560
+MISC metadata.xml 234 SHA256 8297e76ecd2cb828f604e9f138b263179eb84beb640215a0f60d7613eb46bb7f SHA512 0e94c0e6570a9267a39968d81c3b80680ccbc6eebb62199e4830b021a114c94a0de17ef2103cef62b7e27da1f51f225a30abb802aff82140ae6dc43366113d31 WHIRLPOOL fa6d4d90b092953b88ed3ad03e1e8c189296d268b39d13a4b4dcb78f0c4456341e3f1b44eea0860054fee43079179cb7cf7a912acf1fbe693ecdca6d9a65f081
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREKAAYFAk/FDaQACgkQgAnW8HDreRaV9QCfWA3rafzeEFWpp24n8PC+w48i
-6jMAoNF4sbY/FGw8Zo52aV7k2kcBX2w7
-=8NFE
+iQIcBAEBCgAGBQJR58//AAoJELnU8jG9FVirrO0QAJLBSRX0Lgp6TlESZaljs31x
+y+RJUQA8AtGegdOdej8Mmg7T7AULfI4J41aWWeVxCwhXL3YNslZKS159SlbAMmhJ
+4Srxy6XO9tifWRhO1IfdUhGrTSMLJ0pc0MRT9COpe9pY41SavlW0yKfbLVCcbMGJ
+VqzjNzb8aY5ru74/0cMezK9DnLpOgiCu4Y6URZFGvlXMeNtbtZvhE/a52XVIyOcX
+gI7TFHMla5iTAe/nuOygFmxWqSoEceuLzKu3fZrWpX2kYgFMiHh40lBxORUtJzR2
+O7TxVKHOSQvcpYuvYX8zrLfUqFVq+en1Hs2GCgEm5fJdXIN4Swu429AKgceqI7JS
+htxNGydVhBkimCi3AHPeCoTVhht7hnUT4/nx8s6s/pXQqLSUGrVg2TLYSLpmVP2H
+0Y8ke5ZtFQj4/ZxOGoea75i1ssRPtSOH//BmQ3qCTJuXJwFGlKbMsOXEsXQ5kZyW
+DaaazyKBAe8JApg7SWkAh1m6Dpca01O6tHdYKtNiiM/kMYzgt992LPZTpoqNZQuc
+Cn4vLqDANfJopOsYQ/gUsaA5N5O62Iz/oFSxueXIy1Eg9PPLnDltC7L0tsqDme7W
+h0Kii78TzTQSaEhNJZq0L1Yqcg8I6CSdLxXbYV1W/2b6DGF5EULTRXbn6SivFaAf
+d9fxVvvaWTuhFPyZ0Ylu
+=vKRb
 -----END PGP SIGNATURE-----
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'
diff --git a/sci-chemistry/sparky/metadata.xml b/sci-chemistry/sparky/metadata.xml
index 1837bbc07a6e..ae9ec7c5f6a4 100644
--- a/sci-chemistry/sparky/metadata.xml
+++ b/sci-chemistry/sparky/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
-	<maintainer>
-		<email>jlec@gentoo.org</email>
-	</maintainer>
+  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/sparky/sparky-3.115-r1.ebuild b/sci-chemistry/sparky/sparky-3.115-r1.ebuild
new file mode 100644
index 000000000000..155d4eaebdc0
--- /dev/null
+++ b/sci-chemistry/sparky/sparky-3.115-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/sparky/sparky-3.115-r1.ebuild,v 1.1 2013/07/18 11:22:37 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="tk"
+
+inherit eutils flag-o-matic multilib prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="Graphical NMR assignment and integration program for proteins, nucleic acids, and other polymers"
+HOMEPAGE="http://www.cgl.ucsf.edu/home/sparky/"
+SRC_URI="http://www.cgl.ucsf.edu/home/sparky/distrib-${PV}/${PN}-source-${PV}.tar.gz"
+
+LICENSE="sparky"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="
+	app-shells/tcsh
+	dev-lang/tcl
+	dev-lang/tk"
+DEPEND="${RDEPEND}"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-ldflags.patch
+	"${FILESDIR}"/${PV}-wrapper-r1.patch
+	"${FILESDIR}"/${PV}-paths.patch
+	"${FILESDIR}"/${PV}-makefile.patch
+	)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	TKVER=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
+	PYVER=${EPYTHON#python}
+}
+
+src_prepare() {
+	epatch ${PATCHES[@]}
+
+	sed -i \
+		-e "s:^\(set PYTHON =\).*:\1 ${EPREFIX}/usr/bin/${EPYTHON}:g" \
+		-e "s:^\(setenv SPARKY_INSTALL[[:space:]]*\).*:\1 ${EPREFIX}/usr/$(get_libdir)/${PN}:g" \
+		-e "s:tcl8.4:tcl${TKVER}:g" \
+		-e "s:tk8.4:tk${TKVER}:g" \
+		-e "s:^\(setenv TCLTK_LIB[[:space:]]*\).*:\1 ${EPREFIX}/usr/$(get_libdir):g" \
+		"${S}"/bin/sparky || die
+	eprefixify "${S}"/bin/sparky
+}
+
+src_compile() {
+	emake \
+		SPARKY="${S}" \
+		PYTHON_VERSION="${PYVER}" \
+		PYTHON_PREFIX="${EPREFIX}/usr" \
+		PYTHON_LIB="${EPREFIX}/usr/$(get_libdir)" \
+		PYTHON_INC="${EPREFIX}/usr/include/${EPYTHON}" \
+		TK_PREFIX="${EPREFIX}/usr" \
+		TCLTK_VERSION="${TKVER}" \
+		TKLIBS="-L${EPREFIX}/usr/$(get_libdir)/ -ltk -ltcl -lX11" \
+		CXX="$(tc-getCXX)" \
+		CC="$(tc-getCC)" \
+		LDSHARED="-shared" \
+		binaries
+
+	rm c++/*.o || die
+
+	emake \
+		SPARKY="${S}" \
+		PYTHON_VERSION="${PYVER}" \
+		PYTHON_PREFIX="${EPREFIX}/usr" \
+		PYTHON_LIB="${EPREFIX}/usr/$(get_libdir)" \
+		PYTHON_INC="${EPREFIX}/usr/include/${EPYTHON}" \
+		TK_PREFIX="${EPREFIX}/usr" \
+		TCLTK_VERSION="${TKVER}" \
+		TKLIBS="-L${EPREFIX}/usr/$(get_libdir)/ -ltk -ltcl -lX11" \
+		CXX="$(tc-getCXX)" \
+		CC="$(tc-getCC)" \
+		CXXFLAGS="${CXXFLAGS} -fPIC" \
+		CFLAGS="${CFLAGS} -fPIC" \
+		LDSHARED="-shared -fPIC" \
+		libraries
+}
+
+src_install() {
+	# The symlinks are needed to avoid hacking the complete code to fix the locations
+
+	dobin c++/{{bruk,matrix,peaks,pipe,vnmr}2ucsf,ucsfdata,sparky-no-python} bin/${PN}
+
+	insinto /usr/share/${PN}/
+	doins lib/{print-prolog.ps,Sparky}
+	dosym ../../share/${PN}/print-prolog.ps /usr/$(get_libdir)/${PN}/print-prolog.ps
+	dosym ../../share/${PN}/Sparky /usr/$(get_libdir)/${PN}/Sparky
+
+	dohtml -r manual/*
+	dosym ../../share/doc/${PF}/html /usr/$(get_libdir)/${PN}/manual
+
+	python_moduleinto ${PN}
+	python_domodule python/*.py c++/{spy.so,_tkinter.so}
+
+	python_optimize
+
+	dosym ../${EPYTHON}/site-packages /usr/$(get_libdir)/${PN}/python
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/
+		doins -r example || die
+		dosym ../../share/doc/${PF}/example /usr/$(get_libdir)/${PN}/example
+	fi
+
+	dodoc README
+	newdoc python/README README.python
+}