Version bump

Package-Manager: portage-2.2_rc40/cvs/Linux i686

4 files changed, 36 insertions, 98 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/Manifest b/sci-visualization/gle/Manifest
index 2a19cdb6f98e..059f77bf8baa 100644
--- a/sci-visualization/gle/Manifest
+++ b/sci-visualization/gle/Manifest
@@ -1,13 +1,9 @@
 AUX 64gle-gentoo.el 161 RMD160 3bb0a12b3db10d0331c272c9386ffc1a3757db58 SHA1 cb2a4da6d13088fe869480efa2ae35c9babe0ea7 SHA256 a14ce47df108c25318471f1ae3ccc6c9984b7e1a2728e16b57cef0a848156a55
-AUX gle-4.1.2b-emacs.patch 1944 RMD160 c2464fc9d7e69dd88c6b9411e76c41801fb35cf4 SHA1 e6ea531239ad081856f4c9b4cf5c46c0519609c6 SHA256 eee8c0c93eb401fb3a42f888b2e53ff6a065e47509b9ac04b1a5529c84a6d2ac
-DIST GLE-4.0.13-manual.pdf 2382284 RMD160 820f5f1f53ffad88c7351c6cf2b76b19b4e5afe1 SHA1 3915787939c0b13aef06098f9ce83792abc76da8 SHA256 e4fef6a97449344b1ff558fcab1db50d13c4a2ea24a20d2cc3e2f5bc2f2ca328
-DIST GLE-4.1.2b-src.zip 1794762 RMD160 491f291e311b94fba37fe3f84384ae3085ba7095 SHA1 725307581b6ba2a1049107ed1ef5f198949d5b89 SHA256 6370b9263bd96397ac72afa9aae078072f0a39346b9cf1d17b159a605a8120ac
 DIST GLE-4.2.0-src.zip 2135998 RMD160 fb3e6a5cd7981c6893e8c6fcc73553e5bbc23f31 SHA1 ee16befc513092cd24c519f2559691557281f5d8 SHA256 588e26b31e181c6c19e4fcac6df7f51fbefba70ab79ee2b8c17f8ecf4fe1ceb8
 DIST GLEusersguide.pdf 2244780 RMD160 6f2b8814f100e3971737ad45d017144e5912fd4e SHA1 2039e6b255da68200b5f881f2554bbdd6e82034a SHA256 02c13fe038f8b4b7726ac3e6a74410e299f50cdccb2b040d7ed1fbc99b9cfbef
-DIST gle-emacs.el 8703 RMD160 3b2aa77e1fe6dfcef13d94aef1475787ce50f28e SHA1 888ddee47233037ae20293b4a3673467d5c48fc8 SHA256 c3f49ee2f286d5681c86bdca53121e0bc6609f8c61fe55dae2108032826332cc
+DIST gle-graphics-4.2.1f-src.tar.gz 2044787 RMD160 adcd5c56a04a0ba152340ff86e1bb06b585f36a1 SHA1 bcb451e3dac70be5628bcdfb001d53b25e4fe5cb SHA256 2299076808cdfc1d12f76e428f3fec680eabd44d4f352c93e9544cfda19eb2b5
 DIST gle-manual-4.2.0.pdf 2529384 RMD160 e24bde8586aa15bf478a5972394261886033fd3d SHA1 699784b0cc6137aee32bba7bcaf34975e6394464 SHA256 646176697850d2e22d58cb99c8f2e806d1b348b1e616939d8a62bfb97a559a20
-DIST vim_gle.zip 2121 RMD160 5ec2978642b81b7f67d1650bca109b5868bd7a71 SHA1 97f29783c57be10e0248f8b9ffe7ab1459032fe5 SHA256 b4913ba1303a6cf8feec3969d4fb391dfcf15adfc623fc8c61fc3834ea8d4941
-EBUILD gle-4.1.2b.ebuild 2692 RMD160 b6d7315517a62add2aea8373f403fbb34287c592 SHA1 9f975a388115df02da64b218c4aa5e3cc0a5301b SHA256 566c7de5d142721a448cd8f2bab6feea457c91c71582fc559526890f31401345
 EBUILD gle-4.2.0.ebuild 2469 RMD160 17b476447e88e7c0db1bd1d1a4f8fdcb8af13e88 SHA1 e7816a5bc5de03af094502195eab92a4a9985ac2 SHA256 a77ab8ce46e62b223f9df252b8ad7f7a5c8015a6e81782088ed518c34abb349c
-MISC ChangeLog 1221 RMD160 9215204c7ea18ec8306b6ca5172bc79ab0590f7c SHA1 ae571ac623760f46820d9f93647d08ea4a14b35c SHA256 1d15c41b1ee49c7145245d7418c1aee31fb50fc2035a2a20f009016124c9ddad
+EBUILD gle-4.2.1.ebuild 2476 RMD160 b6b0f1fd2e9a33bb6dec1f1172e8bdbf3822183a SHA1 f8980c63316a4a2815876e1487e08383c0504564 SHA256 fd40d3773042177789b5f5852a9a677c1c46ceaeadd7c20abf86029cdb10cb8c
+MISC ChangeLog 1384 RMD160 1dabafacc7aa5c0234b7b5aabbc9e159655c3501 SHA1 a497368eae46b2486686896c86508760c6590e32 SHA256 ee780382c04182d9bb491c34ce61e8e945e3aa71192cffbb57db01e2ebe2bcb9
 MISC metadata.xml 515 RMD160 a04a55d1a6c8f1e947200d546e5e8e22be5d144d SHA1 f9a02c835f68b9d91bda0578045e0631084b607b SHA256 a75689c90bb13cf073d34c175453181823b0f6cc9a824baa69bd56e1308d5c95
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
 }