From a5b8deaada820f740d0d6ef1d47afae07020a269 Mon Sep 17 00:00:00 2001 From: Thomas Anderson Date: Wed, 16 Apr 2008 01:38:58 +0000 Subject: sci-mathematics/dataplot: Various style fixes from bicatali svn path=/sunrise/; revision=6057 --- sci-mathematics/dataplot/ChangeLog | 4 ++ sci-mathematics/dataplot/Manifest | 4 +- sci-mathematics/dataplot/dataplot-20080225.ebuild | 49 +++++++++++------------ 3 files changed, 29 insertions(+), 28 deletions(-) (limited to 'sci-mathematics') diff --git a/sci-mathematics/dataplot/ChangeLog b/sci-mathematics/dataplot/ChangeLog index 123eb6d43..ad247957b 100644 --- a/sci-mathematics/dataplot/ChangeLog +++ b/sci-mathematics/dataplot/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 16 Apr 2008; Thomas Anderson (gentoofan23) + dataplot-20080225.ebuild: + Various style fixes from bicatali + 14 Apr 2008; Thomas Anderson (gentoofan23) dataplot-20080225.ebuild: Make DESCRIPTION a little nicer and more accurate diff --git a/sci-mathematics/dataplot/Manifest b/sci-mathematics/dataplot/Manifest index 75577574b..1061c6622 100644 --- a/sci-mathematics/dataplot/Manifest +++ b/sci-mathematics/dataplot/Manifest @@ -1,6 +1,6 @@ AUX dpsrc-patchset-20080225.patch 2672 RMD160 5877cc97e034c52a4228fe19d87fc2d9a7ae043d SHA1 4377f353fb3de6f598884d542fc0c1842a3c29a9 SHA256 022995d5dca408d099c95165476c47f633a91273b931405cb1a90b27ae1113a1 DIST dplib.02_25_2008.tar.gz 5340447 RMD160 51b5892c83bb5d420f324e3dab5edec24925f728 SHA1 3a77ed5e1e49f377083a11b8a177f678284b91f2 SHA256 7f9a30ae8ab029e0eeca4fbe08e665b572ec98a05ec001a67f95e4857d2a5b05 DIST dpsrc.02_25_2008.tar.gz 6399167 RMD160 ed14f8ceb225e86f25026916ab4934a140f602ae SHA1 f1023d99ec7d2a64611dabedfbc5ad6f16e67cf7 SHA256 794bedcc48cf444c5813f864f4bacb158474d450337279edaf7fba1055c552c6 -EBUILD dataplot-20080225.ebuild 3020 RMD160 211f3f81f70362dc71743a703111c23dec1fcc94 SHA1 b9db5d91e60d1def2a03fb3ed0fb4709daf45067 SHA256 0d99db500224f5998dabe312f43f4108ba3146e9fbc5a7e9ea73ebb15d7b00f1 -MISC ChangeLog 803 RMD160 1d5bd25102c2d309ffda9ccb6f83a822ed075683 SHA1 42cffaa76648f89f28de9810790a12850273987c SHA256 54d0a920db712e4ff02e24248d8935fd505a6a3b480f4a4b544154e4004a719f +EBUILD dataplot-20080225.ebuild 3040 RMD160 837e5a4ade5978a8fd274acb21140ca17d5ec943 SHA1 11cf488e346ee434eb16c345f930a1371f01371a SHA256 9d30ca16bc6e9403d46f393c6b5e86da85f71317043657e5f4c8f29be5a17c1c +MISC ChangeLog 937 RMD160 cdfd2a3c4e0d9aa65e7aa697f25074a8aae154d0 SHA1 3a49deb9369283db99327586ff9c50d946ad09fa SHA256 eb70d669e6bfaac58d777aa09f9c88a2466c8b48d35beb7846140912e678d013 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/sci-mathematics/dataplot/dataplot-20080225.ebuild b/sci-mathematics/dataplot/dataplot-20080225.ebuild index 3e2c93e19..119f4afa8 100644 --- a/sci-mathematics/dataplot/dataplot-20080225.ebuild +++ b/sci-mathematics/dataplot/dataplot-20080225.ebuild @@ -2,21 +2,19 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -inherit eutils fortran toolchain-funcs +inherit eutils fortran toolchain-funcs flag-o-matic -## PVD->Day component -## PVM->Month component -## PVY->Year component -MY_PVD="${PV:6:2}" -MY_PVM="${PV:4:2}" -MY_PVY="${PV:0:4}" -MY_PV="${MY_PVM}_${MY_PVD}_${MY_PVY}" +# DAY MONTH YEAR +MY_PV=${PV:4:2}_${PV:6:2}_${PV:0:4} +MY_P=dpsrc.${MY_PV} +MY_P_AUX=dplib.${MY_PV} DESCRIPTION="A program for scientific visualization and statistical analyis" HOMEPAGE="http://www.itl.nist.gov/div898/software/dataplot/" SRC_URI="ftp://ftp.nist.gov/pub/dataplot/unix/dpsrc.${MY_PV}.tar.gz examples? ( ftp://ftp.nist.gov/pub/dataplot/unix/dplib.${MY_PV}.tar.gz )" + LICENSE="public-domain" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -27,8 +25,8 @@ RDEPEND="X? ( x11-libs/libX11 ) opengl? ( virtual/opengl ) gd? ( media-libs/gd )" -S="${WORKDIR}/dpsrc" -LIBS="${WORKDIR}/dplib" +S="${WORKDIR}/${MY_P}" +S_AUX="${WORKDIR}/${MY_P_AUX}" pkg_setup() { #Dataplot requires media-libs/gd to be built with USE="png jpeg" @@ -37,15 +35,15 @@ pkg_setup() { eerror "Please recompile media-libs/gd, ensuring USE=\"png jpeg\"" die fi - - need_fortran gfortran + FORTRAN="gfortran" # needs tests on g77 and ifc + fortran_pkg_setup } src_unpack() { - mkdir dpsrc && cd "${S}" - unpack dpsrc.${MY_PV}.tar.gz + mkdir ${MY_P} && cd "${S}" + unpack ${MY_P}.tar.gz ##Arches!: Add your architecture name here in the braces if you are 64-bit! - if use {amd64}; then + if use amd64; then cp dp1_linux_64.f dp1.f cp DPCOPA_BIG.INC DPCOPA.INC else @@ -54,13 +52,13 @@ src_unpack() { epatch "${FILESDIR}/dpsrc-patchset-${PV}.patch" if use examples; then - mkdir "${LIBS}" && cd "${LIBS}" - unpack dplib.${MY_PV}.tar.gz + mkdir "${S_AUX}" && cd "${S_AUX}" + unpack ${MY_P_AUX}.tar.gz fi } src_compile() { - FFLAGS="${FFLAGS} -fno-range-check -c" + [[ ${FORTRAN} = gfortran ]] && FFLAGS="${FFLAGS:--O2} -fno-range-check -c" for i in {1..46}; do FORTRANSOURCES+="dp${i}.f " @@ -72,13 +70,13 @@ src_compile() { starpac.f tcdriv_nopc.f aqua_src.f" for i in ${FORTRANSOURCES}; do - einfo "Compiling ${i}..." - $FORTRANC -w ${FFLAGS} ${i} || die "Fortran Compile failed for file: ${i}" + echo "${FORTRANC} ${FFLAGS} ${i}" + ${FORTRANC} ${FFLAGS} ${i} || die "Fortran Compile failed for file: ${i}" done - use X && LDFLAGS="${LDFLAGS} -L/usr/$(get_libdir) -lX11" - use opengl && LDFLAGS="${LDFLAGS} -L/usr/$(get_libdir)/opengl/xorg-x11/lib -lGL -lGLU" - use gd && LDFLAGS="${LDFLAGS} -lgd -lpng -ljpeg -lz" + use X && append-ldflags -lX11 + use opengl && append-ldflags "-lGL -lGLU" + use gd && append-ldflags "-lgd -lpng -ljpeg -lz" ##Compile x11/gd/opengl device drivers @@ -112,8 +110,7 @@ src_install() { dobin dataplot if use examples; then - cd "${LIBS}" - insinto /usr/share/${PN} - doins -r data + insinto /usr/share/doc/${PF}/examples + doins -r "${S_AUX}"/data/* || die "installing examples failed" fi } -- cgit v1.2.3-65-gdbad