Updated emacs support and removed old versions (fixes bug #194543).

Package-Manager: portage-2.1.4_rc10

11 files changed, 56 insertions, 285 deletions

diff --git a/sci-mathematics/geomview/ChangeLog b/sci-mathematics/geomview/ChangeLog
index ed034dcbda04..78c0de204564 100644
--- a/sci-mathematics/geomview/ChangeLog
+++ b/sci-mathematics/geomview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/geomview
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/ChangeLog,v 1.8 2007/09/25 13:39:19 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/ChangeLog,v 1.9 2007/12/18 16:43:20 markusle Exp $
+
+  18 Dec 2007; Markus Dittrich <markusle@gentoo.org>
+  +files/50geomview-gentoo.el, geomview-1.9.2.ebuild, geomview-1.9.4.ebuild, -geomview-1.8.1-r3.ebuild, -geomview-1.8.2_rc9.ebuild, 
+  -files/geomview-1.8.1-configure.diff, files/geomview-1.8.1-stdiostream.diff:
+  Updated emacs support and removed old versions (fixes bug #194543).
 
 *geomview-1.9.4 (25 Sep 2007)
 
diff --git a/sci-mathematics/geomview/Manifest b/sci-mathematics/geomview/Manifest
index 4f1ae39b98cf..91a251fc7c24 100644
--- a/sci-mathematics/geomview/Manifest
+++ b/sci-mathematics/geomview/Manifest
@@ -1,11 +1,7 @@
-AUX geomview-1.8.1-configure.diff 345 RMD160 70adb3ddd706fddf8f8ec0d858ff2ea395a19308 SHA1 84846508ef5fae80fd0869ad73909c1add995435 SHA256 c9ac2e438d6aa53a794a1d618acd8bd38c0979e19f7df1aacf9fb53f2bb2282b
-MD5 3d18ce933a28b57ce8532b5855eb4c18 files/geomview-1.8.1-configure.diff 345
-RMD160 70adb3ddd706fddf8f8ec0d858ff2ea395a19308 files/geomview-1.8.1-configure.diff 345
-SHA256 c9ac2e438d6aa53a794a1d618acd8bd38c0979e19f7df1aacf9fb53f2bb2282b files/geomview-1.8.1-configure.diff 345
-AUX geomview-1.8.1-stdiostream.diff 3679 RMD160 29f114ab6b438e17a3d30780f38f429b9ea62729 SHA1 d7715b72a6fa1e2aeaf3c215b7bcd4aae481b8e1 SHA256 13e6a320e4a966572f7ddbbcf677c7175fbb0aeb9c4aa308a5d582cb4edd82ac
-MD5 516cbbb8f525f64c20a456811b93c9fc files/geomview-1.8.1-stdiostream.diff 3679
-RMD160 29f114ab6b438e17a3d30780f38f429b9ea62729 files/geomview-1.8.1-stdiostream.diff 3679
-SHA256 13e6a320e4a966572f7ddbbcf677c7175fbb0aeb9c4aa308a5d582cb4edd82ac files/geomview-1.8.1-stdiostream.diff 3679
+AUX 50geomview-gentoo.el 231 RMD160 18434375f56703c275e42a8dfe791c3e1b28273d SHA1 87d7920477a038958c0d9b200544ef6b72e58814 SHA256 20cbf618e5754e4a8a44b2e1b78be8bd83f417f97546de09f21702218a9eabe5
+MD5 7bdaca473ffb241ee345b8cae89c87cc files/50geomview-gentoo.el 231
+RMD160 18434375f56703c275e42a8dfe791c3e1b28273d files/50geomview-gentoo.el 231
+SHA256 20cbf618e5754e4a8a44b2e1b78be8bd83f417f97546de09f21702218a9eabe5 files/50geomview-gentoo.el 231
 AUX geomview.png 4078 RMD160 56e8e342976e20e5f173cdeb5ba3eefc2be6b0f9 SHA1 d9b66bcc42d72e11a8d9bdca58a3bcad7f5afff6 SHA256 8ed4c6b4a9a4edb5c7c31346a030a0547563b7e98dc2dc29eefde85fec7b64c2
 MD5 dfdfe5091208d8e26f3a00419f87f2f7 files/geomview.png 4078
 RMD160 56e8e342976e20e5f173cdeb5ba3eefc2be6b0f9 files/geomview.png 4078
@@ -14,40 +10,24 @@ AUX gvcl-mode.el 7014 RMD160 772b4f96ca4278402bc39850bbc61f67bb0977d0 SHA1 2de81
 MD5 ce6a1af8cc3e2373741dea9e46babb60 files/gvcl-mode.el 7014
 RMD160 772b4f96ca4278402bc39850bbc61f67bb0977d0 files/gvcl-mode.el 7014
 SHA256 3014bb3990ec5e7afc8389be3527f0a763d3b4fc4d281ac9ff2d087408822b8e files/gvcl-mode.el 7014
-DIST geomview-1.8.1.tar.gz 2766832 RMD160 4c42b928376517115e1bba16c978b80ff41b7b45 SHA1 026a22ecba471f7d55c407de4fc409213d166477 SHA256 4e65674b4a06b2042067003b5113eafd78b675748d4b572ee55c3ac93222703f
-DIST geomview-1.8.2-rc9.tar.bz2 3053944 RMD160 93705bef1d32796c3efec4891add5a1c6d4c12dc SHA1 4dd71d92b889c9440b8693cf31ad095856caf654 SHA256 dd7b6f066bda3cbcf628ef7ea3e4dd9da15948d15c1ab4125b89dfbd9d127738
 DIST geomview-1.9.2.tar.bz2 3060421 RMD160 af91598a2ce379df33aefbc018d40f4079891ed5 SHA1 81a11b5e7cd7b003550b90698bd32ac2b220ef5c SHA256 de91ba018fa08626180102d281d8564e5a55329a2a13fef23165504c56200c40
 DIST geomview-1.9.4.tar.bz2 4037982 RMD160 6d53d7e6bce17e3298dc6f55e1e1770918b868a5 SHA1 4d1c2654968c3f2395b438302e163e0465b7e2d3 SHA256 a384790429541b8c86c41c4b27d157d5a92ee7c46e6a78741e55d81bd9a46c5b
-EBUILD geomview-1.8.1-r3.ebuild 839 RMD160 65891f6b1fb92581e98fcd05deccc5aa8711b9c0 SHA1 caec2d73df6f9fd2c074f80a8f793dc94fc9360f SHA256 d65dc454e6f0b7a90681ebeff8e0d7090c416e5fe72bd7517301d3ba28c32168
-MD5 198d709a2060c952b869fd28e23f286b geomview-1.8.1-r3.ebuild 839
-RMD160 65891f6b1fb92581e98fcd05deccc5aa8711b9c0 geomview-1.8.1-r3.ebuild 839
-SHA256 d65dc454e6f0b7a90681ebeff8e0d7090c416e5fe72bd7517301d3ba28c32168 geomview-1.8.1-r3.ebuild 839
-EBUILD geomview-1.8.2_rc9.ebuild 789 RMD160 477ebb6526d82129e084b41e3bd4c0c72a6adbb4 SHA1 caa48879058671f8ac779b0c513b39599dcbd683 SHA256 ed545dcbe2fa9b9e65c144bf7897fcce5e7c73f5ec9f769f78e989209edc944f
-MD5 552e37e9e345cd1f5deec4d6ffd81f66 geomview-1.8.2_rc9.ebuild 789
-RMD160 477ebb6526d82129e084b41e3bd4c0c72a6adbb4 geomview-1.8.2_rc9.ebuild 789
-SHA256 ed545dcbe2fa9b9e65c144bf7897fcce5e7c73f5ec9f769f78e989209edc944f geomview-1.8.2_rc9.ebuild 789
-EBUILD geomview-1.9.2.ebuild 2606 RMD160 38cf6082b7c0bd6c512590ec3b72c70b2c7e1eac SHA1 49f0e12f94337f7e2455f8e8d4249637709d8959 SHA256 410d81aac4cdb83ca1e3ba62e57f6fded7e571180637fca686754b4f528984d8
-MD5 3400715c9e842c58b5794a51c682d5bb geomview-1.9.2.ebuild 2606
-RMD160 38cf6082b7c0bd6c512590ec3b72c70b2c7e1eac geomview-1.9.2.ebuild 2606
-SHA256 410d81aac4cdb83ca1e3ba62e57f6fded7e571180637fca686754b4f528984d8 geomview-1.9.2.ebuild 2606
-EBUILD geomview-1.9.4.ebuild 2586 RMD160 6bbcda371dcccd53ab56cd9a4df9dc637a075c67 SHA1 0dd96f2db7caa05b69a596d045d7fe76adfebb98 SHA256 76cc8f23dafd6451c478478f5d69602ec6ee129fb52454ab2e726fbdbe555904
-MD5 7d82ef2361241d08cfd681ac416dd591 geomview-1.9.4.ebuild 2586
-RMD160 6bbcda371dcccd53ab56cd9a4df9dc637a075c67 geomview-1.9.4.ebuild 2586
-SHA256 76cc8f23dafd6451c478478f5d69602ec6ee129fb52454ab2e726fbdbe555904 geomview-1.9.4.ebuild 2586
-MISC ChangeLog 2356 RMD160 99ac3beaf8e13cf463c70d117c18ecd644791129 SHA1 5c5338b1fdb5ae526d3ca16707cc4dc9f14fa6ab SHA256 802abab7c7cb68824c01562740d0555a279d7cfa794289dbc9d443c21fa327e5
-MD5 2dae6058ca85fede2fab61a6ad6c3a44 ChangeLog 2356
-RMD160 99ac3beaf8e13cf463c70d117c18ecd644791129 ChangeLog 2356
-SHA256 802abab7c7cb68824c01562740d0555a279d7cfa794289dbc9d443c21fa327e5 ChangeLog 2356
+EBUILD geomview-1.9.2.ebuild 2613 RMD160 c3b1f2d0a1c9071411d8fd53d7669abb8e0a2e31 SHA1 1d99823c6286225840e1637ae55269c7e6196209 SHA256 ac10f16ad9592e0877af03892b7552ead4049e8d226dd67578926081ef002349
+MD5 22e7da7a29a38fc3b12b8ef32a8bc03b geomview-1.9.2.ebuild 2613
+RMD160 c3b1f2d0a1c9071411d8fd53d7669abb8e0a2e31 geomview-1.9.2.ebuild 2613
+SHA256 ac10f16ad9592e0877af03892b7552ead4049e8d226dd67578926081ef002349 geomview-1.9.2.ebuild 2613
+EBUILD geomview-1.9.4.ebuild 2602 RMD160 a359bddcd23f80348bfc3df67143bb848ac445a3 SHA1 4a4ad775371a3f7c3d06306e010a067e7c06aec7 SHA256 b655cfbe0a6a649d76eb007ec522549829d33d4fd666a8af46f3ff00fb7ffa42
+MD5 1be40bd32220a377df123773c6e562ef geomview-1.9.4.ebuild 2602
+RMD160 a359bddcd23f80348bfc3df67143bb848ac445a3 geomview-1.9.4.ebuild 2602
+SHA256 b655cfbe0a6a649d76eb007ec522549829d33d4fd666a8af46f3ff00fb7ffa42 geomview-1.9.4.ebuild 2602
+MISC ChangeLog 2692 RMD160 019e43f5a8977cf780e92e947c7321eb89c82e69 SHA1 b1a5723b05eb5b2b4891ab4ab3571368721e2afd SHA256 b2326ae170ddde3fa474b48e257594f192c67489fe74cd36d0e329fe9cc16f0f
+MD5 84bb7ed209e97b94d0549aacc1caae63 ChangeLog 2692
+RMD160 019e43f5a8977cf780e92e947c7321eb89c82e69 ChangeLog 2692
+SHA256 b2326ae170ddde3fa474b48e257594f192c67489fe74cd36d0e329fe9cc16f0f ChangeLog 2692
 MISC metadata.xml 430 RMD160 69587f0c882c6d46eae5fe0baf06609f1f26c426 SHA1 a49102099313c1499e112ac58c98e8e9d652e509 SHA256 562657a247d7e4c0537adfa97ab2660c1d661d36fa8a7c28a305e4bc1b4ada4a
 MD5 442ddbe198a6f92c339dbd155b375d82 metadata.xml 430
 RMD160 69587f0c882c6d46eae5fe0baf06609f1f26c426 metadata.xml 430
 SHA256 562657a247d7e4c0537adfa97ab2660c1d661d36fa8a7c28a305e4bc1b4ada4a metadata.xml 430
-MD5 9f3fbb86274b6bea63b7f04160826f4f files/digest-geomview-1.8.1-r3 247
-RMD160 dbcf09e43b2435c8b8ad1b9099d44ddf954fea2e files/digest-geomview-1.8.1-r3 247
-SHA256 c72828a6573fb50ae4d866858d2688f74f7ad0728a5130af84ff432f06827c34 files/digest-geomview-1.8.1-r3 247
-MD5 df880f8965a8b2b606b375f8a6d0564b files/digest-geomview-1.8.2_rc9 262
-RMD160 f7cd0709867f2e6a9d331b7c7b7ef5516f8d4cde files/digest-geomview-1.8.2_rc9 262
-SHA256 c1cdf217a6973552db89874fbc549d87d35a4639d6f8db7fe4357d6e315a320e files/digest-geomview-1.8.2_rc9 262
 MD5 393dda97a8f344356bbaba5da3702888 files/digest-geomview-1.9.2 250
 RMD160 e24c982002efe77e9f960afd7ef05a300df6445b files/digest-geomview-1.9.2 250
 SHA256 9d544afc6b45434140ef842e8905be3d532ae090d5e096962ad0b578247939d4 files/digest-geomview-1.9.2 250
diff --git a/sci-mathematics/geomview/files/50geomview-gentoo.el b/sci-mathematics/geomview/files/50geomview-gentoo.el
new file mode 100644
index 000000000000..020fa2ae26d0
--- /dev/null
+++ b/sci-mathematics/geomview/files/50geomview-gentoo.el
@@ -0,0 +1,6 @@
+;;; gvcl-mode site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'gvcl-mode "gvcl-mode"
+  "Major mode for editing Geomview Command Language files." t)
+(add-to-list 'auto-mode-alist '("\\.gcl\\'" . gvcl-mode))
diff --git a/sci-mathematics/geomview/files/digest-geomview-1.8.1-r3 b/sci-mathematics/geomview/files/digest-geomview-1.8.1-r3
deleted file mode 100644
index f94587a5b83a..000000000000
--- a/sci-mathematics/geomview/files/digest-geomview-1.8.1-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1cb0e07a6552e9fe122491af70171536 geomview-1.8.1.tar.gz 2766832
-RMD160 4c42b928376517115e1bba16c978b80ff41b7b45 geomview-1.8.1.tar.gz 2766832
-SHA256 4e65674b4a06b2042067003b5113eafd78b675748d4b572ee55c3ac93222703f geomview-1.8.1.tar.gz 2766832
diff --git a/sci-mathematics/geomview/files/digest-geomview-1.8.2_rc9 b/sci-mathematics/geomview/files/digest-geomview-1.8.2_rc9
deleted file mode 100644
index e13be276a16d..000000000000
--- a/sci-mathematics/geomview/files/digest-geomview-1.8.2_rc9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a8d62bdf60e385f36e0a59f4d8bec361 geomview-1.8.2-rc9.tar.bz2 3053944
-RMD160 93705bef1d32796c3efec4891add5a1c6d4c12dc geomview-1.8.2-rc9.tar.bz2 3053944
-SHA256 dd7b6f066bda3cbcf628ef7ea3e4dd9da15948d15c1ab4125b89dfbd9d127738 geomview-1.8.2-rc9.tar.bz2 3053944
diff --git a/sci-mathematics/geomview/files/geomview-1.8.1-configure.diff b/sci-mathematics/geomview/files/geomview-1.8.1-configure.diff
deleted file mode 100644
index 7c4b3e56b859..000000000000
--- a/sci-mathematics/geomview/files/geomview-1.8.1-configure.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- geomview-1.8.1/configure.old	2003-10-06 20:19:35.000000000 -0700
-+++ geomview-1.8.1/configure	2003-10-06 20:20:22.000000000 -0700
-@@ -3319,7 +3319,7 @@
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
--  STRSTREAMLIB=-liostream
-+  STRSTREAMLIB=-lstdc++
-                      
- fi
- rm -f conftest*
diff --git a/sci-mathematics/geomview/files/geomview-1.8.1-stdiostream.diff b/sci-mathematics/geomview/files/geomview-1.8.1-stdiostream.diff
deleted file mode 100644
index e7821b6c338d..000000000000
--- a/sci-mathematics/geomview/files/geomview-1.8.1-stdiostream.diff
+++ /dev/null
@@ -1,142 +0,0 @@
-*** src/lib/oogl/util/glibglue.C	2001-02-23 05:40:30.000000000 +0100
---- ../geomview-GCC_3.2/src/lib/oogl/util/glibglue.C	2002-10-30 10:23:54.000000000 +0100
-***************
-*** 1,6 ****
-! #include <streambuf.h>
-! #include <strstream.h>
-! #include <stdiostream.h>
-! #include <iostream.h>
-
-  // This C++ glue allows futil.c to use the GNU libc (Linux)
---- 1,4 ----
-! #include <streambuf>
-! #include <sstream>
-
-  // This C++ glue allows futil.c to use the GNU libc (Linux)
-***************
-*** 9,20 ****
-
-  struct stdio_mark {
-!     istdiostream* instream;
-!     streammarker *m;
-  };
-
-! strstreambuf *
-  CC_fmemopen(char *mem, int len)
-  {
-!     return new strstreambuf(mem, len);
-  }
-
---- 7,23 ----
-
-  struct stdio_mark {
-!   FILE* instream;
-!   long m;
-  };
-
-!   std::stringbuf *
-  CC_fmemopen(char *mem, int len)
-  {
-!     std::stringbuf *b;
-!     b = new std::stringbuf;
-!     //b->str(mem);
-!     b->pubsetbuf(mem, len);
-!     return b;
-!     //return new std::streambuf(mem, len);
-  }
-
-***************
-*** 22,29 ****
-  CC_stdio_setmark(stdio_mark *sm, FILE* f)
-  {
-!     if(sm) delete sm->m;
-!     else   sm = new stdio_mark;
-!     sm->instream = new istdiostream(f);
-!     sm->m = new streammarker(sm->instream->rdbuf());
-      return sm;
-  }
---- 25,31 ----
-  CC_stdio_setmark(stdio_mark *sm, FILE* f)
-  {
-!     if(!sm) sm = new stdio_mark;
-!     sm->instream = f;
-!     sm->m = ftell(f);
-      return sm;
-  }
-***************
-*** 32,36 ****
-  CC_stdio_seekmark(struct stdio_mark *sm)
-  {
-!     return sm->instream->rdbuf()->seekmark(*sm->m);
-  }
-
---- 34,38 ----
-  CC_stdio_seekmark(struct stdio_mark *sm)
-  {
-!     return fseek(sm->instream, sm->m, SEEK_SET);
-  }
-
-***************
-*** 38,44 ****
-  CC_stdio_freemark(stdio_mark *sm)
-  {
--    delete sm->m;
--    delete sm->instream;
-     delete sm;
-  }
-
---- 40,45 ----
-  CC_stdio_freemark(stdio_mark *sm)
-  {
-     delete sm;
-  }
-
-+ 
-*** src/lib/oogl/util/futil.c	2001-02-23 05:41:31.000000000 +0100
---- ../geomview-GCC_3.2/src/lib/oogl/util/futil.c	2002-10-30 10:21:38.000000000 +0100
-***************
-*** 841,847 ****
-  #  endif
-  #endif
-! extern struct stdio_mark *CC_stdio_setmark__FP10stdio_markP8_IO_FILE(struct stdio_mark *m, FILE *f);
-! extern int		  CC_stdio_seekmark__FP10stdio_mark(struct stdio_mark *mark);
-! extern void  		  CC_stdio_freemark__FP10stdio_mark(struct stdio_mark *mark); 
-
-  #if !USE_FSTROPEN_1
---- 841,853 ----
-  #  endif
-  #endif
-! 
-! /* This a very nasty trick to link C++ functions from C code.
-!  * The names of the functions bellow are obtained by compiling the
-!  * glibglue.C file with "g++ -c" and then using "objdump -t glibglue.o"
-!  * to spy the names asigned to the functions
-!  */
-! extern struct stdio_mark *_Z16CC_stdio_setmarkP10stdio_markP8_IO_FILE(struct stdio_mark *m, FILE *f);
-! extern int		  _Z17CC_stdio_seekmarkP10stdio_mark(struct stdio_mark *mark);
-! extern void  		  _Z17CC_stdio_freemarkP10stdio_mark(struct stdio_mark *mark); 
-
-  #if !USE_FSTROPEN_1
-***************
-*** 857,867 ****
-
-  struct stdio_mark *stdio_setmark(struct stdio_mark *m, FILE *f)
-! { return CC_stdio_setmark__FP10stdio_markP8_IO_FILE(m, f); }
-
-  int stdio_seekmark(struct stdio_mark *mark)
-! { return CC_stdio_seekmark__FP10stdio_mark(mark) != EOF; }
-
-  void stdio_freemark(struct stdio_mark *mark)
-! { CC_stdio_freemark__FP10stdio_mark(mark); }
-
-
---- 863,873 ----
-
-  struct stdio_mark *stdio_setmark(struct stdio_mark *m, FILE *f)
-! { return _Z16CC_stdio_setmarkP10stdio_markP8_IO_FILE(m, f); }
-
-  int stdio_seekmark(struct stdio_mark *mark)
-! { return _Z17CC_stdio_seekmarkP10stdio_mark(mark) != EOF; }
-
-  void stdio_freemark(struct stdio_mark *mark)
-! { _Z17CC_stdio_freemarkP10stdio_mark(mark); }
diff --git a/sci-mathematics/geomview/geomview-1.8.1-r3.ebuild b/sci-mathematics/geomview/geomview-1.8.1-r3.ebuild
deleted file mode 100644
index b9d772af16b1..000000000000
--- a/sci-mathematics/geomview/geomview-1.8.1-r3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/geomview-1.8.1-r3.ebuild,v 1.1 2004/12/28 05:28:11 ribosome Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Interactive Geometry Viewer"
-SRC_URI="http://ftp1.sourceforge.net/geomview/geomview-1.8.1.tar.gz"
-HOMEPAGE="http://geomview.sourceforge.net"
-
-KEYWORDS="~x86 ~sparc ~ppc"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-lang/tk
-	x11-libs/xforms
-	x11-libs/lesstif
-	virtual/opengl"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-stdiostream.diff
-	epatch ${FILESDIR}/${P}-configure.diff
-}
-
-src_compile() {
-	append-flags "-DGL_GLEXT_LEGACY"
-	econf || die "could not configure"
-	make || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install
-}
diff --git a/sci-mathematics/geomview/geomview-1.8.2_rc9.ebuild b/sci-mathematics/geomview/geomview-1.8.2_rc9.ebuild
deleted file mode 100644
index e5696090a047..000000000000
--- a/sci-mathematics/geomview/geomview-1.8.2_rc9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/geomview-1.8.2_rc9.ebuild,v 1.1 2007/04/04 06:08:02 nerdboy Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Interactive Geometry Viewer"
-SRC_URI="http://mesh.dl.sourceforge.net/sourceforge/geomview/${P/_/-}.tar.bz2"
-HOMEPAGE="http://geomview.sourceforge.net"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-lang/tk
-	x11-libs/xforms
-	x11-libs/lesstif
-	virtual/opengl"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_compile() {
-	append-flags "-DGL_GLEXT_LEGACY"
-	econf || die "could not configure"
-	make || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "make install failed"
-}
diff --git a/sci-mathematics/geomview/geomview-1.9.2.ebuild b/sci-mathematics/geomview/geomview-1.9.2.ebuild
index 97d78e10ba33..5f9c101f2dc8 100644
--- a/sci-mathematics/geomview/geomview-1.9.2.ebuild
+++ b/sci-mathematics/geomview/geomview-1.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/geomview-1.9.2.ebuild,v 1.4 2007/07/13 05:28:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/geomview-1.9.2.ebuild,v 1.5 2007/12/18 16:43:20 markusle Exp $
 
 inherit eutils flag-o-matic fdo-mime
 
