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

Package-Manager: portage-2.2.8-r1/cvs/Linux i686
Manifest-Sign-Key: 0x3AFFCE974D34BD8C!

5 files changed, 114 insertions, 11 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/Manifest b/sci-mathematics/geomview/Manifest
index 8dd971e5f3e5..456c469a3410 100644
--- a/sci-mathematics/geomview/Manifest
+++ b/sci-mathematics/geomview/Manifest
@@ -1,7 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 50geomview-gentoo.el 231 SHA256 b109acc005929e40cfe416b45ddea7e5c2831fe47648d4164905c587194a58d9 SHA512 c5d1420dedc078cee78870c48556f5470f384f1fd69c4cb4935ff4f59cbf2a9c17ea6e1dcdbf36149fcc4af2f801cc7420f1a1b0df8d96e14b97eb6439e94986 WHIRLPOOL 57c71c097c91f97e87bccd3eda89aabd7f2756e4667d94341b085b36016363072f8044e8db7ab355948835e419e1f42f5c79b0b5e9146fde5fe94d18b972ad4e
-AUX gvcl-mode.el 7014 SHA256 3014bb3990ec5e7afc8389be3527f0a763d3b4fc4d281ac9ff2d087408822b8e SHA512 3153ed7b86bc0f78a89f03e1fe7ad09e09fed1d64991f911591e0ca087aa4a1d9aad88003ed888f643991a75a4fbb63976fe65493bdf572063d23f6eea60e80f WHIRLPOOL 7bcef9b78d3e826ca0e620628244eadb0135ba499cc89e7f9ad6b7a43e19696fc14a5e69ae6f1c53c404f3fde3a036fdcaf18a3b199103f7fdd85f9cce9623e3
+AUX gvcl-mode.el 7416 SHA256 924325cdd45314b7038c02d1afd1620f5884343b7c5fd8a5bc38a42437d9d811 SHA512 b7f834cc5a3187e4a1fe5342a392d22576aee7f76f95493e02512e3055b1f5e349e170405e6b419c06816470167fc3a063f6f6dee934b35ed4f02f5a3e0a0812 WHIRLPOOL b37892d488384bcf64327e60f95fd69a1539913fad28fbcb9837e9c7072ac9647df74482a3d1fa78a87272c49d665ba85875ea0b27f375adaf3cfd51543c7731
 DIST geomview-1.9.4.tar.bz2 4037982 SHA256 a384790429541b8c86c41c4b27d157d5a92ee7c46e6a78741e55d81bd9a46c5b SHA512 bb584f654b3fbfb5fe317547a0b49270e4419a54d30fe70afbe161d76c0e29ca14c17a6bb44afbfa1fef75f18dfb53287e129a93fa57ab356727dc2dd9671a7f WHIRLPOOL 0c59c5c1e5dd8e2feb6916c5efc8affa1f6b7c82201b912834069b380606ea3dacae547633eabfce7887fbb15edd1e4b5dbe5af3a0455553dedaab2535e5ff1a
+DIST geomview-1.9.5.tar.bz2 4532535 SHA256 6b683735582ac4eab7f2618cf924c1244de58dd3ef195d06442aaea54cd9fb40 SHA512 a22bcd254e1e4c5c6797811f315d158f84fe82a3f95646bfdf3be203e9cd7fc8cacbf26f55a0a08bcb47cf2b2ad17ae4b48cdc4d78f810f48dab9fa1c7d56e7f WHIRLPOOL f89188ba357f814408fd8523ec416aab6052c1fb110110547e3e48a6c2d4bd8aa3d14f9d4995173e38714fa69156940950e2e4266d34685159d6ad35279b67f1
 DIST geomview.png.tar 10240 SHA256 cf1f5b94d868d363fa6f251343b1426cc7e9ed36ed8ee1fea4339ccabcba33cb SHA512 3abdc04f04410a50876af6b0f1aefc6891c47926ca9e5a4a31bd001310972996497f4e6c33db059fdbca09b236b7763e5476d75427e653d54861b4b3a4e54f51 WHIRLPOOL fecc6989bbef303b379673a503c322db1c8bbe61c346bc3dee984319eb29537985f2696c5a716e94398eb873fd6ed77a06e2462b615d7d4f22bad0bb033765a3
 EBUILD geomview-1.9.4.ebuild 2615 SHA256 dc621b2f5ab79d21bdd317dd6688c252ab95c275eb697822633c3bfdf83e85ec SHA512 a88c12d096b49cbad0058a6da9eb6f0791258ac1e939b3cce5b2de6b024f7ddba9b9b68dd4680f558ffda9b1b49ab6e83ca084a61a604853db6fcb8fdf6ab1d8 WHIRLPOOL 82c5cef7057f31a3056daedb68e98481efe45ca1fd280b57c0d42e9b95d927db267a9b4cf0b61d270630776d15630696eb4afe1dcaacf88442f583e50d9d66ba
