diff options
| -rw-r--r-- | media-gfx/gnuplot/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/gnuplot/Manifest | 14 | ||||
| -rw-r--r-- | media-gfx/gnuplot/gnuplot-4.0-r1.ebuild | 56 |
3 files changed, 50 insertions, 27 deletions
diff --git a/media-gfx/gnuplot/ChangeLog b/media-gfx/gnuplot/ChangeLog index eadb64336db5..b36ab9c7d53f 100644 --- a/media-gfx/gnuplot/ChangeLog +++ b/media-gfx/gnuplot/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-gfx/gnuplot # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/ChangeLog,v 1.30 2004/10/17 05:46:48 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/ChangeLog,v 1.31 2004/10/19 15:34:47 usata Exp $ + + 20 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> gnuplot-4.0-r1.ebuild: + Support for emacs. Thanks to P.L.Hayes <paul@wolfbone.ath.cx>; bug #66765. 17 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> gnuplot-4.0-r1.ebuild: Detects XEmacs correctly; bug #66765. @@ -35,7 +38,7 @@ files/header-order.patch: Added a patch for bug #49263 and corrected the header. - 05 May 2004; Bryan Østergaard <kloeri@gentoo.org> gnuplot-3.8j.ebuild: + 05 May 2004; Bryan stergaard <kloeri@gentoo.org> gnuplot-3.8j.ebuild: Stable on alpha. *gnuplot-4.0 (27 Apr 2004) diff --git a/media-gfx/gnuplot/Manifest b/media-gfx/gnuplot/Manifest index 7e202ce3eb3f..7fdaf08b1127 100644 --- a/media-gfx/gnuplot/Manifest +++ b/media-gfx/gnuplot/Manifest @@ -1,22 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 aec4590fff8881407ea7443d0e59fbb5 ChangeLog 4556 +MD5 fbb54c2da5357d7eaa6773474faee7d6 ChangeLog 4707 MD5 174dc45e9be9beb7e7bd6556c3c6b209 gnuplot-3.8j.ebuild 2000 MD5 0d0ccbc08efef8b97818204479649574 metadata.xml 220 MD5 fba6d79f940f9261fbca68b3b241f739 gnuplot-3.8j-r1.ebuild 2117 MD5 b6cefe9b7b098978ff2a50ac87a1cebc gnuplot-4.0.ebuild 2558 -MD5 3e8beed5ef8124cb60d457726cfd510a gnuplot-4.0-r1.ebuild 2929 +MD5 92f68e7d375b6015d63d2c14b6ccc858 gnuplot-4.0-r1.ebuild 3907 MD5 4ca2057b57f07811b4da7bd8958d50c2 files/digest-gnuplot-3.8j 67 MD5 4ca2057b57f07811b4da7bd8958d50c2 files/digest-gnuplot-3.8j-r1 67 MD5 d6d201e466142a8e19ab7a86da486dde files/gnuplot-3.8j-amd64.diff 329 MD5 ca4f01c5e5b582017b2ff93ac26d650e files/digest-gnuplot-4.0 66 MD5 6bd90ea3b0173af9fe24085ca37fbfa3 files/header-order.patch 1692 MD5 ca4f01c5e5b582017b2ff93ac26d650e files/digest-gnuplot-4.0-r1 66 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFBcgYRVWNWqTUmv+0RArTxAJ9/A9e+BS39ptNhlGQHkvlIMdPINgCfTN4N -yoaW9jruz51wJS6ukoSKqHM= -=8EZ7 ------END PGP SIGNATURE----- diff --git a/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild b/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild index 5c2f29ffa51b..cd7afb31b966 100644 --- a/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild +++ b/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild,v 1.3 2004/10/17 05:46:48 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild,v 1.4 2004/10/19 15:34:47 usata Exp $ -inherit eutils -# inherit elisp-common +inherit eutils elisp-common MY_P="${P}.0" @@ -14,11 +13,11 @@ LICENSE="gnuplot" SLOT="0" KEYWORDS="~x86 ~amd64 ~sparc" -IUSE="doc gd ggi pdflib plotutils png readline svga X xemacs" -#IUSE="${IUSE} emacs" +IUSE="doc emacs gd ggi pdflib plotutils png readline svga X xemacs" DEPEND=" xemacs? ( virtual/xemacs ) + emacs? ( virtual/emacs !app-emacs/gnuplot-mode ) pdflib? ( media-libs/pdflib ) ggi? ( media-libs/libggi ) png? ( media-libs/libpng ) @@ -28,10 +27,11 @@ DEPEND=" svga? ( media-libs/svgalib ) readline? ( >=sys-libs/readline-4.2 ) plotutils? ( media-libs/plotutils )" -# emacs? ( app-emacs/gnuplot-mode ) S=${WORKDIR}/${MY_P} +E_SITEFILE="50gnuplot-gentoo.el" + src_unpack() { unpack ${A} cd ${S} @@ -56,13 +56,7 @@ src_compile() { && myconf="${myconf} --with-readline=gnu --enable-history-file" \ || myconf="${myconf} --with-readline" - if use xemacs ; then - export EMACS=xemacs - myconf="${myconf} --with-lispdir=/usr/lib/xemacs/site-packages/${PN}" - else - export EMACS=no - myconf="${myconf} --without-lisp-files" - fi + 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 @@ -83,6 +77,37 @@ src_compile() { 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 @@ -102,6 +127,7 @@ src_install () { } 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" @@ -109,3 +135,7 @@ pkg_postinst() { einfo "As root, manually \"chmod u+s /usr/bin/gnuplot\"." fi } + +pkg_postrm() { + use emacs && elisp-site-regen +} |