Fix tcl/tk slotting; drop old
authorJustin Lecher <jlec@gentoo.org>
Fri, 20 Mar 2015 15:29:22 +0000 (15:29 +0000)
committerJustin Lecher <jlec@gentoo.org>
Fri, 20 Mar 2015 15:29:22 +0000 (15:29 +0000)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

sci-chemistry/sparky/ChangeLog
sci-chemistry/sparky/Manifest
sci-chemistry/sparky/sparky-3.115-r1.ebuild
sci-chemistry/sparky/sparky-3.115.ebuild [deleted file]

index 11c558bdf48c18bc193dc2d09ebac5b2f80689fc..c704c6fabdd98fba4fc63491f10e00c3fd88ae88 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/sparky
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/sparky/ChangeLog,v 1.20 2013/11/11 18:12:11 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/sparky/ChangeLog,v 1.21 2015/03/20 15:29:21 jlec Exp $
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org> -sparky-3.115.ebuild,
+  sparky-3.115-r1.ebuild:
+  Fix tcl/tk slotting; drop old
 
   11 Nov 2013; Justin Lecher <jlec@gentoo.org> sparky-3.115-r1.ebuild:
   It also works with python 2.7
@@ -83,4 +87,3 @@
   A new graphical NMR assignment and integration program for proteins, nucleic
   acids, and other polymers. Very strange build system; takes lots of hacking
   and tweaking to get working. Doesn't work with python-2.4, only 2.3.
-
index 27f27bb77bce41311d699ededd5b553256941308..a4c7f2751ee5569dd01a46823d5957dbb07c65de 100644 (file)
@@ -9,24 +9,25 @@ AUX 3.115-wrapper-r1.patch 1518 SHA256 e99acd1e5d735ee027361fda5d4c0652c729e2a02
 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 3d5bff0f4fcdfb6f0469cf1fea9360718fc5d4675b38700382889cc93714ad0b SHA512 f61a32ea50e961e7f46c0f6ccb54fbdc3231f5aa81898acb42af7f25265d0b132268c8ea5300b3e051a31ed1ff7391276c5ad9f9f701843efc5dedc47fd508f6 WHIRLPOOL 8e645ce32ae294144a27d20bbec61d21469b214a46250553895c060ff79147b996bdd68e52b04ec4d406b0c43944e694ce06b3d31aa10e768b418365d2ae2c0a
