summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-03-28 10:27:49 +0000
committerJustin Lecher <jlec@gentoo.org>2010-03-28 10:27:49 +0000
commit3b82f7204ca61b12536223d62019c18f1d937a77 (patch)
treed77222104f46e7291b0e3a7b4166486286d48974 /sci-chemistry/raster3d
parentStable dev-haskell/c2hs on amd64. (diff)
downloadgentoo-2-3b82f7204ca61b12536223d62019c18f1d937a77.tar.gz
gentoo-2-3b82f7204ca61b12536223d62019c18f1d937a77.tar.bz2
gentoo-2-3b82f7204ca61b12536223d62019c18f1d937a77.zip
Version BUmp, keyworded for ~*-linux, as-needed aware linking, removed unneded imake DEPEND
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry/raster3d')
-rw-r--r--sci-chemistry/raster3d/ChangeLog11
-rw-r--r--sci-chemistry/raster3d/files/2.9.1-as-needed.patch41
-rw-r--r--sci-chemistry/raster3d/metadata.xml3
-rw-r--r--sci-chemistry/raster3d/raster3d-2.9.1.ebuild78
4 files changed, 131 insertions, 2 deletions
diff --git a/sci-chemistry/raster3d/ChangeLog b/sci-chemistry/raster3d/ChangeLog
index 2d1f15ee78c6..be084f7d5888 100644
--- a/sci-chemistry/raster3d/ChangeLog
+++ b/sci-chemistry/raster3d/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sci-chemistry/raster3d
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/ChangeLog,v 1.16 2008/10/16 14:01:23 markusle Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/ChangeLog,v 1.17 2010/03/28 10:27:42 jlec Exp $
+
+*raster3d-2.9.1 (28 Mar 2010)
+
+ 28 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+ +files/2.9.1-as-needed.patch, +raster3d-2.9.1.ebuild, metadata.xml:
+ Version BUmp, keyworded for ~*-linux, as-needed aware linking, removed
+ unneded imake DEPEND
16 Oct 2008; Markus Dittrich <markusle@gentoo.org> raster3d-2.7s.ebuild, raster3d-2.7d.ebuild:
Added -ffixed-line-length-132 to FFLAGS to avoid gcc-4.1.2 errors
diff --git a/sci-chemistry/raster3d/files/2.9.1-as-needed.patch b/sci-chemistry/raster3d/files/2.9.1-as-needed.patch
new file mode 100644
index 000000000000..2139804c8962
--- /dev/null
+++ b/sci-chemistry/raster3d/files/2.9.1-as-needed.patch
@@ -0,0 +1,41 @@
+diff --git a/Makefile b/Makefile
+index e75ffcf..bcdd05c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -188,7 +188,7 @@ avs2ps: avs2ps.c
+ $(CC) $(CFLAGS) $(FLAGS) $(LDFLAGS) -o avs2ps avs2ps.c -lm
+
+ balls: balls.f
+- $(FC) $(FFLAGS) -o balls balls.f
++ $(FC) $(LDFLAGS) $(FFLAGS) -o balls balls.f
+
+ local.o: Makefile.incl local.c
+ $(CC) $(CFLAGS) $(FLAGS) -c local.c
+@@ -201,21 +201,18 @@ ribbon: ribbon.f ribbon1.f modsubs.f
+ ribbon.f ribbon1.f modsubs.f -o ribbon
+
+ rastep: rastep.f quadric.o suv.o
+- $(FC) $(FFLAGS) \
+- rastep.f quadric.o suv.o $(LDFLAGS) \
+- -o rastep
++ $(FC) $(FFLAGS) $(LDFLAGS) -o rastep \
++ rastep.f quadric.o suv.o
+
+ render: render.o local.o quadric.o parse.o r3dtops.o ungz.o qinp.o
+- $(FC) $(FFLAGS) \
++ $(FC) $(FFLAGS) $(LDFLAGS) -o render \
+ render.o local.o quadric.o parse.o r3dtops.o ungz.o \
+ qinp.o \
+- $(LIBS) $(LDFLAGS) \
+- -o render
++ $(LIBS)
+
+ normal3d: normal3d.o quadric.o qinp.o ungz.o parameters.incl
+- $(FC) $(FFLAGS) \
+- normal3d.o quadric.o ungz.o qinp.o $(LDFLAGS) \
+- -o normal3d
++ $(FC) $(FFLAGS) $(LDFLAGS) -o normal3d \
++ normal3d.o quadric.o ungz.o qinp.o
+
+ stereo3d:
+
diff --git a/sci-chemistry/raster3d/metadata.xml b/sci-chemistry/raster3d/metadata.xml
index 9ac9ffdb3a41..3fe03418e735 100644
--- a/sci-chemistry/raster3d/metadata.xml
+++ b/sci-chemistry/raster3d/metadata.xml
@@ -2,4 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>sci-chemistry</herd>
+<upstream>
+ <changelog>http://skuld.bmsc.washington.edu/raster3d/CHANGELOG</changelog>
+</upstream>
</pkgmetadata>
diff --git a/sci-chemistry/raster3d/raster3d-2.9.1.ebuild b/sci-chemistry/raster3d/raster3d-2.9.1.ebuild
new file mode 100644
index 000000000000..4215eed27c48
--- /dev/null
+++ b/sci-chemistry/raster3d/raster3d-2.9.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.9.1.ebuild,v 1.1 2010/03/28 10:27:42 jlec Exp $
+
+EAPI="3"
+
+inherit fortran flag-o-matic multilib toolchain-funcs versionator
+
+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"
+
+LICENSE="as-is"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ media-libs/jpeg
+ media-libs/libpng
+ media-libs/tiff"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PV}-as-needed.patch
+}
+
+src_compile() {
+ sed -e "s:prefix = /usr/local:prefix = ${EPREFIX}/usr:" \
+ -i Makefile.template || \
+ die "Failed to patch makefile.template"
+
+ if [[ ${FORTRANC} == gfortran ]]; then
+ append-cflags -Dgfortran
+ fi
+
+ append-fflags -ffixed-line-length-132
+
+ for target in linux-gfortran all; do
+ emake \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ FFLAGS="${FFLAGS}" \
+ CC="$(tc-getCC)"\
+ FC="${FORTRANC}" \
+ INCDIRS="-I${EPREFIX}"/usr/include \
+ LIBDIRS="-L${EPREFIX}"/usr/$(get_libdir) \
+ ${target} || die
+ 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/Raster3D/html \
+ examdir="${ED}"/usr/share/Raster3D/examples \
+ install || die "Failed to install application."
+
+ dodir /etc/env.d
+ echo -e "R3D_LIB=${EPREFIX}/usr/share/${NAME}/materials" > \
+ "${D}"/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"
+}