From e48bd7d2cd3bd826aab86deb2b31e3a9f0642503 Mon Sep 17 00:00:00 2001 From: Markus Dittrich Date: Mon, 26 Feb 2007 14:22:33 +0000 Subject: [PATCH] Added patch to fix problems with failing tests on amd64 (see bug #159653). Package-Manager: portage-2.1.2-r9 --- sci-visualization/gnuplot/ChangeLog | 9 +- sci-visualization/gnuplot/Manifest | 19 ++- .../gnuplot/files/digest-gnuplot-4.0-r2 | 3 + .../files/gnuplot-4.0-filled-arrow.patch | 41 +++++ .../gnuplot/gnuplot-4.0-r2.ebuild | 143 ++++++++++++++++++ 5 files changed, 210 insertions(+), 5 deletions(-) create mode 100644 sci-visualization/gnuplot/files/digest-gnuplot-4.0-r2 create mode 100644 sci-visualization/gnuplot/files/gnuplot-4.0-filled-arrow.patch create mode 100644 sci-visualization/gnuplot/gnuplot-4.0-r2.ebuild diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog index a43e28759a05..40c44ea09859 100644 --- a/sci-visualization/gnuplot/ChangeLog +++ b/sci-visualization/gnuplot/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-visualization/gnuplot # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.9 2007/01/17 19:39:57 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.10 2007/02/26 14:22:33 markusle Exp $ + +*gnuplot-4.0-r2 (26 Feb 2007) + + 26 Feb 2007; Markus Dittrich + +files/gnuplot-4.0-filled-arrow.patch, +gnuplot-4.0-r2.ebuild: + Added patch to fix problems with failing tests on amd64 + (see bug #159653). 17 Jan 2007; Fabian Groffen gnuplot-4.0-r1.ebuild, gnuplot-4.2_rc1.ebuild: diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest index 1856df8eeb9a..c8e39c141078 100644 --- a/sci-visualization/gnuplot/Manifest +++ b/sci-visualization/gnuplot/Manifest @@ -2,6 +2,10 @@ AUX gnuplot-3.8j-amd64.diff 329 RMD160 fbc9606b2aa9346958eaee3ab9d28732f5356624 MD5 d6d201e466142a8e19ab7a86da486dde files/gnuplot-3.8j-amd64.diff 329 RMD160 fbc9606b2aa9346958eaee3ab9d28732f5356624 files/gnuplot-3.8j-amd64.diff 329 SHA256 dde4957e83b7e779cf4c290da8349337333bbce1c22c125b15a29008300c3623 files/gnuplot-3.8j-amd64.diff 329 +AUX gnuplot-4.0-filled-arrow.patch 1349 RMD160 99c620fda889773a4814726e339e51095924a38b SHA1 8a32dfc108e1a82fd013899a194f9a31e1e0ac0a SHA256 aa3adb859e5ed943d948e8817e24b9f3e391411684ca4bdea5485374d976e652 +MD5 7af7e5f057531526e6c3447bf18c2ed8 files/gnuplot-4.0-filled-arrow.patch 1349 +RMD160 99c620fda889773a4814726e339e51095924a38b files/gnuplot-4.0-filled-arrow.patch 1349 +SHA256 aa3adb859e5ed943d948e8817e24b9f3e391411684ca4bdea5485374d976e652 files/gnuplot-4.0-filled-arrow.patch 1349 AUX header-order.patch 1692 RMD160 d9b45d996958e41b7b4bbc9d33cdb1018f718dc4 SHA1 2e59302f469c31ee14bbe6b2f1658e571342e7e9 SHA256 d0feb2cd13afae70d558fd3c4d1284383e7ccb4d1d14527d9564ffe0e9b0d7c1 MD5 6bd90ea3b0173af9fe24085ca37fbfa3 files/header-order.patch 1692 RMD160 d9b45d996958e41b7b4bbc9d33cdb1018f718dc4 files/header-order.patch 1692 @@ -16,14 +20,18 @@ EBUILD gnuplot-4.0-r1.ebuild 4024 RMD160 6875be3106bcb5b23098ae80e21fcdabe6dace9 MD5 01fcd026f9b6d91db8dd3e9154f7b431 gnuplot-4.0-r1.ebuild 4024 RMD160 6875be3106bcb5b23098ae80e21fcdabe6dace93 gnuplot-4.0-r1.ebuild 4024 SHA256 8a95ffa9f7942c7504d34dbc256244e908431198c7dab7656688af310dc2be4b gnuplot-4.0-r1.ebuild 4024 +EBUILD gnuplot-4.0-r2.ebuild 4085 RMD160 ef7be3047c597b16c55d0d834b97bf895683916e SHA1 27f650f6fc6e123e64fa226b9d5733ba8293f517 SHA256 e5c6d17bb455441aea5229de02dcf9224cdd1a3b357a1fc40104b1120280c073 +MD5 d5fee3756e6485d2d0be508b7944adfc gnuplot-4.0-r2.ebuild 4085 +RMD160 ef7be3047c597b16c55d0d834b97bf895683916e gnuplot-4.0-r2.ebuild 4085 +SHA256 e5c6d17bb455441aea5229de02dcf9224cdd1a3b357a1fc40104b1120280c073 gnuplot-4.0-r2.ebuild 4085 EBUILD gnuplot-4.2_rc1.ebuild 4308 RMD160 7047e292699a827491fecee14289558b911f6c77 SHA1 522be7776d9861c0cc4b6ebff7bec3ab13e11ed9 SHA256 a98f4fdf404a114f759ab768d6565342acb366859735d2530992ce349f2a6b85 MD5 e317b725ca9c98be42b5bdee4fe42050 gnuplot-4.2_rc1.ebuild 4308 RMD160 7047e292699a827491fecee14289558b911f6c77 gnuplot-4.2_rc1.ebuild 4308 SHA256 a98f4fdf404a114f759ab768d6565342acb366859735d2530992ce349f2a6b85 gnuplot-4.2_rc1.ebuild 4308 -MISC ChangeLog 7794 RMD160 e500afb5434bf1ade7a83be485bb6b2bc0f3034a SHA1 dfc14e4a27013cb5dcc2bc4251d9d5dac322d1d8 SHA256 c07adc6e44398e776c8d9ef7cc033c581124101a8a659ab6ea825e566e2a6c74 -MD5 2d82ad845428efa4895613516a1a9f5c ChangeLog 7794 -RMD160 e500afb5434bf1ade7a83be485bb6b2bc0f3034a ChangeLog 7794 -SHA256 c07adc6e44398e776c8d9ef7cc033c581124101a8a659ab6ea825e566e2a6c74 ChangeLog 7794 +MISC ChangeLog 8026 RMD160 6a534f8b3eb968803b4bc42a4acb9409a2bee6ee SHA1 408e6a1d6a0768ce21a9d6d16cd35a2df9b28940 SHA256 49d1a2b429f5dd54a3ae2bc539b11e5ddb0d5144dedfb91708ed1aad841ce810 +MD5 234c924fe7839c5813e1df0bfe3c0608 ChangeLog 8026 +RMD160 6a534f8b3eb968803b4bc42a4acb9409a2bee6ee ChangeLog 8026 +SHA256 49d1a2b429f5dd54a3ae2bc539b11e5ddb0d5144dedfb91708ed1aad841ce810 ChangeLog 8026 MISC metadata.xml 220 RMD160 f220b5db3b6de3f59e08ab45bfaae138eaae63ee SHA1 e3b505cf1accaf86c17fdc78a3c98b08917d56ee SHA256 bcdae0f0c39207d696ad66e9c264b241cc25453afeadc3f6eb194a7e4452f770 MD5 0d0ccbc08efef8b97818204479649574 metadata.xml 220 RMD160 f220b5db3b6de3f59e08ab45bfaae138eaae63ee metadata.xml 220 @@ -31,6 +39,9 @@ SHA256 bcdae0f0c39207d696ad66e9c264b241cc25453afeadc3f6eb194a7e4452f770 metadata MD5 1bd5edeb7318abbd217b4a92aa9837f7 files/digest-gnuplot-4.0-r1 244 RMD160 12aef3c42457f843088cb4a3de4c07d33b8bda4f files/digest-gnuplot-4.0-r1 244 SHA256 911f90b2bf05ec39c8895c5391d384465266d4a5357e1b95259ef2ab05656610 files/digest-gnuplot-4.0-r1 244 +MD5 1bd5edeb7318abbd217b4a92aa9837f7 files/digest-gnuplot-4.0-r2 244 +RMD160 12aef3c42457f843088cb4a3de4c07d33b8bda4f files/digest-gnuplot-4.0-r2 244 +SHA256 911f90b2bf05ec39c8895c5391d384465266d4a5357e1b95259ef2ab05656610 files/digest-gnuplot-4.0-r2 244 MD5 cc3a331d286da1993b671e9d853aee2a files/digest-gnuplot-4.2_rc1 250 RMD160 b87ead8579fe6f7a8bbec98e4aa7a484c07ced95 files/digest-gnuplot-4.2_rc1 250 SHA256 3b4247d362e36b516ed25cd4d19dcf2d5cdd9259c0fb22da62441ef0bd7d0c56 files/digest-gnuplot-4.2_rc1 250 diff --git a/sci-visualization/gnuplot/files/digest-gnuplot-4.0-r2 b/sci-visualization/gnuplot/files/digest-gnuplot-4.0-r2 new file mode 100644 index 000000000000..81d4b623b0c0 --- /dev/null +++ b/sci-visualization/gnuplot/files/digest-gnuplot-4.0-r2 @@ -0,0 +1,3 @@ +MD5 66258443d9f93cc4f46b147dac33e63a gnuplot-4.0.0.tar.gz 2160918 +RMD160 7b1fc84c161c132c776269b6e9a49abd29251a18 gnuplot-4.0.0.tar.gz 2160918 +SHA256 a77ad7cb08b2551dacbaa0bb02e561fddb6b9f4a0f3d45eb1c38be219955ea48 gnuplot-4.0.0.tar.gz 2160918 diff --git a/sci-visualization/gnuplot/files/gnuplot-4.0-filled-arrow.patch b/sci-visualization/gnuplot/files/gnuplot-4.0-filled-arrow.patch new file mode 100644 index 000000000000..f20970926355 --- /dev/null +++ b/sci-visualization/gnuplot/files/gnuplot-4.0-filled-arrow.patch @@ -0,0 +1,41 @@ +diff -Naur gnuplot-4.0.0/src/term.c gnuplot-4.0.0-new/src/term.c +--- gnuplot-4.0.0/src/term.c 2004-04-13 13:24:02.000000000 -0400 ++++ gnuplot-4.0.0-new/src/term.c 2007-01-21 12:14:08.000000000 -0500 +@@ -927,7 +927,7 @@ + ym = (int) (dy2 + backlen * sin( phi + beta )); + } + #ifdef PM3D +- if (curr_arrow_headfilled==2) { ++ if (curr_arrow_headfilled==2 && !clip_point(ex,ey)) { + /* draw filled forward arrow head */ + filledhead[0].x = ex + xm; + filledhead[0].y = ey + ym; +@@ -939,7 +939,8 @@ + filledhead[3].y = ey + y2; + filledhead[4].x = ex + xm; + filledhead[4].y = ey + ym; +- (*t->filled_polygon) (5, filledhead); ++ if (t->filled_polygon) ++ (*t->filled_polygon) (5, filledhead); + } + #endif + /* draw outline of forward arrow head */ +@@ -956,7 +957,7 @@ + } + if (head == 2) { /* backward arrow head */ + #ifdef PM3D +- if (curr_arrow_headfilled==2) { ++ if (curr_arrow_headfilled==2 && !clip_point(sx,sy)) { + /* draw filled backward arrow head */ + filledhead[0].x = sx - xm; + filledhead[0].y = sy - ym; +@@ -968,7 +969,8 @@ + filledhead[3].y = sy - y2; + filledhead[4].x = sx - xm; + filledhead[4].y = sy - ym; +- (*t->filled_polygon) (5, filledhead); ++ if (t->filled_polygon) ++ (*t->filled_polygon) (5, filledhead); + } + #endif + /* draw outline of backward arrow head */ diff --git a/sci-visualization/gnuplot/gnuplot-4.0-r2.ebuild b/sci-visualization/gnuplot/gnuplot-4.0-r2.ebuild new file mode 100644 index 000000000000..ef439a5c3483 --- /dev/null +++ b/sci-visualization/gnuplot/gnuplot-4.0-r2.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.0-r2.ebuild,v 1.1 2007/02/26 14:22:33 markusle Exp $ + +inherit eutils elisp-common + +MY_P="${P}.0" + +DESCRIPTION="Command-line driven interactive plotting program" +HOMEPAGE="http://www.gnuplot.info/" +SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz" + +LICENSE="gnuplot" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="doc emacs gd ggi pdf plotutils png readline svga X xemacs" + +DEPEND=" + xemacs? ( virtual/xemacs ) + emacs? ( virtual/emacs !app-emacs/gnuplot-mode ) + pdf? ( media-libs/pdflib ) + ggi? ( media-libs/libggi ) + png? ( media-libs/libpng ) + gd? ( >=media-libs/gd-2 ) + doc? ( virtual/tetex ) + X? ( || ( x11-libs/libXaw virtual/x11 ) ) + svga? ( media-libs/svgalib ) + readline? ( >=sys-libs/readline-4.2 ) + plotutils? ( media-libs/plotutils )" + +S=${WORKDIR}/${MY_P} + +E_SITEFILE="50gnuplot-gentoo.el" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/header-order.patch + epatch "${FILESDIR}"/pdflib-6-compat.patch + epatch "${FILESDIR}"/${P}-filled-arrow.patch +} + +src_compile() { + local myconf="--with-gihdir=/usr/share/${PN}/gih" + + myconf="${myconf} $(use_with X x)" + myconf="${myconf} $(use_with svga linux-vga)" + myconf="${myconf} $(use_with gd)" + myconf="${myconf} $(use_with plotutils plot /usr/lib)" + myconf="${myconf} $(use_with png png /usr/lib)" + myconf="${myconf} $(use_with pdf pdf /usr/lib)" + + use ggi \ + && myconf="${myconf} --with-ggi=/usr/lib --with-xmi=/usr/lib" \ + || myconf="${myconf} --without-ggi" + + use readline \ + && myconf="${myconf} --with-readline=gnu --enable-history-file" \ + || myconf="${myconf} --with-readline" + + myconf="${myconf} --without-lisp-files" + + # This is a hack to avoid sandbox violations when using the Linux console. + # Creating the DVI and PDF tutorials require /dev/svga to build the + # example plots. + addwrite /dev/svga:/dev/mouse:/dev/tts/0 + + econf ${myconf} || die + emake || die + + if use doc ; then + cd docs + make pdf || die + cd ../tutorial + make pdf || die + fi +} + +src_install () { + make DESTDIR=${D} install || die + + if use emacs; then + cd lisp + einfo "Configuring gnuplot-mode for emacs..." + EMACS="emacs" lispdir="/usr/share/emacs/site-lisp/${PN}" econf || die + make DESTDIR=${D} install || die + make clean + cd .. + + # Gentoo emacs site-lisp configuration + string="(add-to-list 'load-path \"/usr/share/emacs/site-lisp/${PN}\")" + echo -e ";;; Gnuplot site-lisp configuration\n\n${string}\n" > ${E_SITEFILE} + sed '/^;; move/,+4 d' lisp/dotemacs >> ${E_SITEFILE} + elisp-site-file-install ${E_SITEFILE} + fi + + if use xemacs; then + cd lisp + einfo "Configuring gnuplot-mode for xemacs..." + EMACS="xemacs" lispdir="/usr/lib/xemacs/site-packages/${PN}" econf || die + make DESTDIR=${D} install || { + ewarn "Compiling/installing gnuplot-mode for xemacs has failed." + ewarn "I need xemacs-base to be installed before I can compile" + ewarn "the gnuplot-mode lisp files for xemacs successfully." + ewarn "Please try re-emerging me after app-xemacs/xemacs-base" + ewarn "has been successfuly emerged." + die + } + cd .. + fi + + + dodoc BUGS ChangeLog FAQ NEWS PATCHLEVEL PGPKEYS PORTING README* TODO VERSION + + if use doc; then + # Demo files + insinto /usr/share/${PN}/demo + doins demo/* + # Manual + insinto /usr/share/doc/${PF}/manual + doins docs/gnuplot.pdf + # Tutorial + insinto /usr/share/doc/${PF}/tutorial + doins tutorial/{tutorial.dvi,tutorial.pdf} + # Documentation for making PostScript files + insinto /usr/share/doc/${PF}/psdoc + doins docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README} + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen + if use svga ; then + einfo "In order to enable ordinary users to use SVGA console graphics" + einfo "gnuplot needs to be set up as setuid root. Please note that" + einfo "this is usually considered to be a security hazard." + einfo "As root, manually \"chmod u+s /usr/bin/gnuplot\"." + fi +} + +pkg_postrm() { + use emacs && elisp-site-regen +} -- 2.26.2