new revision, fixes ##18436 and 20853

6 files changed, 88 insertions, 9 deletions

diff --git a/app-sci/scigraphica/ChangeLog b/app-sci/scigraphica/ChangeLog
index ad248a9ab1f0..26911c516403 100644
--- a/app-sci/scigraphica/ChangeLog
+++ b/app-sci/scigraphica/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-sci/scigraphica
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/scigraphica/ChangeLog,v 1.5 2003/09/02 22:41:58 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/scigraphica/ChangeLog,v 1.6 2004/01/04 20:49:18 george Exp $
+
+*scigraphica-0.8.0-r2 (04 jan 2003)
+
+  04 Jan 2003; George Shapovalov <george@gentoo.org> scigraphica-0.8.0-r2.ebuild :
+  fixes ##18436 and 20853.
 
   02 Sep 2003; Alastair Tse <liquidx@gentoo.org> scigraphica-0.8.0-r1.ebuild,
   scigraphica-0.8.0.ebuild:
diff --git a/app-sci/scigraphica/Manifest b/app-sci/scigraphica/Manifest
index f4810c2cd8e5..e4bc8db16dfb 100644
--- a/app-sci/scigraphica/Manifest
+++ b/app-sci/scigraphica/Manifest
@@ -1,6 +1,8 @@
-MD5 e17fa1fad380539c0cdb6115d341307a ChangeLog 1008
-MD5 3da61bb108738c38684d43c0ed60ca56 scigraphica-0.8.0.ebuild 1644
-MD5 1c49c8ce5412b48d56881cc0f634f407 scigraphica-0.8.0-r1.ebuild 1673
+MD5 12a51837dc01baaaf94ee15c98f8f5c8 scigraphica-0.8.0-r2.ebuild 2366
+MD5 9d19e029f3de2430bca211abeab7d45a scigraphica-0.8.0.ebuild 1642
+MD5 6ae8b056e9214edf89470505930c1930 scigraphica-0.8.0-r1.ebuild 1671
+MD5 ccae2be689b7ebe36fa3310e0d56b121 ChangeLog 1155
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 c2d9cfaee160e764e5ea4eef6864b114 files/digest-scigraphica-0.8.0 69
 MD5 c2d9cfaee160e764e5ea4eef6864b114 files/digest-scigraphica-0.8.0-r1 69
+MD5 c2d9cfaee160e764e5ea4eef6864b114 files/digest-scigraphica-0.8.0-r2 69
+MD5 c2d9cfaee160e764e5ea4eef6864b114 files/digest-scigraphica-0.8.0 69
diff --git a/app-sci/scigraphica/files/digest-scigraphica-0.8.0-r2 b/app-sci/scigraphica/files/digest-scigraphica-0.8.0-r2
new file mode 100644
index 000000000000..16631c877734
--- /dev/null
+++ b/app-sci/scigraphica/files/digest-scigraphica-0.8.0-r2
@@ -0,0 +1 @@
+MD5 8527c80fe75bc4f72c14548c7a2b0b71 scigraphica-0.8.0.tar.gz 841199
diff --git a/app-sci/scigraphica/scigraphica-0.8.0-r1.ebuild b/app-sci/scigraphica/scigraphica-0.8.0-r1.ebuild
index 61b30e652075..2b68e90cd1ba 100644
--- a/app-sci/scigraphica/scigraphica-0.8.0-r1.ebuild
+++ b/app-sci/scigraphica/scigraphica-0.8.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/scigraphica/scigraphica-0.8.0-r1.ebuild,v 1.4 2003/09/06 22:23:06 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/scigraphica/scigraphica-0.8.0-r1.ebuild,v 1.5 2004/01/04 20:49:18 george Exp $
 
 DESCRIPTION="Scientific application for data analysis and technical graphics"
 SRC_URI="http://scigraphica.sourceforge.net/src/${P}.tar.gz"
diff --git a/app-sci/scigraphica/scigraphica-0.8.0-r2.ebuild b/app-sci/scigraphica/scigraphica-0.8.0-r2.ebuild
new file mode 100644
index 000000000000..9a30b6dccda2
--- /dev/null
+++ b/app-sci/scigraphica/scigraphica-0.8.0-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/scigraphica/scigraphica-0.8.0-r2.ebuild,v 1.1 2004/01/04 20:49:18 george Exp $
+
+DESCRIPTION="Scientific application for data analysis and technical graphics"
+SRC_URI="http://scigraphica.sourceforge.net/src/${P}.tar.gz"
+HOMEPAGE="http://scigraphica.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="gnome"
+
+DEPEND=">=x11-libs/gtk+extra-0.99.17
+	=dev-python/pygtk-0.6*
+	>=dev-python/numeric-20.3
+	>=dev-libs/libxml-1.8.16
+	>=media-libs/imlib-1.9.14
+	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r3 >=gnome-base/ORBit-0.5.12-r1 >=gnome-base/gnome-print-0.34 )"
+	#bonobo? ( >=gnome-base/bonobo-1.0.18 )"
+
+pkg_setup() {
+	if has_version ">=dev-python/pygtk-0.99"; then
+		eerror "Setup has detected that you have >=dev-python/pygtk-0.99 installed"
+		eerror "on yor system. This will conflict with the required pygtk-0.6"
+		ewarn "Therefore"
+		ewarn 'Please "emerge unmerge pygtk",  then'
+		ewarn '"emerge scigraphica; run it once, and then remerge pygtk version'
+		ewarn 'you had (best accomplished by running "emerge -u --deep world")'
+		die
+	fi
+}
+
+src_compile() {
+	#bonobo breaks compile when enabled so it is not enabled for now.
+	#the result seems to be no printing under gnome.
+	#also need to look into --with-lp and --with-lpr config flags
+
+	local myconf=""
+	use gnome || myconf="${myconf} --without-gnome" #default enabled
+#	use bonobo && myconf="${myconf} --with-bonobo" #default disabled
+
+	#fix Exec= in sg.desktop
+	cp sg.desktop sg.desktop.orig
+	sed -e 's:\(Exec=\)sga:\1scigraphica:' sg.desktop.orig > sg.desktop
+
+	#fix termcap dependency
+	cp configure configure.orig
+	sed -e 's:-ltermcap:-lncurses:' configure.orig > configure
+
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		${myconf} || die "Configuration Failed"
+
+	emake || die "Parallel Make Failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "Installation Failed"
+	dodoc AUTHORS ChangeLog FAQ.compile \
+		INSTALL NEWS README TODO
+}
+
+pkg_postinst() {
+	ewarn "Please, if you need to remerge pygtk-2* afterwards, do not forget to run scigraphica"
+	ewarn "as your intended user once before that!"
+	ewarn "You may also want to remove ~/.scigpahica/config first."
+}
diff --git a/app-sci/scigraphica/scigraphica-0.8.0.ebuild b/app-sci/scigraphica/scigraphica-0.8.0.ebuild
index 78ebaf4d2fa9..80a04bfa3b05 100644
--- a/app-sci/scigraphica/scigraphica-0.8.0.ebuild
+++ b/app-sci/scigraphica/scigraphica-0.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/scigraphica/scigraphica-0.8.0.ebuild,v 1.10 2003/09/06 22:23:06 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/scigraphica/scigraphica-0.8.0.ebuild,v 1.11 2004/01/04 20:49:18 george Exp $
 
 DESCRIPTION="Scientific application for data analysis and technical graphics"
 SRC_URI="http://scigraphica.sourceforge.net/src/${P}.tar.gz"