diff options
author | Kacper Kowalik <xarthisius@gentoo.org> | 2010-11-08 17:21:44 +0000 |
---|---|---|
committer | Kacper Kowalik <xarthisius@gentoo.org> | 2010-11-08 17:21:44 +0000 |
commit | 3b486064fb864d5511c9886c7c3b37a562f4e5c8 (patch) | |
tree | 231ff33268c5a3690c5a6ab383d9c92f8e3e322a /sci-chemistry/raster3d | |
parent | Update EAPI. Fix dependencies. Set SUPPORT_PYTHON_ABIS. Set PYTHON_MODNAME. (diff) | |
download | historical-3b486064fb864d5511c9886c7c3b37a562f4e5c8.tar.gz historical-3b486064fb864d5511c9886c7c3b37a562f4e5c8.tar.bz2 historical-3b486064fb864d5511c9886c7c3b37a562f4e5c8.zip |
media-libs/jpeg -> virtual/jpeg. Drop old.
Package-Manager: portage-2.1.9.24/cvs/Linux x86_64
Diffstat (limited to 'sci-chemistry/raster3d')
-rw-r--r-- | sci-chemistry/raster3d/ChangeLog | 7 | ||||
-rw-r--r-- | sci-chemistry/raster3d/files/raster3d-2.7d-gcc4-gentoo.patch | 38 | ||||
-rw-r--r-- | sci-chemistry/raster3d/raster3d-2.7c.ebuild | 6 | ||||
-rw-r--r-- | sci-chemistry/raster3d/raster3d-2.7d.ebuild | 61 | ||||
-rw-r--r-- | sci-chemistry/raster3d/raster3d-2.7s.ebuild | 61 | ||||
-rw-r--r-- | sci-chemistry/raster3d/raster3d-2.9.1.ebuild | 78 | ||||
-rw-r--r-- | sci-chemistry/raster3d/raster3d-2.9.2.ebuild | 4 |
7 files changed, 11 insertions, 244 deletions
diff --git a/sci-chemistry/raster3d/ChangeLog b/sci-chemistry/raster3d/ChangeLog index 22255522463e..3aa1ef3d742b 100644 --- a/sci-chemistry/raster3d/ChangeLog +++ b/sci-chemistry/raster3d/ChangeLog @@ -1,6 +1,11 @@ # 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.19 2010/04/02 08:31:46 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/ChangeLog,v 1.20 2010/11/08 17:21:44 xarthisius Exp $ + + 08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org> raster3d-2.7c.ebuild, + -raster3d-2.7d.ebuild, -files/raster3d-2.7d-gcc4-gentoo.patch, + -raster3d-2.7s.ebuild, -raster3d-2.9.1.ebuild, raster3d-2.9.2.ebuild: + media-libs/jpeg -> virtual/jpeg. Drop old. *raster3d-2.9.2 (02 Apr 2010) diff --git a/sci-chemistry/raster3d/files/raster3d-2.7d-gcc4-gentoo.patch b/sci-chemistry/raster3d/files/raster3d-2.7d-gcc4-gentoo.patch deleted file mode 100644 index eb2ab51a7c87..000000000000 --- a/sci-chemistry/raster3d/files/raster3d-2.7d-gcc4-gentoo.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -Naur Raster3D_2.7d/normal3d.f Raster3D_2.7d.new/normal3d.f ---- Raster3D_2.7d/normal3d.f 2003-10-20 18:50:11.000000000 -0400 -+++ Raster3D_2.7d.new/normal3d.f 2007-09-08 10:12:49.000000000 -0400 -@@ -443,7 +443,8 @@ - READ (INPUT,'(A)',ERR=101) TITLE - IF (TITLE(1:1).EQ.'#') GOTO 100 - GOTO 102 -- 101 WRITE (NOISE,'(A,A)') ' >> Cannot open or read file ',TITLE(2:132) -+ 101 WRITE (NOISE,'(A,A)') ' >> Cannot open or read file ', -+ *TITLE(2:132) - CALL EXIT(-1) - 102 CONTINUE - ENDIF -diff -Naur Raster3D_2.7d/parse.f Raster3D_2.7d.new/parse.f ---- Raster3D_2.7d/parse.f 2006-04-11 14:33:48.000000000 -0400 -+++ Raster3D_2.7d.new/parse.f 2007-09-08 10:25:24.000000000 -0400 -@@ -4,7 +4,8 @@ - COMMON /OPTIONS/ FONTSCALE, GAMMA, ZOOM, NSCHEME, SHADOWFLAG, XBG, - & NAX, NAY, OTMODE, QUALITY, INVERT, LFLAG - REAL FONTSCALE, GAMMA, ZOOM -- INTEGER NSCHEME, SHADOWFLAG, XBG -+ INTEGER NSCHEME, SHADOWFLAG -+ INTEGER*8 XBG - INTEGER*2 NAX, NAY, OTMODE, QUALITY - LOGICAL*2 INVERT, LFLAG - c -diff -Naur Raster3D_2.7d/render.f Raster3D_2.7d.new/render.f ---- Raster3D_2.7d/render.f 2006-04-11 17:13:04.000000000 -0400 -+++ Raster3D_2.7d.new/render.f 2007-09-08 10:15:17.000000000 -0400 -@@ -3685,7 +3685,7 @@ - FRAC = DETAIL(K+8) - INEXT = INDTOP + 1 - IF (TYPE(INEXT).EQ.VERTEXRGB) INEXT = INEXT + 1 -- CALL ASSERT(TYPE(INEXT).EQ.VERTRANSP,'lost vertex transp') -+ CALL ASSERT(TYPE(INEXT).EQ.VERTRANSP,'lost vertex transp') - K = LIST(INEXT) - CLRITY = FRAC*DETAIL(K+1) + (1.-FRAC)*DETAIL(K+2) - ELSE IF (TYPE(INDTOP).EQ.TRIANG) THEN diff --git a/sci-chemistry/raster3d/raster3d-2.7c.ebuild b/sci-chemistry/raster3d/raster3d-2.7c.ebuild index 7b13aa155e8f..e4de11f9207b 100644 --- a/sci-chemistry/raster3d/raster3d-2.7c.ebuild +++ b/sci-chemistry/raster3d/raster3d-2.7c.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# 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.7c.ebuild,v 1.8 2007/07/22 07:25:12 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.7c.ebuild,v 1.9 2010/11/08 17:21:44 xarthisius Exp $ inherit toolchain-funcs fortran @@ -15,7 +15,7 @@ SLOT="0" IUSE="" KEYWORDS="ppc x86" -RDEPEND="media-libs/jpeg +RDEPEND="virtual/jpeg media-libs/libpng media-libs/tiff" diff --git a/sci-chemistry/raster3d/raster3d-2.7d.ebuild b/sci-chemistry/raster3d/raster3d-2.7d.ebuild deleted file mode 100644 index 1e2ca6e32fe7..000000000000 --- a/sci-chemistry/raster3d/raster3d-2.7d.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.7d.ebuild,v 1.2 2008/10/16 14:01:23 markusle Exp $ - -inherit toolchain-funcs fortran - -NAME="Raster3D" - -DESCRIPTION="a set of tools for generating high quality raster images of proteins or other molecules" -LICENSE="as-is" -HOMEPAGE="http://www.bmsc.washington.edu/raster3d/raster3d.html" -SRC_URI="http://www.bmsc.washington.edu/${PN}/${NAME}_${PV}.tar.gz" - -SLOT="0" -IUSE="" -KEYWORDS="~ppc ~x86" - -RDEPEND="media-libs/jpeg - media-libs/libpng - media-libs/tiff" - -DEPEND="${RDEPEND} - x11-misc/imake" - -S="${WORKDIR}/${NAME}_${PV}" - -src_unpack() { - unpack ${A} - epatch "${FILESDIR}"/${P}-gcc4-gentoo.patch -} - -src_compile() { - # fix Makefile to honor user's CFLAGS/FFLAGS - sed -e "s:gcc:$(tc-getCC):" \ - -e "s:g77:${FORTRANC}:" \ - -e "s:-g -m486 -w:${CFLAGS}:" \ - -e "s:-g -O -w -malign-double:${FFLAGS} -w:" \ - -i Makefile || die "Failed to patch makefile" - - sed -e "s:prefix = /usr/local:prefix = /usr:" \ - -i Makefile.template || \ - die "Failed to patch makefile.template" - - make linux || die "Failed to make linux target." - make all || die "Failed to make all target." -} - -src_install() { - emake prefix="${D}"/usr \ - bindir="${D}"/usr/bin \ - datadir="${D}"/usr/share/Raster3D/materials \ - mandir="${D}"/usr/share/man/man1 \ - htmldir="${D}"/usr/share/Raster3D/html \ - examdir="${D}"/usr/share/Raster3D/examples \ - install || die "Failed to install application." - - dodir /etc/env.d - echo -e "R3D_LIB=/usr/share/${NAME}/materials" > \ - "${D}"/etc/env.d/10raster3d || \ - die "Failed to install env file." -} diff --git a/sci-chemistry/raster3d/raster3d-2.7s.ebuild b/sci-chemistry/raster3d/raster3d-2.7s.ebuild deleted file mode 100644 index 12095f0048de..000000000000 --- a/sci-chemistry/raster3d/raster3d-2.7s.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.7s.ebuild,v 1.3 2008/10/16 14:01:23 markusle Exp $ - -inherit toolchain-funcs fortran - -NAME="Raster3D" - -DESCRIPTION="a set of tools for generating high quality raster images of proteins or other molecules" -LICENSE="as-is" -HOMEPAGE="http://www.bmsc.washington.edu/raster3d/raster3d.html" -SRC_URI="http://www.bmsc.washington.edu/${PN}/${NAME}_${PV}.tar.gz" - -SLOT="0" -IUSE="" -KEYWORDS="~amd64 ~ppc ~x86" - -RDEPEND="media-libs/jpeg - media-libs/libpng - media-libs/tiff" - -DEPEND="${RDEPEND} - x11-misc/imake" - -S="${WORKDIR}/${NAME}_${PV}" - -src_compile() { - # some source files have lines that extend - # beyond 72 characters causing problems with - # gcc-4.1.2 without the below - FFLAGS="${FFLAGS} -ffixed-line-length-132" - - # fix Makefile to honor user's CFLAGS/FFLAGS - sed -e "s:gcc:$(tc-getCC):" \ - -e "s:g77:${FORTRANC}:" \ - -e "s:-g -m486 -w:${CFLAGS}:" \ - -e "s:-g -O -w -malign-double:${FFLAGS} -w:" \ - -i Makefile || die "Failed to patch makefile" - - sed -e "s:prefix = /usr/local:prefix = /usr:" \ - -i Makefile.template || \ - die "Failed to patch makefile.template" - - emake linux || die "Failed to make linux target." - emake all || die "Failed to make all target." -} - -src_install() { - emake prefix="${D}"/usr \ - bindir="${D}"/usr/bin \ - datadir="${D}"/usr/share/Raster3D/materials \ - mandir="${D}"/usr/share/man/man1 \ - htmldir="${D}"/usr/share/Raster3D/html \ - examdir="${D}"/usr/share/Raster3D/examples \ - install || die "Failed to install application." - - dodir /etc/env.d - echo -e "R3D_LIB=/usr/share/${NAME}/materials" > \ - "${D}"/etc/env.d/10raster3d || \ - die "Failed to install env file." -} diff --git a/sci-chemistry/raster3d/raster3d-2.9.1.ebuild b/sci-chemistry/raster3d/raster3d-2.9.1.ebuild deleted file mode 100644 index db058f2590c6..000000000000 --- a/sci-chemistry/raster3d/raster3d-2.9.1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# 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.2 2010/04/01 19:58:32 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" > \ - "${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" -} diff --git a/sci-chemistry/raster3d/raster3d-2.9.2.ebuild b/sci-chemistry/raster3d/raster3d-2.9.2.ebuild index d36a1d1ad2dc..21b9e4bee7f0 100644 --- a/sci-chemistry/raster3d/raster3d-2.9.2.ebuild +++ b/sci-chemistry/raster3d/raster3d-2.9.2.ebuild @@ -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/raster3d/raster3d-2.9.2.ebuild,v 1.1 2010/04/02 08:31:46 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.9.2.ebuild,v 1.2 2010/11/08 17:21:44 xarthisius Exp $ EAPI="3" @@ -20,7 +20,7 @@ IUSE="" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" RDEPEND=" - media-libs/jpeg + virtual/jpeg media-libs/libpng media-libs/tiff" DEPEND="${RDEPEND}" |