@@ -50,9 +50,9 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "emake install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 
-	doicon ${FILESDIR}/geomview.png
+	doicon "${FILESDIR}"/geomview.png
 	make_desktop_entry geomview "GeomView ${PV}" \
 	    "/usr/share/pixmaps/geomview.png" \
 	    "Science;Math;Education"
@@ -60,12 +60,12 @@ src_install() {
 	dodoc AUTHORS ChangeLog NEWS INSTALL.Geomview
 
 	if ! use pdf; then
-	    rm ${D}usr/share/doc/${PF}/${PN}.pdf
+	    rm "${D}"usr/share/doc/${PF}/${PN}.pdf
 	fi
 
 	if use emacs; then
 	    insinto /usr/share/geomview
-	    doins ${FILESDIR}/gvcl-mode.el || die
+	    doins "${FILESDIR}"/gvcl-mode.el || die
 	fi
 }
 
diff --git a/sci-mathematics/geomview/geomview-1.9.4.ebuild b/sci-mathematics/geomview/geomview-1.9.4.ebuild
index 2b650dfccbdb..371a18bfc0c5 100644
--- a/sci-mathematics/geomview/geomview-1.9.4.ebuild
+++ b/sci-mathematics/geomview/geomview-1.9.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/geomview-1.9.4.ebuild,v 1.1 2007/09/25 13:39:19 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/geomview-1.9.4.ebuild,v 1.2 2007/12/18 16:43:20 markusle Exp $
 
