Version bump and removed old ebuilds (see bug #183828). Also added amd64 keyword.

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-SENTINEL-2 i686)

3 files changed, 19 insertions, 82 deletions

diff --git a/sci-chemistry/platon/ChangeLog b/sci-chemistry/platon/ChangeLog
index c4cee6c92131..e406d01957f5 100644
--- a/sci-chemistry/platon/ChangeLog
+++ b/sci-chemistry/platon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/platon
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/platon/ChangeLog,v 1.13 2008/07/07 05:36:37 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/platon/ChangeLog,v 1.14 2008/08/30 11:27:28 markusle Exp $
+
+*platon-20080725 (30 Aug 2008)
+
+  30 Aug 2008; Markus Dittrich <markusle@gentoo.org>
+  -platon-20060717.ebuild, -platon-20070425.ebuild, +platon-20080725.ebuild:
+  Version bump and removed old ebuilds (see bug #183828). Also added 
+  amd64 keyword.
 
   07 Jul 2008; Donnie Berkholz <dberkholz@gentoo.org>;
   platon-20080702.ebuild:
diff --git a/sci-chemistry/platon/platon-20070425.ebuild b/sci-chemistry/platon/platon-20070425.ebuild
deleted file mode 100644
index 5e071ef603f7..000000000000
--- a/sci-chemistry/platon/platon-20070425.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/platon/platon-20070425.ebuild,v 1.2 2007/07/22 07:21:34 dberkholz Exp $
-
-inherit fortran toolchain-funcs
-
-FORTRAN="g77 gfortran"
-DESCRIPTION="Versatile, SHELX-97 compatible, multipurpose crystallographic tool"
-HOMEPAGE="http://www.cryst.chem.uu.nl/platon/"
-SRC_URI="${P}.tar.gz"
-RESTRICT="fetch"
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE=""
-# Can't do libf2c dependent on whether <gcc-4 is selected for the build,
-# so we must always require it
-RDEPEND="x11-libs/libX11
-	dev-libs/libf2c"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}"
-
-pkg_nofetch() {
-	einfo "Download ${A/-${PV}} from ${HOMEPAGE},"
-	einfo "rename it to ${A} and place it"
-	einfo "in ${DISTDIR}."
-	einfo "If there is a digest mismatch, please file a bug"
-	einfo "at https://bugs.gentoo.org/ -- a version bump"
-	einfo "is probably required."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	gunzip platon.f.Z xdrvr.c.gz
-}
-
-src_compile() {
-	local F2C
-	# Needs signal_ and system_, which g77 and libf2c provide,
-	# but gfortran does not
-	if [[ ${FORTRANC} != g77 ]]; then
-		F2C="-lf2c"
-	fi
-
-	COMMAND="$(tc-getCC) -c ${CFLAGS} xdrvr.c"
-	echo ${COMMAND}
-	${COMMAND} || die "Compilation of xdrvr.c failed"
-	COMMAND="${FORTRANC} -c ${FFLAGS:- -O2} -fno-second-underscore platon.f"
-	echo ${COMMAND}
-	${COMMAND} || die "Compilation of platon.f failed"
-	COMMAND="${FORTRANC} -o platon ${LDFLAGS} platon.o xdrvr.o -lX11 ${F2C}"
-	echo ${COMMAND}
-	${COMMAND} || die "Linking failed"
-}
-
-src_install() {
-	dobin platon
-
-	dosym platon /usr/bin/pluton
-	dosym platon /usr/bin/s
-	dosym platon /usr/bin/cifchk
-	dosym platon /usr/bin/helena
-	dosym platon /usr/bin/stidy
-
-	insinto /usr/lib/platon
-	doins check.def
-
-	echo "CHECKDEF=\"/usr/lib/platon/check.def\"" > ${T}/env.d
-	newenvd ${T}/env.d 50platon
-
-	dodoc README.* VALIDATION.DOC
-}
diff --git a/sci-chemistry/platon/platon-20060717.ebuild b/sci-chemistry/platon/platon-20080725.ebuild
index 9eac41eb4f4f..768c000fae87 100644
--- a/sci-chemistry/platon/platon-20060717.ebuild
+++ b/sci-chemistry/platon/platon-20080725.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/platon/platon-20060717.ebuild,v 1.3 2007/07/22 07:21:34 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/platon/platon-20080725.ebuild,v 1.1 2008/08/30 11:27:28 markusle Exp $
 
-inherit fortran toolchain-funcs
+inherit fortran toolchain-funcs flag-o-matic
 
 FORTRAN="g77 gfortran"
 DESCRIPTION="Versatile, SHELX-97 compatible, multipurpose crystallographic tool"
@@ -11,7 +11,7 @@ SRC_URI="${P}.tar.gz"
 RESTRICT="fetch"
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~ppc ~x86 ~amd64"
 IUSE=""
 # Can't do libf2c dependent on whether <gcc-4 is selected for the build,
 # so we must always require it
@@ -21,7 +21,7 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${PN}"
 
 pkg_nofetch() {
-	einfo "Download ${A/-${PV}} from ${HOMEPAGE},"
+	einfo "Download ${A/-${PV}} from ftp://xraysoft.chem.uu.nl/pub/unix/,"
 	einfo "rename it to ${A} and place it"
 	einfo "in ${DISTDIR}."
 	einfo "If there is a digest mismatch, please file a bug"
@@ -31,7 +31,7 @@ pkg_nofetch() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	gunzip platon.f.Z xdrvr.c.gz
 }
 
@@ -43,6 +43,9 @@ src_compile() {
 		F2C="-lf2c"
 	fi
 
+	# easy to ICE, at least on gcc 4.3
+	strip-flags
+
 	COMMAND="$(tc-getCC) -c ${CFLAGS} xdrvr.c"
 	echo ${COMMAND}
 	${COMMAND} || die "Compilation of xdrvr.c failed"
@@ -66,8 +69,8 @@ src_install() {
 	insinto /usr/lib/platon
 	doins check.def
 
-	echo "CHECKDEF=\"/usr/lib/platon/check.def\"" > ${T}/env.d
-	newenvd ${T}/env.d 50platon
+	echo "CHECKDEF=\"/usr/lib/platon/check.def\"" > "${T}"/env.d
+	newenvd "${T}"/env.d 50platon
 
 	dodoc README.* VALIDATION.DOC
 }