diff options
| author |   Christoph Junghans <kleiner_otti@gmx.de> | 2010-01-23 14:57:14 +0100 |
|---|---|---|
| committer | Christoph Junghans <kleiner_otti@gmx.de> | 2010-01-23 14:57:14 +0100 |
| commit | 74f6877afb2639215e277540f047c60f861cd746 (patch) | |
| tree | 3cbac5518d024f3853d804cf62f26c31ac0fa598 /sci-visualization | |
| parent | sci-chemistry/votca-csg: live ebuild added (diff) | |
| download | sci-74f6877afb2639215e277540f047c60f861cd746.tar.gz sci-74f6877afb2639215e277540f047c60f861cd746.tar.bz2 sci-74f6877afb2639215e277540f047c60f861cd746.zip | |
sci-visualization/gnuplot: some fixes went upstream
(Portage version: 2.1.6.13/git/Linux i686)
(Signed Manifest commit)
Diffstat (limited to 'sci-visualization')
| -rw-r--r-- | sci-visualization/gnuplot/ChangeLog | 4 | ||||
| -rw-r--r-- | sci-visualization/gnuplot/Manifest | 10 | ||||
| -rw-r--r-- | sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild | 19 |
3 files changed, 14 insertions, 19 deletions
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog index 0109769ed..015239c92 100644 --- a/sci-visualization/gnuplot/ChangeLog +++ b/sci-visualization/gnuplot/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 23 Jan 2010; Christoph Junghans <kleiner_otti@gmx.de> + gnuplot-4.5.9999.ebuild: + some bugfixes went upstream + 17 Jan 2010; Christoph Junghans <kleiner_otti@gmx.de> gnuplot-4.2.6-r1.ebuild, gnuplot-4.4.0_rc1.ebuild: Some multislot install fixes diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest index 47e915624..fe29c20df 100644 --- a/sci-visualization/gnuplot/Manifest +++ b/sci-visualization/gnuplot/Manifest @@ -17,13 +17,13 @@ DIST gnuplot-4.2.6.tar.gz 2936753 RMD160 3b1726e5327b17bb7b528198e62a12b9fe3e5a7 DIST gnuplot-4.4.0-rc1.tar.gz 3294054 RMD160 262cce576e6d64dd8a54edef0730f4576414456c SHA1 e9c2b99896a652a52d0160e8e2a6406ed861fda4 SHA256 d284ac5f75948e5a6716d26532adaf40e9ed8a205cbdeb75e76999dab07baf14 EBUILD gnuplot-4.2.6-r1.ebuild 6997 RMD160 ae586b402f58efb5e12f3eff39ce00db1a98f088 SHA1 0d705aa36ec4e162e12f13e486bdc0e4ab5fc665 SHA256 28f245975ef12746830103fdf5d4333dff288163a53c94a71c1da602b81f0afc EBUILD gnuplot-4.4.0_rc1.ebuild 6712 RMD160 62cbc04a43cee4212550168c2517ff01c2ed2710 SHA1 31fc52029dacdfbd792a1d9baae2c036e4e7ac4d SHA256 f164c5733a0e4ec29a1b1e35ac5a5f63468c5ea4aa9ba8b4b59c9861bb7e6594 -EBUILD gnuplot-4.5.9999.ebuild 6920 RMD160 0e1236094566976f5ec12fe92b35fca0a84e76d9 SHA1 7e201b873e4c19f579e00060ec62d95249d07a37 SHA256 71c414d17b81ded17de55ee478a2458eb38fa426cdbd6bcaa488c8eec2addec3 -MISC ChangeLog 1624 RMD160 5e889444ab7ce2cfcbd0826493e8c4e5d2db40ba SHA1 7da7b4f960788f238729c5f53058ea3f00e48136 SHA256 d0a6add67a562b6768542b72d97894ff35d7f9a2a496f023c05f8989726de64e +EBUILD gnuplot-4.5.9999.ebuild 6787 RMD160 29e61c66db3839605f4311137ff8db0a3838e3bf SHA1 8d958f25be6e623719beb64463df26e1180a657a SHA256 4964f59f79c3b47d19bebb1c205938147429dfc01ef346e6ad90defd09a724ee +MISC ChangeLog 1738 RMD160 6c4827f36e6f72e6854f49bad511a69e3de77c28 SHA1 05258d34d36573f6f4585b326a91d5fa9e32875f SHA256 9457afb76bf1fcc81060fa9feeec489e94ba1099fe1b6866c8a862a23845c294 MISC metadata.xml 349 RMD160 87a767ce8e90a00d852a98474ba4613ec1311796 SHA1 d4de5b0b36dac3911669ae23a080982f0986d273 SHA256 70b5b4315995c437de4e5b0434d5f2034fbd35975be71ecc2782cffee5be16a2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAktTWUQACgkQy0OE/ans1/mlywCdEIIj7IdG5cBScZrCjeUkDsYL -j04An35EARpGAM9nfjGMDBzGOaNeiRtf -=vpkk +iEYEARECAAYFAktbADoACgkQy0OE/ans1/mhmACfRLDs4/1exScBi0oXXpMA/11W +bK4An2VTy4WH/VfsFJzoDnB2kke8X7HE +=+73O -----END PGP SIGNATURE----- diff --git a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild index 881a40016..5f1eac6e6 100644 --- a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild @@ -66,18 +66,16 @@ pkg_setup() { } src_prepare() { - local i + local dir epatch "${FILESDIR}"/${PN}-4.2.2-disable_texi_generation.patch #194216 epatch "${FILESDIR}"/${PF}-app-defaults.patch #219323 epatch "${FILESDIR}"/${PN}-4.4.0_rc1-disable-texhash.patch #201871 # Add Gentoo version identification since the licence requires it epatch "${FILESDIR}"/${PF}-gentoo-version.patch - for i in config demo m4 term tutorial; do - cd $i - emake -f Makefile.am.in Makefile.am || \ - die "make -f Makefile.am.in Makefile.am in $i failed" - cd .. + for dir in config demo m4 term tutorial; do + emake -C "$dir" -f Makefile.am.in Makefile.am || \ + die "make -f Makefile.am.in Makefile.am in $dir failed" done eautoreconf } @@ -87,14 +85,11 @@ src_configure() { if use latex ; then sed -i -e "s:\`kpsexpand.*\`:${TEXMF}/tex/latex/${PN}/${GP_VERSION}:" \ share/LaTeX/Makefile.in || die "sed kpsexpand removed failed" - else - sed -i \ - -e '/^SUBDIRS/ s/LaTeX//' share/Makefile.in || \ - die "sed disable of LateX failed" fi local myconf="--enable-thin-splines" + myconf="${myconf} $(use_with latex)" myconf="${myconf} $(use_with X x)" myconf="${myconf} $(use_with svga linux-vga)" myconf="${myconf} $(use_with gd)" @@ -198,10 +193,6 @@ src_install () { doins docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README} fi - if ! use X; then - # see bug 194527 - rm -rf "${D}/etc/X11" - fi use multislot && \ mv "${D}/usr/share/info/gnuplot.info" "${D}/usr/share/info/gnuplot-${GP_VERSION}.info" } |