Moved to autotools-utils.eclass in order to have correct .a/la file handling, #385865

Package-Manager: portage-2.2.0_alpha62/cvs/Linux x86_64

diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index 41fde89bbf9295de749d74508dcab386fc1c661a..256d1c1d421202e4744fec18c0beafed65569758 100644 (file)
--- a/sci-chemistry/coot/ChangeLog
+++ b/sci-chemistry/coot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/coot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/ChangeLog,v 1.43 2011/10/06 12:04:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/ChangeLog,v 1.44 2011/10/07 09:01:12 jlec Exp $
+
+*coot-0.6.2-r1 (07 Oct 2011)
+
+  07 Oct 2011; Justin Lecher <jlec@gentoo.org> +coot-0.6.2-r1.ebuild:
+  Moved to autotools-utils.eclass in order to have correct .a/la file handling,
+  #385865
 
   06 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> coot-0.6.2.ebuild:
   Pass -Wl,--no-as-needed with USE="openmp" and <sys-devel/libtool-2.4-r2 wrt

diff --git a/sci-chemistry/coot/Manifest b/sci-chemistry/coot/Manifest
index c3214cebab2872765b7294404fbb9daa257bb937..1439431fbe079c9916569ef5590b1c9b450ec326 100644 (file)
--- a/sci-chemistry/coot/Manifest
+++ b/sci-chemistry/coot/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 0.6.1-libpng14.patch 950 RMD160 c2d1c298ada419272d79d49972b13e414a234cd3 SHA1 bfd4828ab8e05863ce197c59865901ce3186fb66 SHA256 7b121a0bccd49da0c459003512a2c61368eeab41b33a6726525ace501eb03559
 AUX 0.6.2-clipper-config.patch 431 RMD160 7a00939760bc4c062bbde1a65f53b9556b93c3bc SHA1 0d72c4c898fd29802c74d237b54f715444922956 SHA256 9ae9129e733d845ad2e4dd505bc5e0987147fc3a5e5dd2457b5857643809db2f
@@ -13,17 +13,14 @@ DIST coot-0.6.2.tar.gz 13597123 RMD160 707eb3df47681a011f42874210b940329a748bc7
 DIST greg-data-0.6.1.tar.gz 7930213 RMD160 e9a17d1ef2d3f15b3792ea5c7204901e0105b76b SHA1 f4158fa440406b88d0bb72880cdee9a3653c4233 SHA256 658a557b85ee6b90fc446cb3c605556586a2a5a0575ddd11b42265e019eb74a0
 DIST greg-data-0.6.2.tar.gz 8044588 RMD160 065acee98384540d0c2ffaf2511dfd1aa400b11c SHA1 92cec24dab594d8024f41047af2bf6760e9e7d00 SHA256 c9fedf6e1fa60fda178753bbfb539671c274f64d4daca2b63ab49c59bd4c5856
 EBUILD coot-0.6.1.ebuild 3934 RMD160 6376495fce52056acbaaf0df862fbb502b8a7600 SHA1 0ecc3bfa5760bb663d62c67c98c6146f3f77e707 SHA256 7ac1bd7397140da0386b360ef613067a2932d381d0a85e9ad97218fac20f944d
+EBUILD coot-0.6.2-r1.ebuild 4206 RMD160 6b95783576c053193eb5175ef45c1d7cec194653 SHA1 58cd70da41184d8f274ff44ae2ea6d1af9b8970a SHA256 948a8214148ed5be2878fd4179bf9660111eb7836a0744fd8e5e39e4ff9fbb83
 EBUILD coot-0.6.2.ebuild 4137 RMD160 496e43457d80369e52638a837fb65a3eec85efd1 SHA1 49b2404da00012444ea94b27e891d150cefcb7a3 SHA256 a5729af0c80e08b7f3727758abf54434ade39e2bede382914c5b4e998f2844d6
