diff options
| -rw-r--r-- | sci-chemistry/molscript/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-chemistry/molscript/molscript-2.1.2-r1.ebuild | 4 | ||||
| -rw-r--r-- | sci-chemistry/molscript/molscript-2.1.2.ebuild | 62 |
3 files changed, 7 insertions, 65 deletions
diff --git a/sci-chemistry/molscript/ChangeLog b/sci-chemistry/molscript/ChangeLog index 8440432f5853..1c0aa5f044b9 100644 --- a/sci-chemistry/molscript/ChangeLog +++ b/sci-chemistry/molscript/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-chemistry/molscript # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/ChangeLog,v 1.11 2010/09/16 17:27:22 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/ChangeLog,v 1.12 2010/11/08 17:16:15 xarthisius Exp $ + + 08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org> + -molscript-2.1.2.ebuild, molscript-2.1.2-r1.ebuild: + media-libs/jpeg -> virtual/jpeg. Drop old. 16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> molscript-2.1.2.ebuild, molscript-2.1.2-r1.ebuild: diff --git a/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild b/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild index 94301616f13d..f6592f9bd59d 100644 --- a/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild +++ b/sci-chemistry/molscript/molscript-2.1.2-r1.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/molscript/molscript-2.1.2-r1.ebuild,v 1.4 2010/09/16 17:27:21 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild,v 1.5 2010/11/08 17:16:15 xarthisius Exp $ EAPI="3" @@ -17,7 +17,7 @@ RESTRICT="fetch" IUSE="" DEPEND=" - media-libs/jpeg + virtual/jpeg media-libs/libpng media-libs/gd media-libs/freeglut diff --git a/sci-chemistry/molscript/molscript-2.1.2.ebuild b/sci-chemistry/molscript/molscript-2.1.2.ebuild deleted file mode 100644 index 06b6b578e816..000000000000 --- a/sci-chemistry/molscript/molscript-2.1.2.ebuild +++ /dev/null @@ -1,62 +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/molscript/molscript-2.1.2.ebuild,v 1.6 2010/09/16 17:27:21 scarabeus Exp $ - -inherit toolchain-funcs eutils - -DESCRIPTION="Display molecular 3D structures, such as proteins, in both schematic and detailed representations." -HOMEPAGE="http://www.avatar.se/molscript/" -SRC_URI="${P}.tar.gz" -LICENSE="glut molscript" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" -RESTRICT="fetch" -IUSE="" -DEPEND="media-libs/jpeg - media-libs/libpng - media-libs/gd - media-libs/freeglut - || ( x11-libs/libXmu - x11-libs/libXext - x11-libs/libX11 )" -RDEPEND="${DEPEND}" - -pkg_nofetch() { - elog "Please visit ${HOMEPAGE}" - elog "and get ${A}." - elog "Place it in ${DISTDIR}" -} - -src_unpack() { - unpack ${A} - epatch ${FILESDIR}/fix-makefile-shared.patch - - # Provide glutbitmap.h, because freeglut doesn't have it - cp ${FILESDIR}/glutbitmap.h ${S}/clib/ - - # Stop an incredibly hacky include - sed -i -e 's:<../lib/glut/glutbitmap.h>:"glutbitmap.h":g' \ - ${S}/clib/ogl_bitmap_character.c -} - -src_compile() { - # Prefix of programs it links with - export FREEWAREDIR="/usr" - - ln -s Makefile.complete Makefile - - # Honor CC and CFLAGS from environment; - # unfortunately a bash bug prevents us from doing typeset and - # assignment on the same line. - typeset -a args - args=( CC="$(tc-getCC)" \ - COPT="${CFLAGS}" ) - - emake "${args[@]}" || die "emake failed" -} - -src_install() { - exeinto /usr/bin - doexe molscript molauto - dohtml ${S}/doc/*.html -} |