(#93095) New GTK+-2 version, taken from the science overlay (Pablo De Nápoli, Jan Kohnert, et al.).

(Portage version: 2.1.2_rc3-r4)

7 files changed, 176 insertions, 1 deletions

diff --git a/sci-visualization/scigraphica/ChangeLog b/sci-visualization/scigraphica/ChangeLog
index 5b0b94693d57..f1fb408a72e8 100644
--- a/sci-visualization/scigraphica/ChangeLog
+++ b/sci-visualization/scigraphica/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-visualization/scigraphica
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scigraphica/ChangeLog,v 1.2 2006/02/16 19:30:42 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scigraphica/ChangeLog,v 1.3 2006/12/18 07:35:05 dberkholz Exp $
+
+*scigraphica-2.1.0 (18 Dec 2006)
+
+  18 Dec 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/scigraphica-2.1.0-arrayobject.patch,
+  +files/scigraphica-2.1.0-desktop.patch,
+  +files/scigraphica-2.1.0-intl.patch,
+  +files/scigraphica-2.1.0-versioning.patch, +scigraphica-2.1.0.ebuild:
+  (#93095) New GTK+-2 version, taken from the science overlay (Pablo De
+  Nápoli, Jan Kohnert, et al.).
 
   29 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> +files/gcc3.4.patch,
   +metadata.xml, +scigraphica-0.8.0-r2.ebuild:
diff --git a/sci-visualization/scigraphica/files/digest-scigraphica-2.1.0 b/sci-visualization/scigraphica/files/digest-scigraphica-2.1.0
new file mode 100644
index 000000000000..ca9685699844
--- /dev/null
+++ b/sci-visualization/scigraphica/files/digest-scigraphica-2.1.0
@@ -0,0 +1,3 @@
+MD5 80b74b2faa0e2c46361f4de51e73df34 scigraphica-2.1.0.tar.gz 539549
+RMD160 275790299fcceee41a186b4ec03e1a9e3b3eb125 scigraphica-2.1.0.tar.gz 539549
+SHA256 b424310506995507d053573f1995f9cfbbce0a7fdc7dc93effc6dbec54aa15f9 scigraphica-2.1.0.tar.gz 539549
diff --git a/sci-visualization/scigraphica/files/scigraphica-2.1.0-arrayobject.patch b/sci-visualization/scigraphica/files/scigraphica-2.1.0-arrayobject.patch
new file mode 100644
index 000000000000..faf851624d0d
--- /dev/null
+++ b/sci-visualization/scigraphica/files/scigraphica-2.1.0-arrayobject.patch
@@ -0,0 +1,15 @@
+diff -urN scigraphica-2.1.0/configure.in scigraphica-2.1.0.new/configure.in
+--- scigraphica-2.1.0/configure.in	2005-06-24 02:43:36.000000000 +0100
++++ scigraphica-2.1.0.new/configure.in	2006-06-08 17:06:44.000000000 +0100
+@@ -381,9 +381,9 @@
+                   PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
+ 		  PY_LIBS="python$PY_VERSION"
+ 		  PY_LIB_LOC="$PY_EXEC_PREFIX/lib/python$PY_VERSION/"
+-                  array_loc=`find $python_numeric_path -name arrayobject.h | sed s/arrayobject\.h//`
++                  array_loc=`find $python_numeric_path -name arrayobject.h | sed s/arrayobject\.h// | head -n 1`
+                   if test x$array_loc = x; then 
+-                     array_loc=`find $PY_PREFIX/ -name arrayobject.h | sed s/arrayobject\.h//`
++                     array_loc=`find $PY_PREFIX/ -name arrayobject.h | sed s/arrayobject\.h// | head -n 1`
+                   fi
+                   if test -n $array_loc -a -d $array_loc; then
+                      echo "$array_loc"
diff --git a/sci-visualization/scigraphica/files/scigraphica-2.1.0-desktop.patch b/sci-visualization/scigraphica/files/scigraphica-2.1.0-desktop.patch
new file mode 100644
index 000000000000..d8d23ad5cb10
--- /dev/null
+++ b/sci-visualization/scigraphica/files/scigraphica-2.1.0-desktop.patch
@@ -0,0 +1,23 @@
+diff -urN scigraphica-2.1.0/docs/Makefile.am scigraphica-2.1.0.new/docs/Makefile.am
+--- scigraphica-2.1.0/docs/Makefile.am	2006-06-08 17:13:06.000000000 +0100
++++ scigraphica-2.1.0.new/docs/Makefile.am	2006-06-08 17:16:00.000000000 +0100
+@@ -25,6 +25,6 @@
+ 
+ EXTRA_DIST = $(HTMLFILES) topic.dat
+ 
+-htmldir = $(datadir)/gnome/help/scigraphica/C/
++htmldir = $(datadir)/scigraphica
+ 
+ html_DATA = $(HTMLFILES) topic.dat
+diff -urN scigraphica-2.1.0/Makefile.am scigraphica-2.1.0.new/Makefile.am
+--- scigraphica-2.1.0/Makefile.am	2006-06-08 17:13:06.000000000 +0100
++++ scigraphica-2.1.0.new/Makefile.am	2006-06-08 17:14:07.000000000 +0100
+@@ -26,7 +26,7 @@
+         gnome-pty.h  \
+         sg.desktop
+ 
+-Applicationsdir = $(datadir)/gnome/apps/Applications
++Applicationsdir = $(datadir)/applications
+ Applications_DATA = sg.desktop
+ 
+ man_MANS = scigraphica.1
diff --git a/sci-visualization/scigraphica/files/scigraphica-2.1.0-intl.patch b/sci-visualization/scigraphica/files/scigraphica-2.1.0-intl.patch
new file mode 100644
index 000000000000..5e81dcefe4ed
--- /dev/null
+++ b/sci-visualization/scigraphica/files/scigraphica-2.1.0-intl.patch
@@ -0,0 +1,47 @@
+diff -urN scigraphica-2.1.0.old/configure.in scigraphica-2.1.0/configure.in
+--- scigraphica-2.1.0.old/configure.in	2006-06-09 20:48:36.000000000 +0100
++++ scigraphica-2.1.0/configure.in	2006-06-09 20:49:08.000000000 +0100
+@@ -84,7 +84,7 @@
+ 
+ # The list of languages known to SciGraphica
+ # This is needed by GNU gettext
+-ALL_LINGUAS="es de nl"
++#ALL_LINGUAS="es de nl"
+ 
+ dnl Extra include and library paths
+ 
+@@ -99,7 +99,7 @@
+ fi
+ 
+ dnl i18n internationalization
+-#AM_GNU_GETTEXT
++AM_GLIB_GNU_GETTEXT
+ USE_INCLUDED_LIBINTL="yes"
+ AC_SUBST(USE_INCLUDED_LIBINTL)
+ 
+@@ -489,6 +489,7 @@
+ plugins/Makefile
+ src/Makefile
+ pixmaps/Makefile
++po/Makefile.in
+ plugins/io/Makefile
+ plugins/toolbars/Makefile
+ plugins/menus/Makefile
+diff -urN scigraphica-2.1.0.old/Makefile.am scigraphica-2.1.0/Makefile.am
+--- scigraphica-2.1.0.old/Makefile.am	2006-06-09 20:48:36.000000000 +0100
++++ scigraphica-2.1.0/Makefile.am	2006-06-09 20:48:45.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Makefile.am for sg
+ 
+-SUBDIRS = docs examples pixmaps src plugins
++SUBDIRS = docs examples pixmaps src plugins po
+ 
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+diff -urN scigraphica-2.1.0.old/po/POTFILES.in scigraphica-2.1.0/po/POTFILES.in
+--- scigraphica-2.1.0.old/po/POTFILES.in	1970-01-01 01:00:00.000000000 +0100
++++ scigraphica-2.1.0/po/POTFILES.in	2006-06-09 20:48:45.000000000 +0100
+@@ -0,0 +1,3 @@
++plugins/io/plugin.xml.in
++plugins/menus/plugin.xml.in
++plugins/toolbars/plugin.xml.in
diff --git a/sci-visualization/scigraphica/files/scigraphica-2.1.0-versioning.patch b/sci-visualization/scigraphica/files/scigraphica-2.1.0-versioning.patch
new file mode 100644
index 000000000000..fe3dfd1a1a5c
--- /dev/null
+++ b/sci-visualization/scigraphica/files/scigraphica-2.1.0-versioning.patch
@@ -0,0 +1,25 @@
+diff -urN scigraphica-2.1.0/configure.in scigraphica-2.1.0.new/configure.in
+--- scigraphica-2.1.0/configure.in	2006-06-08 17:06:44.000000000 +0100
++++ scigraphica-2.1.0.new/configure.in	2006-06-08 17:12:33.000000000 +0100
+@@ -428,9 +428,9 @@
+ #
+ 
+ UNAME=`uname -s -m -r -p`
+-GTK_EXTRA_VERSION=`$GTK_EXTRA_CONFIG --version`
+-GTK_VERSION=`$GTK_CONFIG --version`
+-XML_VERSION=`$XML_CONFIG --version`
++GTK_EXTRA_VERSION=`$PKG_CONFIG --modversion gtkextra-2.0`
++GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0`
++XML_VERSION=`$PKG_CONFIG --modversion libxml-2.0`
+ 
+ # strip duplicate entries in compiler flags
+ echo "stripping compiler flags"
+@@ -472,7 +472,7 @@
+ xml-$XML_VERSION  python-$PY_VVERSION  $array_loc\\n"\
+ __DATE__ " " __TIME__ "\\n\
+ Compiler flags:$COMPILER_FLAGS\\n\
+-(C) 2000 Adrian E. Feiguin\\n"
++(C) 2000 - 2005 Adrian E. Feiguin\\n"
+ )
+ 
+ AC_DEFINE_UNQUOTED(SCIGRAPHICA_ROOT, "$prefix")
diff --git a/sci-visualization/scigraphica/scigraphica-2.1.0.ebuild b/sci-visualization/scigraphica/scigraphica-2.1.0.ebuild
new file mode 100644
index 000000000000..c27f06e3f574
--- /dev/null
+++ b/sci-visualization/scigraphica/scigraphica-2.1.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scigraphica/scigraphica-2.1.0.ebuild,v 1.1 2006/12/18 07:35:05 dberkholz Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="Scientific application for data analysis and technical graphics"
+SRC_URI="mirror://sourceforge/scigraphica/${P}.tar.gz"
+HOMEPAGE="http://scigraphica.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+DEPEND=">=sci-libs/libscigraphica-2.1.0
+	>=dev-python/pygtk-2.6.1-r1
+	>=media-libs/imlib-1.9.7"
+
+src_unpack() {
+
+	unpack ${A}
+	cd "${S}"
+
+	# fix arrayobject problems
+	epatch "${FILESDIR}"/${P}-arrayobject.patch
+	# fix versioning stuff
+	epatch "${FILESDIR}"/${P}-versioning.patch
+	# fix desktop entry and docs
+	epatch "${FILESDIR}"/${P}-desktop.patch
+	# fix intltoolization and switch to glib_gettext
+	epatch "${FILESDIR}"/${P}-intl.patch
+
+	sed -i \
+		-e "s:/lib:/$(get_libdir):g" \
+		configure.in || die "sed for configure.in failed"
+
+	einfo "Running intltoolize --copy --force --automake"
+	intltoolize --copy --force --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install Failed"
+	dodoc AUTHORS ChangeLog FAQ.compile \
+		INSTALL NEWS README TODO
+}
+
+pkg_postinst() {
+	ewarn "Please be sure to remove your old scigraphica"
+	ewarn "configuration directory."
+	ewarn "Otherwise scigraphica won't work."
+}