diff options
Diffstat (limited to 'sci-visualization/gle')
| -rw-r--r-- | sci-visualization/gle/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-visualization/gle/files/64gle-gentoo.el | 6 | ||||
| -rw-r--r-- | sci-visualization/gle/files/gle-4.1.2b-emacs.patch | 49 | ||||
| -rw-r--r-- | sci-visualization/gle/gle-4.1.2b.ebuild | 33 |
4 files changed, 80 insertions, 15 deletions
diff --git a/sci-visualization/gle/ChangeLog b/sci-visualization/gle/ChangeLog index da01da933f2a..251f8e6d73bc 100644 --- a/sci-visualization/gle/ChangeLog +++ b/sci-visualization/gle/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-visualization/gle # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/ChangeLog,v 1.3 2008/08/28 19:19:26 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/ChangeLog,v 1.4 2008/10/14 11:42:37 grozin Exp $ + + 14 Oct 2008; Andrey Grozin <grozin@gentoo.org> + +files/gle-4.1.2b-emacs.patch, files/64gle-gentoo.el, gle-4.1.2b.ebuild: + Emacs support fixed (bug #241582), a typo introduced in the last revision + fixed (bug #241710), many thanks to Ulrich Mueller <ulm@gentoo.org> 28 Aug 2008; Sébastien Fabbro <bicatali@gentoo.org> gle-4.1.2b.ebuild: Added qt-4.4 deps, make -j1 install to catch some data files, and tested diff --git a/sci-visualization/gle/files/64gle-gentoo.el b/sci-visualization/gle/files/64gle-gentoo.el index fcb527f40b59..841503ba6eec 100644 --- a/sci-visualization/gle/files/64gle-gentoo.el +++ b/sci-visualization/gle/files/64gle-gentoo.el @@ -1,4 +1,6 @@ -;; begin gle-mode + +;;; gle site-lisp configuration + +(add-to-list 'load-path "@SITELISP@") (autoload 'gle-mode "gle-mode") (add-to-list 'auto-mode-alist '("\\.gle\\'" . gle-mode)) -;; end gle-mode diff --git a/sci-visualization/gle/files/gle-4.1.2b-emacs.patch b/sci-visualization/gle/files/gle-4.1.2b-emacs.patch new file mode 100644 index 000000000000..ff33db706d53 --- /dev/null +++ b/sci-visualization/gle/files/gle-4.1.2b-emacs.patch @@ -0,0 +1,49 @@ +--- gle-mode.el~ 2005-04-27 11:19:52.000000000 +0200 ++++ gle-mode.el 2008-10-14 10:56:58.000000000 +0200 +@@ -167,27 +167,28 @@ + (set (make-local-variable 'comment-start-skip) "!+\\s-*") + (set (make-local-variable 'font-lock-defaults) + '(gle-font-lock-keywords)) ++ (run-hooks 'gle-mode-hook) + ) + +-(add-menu nil "GLE" +- '( +- ["View ps file" gle-view-postscript t] +- ["View png file" gle-view-png t ] +- "--------------------" +- ["Create ps file" gle-create-postscript t] +- "--------------------" +- ["Write graph" gle-write-standard-graph t] +- )) ++(define-key gle-mode-map [menu-bar gle-mode] ++ (cons "GLE" (make-sparse-keymap "GLE"))) ++(define-key gle-mode-map [menu-bar gle-mode gle-write-standard-graph] ++ '("Write graph" . gle-write-standard-graph)) ++(define-key gle-mode-map [menu-bar gle-mode separator-gle-mode-2] ++ '("--------------------")) ++(define-key gle-mode-map [menu-bar gle-mode gle-create-postscript] ++ '("Create ps file" . gle-create-postscript)) ++(define-key gle-mode-map [menu-bar gle-mode separator-gle-mode-1] ++ '("--------------------")) ++(define-key gle-mode-map [menu-bar gle-mode gle-view-png] ++ '("View png file" . gle-view-png)) ++(define-key gle-mode-map [menu-bar gle-mode gle-view-postscript] ++ '("View ps file" . gle-view-postscript)) + +- +-(setq major-mode 'gle-mode) +-(setq mode-name "GLE") +-(local-set-key "\t" " ") +-(global-set-key "\C-c\C-p" 'gle-create-postscript) +-(global-set-key "\C-c\C-v" 'gle-view-postscript) +-(global-set-key "\C-c\C-x" 'gle-view-x) +-(global-set-key "\C-c\C-b" 'gle-write-basic-commands) +-(run-hooks 'gle-mode-hook) ++(define-key gle-mode-map "\C-c\C-p" 'gle-create-postscript) ++(define-key gle-mode-map "\C-c\C-v" 'gle-view-postscript) ++(define-key gle-mode-map "\C-c\C-x" 'gle-view-x) ++(define-key gle-mode-map "\C-c\C-b" 'gle-write-basic-commands) + + (provide 'gle-mode) + ;; End gle-mode diff --git a/sci-visualization/gle/gle-4.1.2b.ebuild b/sci-visualization/gle/gle-4.1.2b.ebuild index c3f6b3b9da47..9aa13dd160d8 100644 --- a/sci-visualization/gle/gle-4.1.2b.ebuild +++ b/sci-visualization/gle/gle-4.1.2b.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/gle-4.1.2b.ebuild,v 1.3 2008/08/28 19:19:26 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/gle-4.1.2b.ebuild,v 1.4 2008/10/14 11:42:37 grozin Exp $ EAPI=1 @@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/glx/${MY_P}-src.zip vim-syntax? ( http://glx.sourceforge.net/downloads/vim_gle.zip )" SLOT="0" -LICENSE="BSD" +LICENSE="BSD emacs? ( GPL-2 )" KEYWORDS="~amd64 ~x86" IUSE="X qt4 jpeg png tiff doc emacs vim-syntax" @@ -41,18 +41,27 @@ RDEPEND="${CDEPEND} S="${WORKDIR}"/gle4 +src_unpack() { + unpack ${A} + if use emacs; then + cp "${DISTDIR}"/gle-emacs.el gle-mode.el || die "cp gle-mode.el failed" + epatch "${FILESDIR}"/${P}-emacs.patch + fi +} + src_compile() { - local qtconf="--without-qt" - use qt4 && qtconf="--with-qt=/usr" - econf \ + econf $(use_with qt4 qt /usr) \ $(use_with X x) \ $(use_with jpeg) \ $(use_with png) \ - $(use_with tiff) \ - ${qtconf} || die "econf failed" + $(use_with tiff) # emake failed in src/gui (probably qmake stuff) emake -j1 || die "emake failed" + + if use emacs; then + elisp-compile "${WORKDIR}"/gle-mode.el || die + fi } src_install() { @@ -62,19 +71,19 @@ src_install() { if use qt4; then newicon src/gui/images/gle_icon.png gle.png -q make_desktop_entry qgle GLE gle + make_desktop_entry qgle GLE gle newdoc src/gui/readme.txt gui_readme.txt fi - if use doc ; then + if use doc; then insinto /usr/share/doc/${PF} doins "${DISTDIR}"/GLE-${DOC_VERSION}-manual.pdf \ "${DISTDIR}"/GLEusersguide.pdf fi - if use emacs ; then - elisp-site-file-install "${DISTDIR}"/gle-emacs.el gle-mode.el - elisp-site-file-install "${FILESDIR}"/64gle-gentoo.el + if use emacs; then + elisp-install ${PN} "${WORKDIR}"/gle-mode.{el,elc} || die + elisp-site-file-install "${FILESDIR}"/64gle-gentoo.el || die fi if use vim-syntax ; then |