-MISC ChangeLog 6717 RMD160 7b7f53c3808a2faf2827d615da42d9db263d682e SHA1 b45b810d47a865eec22720be5c10f329631fcd02 SHA256 5c37b44e7b7dec31571535ea809ad18561d41de8045891a7969fddb145efdaac
+MISC ChangeLog 6903 RMD160 ec0e666af5d045aaea24f322e7f109d82e5a8648 SHA1 781863a6ac5e4a6f6c63e37fb208e250f9681386 SHA256 e2d81a96c27f66a15559365b0f8a871b2e918081c56d68216881d6dec4042e49
 MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOjZlbAAoJEEdUh39IaPFNpPgH/2mKYwgk83ZwuMzY8rIvlmZn
-kCx/+zfpd4/0cPYqIM+PM2uIiW4KRtq2E1hP+reIqCbYaoJN5tN6N3hPWAF6Yc/d
-R6dkg2uFCBjWWhzdR+q3ajUQUtWRa7E05ZTzd1EywG0H5exPFo8NlokfTPnHbKeq
-S+bnP0Qg+GV4EQlTrzdSCDuxKMDXzIZRalezKxordUJPnEhnTsnpuwQdeBisEMY5
-lLHEU3mmn2GWB2+Gc46wR1bWYmvp3ofSIoPTk57l8TLOj3lf0J5L8F6uibX/afot
-57+Y1caRaN2y7aowpDe4VKhBRbWmEGZoH4g/FWg1oiqDuUlmFfUVpFrwVc0eLLM=
-=K3x7
+iEYEAREKAAYFAk6Ov94ACgkQgAnW8HDreRZpUwCgkzmWONAAZSBEYfodsCUzXaOM
+EG4An0HKJFH4m5OpGfhECgONEsm5IXqN
+=p/qb
 -----END PGP SIGNATURE-----

