diff options
| -rw-r--r-- | sci-chemistry/raster3d/ChangeLog | 11 | ||||
| -rw-r--r-- | sci-chemistry/raster3d/Manifest | 17 | ||||
| -rw-r--r-- | sci-chemistry/raster3d/files/2.9.1-as-needed.patch | 41 | ||||
| -rw-r--r-- | sci-chemistry/raster3d/metadata.xml | 3 | ||||
| -rw-r--r-- | sci-chemistry/raster3d/raster3d-2.9.1.ebuild | 78 |
5 files changed, 146 insertions, 4 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/Manifest b/sci-chemistry/raster3d/Manifest index 41d7b66c7426..afc2372d31f4 100644 --- a/sci-chemistry/raster3d/Manifest +++ b/sci-chemistry/raster3d/Manifest @@ -1,10 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX 2.9.1-as-needed.patch 1126 RMD160 885a28b9888a7a7749f2f37b57ab33b37e243ff6 SHA1 700026b207bd53a873ea8cddfe697992c420f96b SHA256 b482bc2e1b6aea6144f8bb37beb6b9b98302067eb0d84c77d9e91cb9e6247176 AUX raster3d-2.7d-gcc4-gentoo.patch 1697 RMD160 a41c6744ef56bb548b4eab58f86b47a26cdab7e6 SHA1 6267baec8e33dc36281b79abe278a22d3db09e66 SHA256 c50c90e474451e6080c8d66ce82cdd0801f2c20942e8b9c4cdba4f3928203171 AUX raster3d-gcc-4.1-gentoo.patch 2994 RMD160 3341eb4071b46b9fbec7fef51c0a76c257041ba3 SHA1 0d23cdcd54a31fb2f77f7ea8bb8768d3f12b0775 SHA256 b1a9ea24005c0ddb9fcd54e71196417186bea0a92b1bcf47ecea978d1faf2cc3 +DIST Raster3D-2.9-1.tar.gz 1852512 RMD160 53bdd49b067bdd08008edfd67635010f350f8da6 SHA1 64202f3e20a13f4ce3847f75ff0fb7d6d1f74859 SHA256 914ba579a17db2e50ea03f453a74cd5eccd9d4c03f6100a353e6a02759ad2126 DIST Raster3D_2.7c.tar.gz 1727387 RMD160 ebb41c0504646b8d965dbccad0f3cee1bfad0244 SHA1 b13e046d05b0f435dba6c09ebb0183454063b76d SHA256 7d5c450e83865fbafecbab3caabf38a8560b6c41982948a3b0e34d79c2c3381a DIST Raster3D_2.7d.tar.gz 1724473 RMD160 646db1421f3222d75ba4f1a0c2339d603629877e SHA1 eb939d6fa0e27d4f50fbb56e84985b1db96bcb0a SHA256 b784e0a96679791adc7db2b1767a1011ef742380ee4fc783ecae9971a251eca1 DIST Raster3D_2.7s.tar.gz 1724766 RMD160 3435ec8236fcc1d0ca7e880b69f4cd45e964040e SHA1 764e043803207b89ba6c66a2ae51271857c4394c SHA256 a5952a26ece4af67ac0b4331601e639055cdafb5622aa778779cd15feb071a1a EBUILD raster3d-2.7c.ebuild 1711 RMD160 119f9f3edf7e1541cf0656c327e369b83d6706ec SHA1 eeaa160f4e08fa388f121b38435c5c3788f7f736 SHA256 b58ed73f95668610cbf4b7536c1b05f5e7306f6d2c08c9501c6a7e1a50e7b15c EBUILD raster3d-2.7d.ebuild 1693 RMD160 0cad0c31e36b4bd9d223ae138f73e0da83a04b9b SHA1 cd296135a8f703509de36239d52641fe7d365132 SHA256 f2d8579f8750e65895cf83693be8a71cd8970c75e0da5178a53a6757a2fedaf3 EBUILD raster3d-2.7s.ebuild 1792 RMD160 18bc9bc499bf54f0bbddaa842aaea1b45c558539 SHA1 b9bf10b959444089cc566fed45725aceabc5679e SHA256 336464bf79a3883211a14c58ba4d98a0900d899cca334db9bb79339c945d0c71 -MISC ChangeLog 3015 RMD160 63104e16dfdc2841c5686e971317dd28e4075641 SHA1 159253e0396dd9b88f79f44b8a09c9b08b76f231 SHA256 2f736d4c48d0d292c7e3408e63b181671ffaed3d129da3ef8d26f522dde79f47 -MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852 +EBUILD raster3d-2.9.1.ebuild 2130 RMD160 2916a8a534c59622dc195c09f219cc5683a5c5d2 SHA1 fdd529d8d6b885fe9a26d1cf1e47472aadaa54d3 SHA256 c978868f2dda3e84c52431bf5fe43e9d5ed792056718407f652db2b67f2cdb68 +MISC ChangeLog 3263 RMD160 1a101c9a9cc97c5e78fed77bc537c39278734b9a SHA1 caa956eebc9b23b8fd07f03ae30f7ddc716e631f SHA256 c887addf527cf054f0cc03d0c7a0f4f6287edf60ae36ffb0c3bf3c5f394b3e3b +MISC metadata.xml 265 RMD160 7a18d1766684e5d081b5a39499b2501bc0ed818d SHA1 acb0b82f46254db5363303198ddc8fe96d5f5239 SHA256 6cf9ab6dd1bdee7edeac984fc40afb0477763818193a34f231498114418974c3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkuvLy0ACgkQgAnW8HDreRbmewCeIYBHyuAyq9cSAvWPVwaH4utF +q48AoMjBkR62mJAh/OABX0MUQspfToZf +=XXtp +-----END PGP SIGNATURE----- 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" +} |