-MISC ChangeLog 3898 SHA256 5f76d8a0baa99ae37a87b3cc3952ca5630b9937d687c9f11a02b3a5137bfe35c SHA512 bb1b300faf6f76fd402a8469450694ac71ec82ddc1e6f8119fdb14bf7cb8beaba4e77d9b04448030fda14cb8e7fa0c4d5cc5033dffce5a36100b8bbf248e5a03 WHIRLPOOL 00df1d9e868aeb67ea4319ffba02afd3f5e776b95a14d71f5235ba4624e0169d7f7a1ebcc5ae22d08bdf2970b6137813c0c509c25ee37a0bab8c80ec2c7b8182
-MISC metadata.xml 472 SHA256 dfb5beff6cdb535975b43eb3fed87d145d12235fb56435eca6caf7a876c6a43d SHA512 b8c12cdbd5424f7257a698f78b2816d6e0e14cbb62fa37fe52e53b77ec1df98c4b4330cfc1d05454c30211b52f49640648599165306c11a4010964228b890e8c WHIRLPOOL 36a214ca63c04efef3cdc315968182d1840be1856a4bf861954665e79d257c6c495ccb1103189c70058e44d6e323d4c02d65b9259496464d78c1655acf284cc4
+EBUILD geomview-1.9.5.ebuild 1638 SHA256 f72324b0f961ea6c25ec7134f7fee684ea3908450a72f8c43bc839b39d983ba6 SHA512 dcb0388335abac14488edb0f7c3ada34a09b5ead282210a079bd46ee30f2422acfc3f2722f611d955cbe01847bd5f5b29f55c9ab571b9e9cbf3b5f2f601e25b4 WHIRLPOOL 4187348d0f2fc25c01eae75f414ea6410a95126b2f7f9c716e60a7aea7eea76181cd88cc68ee7007ec4052ebfa1fca477cfafdb81bd2f06fac6f351469399834
+MISC ChangeLog 4123 SHA256 cd0671d2bd4941ad27bdbcc96897e71b847fe9bcc55a95462a85f0924458998e SHA512 e13c7cb21a58ef3fa5a36a39f993355b23171bf7fc1a1285c6858719fe95fc3200faa4efb39a3af309d0628aacb163cad1e69eeb38364a0224998c170b2cc78a WHIRLPOOL 8d160597d6e8da141f32d1e26f08e08551a6165b4db3b099cad2af48c9c7e7c719e92ba9e822a93ad79d48c05590396606e930c57a6b6095aadb46291d1da9e0
+MISC metadata.xml 557 SHA256 49b6e651f710d05949a8034e9756d85db51eb4f86f6aca822d50a064cbc8911c SHA512 955fc9dce33ffe5f77b3f342db36d5db8df0c4d368be9a0105b81f74925bb538e47fa729f1091c89e94ef48b8132733c02fe6e660c2d428f14f8023a67907cf7 WHIRLPOOL 45f640d1892caa8347be1142a6ed6f425eef09e852128032140619da700995f89499474bd0c6ab09699d2c3bdd18ca7737afae54492de260fec1170355aea1c7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQJ8BAEBCABmBQJTMRcTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
+QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2MHhgP/2LOjF1tUGCtDdD6eqv0bmC6
+d+J4BBBR3HgzHshT1yP3rtftS27ey6wL1y5D/VC+v449dlOnBx8IgECM+w4XE8WE
+ktvNPwmv3pogN19pBqjXgiwl6PuYW4JyG4O0Dww71luFE4eLEFgCu35w7zrUTgHm
+aPYZN/Bpq48d+DGVVr5uejQ4SFFh6buZNDUIBrRKOoDRk7xBDzqnKfxgnoFkT3eN
+Fsd8rHjKTiqi0B5T5dunj+UR0dfYHxXULZvWknVM/W247CZyf6PqOpj/vc9jK8PF
+4OM3/5C1ruzq8eMVZQJeZN3qJf++MzvMOvppyl/NF7WFv7VBZx3sTkZfZhtF3pWj
+515X5EnejrYPUDL3dj42gTClqyfCPo8Wfrms7bGeyqsN9ttvd225yU0HWkaW4ljL
+bYnFBIaGwjsQWcFtLv0VhU8Fv7q+CbUe89KMhRxANaDjyYdolP49APhsi8moCeTR
+XBrsRdyaYTjh+YEv78v5iJUFWmSmsEUYYnse82QpGp2CVB18w2Y50A+tyiexKmZ/
+tFWCXPO2JasQKzM2m4lRU3P4QaBAu5KMisAmvWPURA46AbQHc+fr7wV3qf/iMPOo
+SDU3KJRUPJYprSyYw+It8OQKjNs+t4Dn1KdFvz6HO9YhvddUNd8slLbLNAhqd66W
+EVGrwBXbh8k9DGRz2zHF
+=tzOp
+-----END PGP SIGNATURE-----
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>