diff options
author | Kacper Kowalik <xarthisius@gentoo.org> | 2010-09-12 19:50:53 +0000 |
---|---|---|
committer | Kacper Kowalik <xarthisius@gentoo.org> | 2010-09-12 19:50:53 +0000 |
commit | 9adb44c650cb78f61f41555025df9e173a48094b (patch) | |
tree | f15b1b5126edaef1973b81aedbb648db9e69fdb0 /sci-visualization | |
parent | Version bump. (diff) | |
download | historical-9adb44c650cb78f61f41555025df9e173a48094b.tar.gz historical-9adb44c650cb78f61f41555025df9e173a48094b.tar.bz2 historical-9adb44c650cb78f61f41555025df9e173a48094b.zip |
Respect CC,LDFLAGS wrt bug 336984. Thanks to Diego for the report. Call econf in src_configure.
Package-Manager: portage-2.1.9/cvs/Linux x86_64
Diffstat (limited to 'sci-visualization')
-rw-r--r-- | sci-visualization/grace/ChangeLog | 10 | ||||
-rw-r--r-- | sci-visualization/grace/Manifest | 14 | ||||
-rw-r--r-- | sci-visualization/grace/files/grace-5.1.22-ldflags.patch | 41 | ||||
-rw-r--r-- | sci-visualization/grace/grace-5.1.22-r1.ebuild | 4 | ||||
-rw-r--r-- | sci-visualization/grace/grace-5.1.22-r2.ebuild | 103 |
5 files changed, 164 insertions, 8 deletions
diff --git a/sci-visualization/grace/ChangeLog b/sci-visualization/grace/ChangeLog index 8ba8cdd6e1ce..d576fa323e49 100644 --- a/sci-visualization/grace/ChangeLog +++ b/sci-visualization/grace/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-visualization/grace # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/ChangeLog,v 1.42 2010/07/22 19:21:49 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/ChangeLog,v 1.43 2010/09/12 19:50:53 xarthisius Exp $ + +*grace-5.1.22-r2 (12 Sep 2010) + + 12 Sep 2010; Kacper Kowalik <xarthisius@gentoo.org> + grace-5.1.22-r1.ebuild, +grace-5.1.22-r2.ebuild, + +files/grace-5.1.22-ldflags.patch: + Respect CC,LDFLAGS wrt bug 336984. Thanks to Diego for the report. Call + econf in src_configure. 22 Jul 2010; SĂ©bastien Fabbro <bicatali@gentoo.org> grace-5.1.22-r1.ebuild: diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest index 0806a48d0e5b..b1e0e3019042 100644 --- a/sci-visualization/grace/Manifest +++ b/sci-visualization/grace/Manifest @@ -4,17 +4,21 @@ Hash: SHA1 AUX grace-5.1.21-fortran.patch 650 RMD160 1eb2b9cb37cad4b103f5fe4749e65403a1dffab5 SHA1 50b5a5af6ab802936fcb227ebba46bb69e37bd7b SHA256 5001b3eb4ceb4b408b01a92651162bdf6f3ce1823199ae8f0a62c32a816a5c1e AUX grace-5.1.21-netcdf.patch 413 RMD160 dab48c7889042ebe741293da0184c36c00034e32 SHA1 750efdb37af1f1c1eab0f8c28f52df4621964c44 SHA256 57c36bfd320d2a3a61c2f7628ede67f96c4c165969f7162b4d3dbf07d23d5adb AUX grace-5.1.22-dlmodule.patch 356 RMD160 1900c1e7a2d964d299408af73f52b32b145d976f SHA1 a06088c543c1c6ae0280af1fdba7a80c55e97a62 SHA256 b8e0b2527a2083b0594756e927f45ad9051711ac370330deb11e299ca849e05a +AUX grace-5.1.22-ldflags.patch 1161 RMD160 483e599df369dd2bad51c58e5ccaf05540946393 SHA1 5ce5accd804bb611fabfcbee78bfa7ea3d208632 SHA256 955c74169f859bef042601d85be80319c29d7774b62aacceafeb352803d5ea15 AUX grace-5.1.22-mkstemp.patch 1664 RMD160 5dc6c1b84d33e5848f546b17509ca1c36973d152 SHA1 5221a837385c762ad397dfdf4c733381e9318821 SHA256 6e436fe9c27d4b627a8116ca2a1bea94bd5fc01bc475be6f56a63ec9b5cf2f97 AUX grace-5.1.22-pdfdrv.patch 353 RMD160 77dbd6af3bac15822f5e2e7e75b8172d8ca67798 SHA1 b7a1ddc3341c0208f538b660b6d8d3705c58caff SHA256 c347802157e90aa56a4fcddaea437ba016f5344354b64d50748171ba52fe27ff AUX grace.png 498 RMD160 01c0e1841ca819eafd6c49933e8bcf656ba664d6 SHA1 32d698b82f8b4a6640483a633a5a12808c6124ca SHA256 5853749dccb423411bd2c6b9098e7627c3ce6ea38682b1bab0e5555c095084d2 DIST grace-5.1.22.tar.gz 2516576 RMD160 ca7b1abe240de7cd3dbdc52d5182020c410b9772 SHA1 3ce88c7c264d2de73b8935f835a1c1f8e368c78f SHA256 4ce8f058b6c1267a842419a3edbf471421dea9cf5744783745b6cb375cdf5f25 -EBUILD grace-5.1.22-r1.ebuild 2793 RMD160 ab7e4c1b0a85050a334fb1a2185d277e4ae56845 SHA1 9fd159565030a646e5ed39027ebc9deaa21bca95 SHA256 7ec64d6eff43fca831420c1e3e7476545e46240aa4dff8132e1467cfe817ade9 -MISC ChangeLog 13384 RMD160 d0b777f6b5051582281dadc5448cacd0d5844d51 SHA1 477df23beeb0b742cef1cea5e29c773143c524e3 SHA256 76f23a9fe5f0c9d411263305eadb11308c2eb18e239933673643e01b27db583d +EBUILD grace-5.1.22-r1.ebuild 2797 RMD160 913457f8ff09418016cb7bd97abd62f66a632bc4 SHA1 afd594e1be5ff211415b89679306a1f27e2a99c6 SHA256 dac3438ee3f96a4601b0c164cf180d5d113bf2c865c8a53ed69c45d1fef42609 +EBUILD grace-5.1.22-r2.ebuild 2822 RMD160 d87e4316e0c3024ab49031161371267c466d228d SHA1 ae1ed271215f2d3274b3c70a86fcf468860c4355 SHA256 c54818e2b7cd843572e2164f8df356758d26e7ebff7712041d9d704d1fc7e612 +MISC ChangeLog 13661 RMD160 212142e642df7b38cdde2e8f54359e4a85df32a5 SHA1 3a1fe7cab182224939acd7499a2fbb13aa670fba SHA256 924b5d46b33014c8bf9f03ba7480cb1e8b31a35cbd42939e8d43332831363214 MISC metadata.xml 645 RMD160 78fdc207c55c585d82c8282ddedf554da9ebbeaf SHA1 f905e31a079fe543bc3f81d0305c11ea3529c605 SHA256 97aa6dae00402081c1d846ef26f8a5283b5bbe62c414bb66febee13bf2d92bfe -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkxImlYACgkQ1ycZbhPLE2ASjgCfT4VRVYPunWihbcuoBXk+8HMo -LEkAoISBerDebDCmgCBPfCgqy0C4ck58 -=eqcN +iJwEAQECAAYFAkyNLyYACgkQIiMqcbOVdxRWuwP/b9QezVs2f0gkBhaMfmAGnxbQ +fq6hXYEpgfa4hmMOIcjnn7ujuRrNkP4IK2pwBRiE2m4RpYYM/zZbWojPOO7GbV3r +uuo4cwxA3IaZQr/Ftjfn5DnJfkKCQe+b9AYCjoQ27WGO/BrEzbII23BLGscXZ0jz +mi5MJqbwAckoWPr1CZo= +=uO5v -----END PGP SIGNATURE----- diff --git a/sci-visualization/grace/files/grace-5.1.22-ldflags.patch b/sci-visualization/grace/files/grace-5.1.22-ldflags.patch new file mode 100644 index 000000000000..2a65cd233361 --- /dev/null +++ b/sci-visualization/grace/files/grace-5.1.22-ldflags.patch @@ -0,0 +1,41 @@ +Respect LDFLAGS + +http://bugs.gentoo.org/show_bug.cgi?id=336984 + +--- grace-5.1.22/src/Makefile ++++ grace-5.1.22/src/Makefile +@@ -37,10 +37,10 @@ + include Make.dep + + xmgrace$(EXE) : $(GROBJS) $(PARS_C) $(GUIOBJS) $(CEPHES_LIB) +- $(CC) $(CFLAGS) $(GROBJS) $(GUIOBJS) -o $@ $(LDFLAGS) $(LIBS) ++ $(CC) $(LDFLAGS) $(CFLAGS) $(GROBJS) $(GUIOBJS) -o $@ $(LIBS) + + grace$(EXE) : $(GROBJS) $(PARS_C) $(CEPHES_LIB) +- $(CC) $(CFLAGS) $(GROBJS) -o $@ $(LDFLAGS) $(LIBS) ++ $(CC) $(LDFLAGS) $(CFLAGS) $(GROBJS) -o $@ $(LIBS) + + + buildinfo$(EXE) : buildinfo$(O) +--- grace-5.1.22/auxiliary/Makefile ++++ grace-5.1.22/auxiliary/Makefile +@@ -22,7 +22,7 @@ + devclean : distclean + + convcal$(EXE) : convcal.c +- $(CC) $(CFLAGS0) $(CPPFLAGS) -o $@ convcal.c $(NOGUI_LIBS) ++ $(CC) $(LDFLAGS) $(CFLAGS0) $(CPPFLAGS) -o $@ convcal.c $(NOGUI_LIBS) + + install : $(AUXILIARIES) $(PROGRAMS) $(SCRIPTS) + $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/auxiliary +--- grace-5.1.22/grconvert/Makefile ++++ grace-5.1.22/grconvert/Makefile +@@ -23,7 +23,7 @@ + all : $(PROG) + + $(PROG) : $(OBJS) +- $(CC) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) ++ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + + $(OBJS) : grconvert.h + diff --git a/sci-visualization/grace/grace-5.1.22-r1.ebuild b/sci-visualization/grace/grace-5.1.22-r1.ebuild index 14aa9b652def..1cb7a48d9fea 100644 --- a/sci-visualization/grace/grace-5.1.22-r1.ebuild +++ b/sci-visualization/grace/grace-5.1.22-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/grace-5.1.22-r1.ebuild,v 1.7 2010/07/22 19:21:49 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/grace-5.1.22-r1.ebuild,v 1.8 2010/09/12 19:50:53 xarthisius Exp $ EAPI=3 inherit eutils toolchain-funcs @@ -57,7 +57,7 @@ src_prepare() { gracerc || die } -src_compile() { +src_configure() { local myconf if use fortran; then myconf="--with-f77=$(tc-getFC)" diff --git a/sci-visualization/grace/grace-5.1.22-r2.ebuild b/sci-visualization/grace/grace-5.1.22-r2.ebuild new file mode 100644 index 000000000000..0ef734bd8ecc --- /dev/null +++ b/sci-visualization/grace/grace-5.1.22-r2.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/grace-5.1.22-r2.ebuild,v 1.1 2010/09/12 19:50:53 xarthisius Exp $ + +EAPI=3 +inherit eutils toolchain-funcs + +DESCRIPTION="Motif based XY-plotting tool" +HOMEPAGE="http://plasma-gate.weizmann.ac.il/Grace/" +SRC_URI="ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2 LGPL-2" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="fortran fftw jpeg netcdf pdf png" + +DEPEND="x11-libs/openmotif + sys-libs/zlib + media-libs/t1lib + media-libs/tiff + x11-libs/xbae + fftw? ( sci-libs/fftw:2.1 ) + netcdf? ( sci-libs/netcdf ) + png? ( media-libs/libpng ) + jpeg? ( media-libs/jpeg ) + pdf? ( media-libs/pdflib )" + +RDEPEND="${DEPEND} + x11-misc/xdg-utils" + +pkg_setup() { + tc-export CC +} + +src_prepare() { + # move tmpnam to mkstemp (adapted from debian) + epatch "${FILESDIR}"/${P}-mkstemp.patch + # fix configure instead of aclocal.m4 + epatch "${FILESDIR}"/${PN}-5.1.21-netcdf.patch + # fix for missing defines when fortran is disabled + epatch "${FILESDIR}"/${PN}-5.1.21-fortran.patch + # fix a leak and pdf driver (from freebsd) + epatch "${FILESDIR}"/${P}-dlmodule.patch + epatch "${FILESDIR}"/${P}-pdfdrv.patch \ + "${FILESDIR}"/${P}-ldflags.patch + + # don't strip if not asked for + sed -i \ + -e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \ + {auxiliary,grconvert,src}/Makefile + + sed -i \ + -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \ + -e "s:\$(GRACE_HOME)/lib:\$(PREFIX)/$(get_libdir):g" \ + -e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \ + -e 's:$(PREFIX)/man:$(PREFIX)/share/man:g' \ + Makefile */Makefile || die "sed failed" + + sed -i \ + -e 's:bin/grconvert:grconvert:' \ + -e 's:auxiliary/fdf2fit:fdf2fit:' \ + gracerc || die +} + +src_configure() { + local myconf + if use fortran; then + myconf="--with-f77=$(tc-getFC)" + else + myconf="--without-f77" + fi + + # the configure script just produces a basic Make.conf + # and a config.h + econf \ + --disable-xmhtml \ + --without-bundled-xbae \ + --without-bundled-t1lib \ + --enable-grace-home=/usr/share/${PN} \ + --with-helpviewer="xdg-open %s" \ + --with-editor="xdg-open %s" \ + --with-printcmd="lpr" \ + $(use_with fftw) \ + $(use_enable fortran f77-wrapper) \ + $(use_enable netcdf) \ + $(use_enable jpeg jpegdrv) \ + $(use_enable png pngdrv) \ + $(use_enable pdf pdfdrv) \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc CHANGES ChangeLog DEVELOPERS README || die + + dosym ../../${PN}/examples /usr/share/doc/${PF}/examples + dosym ../../${PN}/doc /usr/share/doc/${PF}/html + + doman "${ED}"/usr/share/doc/${PF}/html/*.1 + rm -f "${ED}"/usr/share/doc/${PF}/html/*.1 + doicon "${FILESDIR}"/${PN}.png || die + make_desktop_entry xmgrace Grace grace +} |