* [gentoo-commits] gentoo-x86 commit in sci-chemistry/coot: ChangeLog coot-0.6.2.ebuild metadata.xml coot-0.6.1.ebuild
@ 2011-06-28 17:01 Justin Lecher (jlec)
0 siblings, 0 replies; only message in thread
From: Justin Lecher (jlec) @ 2011-06-28 17:01 UTC (permalink / raw
To: gentoo-commits
jlec 11/06/28 17:01:28
Modified: ChangeLog metadata.xml coot-0.6.1.ebuild
Added: coot-0.6.2.ebuild
Log:
Version Bump
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Revision Changes Path
1.37 sci-chemistry/coot/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/coot/ChangeLog?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/coot/ChangeLog?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/coot/ChangeLog?r1=1.36&r2=1.37
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/coot/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ChangeLog 2 Mar 2011 09:57:12 -0000 1.36
+++ ChangeLog 28 Jun 2011 17:01:28 -0000 1.37
@@ -1,6 +1,14 @@
# 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.36 2011/03/02 09:57:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/ChangeLog,v 1.37 2011/06/28 17:01:28 jlec Exp $
+
+*coot-0.6.2 (28 Jun 2011)
+
+ 28 Jun 2011; Justin Lecher <jlec@gentoo.org>
+ +files/0.6.2-clipper-config.patch, +files/0.6.2-gl.patch,
+ +files/0.6.2-mmdb-config.patch, coot-0.6.1.ebuild, +coot-0.6.2.ebuild,
+ metadata.xml:
+ Version Bump
02 Mar 2011; Justin Lecher <jlec@gentoo.org> coot-0.6.1.ebuild:
Correct Slots for gtk 3 introduction to tree
1.7 sci-chemistry/coot/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/coot/metadata.xml?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/coot/metadata.xml?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/coot/metadata.xml?r1=1.6&r2=1.7
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/coot/metadata.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- metadata.xml 6 Feb 2010 00:15:00 -0000 1.6
+++ metadata.xml 28 Jun 2011 17:01:28 -0000 1.7
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci-chemistry</herd>
+ <herd>sci-chemistry</herd>
</pkgmetadata>
1.13 sci-chemistry/coot/coot-0.6.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/coot/coot-0.6.1.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/coot/coot-0.6.1.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/coot/coot-0.6.1.ebuild?r1=1.12&r2=1.13
Index: coot-0.6.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/coot/coot-0.6.1.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- coot-0.6.1.ebuild 2 Mar 2011 09:57:12 -0000 1.12
+++ coot-0.6.1.ebuild 28 Jun 2011 17:01:28 -0000 1.13
@@ -1,8 +1,8 @@
# 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.1.ebuild,v 1.12 2011/03/02 09:57:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/coot-0.6.1.ebuild,v 1.13 2011/06/28 17:01:28 jlec Exp $
-EAPI="3"
+EAPI=3
PYTHON_DEPEND="2"
@@ -89,13 +89,13 @@
# Yes, this is broken behavior.
econf \
--includedir='${prefix}/include/coot' \
- --with-gtkcanvas-prefix="${EPREFIX}"/usr \
- --with-clipper-prefix="${EPREFIX}"/usr \
- --with-mmdb-prefix="${EPREFIX}"/usr \
- --with-ssmlib-prefix="${EPREFIX}"/usr \
- --with-gtkgl-prefix="${EPREFIX}"/usr \
+ --with-gtkcanvas-prefix="${EPREFIX}/usr" \
+ --with-clipper-prefix="${EPREFIX}/usr" \
+ --with-mmdb-prefix="${EPREFIX}/usr" \
+ --with-ssmlib-prefix="${EPREFIX}/usr" \
+ --with-gtkgl-prefix="${EPREFIX}/usr" \
--with-guile \
- --with-python="${EPREFIX}"/usr \
+ --with-python="${EPREFIX}/usr" \
--with-guile-gtk \
--with-gtk2 \
--with-pygtk
@@ -149,5 +149,6 @@
einfo "CLIBD_MON ${CLIBD_MON}"
einfo "SYMINFO ${SYMINFO}"
+ "${S}"/src/coot-real --no-graphics --script python-tests/coot_unittest.py || die
"${S}"/src/coot-real --no-graphics --script command-line-greg.scm || die
}
1.1 sci-chemistry/coot/coot-0.6.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/coot/coot-0.6.2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/coot/coot-0.6.2.ebuild?rev=1.1&content-type=text/plain
Index: coot-0.6.2.ebuild
===================================================================
# 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.ebuild,v 1.1 2011/06/28 17:01:28 jlec Exp $
EAPI=3
PYTHON_DEPEND="2"
inherit autotools base eutils 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 test"
SCIDEPS="
>=sci-libs/ccp4-libs-6.1
>=sci-libs/clipper-20090520
>=sci-libs/coot-data-2
>=sci-libs/gsl-1.3
sci-libs/mmdb
sci-chemistry/reduce
sci-chemistry/refmac
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"
fi
python_set_active_version 2
}
PATCHES=(
"${FILESDIR}"/${PV}-clipper-config.patch
"${FILESDIR}"/${PV}-gl.patch
"${FILESDIR}"/${PV}-mmdb-config.patch
)
src_prepare() {
base_src_prepare
eautoreconf
}
src_configure() {
# All the --with's are used to activate various parts.
# Yes, this is broken behavior.
econf \
--includedir='${prefix}/include/coot' \
--with-gtkcanvas-prefix="${EPREFIX}/usr" \
--with-ssmlib-prefix="${EPREFIX}/usr" \
--with-gtkgl-prefix="${EPREFIX}/usr" \
--with-guile \
--with-python="${EPREFIX}/usr" \
--with-guile-gtk \
--with-gtk2 \
--with-pygtk \
$(use_enable openmp)
}
src_compile() {
emake || die "emake failed"
python_convert_shebangs $(python_get_version) 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 python-tests/coot_unittest.py || die
"${S}"/src/coot-real --no-graphics --script command-line-greg.scm || die
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-06-28 17:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-28 17:01 [gentoo-commits] gentoo-x86 commit in sci-chemistry/coot: ChangeLog coot-0.6.2.ebuild metadata.xml coot-0.6.1.ebuild Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox