[gentoo-commits] gentoo-x86 commit in sci-chemistry/raster3d: raster3d-2.7c.ebuild ChangeLog raster3d-3.0.2.ebuild metadata.xml

[Justin Lecher (jlec)]

jlec        11/02/27 10:40:36

  Modified:             raster3d-2.7c.ebuild ChangeLog metadata.xml
  Added:                raster3d-3.0.2.ebuild
  Log:
  Version BUmp
  
  (Portage version: 2.2.0_alpha25/cvs/Linux x86_64)

Revision  Changes    Path
1.12                 sci-chemistry/raster3d/raster3d-2.7c.ebuild

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

Index: raster3d-2.7c.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.7c.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- raster3d-2.7c.ebuild	16 Dec 2010 13:55:41 -0000	1.11
+++ raster3d-2.7c.ebuild	27 Feb 2011 10:40:36 -0000	1.12
@@ -1,24 +1,24 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.7c.ebuild,v 1.11 2010/12/16 13:55:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.7c.ebuild,v 1.12 2011/02/27 10:40:36 jlec Exp $
 
 inherit toolchain-funcs
 
 NAME="Raster3D"
 
-DESCRIPTION="a set of tools for generating high quality raster images of proteins or other molecules"
-LICENSE="as-is"
+DESCRIPTION="A set of tools for generating high quality raster images of proteins or other molecules"
 HOMEPAGE="http://www.bmsc.washington.edu/raster3d/raster3d.html"
 SRC_URI="http://www.bmsc.washington.edu/${PN}/${NAME}_${PV}.tar.gz"
 
+LICENSE="as-is"
 SLOT="0"
 IUSE=""
 KEYWORDS="ppc x86"
 
-RDEPEND="virtual/jpeg
+RDEPEND="
+	virtual/jpeg
 	media-libs/libpng
 	media-libs/tiff"
-
 DEPEND="${RDEPEND}
 	x11-misc/imake"
 



1.23                 sci-chemistry/raster3d/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ChangeLog	17 Dec 2010 07:57:02 -0000	1.22
+++ ChangeLog	27 Feb 2011 10:40:36 -0000	1.23
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/raster3d
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/ChangeLog,v 1.22 2010/12/17 07:57:02 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/ChangeLog,v 1.23 2011/02/27 10:40:36 jlec Exp $
+
+*raster3d-3.0.2 (27 Feb 2011)
+
+  27 Feb 2011; Justin Lecher <jlec@g.o> +files/3.0.2-as-needed.patch,
+  +files/3.0.2-gentoo-prefix.patch, raster3d-2.7c.ebuild,
+  +raster3d-3.0.2.ebuild, metadata.xml:
+  Version BUmp
 
   17 Dec 2010; Justin Lecher <jlec@g.o> raster3d-2.9.2.ebuild:
   Fix for fortran.eclass removal



1.4                  sci-chemistry/raster3d/metadata.xml

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

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/metadata.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- metadata.xml	28 Mar 2010 10:27:42 -0000	1.3
+++ metadata.xml	27 Feb 2011 10:40:36 -0000	1.4
@@ -5,4 +5,8 @@
 <upstream>
 	<changelog>http://skuld.bmsc.washington.edu/raster3d/CHANGELOG</changelog>
 </upstream>
+<use>
+  <flag name='gd'>libgd support for PNG and JPEG output</flag>
+</use>
+
 </pkgmetadata>



1.1                  sci-chemistry/raster3d/raster3d-3.0.2.ebuild

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

Index: raster3d-3.0.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/raster3d/raster3d-3.0.2.ebuild,v 1.1 2011/02/27 10:40:36 jlec Exp $

EAPI="4"

inherit flag-o-matic multilib toolchain-funcs versionator prefix

MY_PN="Raster3D"
MY_PV=$(replace_version_separator 2 -)
MY_P="${MY_PN}_${MY_PV}"

DESCRIPTION="A set of tools for generating high quality raster images of proteins or other molecules"
HOMEPAGE="http://www.bmsc.washington.edu/raster3d/raster3d.html"
SRC_URI="http://www.bmsc.washington.edu/${PN}/${MY_P}.tar.gz -> ${MY_P}.tar"

LICENSE="as-is"
SLOT="0"
IUSE="gd tiff"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"

RDEPEND="
	tiff? ( media-libs/tiff )
	gd? ( media-libs/gd[jpeg,png] )"
DEPEND="${RDEPEND}"

S="${WORKDIR}/${MY_P}"

src_prepare() {
	epatch \
		"${FILESDIR}"/${PV}-as-needed.patch \
		"${FILESDIR}"/${PV}-gentoo-prefix.patch

	sed \
		-e "s:MYPF:${PF}:" \
		-e "s:MYLIB:$(get_libdir):g" \
		-i Makefile.template || \
		die "Failed to patch makefile.template"

	if ! use gd; then
		sed \
			-e "/GDLIBS/s:^:#:g" \
			-e "/GDDEFS/s:^:#:g" \
			-i Makefile.template || die
	fi

	if ! use tiff; then
		sed \
			-e "/TLIBS/s:^:#:g" \
			-e "/TDEFS/s:^:#:g" \
			-i Makefile.template || die
	fi

	if [[ $(tc-getFC) =~ gfortran ]]; then
		append-cflags -Dgfortran
	fi

	append-fflags -ffixed-line-length-132

	eprefixify Makefile.template
	cp Makefile.template Makefile.incl || die
}

src_compile() {
	local target
	local i

	if [[ $(tc-getFC) =~ gfortran ]]; then
		target="linux"
	else
		target="linux-$(tc-getFC)"
	fi

	for i in ${target} all; do
		emake \
			CFLAGS="${CFLAGS}" \
			LDFLAGS="${LDFLAGS}" \
			FFLAGS="${FFLAGS}" \
			CC="$(tc-getCC)"\
			FC="$(tc-getFC)" \
			INCDIRS="-I${EPREFIX}/usr/include" \
			LIBDIRS="-L${EPREFIX}/usr/$(get_libdir)" \
			${i}
	done
}

src_install() {
	emake prefix="${ED}"/usr \
			bindir="${ED}"/usr/bin \
			datadir="${ED}"/usr/share/Raster3D/materials \
			mandir="${ED}"/usr/share/man/man1 \
			htmldir="${ED}"/usr/share/doc/${PF}/html \
			examdir="${ED}"/usr/share/Raster3D/examples \
			install

	dodir /etc/env.d
	echo -e "R3D_LIB=${EPREFIX}/usr/share/${NAME}/materials" > \
		"${ED}"/etc/env.d/10raster3d || \
		die "Failed to install env file."
}

pkg_postinst() {
	elog "Add following line:"
	elog "<delegate decode=\"r3d\" command='\"render\" < \"%i\" > \"%o\"' />"
	elog "to ${EPREFIX}/usr/$(get_libdir)/ImageMagick-6.5.8/config/delegates.xml"
	elog "to make imagemagick use raster3d for .r3d files"
}