version bump plus some QA fixes; RESTRICT test as they won't succeed

(Portage version: 2.1.3.9)

4 files changed, 72 insertions, 96 deletions

diff --git a/sci-misc/gri/ChangeLog b/sci-misc/gri/ChangeLog
index 44fc869173de..dc7bbddc7fc5 100644
--- a/sci-misc/gri/ChangeLog
+++ b/sci-misc/gri/ChangeLog
@@ -1,96 +1,10 @@
 # ChangeLog for sci-misc/gri
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/gri/ChangeLog,v 1.10 2007/02/22 01:17:00 jokey Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/gri/ChangeLog,v 1.11 2007/09/24 20:27:42 opfer Exp $
 
-  22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
-  Redigest for Manifest2
+*gri-2.12.16 (24 Sep 2007)
 
-*gri-2.12.14 (18 Jan 2007)
+  24 Sep 2007; Christian Faulhammer <opfer@gentoo.org> gri-2.12.14.ebuild,
+  +gri-2.12.16.ebuild:
+  version bump plus some QA fixes; RESTRICT test as they won't succeed
 
-  18 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
-  -files/info-install.patch, +gri-2.12.14.ebuild:
-  version bump; adjusted ghostscript dependency to virtual/ghostscript, as the
-  problem is resolved, reported by James Cloos <cloos@jhcloos.com> in bug
-  162630; added some quotes; removed stray patch
-
-*gri-2.12.13 (07 Dec 2006)
-
-  07 Dec 2006; Christian Faulhammer <opfer@gentoo.org> +gri-2.12.13.ebuild:
-  version bump
-
-  23 Nov 2006; Christian Faulhammer <opfer@gentoo.org> gri-2.12.7.ebuild,
-  gri-2.12.9.ebuild, gri-2.12.11.ebuild:
-  Added comment, why app-text/ghostscript-esp is used as a dependency and not
-  virtual/ghostscript
-
-  22 Nov 2006; Christian Faulhammer <opfer@gentoo.org> gri-2.12.7.ebuild,
-  gri-2.12.9.ebuild, gri-2.12.11.ebuild:
-  hard dependency on app-text/ghostscript-esp, as that is the only version
-  working from virtual/ghostscript, fixex bug #155236 reported by Patrick
-  Lauer <bugs@dev.gentooexperimental.org>
-
-*gri-2.12.11 (19 May 2006)
-
-  19 May 2006; Matthew Kennedy <mkennedy@gentoo.org> +files/50gri-gentoo.el,
-  metadata.xml, +gri-2.12.11.ebuild:
-  New upstream version; Resolves Bug #117312; Added Emacs Herd to metadata.xml
-  for Emacs portion maintainership; Added missing virtual/ghostscript
-  depdendency; Resolves Bug #133397.
-
-  15 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> gri-2.12.7.ebuild,
-  gri-2.12.9.ebuild:
-  Added media-gfx/imagemagick to DEPEND, closes bug 111087. Also marked stable
-  on amd64.
-
-*gri-2.12.9 (10 Mar 2005)
-
-  10 Mar 2005; Patrick Kursawe <phosphan@gentoo.org> -gri-2.12.5.ebuild,
-  gri-2.12.7.ebuild, +gri-2.12.9.ebuild:
-  Bug #82456, version bump and cleanup.
-
-*gri-2.12.5 (27 Dec 2004)
-
-  27 Dec 2004; Olivier Fisette <ribosome@gentoo.org> +metadata.xml,
-  +files/info-install.patch, +gri-2.12.5.ebuild, +gri-2.12.7.ebuild:
-  Moved from app-sci/gri to sci-misc/gri.
-
-  06 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> gri-2.12.7.ebuild:
-  Marked stable on amd64.
-
-  22 Apr 2004; David Holm <dholm@gentoo.org> gri-2.12.7.ebuild:
-  Added to ~ppc.
-
-  22 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> gri-2.12.7.ebuild:
-  marked ~amd64
-
-*gri-2.12.7 (22 Apr 2004)
-
-  22 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> gri-2.12.4.ebuild,
-  gri-2.12.5.ebuild, gri-2.12.7.ebuild:
-  Version bump
-
-  18 Nov 2003; Patrick Kursawe <phosphan@gentoo.org> gri-2.12.5.ebuild,
-  files/info-install.patch:
-  Fixing bug 33396, no revision bump.
-
-*gri-2.12.5 (30 Jun 2003)
-
-  30 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> gri-2.12.5.ebuild :
-  Version bump.
-
-*gri-2.12.4 (16 May 2003)
-
-  16 May 2003; George Shapovalov <george@gentoo.org> gri-2.12.4.ebuild :
-  new version
-
-*gri-2.12.1 (06 Dec 2002)
-
-  07 Jan 2003; George Shapovalov <george@gentoo.org> gri-2.12.1.ebuild :
-
-  incorporated changes suggested by Jose "to fix the path of the documentation in the startup msg"
-  added IUSE
-
-  06 Dec 2002; George Shapovalov <george@gentoo.org> ChangeLog, gri-2.12.1.ebuild, files/digest-gri-2.12.1 :
-  initial release (#10695)
-  Gri is a language for scientific graphics programming.
-  ebuild submitted by Jose Fonseca <j_r_fonseca@yahoo.co.uk>
diff --git a/sci-misc/gri/files/digest-gri-2.12.16 b/sci-misc/gri/files/digest-gri-2.12.16
new file mode 100644
index 000000000000..e057eeb9718d
--- /dev/null
+++ b/sci-misc/gri/files/digest-gri-2.12.16
@@ -0,0 +1,3 @@
+MD5 6c368b024367ad56b2c4a02666ce6672 gri-2.12.16.tar.gz 1431717
+RMD160 c42d77d4af370b7a0119e6b10ba69e18a1ed775a gri-2.12.16.tar.gz 1431717
+SHA256 dfe384cc8ebd82760b9c8a1af9644a69a995b2d4bd0f166abb667c918bd68df3 gri-2.12.16.tar.gz 1431717
diff --git a/sci-misc/gri/gri-2.12.14.ebuild b/sci-misc/gri/gri-2.12.14.ebuild
index eb53882c6c97..58d2edb42f8f 100644
--- a/sci-misc/gri/gri-2.12.14.ebuild
+++ b/sci-misc/gri/gri-2.12.14.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-misc/gri/gri-2.12.14.ebuild,v 1.1 2007/01/18 11:59:52 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/gri/gri-2.12.14.ebuild,v 1.2 2007/09/24 20:27:42 opfer Exp $
 
 inherit eutils elisp-common
 
@@ -13,6 +13,7 @@ SRC_URI="mirror://sourceforge/gri/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="test"
 
 DEPEND=">=sci-libs/netcdf-3.5.0
 	virtual/tetex
@@ -32,13 +33,13 @@ src_compile() {
 
 src_install() {
 	# Replace PREFIX now and correct paths in the startup message.
-	sed -e s,PREFIX/share/doc/gri/,/usr/share/doc/${P}/, -i ${S}/startup.msg
+	sed -e s,PREFIX/share/doc/gri/,/usr/share/doc/${P}/, -i "${S}/src/startup.msg"
 
 	einstall || die "einstall failed."
 
-	dodoc AUTHOR README
+	dodoc README
 	#move docs to the proper place
-	mv "${D}/usr/share/gri/doc/*" "${D}/usr/share/doc/${PF}"
+	mv "${D}"/usr/share/gri/doc/* "${D}/usr/share/doc/${PF}"
 	rmdir "${D}/usr/share/gri/doc/"
 
 	if use emacs; then
diff --git a/sci-misc/gri/gri-2.12.16.ebuild b/sci-misc/gri/gri-2.12.16.ebuild
new file mode 100644
index 000000000000..3557fe882708
--- /dev/null
+++ b/sci-misc/gri/gri-2.12.16.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/gri/gri-2.12.16.ebuild,v 1.1 2007/09/24 20:27:42 opfer Exp $
+
+inherit eutils elisp-common
+
+DESCRIPTION="language for scientific graphics programming"
+HOMEPAGE="http://gri.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gri/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="emacs"
+RESTRICT="test"
+
+DEPEND=">=sci-libs/netcdf-3.5.0
+	virtual/tetex
+	media-gfx/imagemagick
+	virtual/ghostscript
+	emacs? ( virtual/emacs )"
+
+SITEFILE="50gri-gentoo.el"
+
+src_compile() {
+	econf || die "econf failed."
+	emake || die "emake failed."
+	if use emacs; then
+		cd src
+		elisp-comp *.el || die "elisp-comp failed"
+	fi
+}
+
+src_install() {
+	# Replace PREFIX now and correct paths in the startup message.
+	sed -e s,PREFIX/share/doc/gri/,/usr/share/doc/${P}/, -i "${S}/src/startup.msg"
+
+	einstall || die "einstall failed."
+
+	dodoc README
+	#move docs to the proper place
+	mv "${D}"/usr/share/gri/doc/* "${D}/usr/share/doc/${PF}"
+	rmdir "${D}/usr/share/gri/doc/"
+
+	if use emacs; then
+		cd src
+		elisp-install gri *.{el,elc} || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}