[gentoo-commits] gentoo-x86 commit in sci-chemistry/balbes: metadata.xml ChangeLog balbes-1.0.0_p100317-r2.ebuild balbes-1.0.0_p100317-r1.ebuild

[gentoo-commits] gentoo-x86 commit in sci-chemistry/balbes: metadata.xml ChangeLog balbes-1.0.0_p100317-r2.ebuild balbes-1.0.0_p100317-r1.ebuild

[Justin Lecher (jlec)]

jlec        11/07/23 12:29:01

  Modified:             metadata.xml ChangeLog
  Added:                balbes-1.0.0_p100317-r2.ebuild
  Removed:              balbes-1.0.0_p100317-r1.ebuild
  Log:
  Fix for missing StripXml, #375903
  
  (Portage version: 2.2.0_alpha46/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  sci-chemistry/balbes/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/balbes/metadata.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/balbes/metadata.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/balbes/metadata.xml?r1=1.2&r2=1.3

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/balbes/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml	13 Jul 2010 15:35:30 -0000	1.2
+++ metadata.xml	23 Jul 2011 12:29:01 -0000	1.3
@@ -2,10 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci-chemistry</herd>
-<maintainer>
-  <email>jlec@gentoo.org</email>
-</maintainer>
-<longdescription>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
+	<longdescription>
 	BALBES is a system for solving protein structures using x-ray 
 	crystalographic data. Molecular Replacement(MR) is its core 
 	scientific method. BALBES aims to integrate all components, 



1.9                  sci-chemistry/balbes/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/balbes/ChangeLog?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/balbes/ChangeLog?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/balbes/ChangeLog?r1=1.8&r2=1.9

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/balbes/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChangeLog	21 Jun 2011 16:05:18 -0000	1.8
+++ ChangeLog	23 Jul 2011 12:29:01 -0000	1.9
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/balbes
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/balbes/ChangeLog,v 1.8 2011/06/21 16:05:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/balbes/ChangeLog,v 1.9 2011/07/23 12:29:01 jlec Exp $
+
+*balbes-1.0.0_p100317-r2 (23 Jul 2011)
+
+  23 Jul 2011; Justin Lecher <jlec@gentoo.org>
+  +files/pyxml-0.8.4-python-2.6.patch, -balbes-1.0.0_p100317-r1.ebuild,
+  +balbes-1.0.0_p100317-r2.ebuild, metadata.xml:
+  Fix for missing StripXml, #375903
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> balbes-1.0.0_p100317-r1.ebuild:
   Add dependency on virtual/fortran



1.1                  sci-chemistry/balbes/balbes-1.0.0_p100317-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/balbes/balbes-1.0.0_p100317-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/balbes/balbes-1.0.0_p100317-r2.ebuild?rev=1.1&content-type=text/plain

Index: balbes-1.0.0_p100317-r2.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/balbes/balbes-1.0.0_p100317-r2.ebuild,v 1.1 2011/07/23 12:29:01 jlec Exp $

EAPI=3

CCP4VER="6.1.3"
PYTHON_DEPEND="2"

inherit eutils fortran-2 python toolchain-funcs

DESCRIPTION="Automated molecular replacement (MR) pipeline"
HOMEPAGE="http://www.ysbl.york.ac.uk/~fei/balbes/index.html"
SRC_URI="
	mirror://gentoo/${P}.tar.gz
	ftp://ftp.ccp4.ac.uk/ccp4/${CCP4VER}/ccp4-${CCP4VER}-core-src.tar.gz"

SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
LICENSE="ccp4"
IUSE=""

# bundled PyXML is modified and cannot be replaced

COMMON_DEPEND="
	sci-libs/ccp4-libs
	virtual/fortran"

RDEPEND="
	${COMMON_DEPEND}
	~sci-libs/balbes-db-${CCP4VER}
	!<=sci-chemistry/ccp4-apps-6.1.3-r1"
DEPEND="${COMMON_DEPEND}"

S="${WORKDIR}"/src

pkg_setup() {
	fortran-2_pkg_setup
	python_set_active_version 2
}

src_unpack() {
	unpack ${P}.tar.gz
	tar xvzf "${DISTDIR}"/ccp4-${CCP4VER}-core-src.tar.gz \
		ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/bin_py \
		ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/PyXML-0.8.4
	python_convert_shebangs 2 "${WORKDIR}"/ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/bin_py/balbes
}

src_prepare() {
	mkdir "${WORKDIR}"/bin || die
	epatch "${FILESDIR}"/${PV}-makefile.patch
	cd "${WORKDIR}"/ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/
	epatch "${FILESDIR}"/pyxml-0.8.4-python-2.6.patch
}

src_compile() {
	emake \
		BLANC_FORT="$(tc-getFC) ${FFLAGS}" || die
	cd "${WORKDIR}"/ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/PyXML-0.8.4
	find build -delete
	$(PYTHON) setup.py build
	find xml/xslt test -delete
}

src_install() {
	insinto /usr/share/balbes/BALBES_0.0.1/
	doins -r \
		 "${WORKDIR}"/ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/bin_py \
		 "${WORKDIR}"/ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/PyXML-0.8.4 || die
	dobin \
		"${WORKDIR}"/bin/* \
		"${WORKDIR}"/ccp4-${CCP4VER}/share/balbes/BALBES_0.0.1/bin_py/balbes \
		|| die
}

pkg_postinst() {
	python_mod_optimize /usr/share/balbes/BALBES_0.0.1/{bin_py,PyXML-0.8.4}
}

pkg_postrm() {
	python_mod_cleanup /usr/share/balbes/BALBES_0.0.1/{bin_py,PyXML-0.8.4}
}