Version bump

(Portage version: 2.2_rc40/cvs/Linux i686)

3 files changed, 33 insertions, 91 deletions

diff --git a/sci-visualization/gle/ChangeLog b/sci-visualization/gle/ChangeLog
index e4886bdfe0ad..04a9227648d6 100644
--- a/sci-visualization/gle/ChangeLog
+++ b/sci-visualization/gle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/gle
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/ChangeLog,v 1.5 2009/04/19 14:38:18 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/ChangeLog,v 1.6 2009/09/15 13:43:00 grozin Exp $
+
+*gle-4.2.1 (15 Sep 2009)
+
+  15 Sep 2009; Andrey Grozin <grozin@gentoo.org> -gle-4.1.2b.ebuild,
+  -files/gle-4.1.2b-emacs.patch, +gle-4.2.1.ebuild:
+  Version bump
 
 *gle-4.2.0 (19 Apr 2009)
 
diff --git a/sci-visualization/gle/files/gle-4.1.2b-emacs.patch b/sci-visualization/gle/files/gle-4.1.2b-emacs.patch
deleted file mode 100644
index ff33db706d53..000000000000
--- a/sci-visualization/gle/files/gle-4.1.2b-emacs.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- 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.2.1.ebuild
index 9aa13dd160d8..9a3203968606 100644
--- a/sci-visualization/gle/gle-4.1.2b.ebuild
+++ b/sci-visualization/gle/gle-4.2.1.ebuild
@@ -1,66 +1,51 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.4 2008/10/14 11:42:37 grozin Exp $
-
-EAPI=1
-
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/gle-4.2.1.ebuild,v 1.1 2009/09/15 13:43:00 grozin Exp $
+EAPI=2
 inherit eutils elisp-common qt4
-
-MY_P=GLE-${PV}
-DOC_VERSION="4.0.13"
-
 DESCRIPTION="Graphics Layout Engine"
 HOMEPAGE="http://glx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/glx/${MY_P}-src.zip
-	doc? ( http://www.cs.kuleuven.be/~jan/gle/GLE-${DOC_VERSION}-manual.pdf
-		   mirror://sourceforge/glx/GLEusersguide.pdf )
-	emacs? ( http://glx.sourceforge.net/downloads/gle-emacs.el )
-	vim-syntax? ( http://glx.sourceforge.net/downloads/vim_gle.zip )"
-
+MY_P=${PN}-graphics-${PV}
+MAN_V="4.2.0"
+SRC_URI="mirror://sourceforge/glx/${MY_P}f-src.tar.gz
+	doc? ( mirror://sourceforge/glx/${PN}-manual-${MAN_V}.pdf
+		   mirror://sourceforge/glx/GLEusersguide.pdf )"
 SLOT="0"
-LICENSE="BSD emacs? ( GPL-2 )"
-KEYWORDS="~amd64 ~x86"
-
+LICENSE="BSD-2 emacs? ( GPL-2 ) qt4? ( GPL-2 )"
 IUSE="X qt4 jpeg png tiff doc emacs vim-syntax"
+KEYWORDS="~amd64 ~x86"
 
-CDEPEND="sys-libs/ncurses
+DEPEND="sys-libs/ncurses
 	X? ( x11-libs/libX11 )
-	qt4? ( || ( x11-libs/qt-gui:4 =x11-libs/qt-4.3*:4 ) )
+	qt4? ( x11-libs/qt-gui:4 )
 	jpeg? ( media-libs/jpeg )
 	png? ( media-libs/libpng )
 	tiff? ( media-libs/tiff )
 	emacs? ( virtual/emacs )"
 
-DEPEND="${CDEPEND}
-	app-arch/unzip"
-
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	virtual/ghostscript
 	virtual/latex-base
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
-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
-}
+S="${WORKDIR}"/${MY_P}
 
-src_compile() {
+src_configure() {
 	econf $(use_with qt4 qt /usr) \
 		$(use_with X x) \
 		$(use_with jpeg) \
 		$(use_with png) \
 		$(use_with tiff)
+}
 
+src_compile() {
 	# emake failed in src/gui (probably qmake stuff)
 	emake -j1 || die "emake failed"
 
 	if use emacs; then
-		elisp-compile "${WORKDIR}"/gle-mode.el || die
+		cd contrib/editors/highlighting
+		mv ${PN}-emacs.el ${PN}-mode.el
+		elisp-compile ${PN}-mode.el || die
 	fi
 }
 
@@ -77,12 +62,12 @@ src_install() {
 
 	if use doc; then
 		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/GLE-${DOC_VERSION}-manual.pdf \
+		doins "${DISTDIR}"/${PN}-manual-${MAN_V}.pdf \
 			"${DISTDIR}"/GLEusersguide.pdf
 	fi
 
 	if use emacs; then
-		elisp-install ${PN} "${WORKDIR}"/gle-mode.{el,elc} || die
+		elisp-install ${PN} contrib/editors/highlighting/gle-mode.{el,elc} || die
 		elisp-site-file-install "${FILESDIR}"/64gle-gentoo.el || die
 	fi
 
@@ -90,14 +75,14 @@ src_install() {
 		dodir /usr/share/vim/vimfiles/ftplugins \
 			/usr/share/vim/vimfiles/indent \
 			/usr/share/vim/vimfiles/syntax
-		cd ..
+		cd contrib/editors/highlighting/vim
 		chmod 644 ftplugin/* indent/* syntax/*
 		insinto /usr/share/vim/vimfiles/ftplugins
-		doins ftplugin/*
+		doins ftplugin/* || die
 		insinto /usr/share/vim/vimfiles/indent
-		doins indent/*
+		doins indent/* || die
 		insinto /usr/share/vim/vimfiles/syntax
-		doins syntax/*
+		doins syntax/* || die
 	fi
 }