-EBUILD sparky-3.115.ebuild 3506 SHA256 cc80c1e1a9699a8ff2b72ccdaec4e521776dd8d9ec346bb47dc8140e5d2b4cbc SHA512 d4d701184f6b024ba26c765346445e476c9e6ae8b49ae9820981c788d524ac4d5c511ca7faefc7c99dcdcb63ac7792e07b1da25be686081bd4ac902336091ff0 WHIRLPOOL d44b4de44f8ac563b2e389c8cb2c1b5985b6fee39cf229d6b6ac947635b1def3f149d6ff65e318a8ee227e4125710ebd1a3fa60f6401735b2e8e42375fa121da
-MISC ChangeLog 3488 SHA256 7311349f826fcadd04448f2622cdb11aa2fb1200000bfecb3f77a260bcc2152a SHA512 ff27fb12123e4475907a8646b5883c7f7bc8ed5f84624979d220b99bc3f7a768fdb387df3a986143b8690b4ccb2fb3d5a7418d26b31aaca9d27243b94f01ae2a WHIRLPOOL 2d28970ea3f0f1773c420174bc6c419dcbe9e36b12d57bebda96f2dfed8ce83c98fa1a9bb8245a7b998530ac178f771465304b1fd7d9c10ea904e0fb820e9263
+EBUILD sparky-3.115-r1.ebuild 3263 SHA256 a6118683cac683033c6365e7b1ec365b55b7524c18b32ae1e13b7d6e49462a34 SHA512 b70fdfcea8d96f5572dfaa3dfb964473aa939cf24e1ae64283b9defa980d781e928f1045798e7e64faa44a3f9b88408f5ed5be83a91d44ac2368f95afe26545e WHIRLPOOL cc70c6f88def1ca87874d856527c1305b444a697c7bab3278134f82ae66e9f33f06407ffa49e4543c2de6d031f7df3454baac66ce965e501f21ff01a9616119c
+MISC ChangeLog 3615 SHA256 ca930454305a6c0a819f94c74357aa75f93971b0427880550a7a3c0cc9b01d42 SHA512 ba7e788c591eed7e3a61ac8650757557ba44adf5265e0dabad54e0802dc68a5091f15300f6dd5e6f08aacc4b6b66f2b65f815acd14504c624dc5c60b9b0a3ec2 WHIRLPOOL 357f7369e9a0eae7d9f23c92fced2f8da8b63f598e6218f87b2405c76993800bfc6a07867e30cd3e9ffebc0a906c06108667db0aa736fee8e92f74dc5c37fa42
 MISC metadata.xml 234 SHA256 8297e76ecd2cb828f604e9f138b263179eb84beb640215a0f60d7613eb46bb7f SHA512 0e94c0e6570a9267a39968d81c3b80680ccbc6eebb62199e4830b021a114c94a0de17ef2103cef62b7e27da1f51f225a30abb802aff82140ae6dc43366113d31 WHIRLPOOL fa6d4d90b092953b88ed3ad03e1e8c189296d268b39d13a4b4dcb78f0c4456341e3f1b44eea0860054fee43079179cb7cf7a912acf1fbe693ecdca6d9a65f081
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCgAGBQJSgR38AAoJELnU8jG9FVirFSAP/AzxCTYbN1S40QbOpBqmnPOp
-E3LKB6Gx3wqeOQydFw1Bq3XZJJ1axEXgxtpdcWIF4h/W4zwMgBSOAZjfi01CB9JR
-0h111FxnQSRtq3Z/iP+U0TdKRS3maMshru5XWdisyq5SVsC87iUw0CC9TR9X0MDd
-URgsEuUgGzIsyLuBrOvLT15yIshfvlg+STkpWLIbcMk6udXqJcXxtMK87dyEYfsA
-02pzKTbfXqE8PSR6YjVJxM8TZkz1o6YxiZXeA5BcUAjdtTiqIseLE2JAqqQVtY1D
-dw1NguyYkAFQElnph5q0LwsCDVq8HKcoJ2ZMVMwRoWSCk1BvoJHq4sM7BcAp1unV
-N3T9oc0T+dE6i+UehMDZ5Yam51YLZccyNkz5yVcWdvDNLCahiceY2qnZeBLEs9Q9
-8MsU4TO9F4WVnC0l02NE0XNMbmkho1xDiztYMYH2343bp5LhD+e32ka3OAz9BDym
-ykiD2N85fIfhzmD0ybufUEzUMn5Wfe2ddPIxHORDpN2P4UW5QYLjQSRpGkWJY8yA
-X0ns7VaC1bVTnl+VW38JfD81FrNdOXGLoGdQ13EN7G9/eqeWxwHpGZJYKMy+xNEM
-VMxpXGC3SRgUQYC7xccdz1gMnhOKh6PULcc4Nd+JO6fnyv6vhaOB11ggeKCTZEgU
-Hn+ERj29xmjhtDmUI8Aj
-=ACtM
+iQJ8BAEBCgBmBQJVDDzSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirSO4P/AwTgvdkUvszc9PAZONJXYkR
+1eXrpg4LPuPL2clWhkC+4DHu9priI0w7ufm/89Z2GMrPrv9MG9NSwNUf54iR5AGx
+v42yq2G1R1RlFFgGO5i8KgqrZozXDkaYmicc2NT3YFF6VmcqaXlMosq8Kpp/lJdf
+7a267ZowJNbMjdyrSuyWHmKrVeI6dnqQLPors8JHwn0AAU5nYIXuncCBukNpjUn0
+fnDEXiOiHby/BNh9C7aBtF5183XXnvmfd8QxNBoRJ8y3YuLYvzQhFXEUU4FKbCFv
+LQv8RVER0PhqIpJOIYLMPW9DqjMXDgzlhG4miFmjoLv2lbEIYRbs5Ic/Se6vHUD3
+XUeaaJfnv1VIwFUEoylvUxRDnMpjATXqBh2Q95whdhWSY/y2asNaaAwNcKix39Sk
+hPX2LHlaxt1cKIstU5aS6lBKWaAhv9j1ODUEKFs0IYsmmN8f97p679R2KtyxDKsa
+7P/iOLJvA4nyyq+Yq9NsYXvdkQAF7kj6W8wbAKxrsC5sM3kKktb5OPjrobgTMn9Z
+WbjHXBhlrZZ2MbYUBfw58lJ/Bp14WYfnbCRPCpDUtJ0SL17Ee6gM6pVsfr8fnjES
+0Uc5N5ugfgnjdtC8hD3apYOeXnxMS7X9odGP5ZKu2F4PinLB/FuleScK9tQ+Mk75
++zxOKjKedFOPqXZfnUlP
+=ARdh
 -----END PGP SIGNATURE-----
