From: Grant Goodyear Date: Tue, 10 Oct 2006 21:48:15 +0000 (+0000) Subject: add masked rc and fix bug #82940 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1c6dc84b506b8dfc37ec6414b6d61a4ea16e24ab;p=gentoo.git add masked rc and fix bug #82940 Package-Manager: portage-2.1.2_pre1 --- diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog index d7c54ca67a03..d9dbec214ee1 100644 --- a/sci-visualization/gnuplot/ChangeLog +++ b/sci-visualization/gnuplot/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-visualization/gnuplot # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.4 2006/07/12 02:32:19 g2boojum Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.5 2006/10/10 21:48:15 g2boojum Exp $ + +*gnuplot-4.2_rc1 (10 Oct 2006) + + 10 Oct 2006; Grant Goodyear gnuplot-4.0-r1.ebuild, + +gnuplot-4.2_rc1.ebuild: + Added 4.2 rc (masked) and added addwrite statements to + close bug #82940. 12 Jul 2006; Grant Goodyear ChangeLog: Removed 3.x gnuplot builds. diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest index 9463265887a1..8f6a17c6b1f9 100644 --- a/sci-visualization/gnuplot/Manifest +++ b/sci-visualization/gnuplot/Manifest @@ -11,14 +11,19 @@ MD5 51225315add3dabcbbbde9e771bba24c files/pdflib-6-compat.patch 560 RMD160 cb89ecb654a425925b34398a36cb83332fd438e2 files/pdflib-6-compat.patch 560 SHA256 b1745ad75b58f081b7c9d5dc204f58f519b283aa116e2791c93128026b45700f files/pdflib-6-compat.patch 560 DIST gnuplot-4.0.0.tar.gz 2160918 RMD160 7b1fc84c161c132c776269b6e9a49abd29251a18 SHA1 a862bc311724c263aa1ef1c646291d73dc37c978 SHA256 a77ad7cb08b2551dacbaa0bb02e561fddb6b9f4a0f3d45eb1c38be219955ea48 -EBUILD gnuplot-4.0-r1.ebuild 4013 RMD160 a376f5c1bea1b505317b6bf5e9951ce6f82c75a2 SHA1 7858c74d77e694c790cea02bba455031e9aaf739 SHA256 14d51cd6010e2aacf45839886df91b708d0ef93414c5e100136fa7d7baa1bc22 -MD5 09a60055e78ae74f3331f9ba1237c640 gnuplot-4.0-r1.ebuild 4013 -RMD160 a376f5c1bea1b505317b6bf5e9951ce6f82c75a2 gnuplot-4.0-r1.ebuild 4013 -SHA256 14d51cd6010e2aacf45839886df91b708d0ef93414c5e100136fa7d7baa1bc22 gnuplot-4.0-r1.ebuild 4013 -MISC ChangeLog 6976 RMD160 dee39761047121c3048f16f06a86a6f95467bab4 SHA1 c84ac8fe96bb4a95ed8859fc67f4a0f157f67b5d SHA256 436ac6ce5fc51de98fd67b514923fa9cefff076febddb2eee8b3b6a6c4f918a4 -MD5 c2b942c57acf9bbfe6b5db871c7735f5 ChangeLog 6976 -RMD160 dee39761047121c3048f16f06a86a6f95467bab4 ChangeLog 6976 -SHA256 436ac6ce5fc51de98fd67b514923fa9cefff076febddb2eee8b3b6a6c4f918a4 ChangeLog 6976 +DIST gnuplot-4.2.rc1.tar.gz 2808610 RMD160 6080bfca41aaedc75842b0272f1f82d7c61a9fe1 SHA1 1ec9b560bcd2e7553cf2e11aaafbed2b583969a5 SHA256 b8294f526710d622e3831a5d37d880aa16070baf3445d3981a216f678418020c +EBUILD gnuplot-4.0-r1.ebuild 4035 RMD160 da631704672b672fd5df3227c644c1d0ea2f2eff SHA1 7da9afc0f300da862f62b78dc9287e4d6fe68c83 SHA256 cba1f1628bead2a98303d72dc9d404bfc36f5ea10212edae13997f61a8ae150e +MD5 35f3a02f93ddb452f196cc9b1182b90b gnuplot-4.0-r1.ebuild 4035 +RMD160 da631704672b672fd5df3227c644c1d0ea2f2eff gnuplot-4.0-r1.ebuild 4035 +SHA256 cba1f1628bead2a98303d72dc9d404bfc36f5ea10212edae13997f61a8ae150e gnuplot-4.0-r1.ebuild 4035 +EBUILD gnuplot-4.2_rc1.ebuild 4044 RMD160 bbfd1d2de87e9454c19ea2120c890dbd11de3a51 SHA1 dbf270aa7a1b8b31ea5031872af8b454fce33ad6 SHA256 b23a1a3443be7686662880638e8314382fd999f2f324a25a8b201545948f21a1 +MD5 4fdccb5844be38c51b397f6d717e1b40 gnuplot-4.2_rc1.ebuild 4044 +RMD160 bbfd1d2de87e9454c19ea2120c890dbd11de3a51 gnuplot-4.2_rc1.ebuild 4044 +SHA256 b23a1a3443be7686662880638e8314382fd999f2f324a25a8b201545948f21a1 gnuplot-4.2_rc1.ebuild 4044 +MISC ChangeLog 7188 RMD160 683a242e05dcc5f12de41ec83de5166aec1f8198 SHA1 8f3a08f2e0cc93aa0d98c9ba91de8aa46c79bb08 SHA256 6afc7f78c8fb1a61c7b7d711d64ff2303e3e9c38ebcfe2ec82bc29a47208e498 +MD5 d05c1b66021b8a35b2c18c9200589e15 ChangeLog 7188 +RMD160 683a242e05dcc5f12de41ec83de5166aec1f8198 ChangeLog 7188 +SHA256 6afc7f78c8fb1a61c7b7d711d64ff2303e3e9c38ebcfe2ec82bc29a47208e498 ChangeLog 7188 MISC metadata.xml 220 RMD160 f220b5db3b6de3f59e08ab45bfaae138eaae63ee SHA1 e3b505cf1accaf86c17fdc78a3c98b08917d56ee SHA256 bcdae0f0c39207d696ad66e9c264b241cc25453afeadc3f6eb194a7e4452f770 MD5 0d0ccbc08efef8b97818204479649574 metadata.xml 220 RMD160 f220b5db3b6de3f59e08ab45bfaae138eaae63ee metadata.xml 220 @@ -26,3 +31,6 @@ 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 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.2_rc1 b/sci-visualization/gnuplot/files/digest-gnuplot-4.2_rc1 new file mode 100644 index 000000000000..a6431d58da44 --- /dev/null +++ b/sci-visualization/gnuplot/files/digest-gnuplot-4.2_rc1 @@ -0,0 +1,3 @@ +MD5 eb254de6bed84f7d862ca547a0badb9a gnuplot-4.2.rc1.tar.gz 2808610 +RMD160 6080bfca41aaedc75842b0272f1f82d7c61a9fe1 gnuplot-4.2.rc1.tar.gz 2808610 +SHA256 b8294f526710d622e3831a5d37d880aa16070baf3445d3981a216f678418020c gnuplot-4.2.rc1.tar.gz 2808610 diff --git a/sci-visualization/gnuplot/gnuplot-4.0-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.0-r1.ebuild index 5d53b7b039a6..cd721ecb1490 100644 --- a/sci-visualization/gnuplot/gnuplot-4.0-r1.ebuild +++ b/sci-visualization/gnuplot/gnuplot-4.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.0-r1.ebuild,v 1.2 2006/03/24 16:40:14 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.0-r1.ebuild,v 1.3 2006/10/10 21:48:15 g2boojum Exp $ inherit eutils elisp-common @@ -62,7 +62,7 @@ src_compile() { # 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 + addwrite /dev/svga /dev/mouse /dev/tts/0 econf ${myconf} || die emake || die diff --git a/sci-visualization/gnuplot/gnuplot-4.2_rc1.ebuild b/sci-visualization/gnuplot/gnuplot-4.2_rc1.ebuild new file mode 100644 index 000000000000..1d89518bff29 --- /dev/null +++ b/sci-visualization/gnuplot/gnuplot-4.2_rc1.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2_rc1.ebuild,v 1.1 2006/10/10 21:48:15 g2boojum Exp $ + +inherit eutils elisp-common + +MY_P="${P/_/.}" + +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 ppc-macos 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 +#} + +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 +}