Version bump, thanks to Claus-Justus Heine <himself@claus-justus-heine.de>, #504372

(Portage version: 2.2.8-r1/cvs/Linux i686, signed Manifest commit with key 0x3AFFCE974D34BD8C!)

4 files changed, 87 insertions, 8 deletions

diff --git a/sci-mathematics/geomview/ChangeLog b/sci-mathematics/geomview/ChangeLog
index a8322631f0cb..515a3bbd2e2f 100644
--- a/sci-mathematics/geomview/ChangeLog
+++ b/sci-mathematics/geomview/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/geomview
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/ChangeLog,v 1.18 2013/11/11 22:16:29 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/ChangeLog,v 1.19 2014/03/25 05:49:23 grozin Exp $
+
+*geomview-1.9.5 (25 Mar 2014)
+
+  25 Mar 2014; Andrey Grozin <grozin@gentoo.org> +geomview-1.9.5.ebuild,
+  files/gvcl-mode.el,metadata.xnl:
+  Version bump, thanks to Claus-Justus Heine <himself@claus-justus-heine.de>,
+  #504372
 
   11 Nov 2013; Michael Sterrett <mr_bones_@gentoo.org> geomview-1.9.4.ebuild:
   drop gsview which is gtk+:1 only from the list of choices
diff --git a/sci-mathematics/geomview/files/gvcl-mode.el b/sci-mathematics/geomview/files/gvcl-mode.el
index f47ae487a536..cbfadafc205f 100644
--- a/sci-mathematics/geomview/files/gvcl-mode.el
+++ b/sci-mathematics/geomview/files/gvcl-mode.el
@@ -66,7 +66,7 @@
 
 (defconst gvcl-font-lock-keywords-1
   (list
-   '("(\\(progn\\|backcolor\\|read\\|camera\\|new-geometry\\|car\\|cdr\\|emodule-\\S-+\\|ui-\\S-+\\|normalization\\)\\>" . font-lock-builtin-face)
+   '("(\\s-*\\(redraw\\|process-events\\|interest\\|time-interests\\|and\\|sleep-\\(for\\|until\\)\\|or\\|hdefine\\|geometry\\|quote\\|eval\\|if\\|while\\|setq\\|echo\\|let\\|exit\\|quit\\|lambda\\|defun\\|progn\\|backcolor\\|read\\|camera\\|new-geometry\\|car\\|cdr\\|cons\\|emodule\\S-*\\|ui-\\S-+\\|normalization\\)\\>" . font-lock-builtin-face)
    '("\\(\"\\w*\"\\)" . font-lock-variable-name-face))
   "Minimal highlighting expressions for GVCL mode.")
 
@@ -74,24 +74,27 @@
   (append gvcl-font-lock-keywords-1
 		  (list
 		   '("\\<\\(\\(location\\|origin\\)\\s-+\\(camera\\|local\\|global\\|ndc\\|screen\\)\\)\\>" . font-lock-constant-face)
-		   '("\\<\\(define\\|geom\\(etry\\)?\\|camera\\|window\\)\\>" . font-lock-keyword-face)))
+		   '("\\<\\(define\\|geom\\(etry\\)?\\|camera\\|window\\|inertia\\|allgeoms\\|focus-change\\)\\>" . font-lock-keyword-face)))
   "Additional Keywords to highlight in GVCL mode.")
 
 (defconst gvcl-font-lock-keywords-3
   (append gvcl-font-lock-keywords-2
 		  (list
-		   '("\\<\\(yes\\|no\\|on\\|off\\|toggle\\|center\\|none\\|focus-change\\|allgeoms\\)\\>" . font-lock-constant-face)
 		   '("\\<\\(INST\\|T?LIST\\|\\(ST\\)?Z?u?v?C?N?U?4?n?\\(OFF\\|MESH\\|SKEL\\|VECT\\|QUAD\\|BEZ\\|BBP\\|BBOX\\|SPHERE\\|GROUP\\|DISCGRP\\|COMMENT\\)\\)\\>" . font-lock-type-face)
+		   ;; more OOGL keywords
+		   '("\\<\\(SINUSOIDAL\\|CYLINDRICAL\\|RECTANGULAR\\|STEREOGRAPHIC\\|ONEFACE\\)\\>" . font-lock-keyword-face)
 		   ;; apperance constants
-		   '("\\<\\(apply\\s-+\\(blend\\|modulate\\|replace\\|decal\\)\\|replacelights\\|face\\|edge\\|vect\\|transparent\\|normal\\|normscale\\|evert\\|texturing\\|mipmap\\|linear\\|mipinterp\\|backcull\\|concave\\|shadelines\\|keepcolor\\|shading\\s-+\\(smooth\\|flat\\|constant\\)\\|replacelights\\|clamp\\s-+\\(s\\|t\\|st\\|none\\)\\)\\>" . font-lock-constant-face)
+		   '("\\<\\(blend\\|modulate\\|replace\\|decal\\|replacelights\\|face\\|edge\\|vect\\|transparent\\|normal\\|normscale\\|evert\\|texturing\\|mipmap\\|linear\\|mipinterp\\|backcull\\|concave\\|shadelines\\|keepcolor\\|smooth\\|flat\\|constant\\|csmooth\\|vcflat\\|replacelights\\|clamp\\s-+\\(s\\|t\\|st\\|none\\)\\)\\>" . font-lock-constant-face)
 		   ;; image constants
 		   '("\\<\\(RGB\\|RGBA\\|ALPHA\\|LUMINANCE\\|LUMINANCE_ALPHA\\)\\>" . font-lock-constant-face)
 		   ;; image keywords
 		   '("\\<\\(inertia\\|width\\|height\\|channels\\|maxval\\|data\\)\\>" . font-lock-keyword-face)
 		   ;; apperance keywords
-		   '("\\<\\(localviewer\\|attenconst\\|attenmult2?\\|normscale\\|shading\\|linewidth\\|patchdice\\|ka\\|ambient\\|kd\\|diffuse\\|ks\\|specular\\|shininess\\|backdiffuse\\|alpha\\|edgecolor\\|normalcolor\\|color\\|position\\|file\\|alphafile\\|background\\)\\>" . font-lock-keyword-face)
+		   '("\\<\\(apply\\|shading\\|localviewer\\|attenconst\\|attenmult2?\\|normscale\\|shading\\|linewidth\\|patchdice\\|ka\\|ambient\\|kd\\|diffuse\\|ks\\|specular\\|shininess\\|backdiffuse\\|alpha\\|edgecolor\\|normalcolor\\|color\\|position\\|file\\|alphafile\\|background\\|texturing\\)\\>" . font-lock-keyword-face)
 		   ;; some more types
-		   '("\\<\\(texture\\|light\\|material\\|lighting\\|light\\|image\\|appearance\\|n?transforms?\\)\\>" . font-lock-type-face)
+		   '("\\<\\(texture\\|light\\|material\\|lighting\\|light\\|image\\|appearance\\|n?transforms?\\|tlist\\)\\>" . font-lock-type-face)
+		   ;; some more constants
+		   '("\\<\\(yes\\|no\\|on\\|off\\|toggle\\|center\\|none\\)\\>" . font-lock-constant-face)
 		   ))
   "Balls-out highlighting in GVCL mode.")
 
diff --git a/sci-mathematics/geomview/geomview-1.9.5.ebuild b/sci-mathematics/geomview/geomview-1.9.5.ebuild
new file mode 100644
index 000000000000..0ffb7bf92262
--- /dev/null
+++ b/sci-mathematics/geomview/geomview-1.9.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/geomview-1.9.5.ebuild,v 1.1 2014/03/25 05:49:23 grozin Exp $
+
+EAPI=5
+
+inherit elisp-common eutils flag-o-matic fdo-mime
+
+DESCRIPTION="Interactive Geometry Viewer"
+HOMEPAGE="http://geomview.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	http://dev.gentoo.org/~jlec/distfiles/geomview.png.tar"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="motionaveraging debug emacs zlib"
+
+DEPEND=">=x11-libs/motif-2.3:0
+	virtual/opengl
+	emacs? ( virtual/emacs )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	x11-misc/xdg-utils"
+
+S="${WORKDIR}/${P/_/-}"
+
+SITEFILE=50${PN}-gentoo.el
+
+src_configure() {
+	econf --docdir=/usr/share/doc/${PF} \
+		--with-htmlbrowser=xdg-open \
+		--with-pdfviewer=xdg-open \
+		$(use_enable debug d1debug) \
+		$(use_with zlib) \
+		$(use_enable motionaveraging motion-averaging)
+}
+
+src_compile() {
+	default
+	if use emacs; then
+		cp "${FILESDIR}/gvcl-mode.el" "${S}"
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS INSTALL.Geomview || die
+	doicon "${WORKDIR}"/geomview.png || die
+	make_desktop_entry ${PN} "GeomView ${PV}" \
+		/usr/share/pixmaps/${PN}.png \
+		"Science;Math;Education"
+
+	if use emacs; then
+		elisp-install ${PN} *.el *.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	use emacs && elisp-site-regen
+}
diff --git a/sci-mathematics/geomview/metadata.xml b/sci-mathematics/geomview/metadata.xml
index a93971a743e8..5d0f04c7f145 100644
--- a/sci-mathematics/geomview/metadata.xml
+++ b/sci-mathematics/geomview/metadata.xml
@@ -5,6 +5,7 @@
 <longdescription>Geomview is an interactive geometry viewer and Object Oriented Graphics Library (OOGL).</longdescription>
 <use>
   <flag name='avg'>Enable experimental motion averaging technique</flag>
+  <flag name='motionaveraging'>Enable experimental motion averaging technique</flag>
   <flag name='netpbm'>Add <pkg>media-libs/netpbm</pkg> support for external
     modules</flag>
 </use>