[gentoo-commits] gentoo-x86 commit in sci-chemistry/azara: azara-2.8.ebuild ChangeLog azara-2.7.ebuild

[gentoo-commits] gentoo-x86 commit in sci-chemistry/azara: azara-2.8.ebuild ChangeLog azara-2.7.ebuild

[Justin Lecher (jlec)]

jlec        10/08/04 14:52:26

  Modified:             ChangeLog azara-2.7.ebuild
  Added:                azara-2.8.ebuild
  Log:
  Version bump and prll make fixes
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  sci-chemistry/azara/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/azara/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog	11 Apr 2010 18:24:13 -0000	1.3
+++ ChangeLog	4 Aug 2010 14:52:26 -0000	1.4
@@ -1,6 +1,14 @@
 # ChangeLog for sci-chemistry/azara
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/azara/ChangeLog,v 1.3 2010/04/11 18:24:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/azara/ChangeLog,v 1.4 2010/08/04 14:52:26 jlec Exp $
+
+*azara-2.8 (04 Aug 2010)
+
+  04 Aug 2010; Justin Lecher <jlec@gentoo.org> +files/2.7-impl-dec.patch,
+  azara-2.7.ebuild, +files/2.7-prll.patch, +azara-2.8.ebuild,
+  +files/2.8-impl-dec.patch, +files/2.8-prll.patch,
+  -files/help-makefile.patch:
+  Version bump and prll make fixes
 
   11 Apr 2010; Justin Lecher <jlec@gentoo.org> azara-2.7.ebuild:
   Do not try to install not builded bins, fixed 314491



1.4                  sci-chemistry/azara/azara-2.7.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/azara/azara-2.7.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/azara/azara-2.7.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/azara/azara-2.7.ebuild?r1=1.3&r2=1.4

Index: azara-2.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/azara/azara-2.7.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- azara-2.7.ebuild	11 Apr 2010 18:24:13 -0000	1.3
+++ azara-2.7.ebuild	4 Aug 2010 14:52:26 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/azara/azara-2.7.ebuild,v 1.3 2010/04/11 18:24:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/azara/azara-2.7.ebuild,v 1.4 2010/08/04 14:52:26 jlec Exp $
 
 EAPI="3"
 
@@ -23,19 +23,23 @@
 src_prepare() {
 	echo "" > ENVIRONMENT
 
-	epatch "${FILESDIR}"/help-makefile.patch
+#	epatch "${FILESDIR}"/help-makefile.patch
+	epatch "${FILESDIR}"/${PV}-prll.patch
+	epatch "${FILESDIR}"/${PV}-impl-dec.patch
 }
 
 src_compile() {
 	local mymake
 	local xpmuse
+	local makeflags
 
 	mymake="${mymake} help nongui"
 	use X && mymake="${mymake} gui"
 	use opengl && mymake="${mymake} gl"
 	use xpm && XPMUSE="XPM_FLAG=-DUSE_XPM XPM_LIB=-lXpm"
 
-	emake -j1 CC=$(tc-getCC) \
+	emake \
+		CC=$(tc-getCC) \
 		CFLAGS="${CFLAGS}" \
 		LFLAGS="${LDFLAGS}" \
 		MATH_LIB="-lm" \
@@ -64,7 +68,7 @@
 		dobin "${bin}" || die "failed to install ${bin}"
 	done
 
-	mv "${D}"/usr/bin/{,azara-}extract || die "failed to fix extract collision"
+	mv "${ED}"/usr/bin/{,azara-}extract || die "failed to fix extract collision"
 
 	dodoc CHANGES* README* || die
 	dohtml -r html/* || die



1.1                  sci-chemistry/azara/azara-2.8.ebuild

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

Index: azara-2.8.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/azara/azara-2.8.ebuild,v 1.1 2010/08/04 14:52:26 jlec Exp $

EAPI="3"

PYTHON_DEPEND="2"

inherit eutils python toolchain-funcs

DESCRIPTION="A suite of programmes to process and view NMR data"
HOMEPAGE="http://www.bio.cam.ac.uk/azara/"
SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${PN}/${P}-src.tgz"

LICENSE="AZARA"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE="X xpm"

RDEPEND="
	xpm? ( x11-libs/libXpm )
	X? ( x11-libs/libX11 )"
DEPEND="${RDEPEND}"

pkg_setup() {
	python_set_active_version 2
}

src_prepare() {
	cat > ENVIRONMENT <<- EOF
	CC=$(tc-getCC)
	CFLAGS=${CFLAGS}
	LFLAGS=${LDFLAGS}
	MATH_LIB=-lm
	X11_INCLUDE_DIR=-I${EPREFIX}/usr/X11R6/include
	MOTIF_INCLUDE_DIR=-I${EPREFIX}/usr/include
	X11_LIB_DIR=-L${EPREFIX}/usr/$(get_libdir)
	MOTIF_LIB_DIR=-L${EPREFIX}/usr/$(get_libdir)
	X11_LIB=-lX11
	MOTIF_LIB=-lXm -lXt
	PYTHON_INCLUDE_DIR=$(python_get_includedir)
	SHARED_FLAGS = -shared
	ENDIAN_FLAG=-DLITTLE_ENDIAN_DATA
	EOF

	use xpm && echo "XPMUSE=\"XPM_FLAG=-DUSE_XPM XPM_LIB=-lXpm\"" >> ENVIRONMENT

	epatch "${FILESDIR}"/${PV}-prll.patch
	epatch "${FILESDIR}"/${PV}-impl-dec.patch
}

src_compile() {
	local mymake
	local makeflags

	mymake="${mymake} help nongui DataRows"
	use X && mymake="${mymake} gui"

	emake ${mymake} || die
}

src_install() {
	rm bin/pythonAzara || die
	if ! use X; then
		rm bin/plot* || die
	fi
	for bin in bin/*; do
		dobin "${bin}" || die "failed to install ${bin}"
	done

	mv "${ED}"/usr/bin/{,azara-}extract || die "failed to fix extract collision"

	dodoc CHANGES* README* || die
	dohtml -r html/* || die
}

pkg_postinst() {
	einfo "Due to collision we moved the extract binary to azara-extract"
}