diff --git a/sci-chemistry/coot/coot-0.6.2-r1.ebuild b/sci-chemistry/coot/coot-0.6.2-r1.ebuild
new file mode 100644 (file)
index 0000000..4e11b9c
--- /dev/null
+++ b/sci-chemistry/coot/coot-0.6.2-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/coot-0.6.2-r1.ebuild,v 1.1 2011/10/07 09:01:12 jlec Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+
+inherit autotools-utils python toolchain-funcs versionator
+
+MY_S2_PV=$(replace_version_separator 2 - ${PV})
+MY_S2_P=${PN}-${MY_S2_PV/pre1/pre-1}
+MY_S_P=${MY_S2_P}-${PR/r/revision-}
+MY_PV=${PV}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Crystallographic Object-Oriented Toolkit for model building, completion and validation"
+HOMEPAGE="http://www.biop.ox.ac.uk/coot/"
+SRC_URI="
+       http://www.biop.ox.ac.uk/coot/software/source/releases/${MY_P}.tar.gz
+       test? ( http://dev.gentoo.org/~jlec/distfiles/greg-data-${PV}.tar.gz  )"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+openmp static-libs test"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+SCIDEPS="
+       >=sci-libs/ccp4-libs-6.1
+       >=sci-libs/clipper-20090520
+       >=sci-libs/coot-data-2
+       >=sci-libs/gsl-1.3
+       >=sci-libs/mmdb-1.23
+       sci-libs/ssm
+       <sci-libs/monomer-db-1
+       sci-chemistry/reduce
+       <sci-chemistry/refmac-5.6
+       sci-chemistry/probe"
+
+XDEPS="
+       gnome-base/libgnomecanvas
+       gnome-base/librsvg:2
+       media-libs/libpng
+       media-libs/freeglut
+       x11-libs/gtk+:2
+       x11-libs/gtkglext"
+
+SCHEMEDEPS="
+       dev-scheme/net-http
+       dev-scheme/guile-gui
+       >=dev-scheme/guile-lib-0.1.6
+       dev-scheme/guile-www
+       >=x11-libs/guile-gtk-2.1"
+
+RDEPEND="
+       ${SCIDEPS}
+       ${XDEPS}
+       ${SCHEMEDEPS}
+       dev-python/pygtk:2
+       >=dev-libs/gmp-4.2.2-r2
+       >=net-misc/curl-7.19.6
+       net-dns/libidn"
+DEPEND="${RDEPEND}
+       dev-lang/swig
+       sys-devel/bc
+       test? ( dev-scheme/greg )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+       if use openmp; then
+               tc-has-openmp || die "Please use an OPENMP capable compiler"
+               has_version '<sys-devel/libtool-2.4-r2' && append-ldflags $(no-as-needed)
+       fi
+       python_set_active_version 2
+}
+
+PATCHES=(
+       "${FILESDIR}"/${PV}-clipper-config.patch
+       "${FILESDIR}"/${PV}-mmdb-config.patch
+       "${FILESDIR}"/${PV}-gl.patch
+       "${FILESDIR}"/${PV}-test.patch
+       "${FILESDIR}"/${PV}-ssm.patch
+       "${FILESDIR}"/${PV}-libpng15.patch
+       )
+
+src_prepare() {
+       autotools-utils_src_prepare
+
+       eautoreconf
+}
+
+src_configure() {
+       # All the --with's are used to activate various parts.
+       # Yes, this is broken behavior.
+       local myeconfargs=(
+               --includedir='${prefix}/include/coot'
+               --with-gtkcanvas-prefix="${EPREFIX}/usr"
+               --with-gtkgl-prefix="${EPREFIX}/usr"
+               --with-guile
+               --with-python="${EPREFIX}/usr"
+               --with-guile-gtk
+               --with-gtk2
+               --with-pygtk
+               $(use_enable openmp)
+               )
+       autotools-utils_src_configure
+}
+
+src_compile() {
+       autotools-utils_src_compile
+       python_convert_shebangs $(python_get_version) "${S}"/src/coot_gtk2.py
+       cp "${S}"/src/coot_gtk2.py python/coot.py || die
+}
+
+src_test() {
+       source "${EPREFIX}/etc/profile.d/40ccp4.setup.sh"
+       mkdir "${T}"/coot_test
+
+       export COOT_STANDARD_RESIDUES="${S}/standard-residues.pdb"
+       export COOT_SCHEME_DIR="${S}/scheme/"
+       export COOT_RESOURCES_FILE="${S}/cootrc"
+       export COOT_PIXMAPS_DIR="${S}/pixmaps"
+       export COOT_DATA_DIR="${S}"
+       export COOT_PYTHON_DIR="${S}/python"
+       export PYTHONPATH="${COOT_PYTHON_DIR}:${PYTHONPATH}"
+       export PYTHONHOME="${EPREFIX}"/usr
+       export CCP4_SCR="${T}"/coot_test
+       export CLIBD_MON="${EPREFIX}/usr/share/ccp4/data/monomers/"
+       export SYMINFO="${S}/syminfo.lib"
+
+       export COOT_TEST_DATA_DIR="${WORKDIR}"/data/greg-data
+
+       cat > command-line-greg.scm <<- EOF
+       (use-modules (ice-9 greg))
+               (set! greg-tools (list "greg-tests"))
+                       (set! greg-debug #t)
+                       (set! greg-verbose 5)
+                       (let ((r (greg-test-run)))
+                               (if r
+                               (coot-real-exit 0)
+                               (coot-real-exit 1)))
+       EOF
+
+       einfo "Running test with following paths ..."
+       einfo "COOT_STANDARD_RESIDUES $COOT_STANDARD_RESIDUES"
+       einfo "COOT_SCHEME_DIR $COOT_SCHEME_DIR"
+       einfo "COOT_RESOURCES_FILE $COOT_RESOURCES_FILE"
+       einfo "COOT_PIXMAPS_DIR $COOT_PIXMAPS_DIR"
+       einfo "COOT_DATA_DIR $COOT_DATA_DIR"
+       einfo "COOT_PYTHON_DIR $COOT_PYTHON_DIR"
+       einfo "PYTHONPATH $PYTHONPATH"
+       einfo "PYTHONHOME $PYTHONHOME"
+       einfo "CCP4_SCR ${CCP4_SCR}"
+       einfo "CLIBD_MON ${CLIBD_MON}"
+       einfo "SYMINFO ${SYMINFO}"
+
+       "${S}"/src/coot-real --no-graphics --script command-line-greg.scm || die
+       "${S}"/src/coot-real --no-graphics --script python-tests/coot_unittest.py || die
+}