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

(Portage version: 2.1.4_rc10)

10 files changed, 40 insertions, 249 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/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
 }