From: Justin Lecher <jlec@gentoo.org>
Date: Thu, 24 Jun 2010 12:28:41 +0000 (+0000)
Subject: Version Bump, #255619; reduced optimization to prevend bufferoverflows; #325065
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1f41fcbc43214ca1c13f9dd340af3ef2aec26fc8;p=gentoo.git

Version Bump, #255619; reduced optimization to prevend bufferoverflows; #325065
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/sci-chemistry/platon/ChangeLog b/sci-chemistry/platon/ChangeLog
index 56c277b5c9e7..9dc9ba60f213 100644
--- a/sci-chemistry/platon/ChangeLog
+++ b/sci-chemistry/platon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/platon
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/platon/ChangeLog,v 1.16 2009/07/07 23:30:21 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/platon/ChangeLog,v 1.17 2010/06/24 12:28:41 jlec Exp $
+
+*platon-20100615 (24 Jun 2010)
+
+  24 Jun 2010; Justin Lecher <jlec@gentoo.org> -platon-20080702.ebuild,
+  -platon-20080725.ebuild, +platon-20100615.ebuild:
+  Version Bump, #255619; reduced optimization to prevend bufferoverflows;
+  #325065
 
   07 Jul 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   platon-20080725.ebuild:
diff --git a/sci-chemistry/platon/Manifest b/sci-chemistry/platon/Manifest
index 1f280222d6e0..3ecea9be5626 100644
--- a/sci-chemistry/platon/Manifest
+++ b/sci-chemistry/platon/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST platon-20080702.tar.gz 6856529 RMD160 c77f42b021547f5b9aa54a6f279f42452da8840d SHA1 8614efab96903cd482952955050af4f85937531a SHA256 fbf883f83a9f932962d6133794c938d23a5988c0a1a23bef5c179cdb36f7bba9
-DIST platon-20080725.tar.gz 6885844 RMD160 2e00fceb6a4b10e87023f740042474da16ebd8bc SHA1 e8e488c7b1fe6acab0fe455aba6db476eca19e33 SHA256 6c71bac1773714f23ef3aa644cd038f7894a81e6a204655fec9baddcb09ef208
-EBUILD platon-20080702.ebuild 2033 RMD160 62c175c21bc5e2517c420a14cb6940863a8ecd48 SHA1 927a8cd2758a7d8bdc6ee80586b76341c3f9321f SHA256 4062e46d80af8a108170e655e501b6c67f104edfc090f6ad9381337fee78b26e
-EBUILD platon-20080725.ebuild 1867 RMD160 a3f1507a214a17573dea02a9b97571955484f01a SHA1 b9197671d1505347285077bf3adf1ffddc3cc836 SHA256 4478734fc033ce6838acda3026523587f7d1cb5743c8fe317d7b936606926762
-MISC ChangeLog 2808 RMD160 69a2425e66450da5d45dea635f3afed077345b07 SHA1 cca227df1b0c2d2e391974e7bb0dd8142ed7e19f SHA256 b155eed21c4655c76a5559359347db8a25746ff053bedc99152d853614fc793d
+DIST platon-20100615.tar.gz 8841165 RMD160 15817699c77ce6927cc21ae57ed07bdf0b3609a8 SHA1 897e1c024582d8d45e119c14984f4f615e2a73be SHA256 da432f5e3b0bd9a7245a7997288cd5d171d136c2ee94d5914728252a3562764e
+EBUILD platon-20100615.ebuild 1988 RMD160 010a24750d73d38aa10d5dd6623b76abf5f83d93 SHA1 8f3b0dbff30d00d9cd92eec5d636371a79ee8b9b SHA256 6ce23522bad3b25452c0ad20548f94309e3966467da12647c5877e48eceb0db5
+MISC ChangeLog 3044 RMD160 7d2cc4600ae961d22787fb49e74efc23936a31a0 SHA1 58998c06709fe05b3bf2a49f279551e553d3e315 SHA256 16248a7327afccaf6d9bbbd78be4f98528347272f583044d2b70a1abf05bb165
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkpT2pMACgkQAiZjviIA2XhaTQCcCrvsv6u6KXUZiC6yVc+FPc7e
-8roAn0nDEcS8ERUgi8rX5NnHYJ93ZMGV
-=tfmb
+iEYEARECAAYFAkwjT38ACgkQgAnW8HDreRY1pgCeKlwZh1QcAOLewDc08ieYa3SO
+lCkAoLTzel3FsRbyGCQNkImWGy4BVIYf
+=CD8w
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/platon/platon-20080702.ebuild b/sci-chemistry/platon/platon-20080702.ebuild
deleted file mode 100644
index 11fc76346fb7..000000000000
--- a/sci-chemistry/platon/platon-20080702.ebuild
+++ /dev/null
@@ -1,76 +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/platon/platon-20080702.ebuild,v 1.2 2008/07/07 05:36:37 dberkholz Exp $
-
-inherit fortran toolchain-funcs flag-o-matic
-
-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 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"
-	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
-
-	# 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"
-	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-20080725.ebuild b/sci-chemistry/platon/platon-20100615.ebuild
similarity index 66%
rename from sci-chemistry/platon/platon-20080725.ebuild
rename to sci-chemistry/platon/platon-20100615.ebuild
index 947952ee4b10..caf6427de0ba 100644
--- a/sci-chemistry/platon/platon-20080725.ebuild
+++ b/sci-chemistry/platon/platon-20100615.ebuild
@@ -1,22 +1,29 @@
-# Copyright 1999-2009 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/platon/platon-20080725.ebuild,v 1.3 2009/07/07 23:30:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/platon/platon-20100615.ebuild,v 1.1 2010/06/24 12:28:41 jlec Exp $
 
-inherit fortran toolchain-funcs flag-o-matic
+EAPI="3"
+
+inherit flag-o-matic fortran multilib 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 ~amd64"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
 # Can't do libf2c dependent on whether <gcc-4 is selected for the build,
 # so we must always require it
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
+
+RESTRICT="fetch"
+
 S="${WORKDIR}/${PN}"
 
 pkg_nofetch() {
@@ -38,7 +45,7 @@ src_compile() {
 	# easy to ICE, at least on gcc 4.3
 	strip-flags
 
-	COMMAND="$(tc-getCC) -c ${CFLAGS} xdrvr.c"
+	COMMAND="$(tc-getCC) -c ${CFLAGS} -O0 xdrvr.c"
 	echo ${COMMAND}
 	${COMMAND} || die "Compilation of xdrvr.c failed"
 	COMMAND="${FORTRANC} -c ${FFLAGS:- -O2} -fno-second-underscore platon.f"
@@ -50,19 +57,22 @@ src_compile() {
 }
 
 src_install() {
-	dobin platon
+	dobin platon || die
+
+	for bin in pluton s cifchk helena stidy; do
+		dosym platon /usr/bin/${bin} || die
+	done
 
-	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/$(get_libdir)/platon
+	doins check.def || die
 
-	insinto /usr/lib/platon
-	doins check.def
+	echo "CHECKDEF=\"${EPREFIX}/usr/$(get_libdir)/platon/check.def\"" > "${T}"/env.d
+	newenvd "${T}"/env.d 50platon || die
 
-	echo "CHECKDEF=\"/usr/lib/platon/check.def\"" > "${T}"/env.d
-	newenvd "${T}"/env.d 50platon
+	dodoc README.* || die
 
-	dodoc README.* VALIDATION.DOC
+	if use examples; then
+		insinto /usr/share/${PN}
+		doins -r TEST || die
+	fi
 }