-inherit eutils flag-o-matic fdo-mime
+inherit elisp-common eutils flag-o-matic fdo-mime
 
 DESCRIPTION="Interactive Geometry Viewer"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -14,6 +14,7 @@ SLOT="0"
 IUSE="avg bzip2 debug emacs netpbm pdf zlib"
 
 DEPEND="zlib? ( sys-libs/zlib )
+	emacs? ( virtual/emacs )
 	virtual/motif
 	virtual/opengl"
 
@@ -32,21 +33,28 @@ RDEPEND="${DEPEND}
 	virtual/w3m"
 
 S="${WORKDIR}/${P/_/-}"
+SITEFILE=50${PN}-gentoo.el
 
 src_compile() {
 	# GNU standard is /usr/share/doc/${PN}, so override this; also note
 	# that motion averaging is still experimental.
 	if use pdf; then
-	    local myconf="--docdir=/usr/share/doc/${PF}"
+		local myconf="--docdir=/usr/share/doc/${PF}"
 	else
-	    local myconf="--docdir=/usr/share/doc/${PF} --without-pdfviewer"
+		local myconf="--docdir=/usr/share/doc/${PF} --without-pdfviewer"
 	fi
 
 	econf ${myconf} $(use_enable debug d1debug) $(use_with zlib) \
-	    $(use_enable avg motion-averaging) \
-	    || die "could not configure"
+		$(use_enable avg motion-averaging) \
+		|| die "could not configure"
 
 	emake || die "make failed"
+
+	if use emacs; then
+		cp "${FILESDIR}/gvcl-mode.el" "${S}"
+		elisp-compile *.el || die "elisp-compile failed"
+	fi
+
 }
 
 src_install() {
@@ -54,18 +62,19 @@ src_install() {
 
 	doicon "${FILESDIR}"/geomview.png
 	make_desktop_entry geomview "GeomView ${PV}" \
-	    "/usr/share/pixmaps/geomview.png" \
-	    "Science;Math;Education"
+		"/usr/share/pixmaps/geomview.png" \
+		"Science;Math;Education"
 
 	dodoc AUTHORS ChangeLog NEWS INSTALL.Geomview
 
 	if ! use pdf; then
-	    rm "${D}"/usr/share/doc/${PF}/${PN}.pdf
+		rm "${D}"/usr/share/doc/${PF}/${PN}.pdf
 	fi
 
 	if use emacs; then
-	    insinto /usr/share/geomview
-	    doins "${FILESDIR}"/gvcl-mode.el || die
+		elisp-install ${PN} *.el *.elc|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || \
+			die "elisp-site-file-install failed"
 	fi
 }
 
@@ -79,14 +88,11 @@ pkg_postinst() {
 	elog "you wish to use an alternate PDF viewer, feel free to remove"
 	elog "xpdf and use the viewer of your choice (see the docs for how"
 	elog "to setup the \'(ui-pdf-viewer VIEWER)\' GCL-command)."
-	elog ""
-	elog "If you use emacs, enable the corresponding use flag and check"
-	elog "out the provided mode file for editing the GeomView command"
-	elog "language (courtesy of Claus-Justus Heine).  Incorporating it"
-	elog "into your emacs configuration is left as an exercise..."
-	elog ""
+
+	use emacs && elisp-site-regen
 }
 
 pkg_postrm() {
 	fdo-mime_desktop_database_update
+	use emacs && elisp-site-regen
 }