summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2003-10-03 20:50:47 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2003-10-03 20:50:47 +0000
commite28e93aa0c60c8bb8d79da05630780acc8d18c68 (patch)
treec7ca0f3d0e740118af46f033a1cca17b0b92e11c /app-sci
parentversion bump (diff)
downloadgentoo-2-e28e93aa0c60c8bb8d79da05630780acc8d18c68.tar.gz
gentoo-2-e28e93aa0c60c8bb8d79da05630780acc8d18c68.tar.bz2
gentoo-2-e28e93aa0c60c8bb8d79da05630780acc8d18c68.zip
Basic cleanup. Removed hard-coded gcc, cleaner SRC_URI and src_unpack.
Diffstat (limited to 'app-sci')
-rw-r--r--app-sci/rasmol/ChangeLog6
-rw-r--r--app-sci/rasmol/Manifest4
-rw-r--r--app-sci/rasmol/rasmol-2.6_beta2.ebuild18
3 files changed, 16 insertions, 12 deletions
diff --git a/app-sci/rasmol/ChangeLog b/app-sci/rasmol/ChangeLog
index d118a3f07d11..3bc4edb8a4a4 100644
--- a/app-sci/rasmol/ChangeLog
+++ b/app-sci/rasmol/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-sci/rasmol
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/rasmol/ChangeLog,v 1.3 2003/02/12 05:19:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/rasmol/ChangeLog,v 1.4 2003/10/03 20:50:44 spyderous Exp $
+
+ 03 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>;
+ rasmol-2.6_beta2.ebuild:
+ Basic cleanup. Removed hard-coded gcc, cleaner SRC_URI and src_unpack.
*rasmol-2.6_beta2 (01 Jul 2002)
diff --git a/app-sci/rasmol/Manifest b/app-sci/rasmol/Manifest
index cc30e6a6ad2b..a27e72a4351d 100644
--- a/app-sci/rasmol/Manifest
+++ b/app-sci/rasmol/Manifest
@@ -1,4 +1,4 @@
-MD5 6377c345d55fe32a0cc6e6878f3743d5 ChangeLog 431
-MD5 2ae720809ad3672eb2324fe5f0e5a606 rasmol-2.6_beta2.ebuild 1510
+MD5 0867723f4dbc5305796d6f7a04e46508 ChangeLog 590
MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+MD5 c9939af3bf8a15910203dcdd6d857a2c rasmol-2.6_beta2.ebuild 1489
MD5 cbf2c3b1987b37cbcf8da8ccd4ef380c files/digest-rasmol-2.6_beta2 135
diff --git a/app-sci/rasmol/rasmol-2.6_beta2.ebuild b/app-sci/rasmol/rasmol-2.6_beta2.ebuild
index afb037ca92ce..a6552b48c2a2 100644
--- a/app-sci/rasmol/rasmol-2.6_beta2.ebuild
+++ b/app-sci/rasmol/rasmol-2.6_beta2.ebuild
@@ -1,39 +1,39 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/rasmol/rasmol-2.6_beta2.ebuild,v 1.7 2003/09/21 12:41:01 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/rasmol/rasmol-2.6_beta2.ebuild,v 1.8 2003/10/03 20:50:44 spyderous Exp $
-DESCRIPTION="Free program which displays molecular structure."
+DESCRIPTION="Free program that displays molecular structure."
HOMEPAGE="http://www.umass.edu/microbio/rasmol/index2.htm"
KEYWORDS="x86"
SLOT="0"
LICENSE="public-domain"
-
DEPEND="virtual/x11"
+PATCHVER="6"
P0=rasmol_2.6b2
SRC_URI="mirror://debian/pool/main/r/rasmol/${P0}.orig.tar.gz
- mirror://debian/pool/main/r/rasmol/${P0}-6.diff.gz"
+ mirror://debian/pool/main/r/rasmol/${P0}-${PATCHVER}.diff.gz"
S="${WORKDIR}/RasMol2"
src_unpack() {
- unpack ${P0}.orig.tar.gz
- zcat ${DISTDIR}/${P0}-6.diff.gz | patch -d ${S} -p1 || die "debian patch failed"
+ unpack ${A}
+ epatch ${WORKDIR}/${P0}-${PATCHVER}.diff
}
src_compile() {
xmkmf || die "xmkmf failed"
- make DEPTHDEF=-DEIGHTBIT=1 CC=gcc \
+ make DEPTHDEF=-DEIGHTBIT=1 CC=${CC} \
CDEBUGFLAGS="${CFLAGS} -DLINUX" \
|| die "8-bit make failed"
mv rasmol rasmol.8
make clean
- make DEPTHDEF=-DSIXTEENBIT=1 CC=gcc \
+ make DEPTHDEF=-DSIXTEENBIT=1 CC=${CC} \
CDEBUGFLAGS="${CFLAGS} -DLINUX" \
|| die "16-bit make failed"
mv rasmol rasmol.16
make clean
- make DEPTHDEF=-DTHIRTYTWOBIT=1 CC=gcc \
+ make DEPTHDEF=-DTHIRTYTWOBIT=1 CC=${CC} \
CDEBUGFLAGS="${CFLAGS} -DLINUX" \
|| die "32-bit make failed"
mv rasmol rasmol.32