summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2008-10-22 19:00:28 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2008-10-22 19:00:28 +0000
commit2b4d4311d75568d9db3c1daee667147897faaf45 (patch)
tree3d5f6d99421300098bb2d7c31d1d89ad38dc3710 /sci-libs/plplot
parentVersion bump. Translation updates. (diff)
downloadhistorical-2b4d4311d75568d9db3c1daee667147897faaf45.tar.gz
historical-2b4d4311d75568d9db3c1daee667147897faaf45.tar.bz2
historical-2b4d4311d75568d9db3c1daee667147897faaf45.zip
Removed gif flag (not used) and merged fortranrtran and fortran95 flag, since they use the same compiler
Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64
Diffstat (limited to 'sci-libs/plplot')
-rw-r--r--sci-libs/plplot/ChangeLog6
-rw-r--r--sci-libs/plplot/Manifest10
-rw-r--r--sci-libs/plplot/plplot-5.9.0.ebuild15
3 files changed, 18 insertions, 13 deletions
diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog
index 34c153002c9c..c17fe2899eb7 100644
--- a/sci-libs/plplot/ChangeLog
+++ b/sci-libs/plplot/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/plplot
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.16 2008/10/21 11:49:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.17 2008/10/22 19:00:28 bicatali Exp $
+
+ 22 Oct 2008; SĂ©bastien Fabbro <bicatali@gentoo.org> plplot-5.9.0.ebuild:
+ Removed gif flag (not used) and merged fortranrtran and fortran95 flag,
+ since they use the same compiler
*plplot-5.9.0 (21 Oct 2008)
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 70f155f7fafd..2c68721d99ca 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -9,13 +9,13 @@ AUX plplot-5.9.0-python.patch 283 RMD160 6252e5a37fd79aafc2e6333cc67fe7fddc76e54
DIST plplot-5.5.2.tar.gz 5891255 RMD160 55ea8e7dde5c0542ce8f360228a676049ad7d701 SHA1 72e0830b12d7d50ff9ac5b54e49aa1813a580786 SHA256 267d9c4070b8b6de75590efc24388da670dd5d0039a5dc21ecb803366d14730c
DIST plplot-5.9.0.tar.gz 5698323 RMD160 46fac543b471ccadd22d6cda6da63108023bb08b SHA1 6473e2ed44c91b10e50a3529e02f4b54541899ca SHA256 742719c2af4a642b9d087d7821a75c6fb4617479cb82cfeeab67a730c23d1231
EBUILD plplot-5.5.2.ebuild 5150 RMD160 f4566a19c4a0dc8c76fd760396046dec47fde91d SHA1 f874b95ad608a7830f72bb4d5fd775e2dc2cb38a SHA256 56eaae02509aaec912d3baaeb719461dfc9395419d626d0158327dcea06481e6
-EBUILD plplot-5.9.0.ebuild 4939 RMD160 b761f4f3c5e02a6a677c1176b9c9e900c3df40f8 SHA1 11ff3984a57fe7b6109236f249dc6aa7197564e3 SHA256 92aac5dc9247f4349b0743974c23ece89cfbff3a8138f5bf9dfb8f1f50c44db0
-MISC ChangeLog 3008 RMD160 e4de8bdf1989991691412de6593fdae5b9e1bc3e SHA1 71b7f792c43a76bc3ce585be8b41c0a217e684f9 SHA256 f889497a0934c225b55045aaea2e26f2c0c3f3feac5151f3da9ffd67971b16ea
+EBUILD plplot-5.9.0.ebuild 4942 RMD160 78a3667240fcafbc4322842c62ffa0a57e0a8d1e SHA1 51fa89cb4cd82aaf633f428f97a26e6cc9e617bd SHA256 995c49398d5535d84a9804d559822f26f55740081d231bf9d8b75a0e53861c7c
+MISC ChangeLog 3194 RMD160 46aca2a6306257943d01ba3076af7df8062589ba SHA1 23194069f2af0ed0de26aa889ace52e9663b6e4a SHA256 9710fa9ac0e7bd4c11777dd0e34e919ce06b727c396a8aea2f599cf89244192b
MISC metadata.xml 1571 RMD160 42804113eded364a734364533ce9f5c174abdf32 SHA1 40b7c7d8f73b06e98dd62624a70d00a401399a90 SHA256 890ca757230243c9c835f3528b7b00961d83a3b308ee33c2bc0ddb147d800c2d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkj9wc4ACgkQ1ycZbhPLE2DA7gCgnbr3UdW1fjNeN5VTtuqo4/+O
-6ccAn0PVgKDY5dzOtDwROs2FIyBYTnsQ
-=d3aF
+iEUEARECAAYFAkj/eFYACgkQ1ycZbhPLE2CxNgCXZSMZ4mw/W01HxsUMYtZICp6S
+2ACfb+D4QY8HqrwjP/Hx55blWAfEN8Q=
+=tMoc
-----END PGP SIGNATURE-----
diff --git a/sci-libs/plplot/plplot-5.9.0.ebuild b/sci-libs/plplot/plplot-5.9.0.ebuild
index 5d0702ca1a0d..533800b33dc2 100644
--- a/sci-libs/plplot/plplot-5.9.0.ebuild
+++ b/sci-libs/plplot/plplot-5.9.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.0.ebuild,v 1.1 2008/10/21 11:49:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.0.ebuild,v 1.2 2008/10/22 19:00:28 bicatali Exp $
EAPI="2"
WX_GTK_VER="2.8"
@@ -13,8 +13,8 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="ada doc examples fortran fortran95 gd gnome java jpeg gif latex
- octave pdf perl png python qhull svga tcl threads tk truetype wxwindows X"
+IUSE="ada doc examples fortran gd gnome java jpeg latex octave pdf perl
+ png python qhull svga tcl threads tk truetype wxwindows X"
RDEPEND="ada? ( virtual/gnat )
java? ( >=virtual/jre-1.5 )
@@ -53,9 +53,8 @@ DEPEND="${RDEPEND}
qhull? ( media-libs/qhull )"
pkg_setup() {
- FORTRAN="gfortran ifc g77"
- use fortran95 && FORTRAN="gfortran ifc"
- if use fortran || use fortran95; then
+ if use fortran; then
+ FORTRAN="gfortran ifc g77"
fortran_pkg_setup
fi
export FC=${FORTRANC} F77=${FORTRANC}
@@ -116,7 +115,6 @@ src_configure() {
$(cmake-utils_has truetype FREETYPE)
$(cmake-utils_use_enable ada ada)
$(cmake-utils_use_enable fortran f77)
- $(cmake-utils_use_enable fortran95 f95)
$(cmake-utils_use_enable java java)
$(cmake-utils_use_enable gnome gnome2)
$(cmake-utils_use_enable octave octave)
@@ -131,6 +129,9 @@ src_configure() {
$(cmake-utils_pld latex pstex)
$(cmake-utils_pld svga linuxvga)"
+ use fortran && [[ ${FORTRANC} != g77 ]] && \
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_enable fortran f95)"
+
use truetype && mycmakeargs="${mycmakeargs}
-DPL_FREETYPE_FONT_PATH:PATH=/usr/share/fonts/freefont-ttf"