index e313dd78f6d26e03b098b8faf168f56fbb8626eb..c275d9c929ff60dfc058a61b0689a1cedbe36c4c 100644 (file)
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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.3 2013/11/11 18:12:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/sparky/sparky-3.115-r1.ebuild,v 1.4 2015/03/20 15:29:21 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk"
 
 inherit eutils flag-o-matic multilib prefix python-single-r1 toolchain-funcs
@@ -20,8 +20,8 @@ IUSE="examples"
 
 RDEPEND="
        app-shells/tcsh
-       dev-lang/tcl
-       dev-lang/tk"
+       dev-lang/tcl:0=
+       dev-lang/tk:0="
 DEPEND="${RDEPEND}"
 
 RESTRICT="mirror"
diff --git a/sci-chemistry/sparky/sparky-3.115.ebuild b/sci-chemistry/sparky/sparky-3.115.ebuild
deleted file mode 100644 (file)
index c20b86b..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/sparky/sparky-3.115.ebuild,v 1.4 2012/05/29 17:55:43 jlec Exp $
-
-EAPI="3"
-
-PYTHON_USE_WITH="tk"
-PYTHON_DEPEND="2"
-
-inherit eutils flag-o-matic multilib prefix python 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"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-       python_set_active_version 2
-       python_pkg_setup
-       TKVER=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-       PYVER=$(python_get_version)
-}
-
-src_prepare() {
-       epatch "${FILESDIR}"/${PV}-ldflags.patch
-       epatch "${FILESDIR}"/${PV}-wrapper.patch
-       epatch "${FILESDIR}"/${PV}-paths.patch
-       epatch "${FILESDIR}"/${PV}-makefile.patch
-
-       sed -i \
-               -e "s:^\(set PYTHON =\).*:\1 ${EPREFIX}/usr/bin/python${PYVER}: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
-       eprefixify "${S}"/bin/sparky
-}
-
-src_compile() {
-       emake \
-               SPARKY="${S}" \
-               PYTHON_VERSION="${PYVER}" \
-               PYTHON_PREFIX="${EPREFIX}/usr" \
-               PYTHON_LIB="${EPREFIX}$(python_get_libdir)" \
-               PYTHON_INC="${EPREFIX}$(python_get_includedir)" \
-               TK_PREFIX="${EPREFIX}/usr" \
-               TCLTK_VERSION="${TKVER}" \
-               TKLIBS="-L${EPREFIX}/usr/$(get_libdir)/ -ltk${TKVER} -ltcl${TKVER} -lX11" \
-               CXX="$(tc-getCXX)" \
-               CC="$(tc-getCC)" \
-               LDSHARED="-shared" \
-               binaries || die "make failed"
-
-       rm c++/*.o || die
-
-       emake \
-               SPARKY="${S}" \
-               PYTHON_VERSION="${PYVER}" \
-               PYTHON_PREFIX="${EPREFIX}/usr" \
-               PYTHON_LIB="${EPREFIX}$(python_get_libdir)" \
-               PYTHON_INC="${EPREFIX}$(python_get_includedir)" \
-               TK_PREFIX="${EPREFIX}/usr" \
-               TCLTK_VERSION="${TKVER}" \
-               TKLIBS="-L${EPREFIX}/usr/$(get_libdir)/ -ltk${TKVER} -ltcl${TKVER} -lX11" \
-               CXX="$(tc-getCXX)" \
-               CC="$(tc-getCC)" \
-               CXXFLAGS="${CXXFLAGS} -fPIC" \
-               CFLAGS="${CFLAGS} -fPIC" \
-               LDSHARED="-shared -fPIC" \
-               libraries || die "make failed"
-}
-
-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} || die
-
-       insinto /usr/share/${PN}/
-       doins lib/{print-prolog.ps,Sparky} || die
-       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/* || die
-       dosym ../../share/doc/${PF}/html /usr/$(get_libdir)/${PN}/manual
-
-       insinto $(python_get_sitedir)/${PN}
-       doins python/*.py c++/{spy.so,_tkinter.so} || die
-       fperms 755 $(python_get_sitedir)/${PN}/{spy.so,_tkinter.so} || die
-       dosym ../python${PYVER}/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 || die
-       newdoc python/README README.python || die
-}
-
-pkg_postinst() {
-       python_need_rebuild
-       python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-       python_mod_cleanup ${PN}
-}