aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-visualization/scigraphica')
-rw-r--r--sci-visualization/scigraphica/ChangeLog13
-rw-r--r--sci-visualization/scigraphica/Manifest12
-rw-r--r--sci-visualization/scigraphica/files/digest-scigraphica-2.1.0-r1 (renamed from sci-visualization/scigraphica/files/digest-scigraphica-2.1.0)0
-rw-r--r--sci-visualization/scigraphica/files/scigraphica-2.1.0-arrayobject.patch (renamed from sci-visualization/scigraphica/files/scigraphica-2.1.0-configure.in.patch)3
-rw-r--r--sci-visualization/scigraphica/files/scigraphica-2.1.0-desktop.patch23
-rw-r--r--sci-visualization/scigraphica/files/scigraphica-2.1.0-intl.patch38
-rw-r--r--sci-visualization/scigraphica/files/scigraphica-2.1.0-versioning.patch25
-rw-r--r--sci-visualization/scigraphica/metadata.xml6
-rw-r--r--sci-visualization/scigraphica/scigraphica-2.1.0-r1.ebuild (renamed from sci-visualization/scigraphica/scigraphica-2.1.0.ebuild)26
9 files changed, 134 insertions, 12 deletions
diff --git a/sci-visualization/scigraphica/ChangeLog b/sci-visualization/scigraphica/ChangeLog
index f7d754afc..3a3a34f63 100644
--- a/sci-visualization/scigraphica/ChangeLog
+++ b/sci-visualization/scigraphica/ChangeLog
@@ -2,6 +2,19 @@
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*scigraphica-2.1.0-r1 (08 Jun 2006)
+
+ 08 Jun 2006; Sebastien Fabbro <seb@ist.utl.pt>
+ -scigraphica-2.1.0.ebuild,
+ -files/scigraphica-2.1.0-configure.in.patch,
+ +scigraphica-2.1.0-r1.ebuild,
+ +files/scigraphica-2.1.0-arrayobject.patch,
+ +files/scigraphica-2.1.0-intl.patch,
+ +files/scigraphica-2.1.0-desktop.patch
+ +files/scigraphica-2.1.0-versioning.patch
+ Fixed compilation with gcc-41 and with as-needed, deskop locations,
+ and internationalization.
+
*scigraphica-2.1.0 (20 May 2006)
20 May 2006; Sebastien Fabbro <seb@ist.utl.pt>
diff --git a/sci-visualization/scigraphica/Manifest b/sci-visualization/scigraphica/Manifest
index cb1dfa219..32182ba17 100644
--- a/sci-visualization/scigraphica/Manifest
+++ b/sci-visualization/scigraphica/Manifest
@@ -1,4 +1,8 @@
-MD5 b5bda0a146b7087f4b61bc6f2b20c2fc ChangeLog 2221
-MD5 57332e7677e7c610ea59d310a1af4c66 files/digest-scigraphica-2.1.0 69
-MD5 11c49b8e72228f0d5836e9cba9e8654f files/scigraphica-2.1.0-configure.in.patch 922
-MD5 88191af9d4089b002ce48f6784cc8d6f scigraphica-2.1.0.ebuild 994
+MD5 75bce2ae2bc737eed94b40221f76db2b ChangeLog 2685
+MD5 57332e7677e7c610ea59d310a1af4c66 files/digest-scigraphica-2.1.0-r1 69
+MD5 e8481260ee46ce21c979382ed3cf8147 files/scigraphica-2.1.0-arrayobject.patch 998
+MD5 20c893a4cbe9b57122650c6255aaf8a1 files/scigraphica-2.1.0-desktop.patch 856
+MD5 9dd695816513999fe3fb8478db0be38a files/scigraphica-2.1.0-intl.patch 1264
+MD5 01c9b8cbf5306f7a6fa8796543baa304 files/scigraphica-2.1.0-versioning.patch 902
+MD5 cb8cb07be7ae8cab04117263363d5d3f metadata.xml 157
+MD5 b845aa87b6e0fb897f7b1145db2ac0a7 scigraphica-2.1.0-r1.ebuild 1356
diff --git a/sci-visualization/scigraphica/files/digest-scigraphica-2.1.0 b/sci-visualization/scigraphica/files/digest-scigraphica-2.1.0-r1
index 1d1478a51..1d1478a51 100644
--- a/sci-visualization/scigraphica/files/digest-scigraphica-2.1.0
+++ b/sci-visualization/scigraphica/files/digest-scigraphica-2.1.0-r1
diff --git a/sci-visualization/scigraphica/files/scigraphica-2.1.0-configure.in.patch b/sci-visualization/scigraphica/files/scigraphica-2.1.0-arrayobject.patch
index 44eda16c9..faf851624 100644
--- a/sci-visualization/scigraphica/files/scigraphica-2.1.0-configure.in.patch
+++ b/sci-visualization/scigraphica/files/scigraphica-2.1.0-arrayobject.patch
@@ -1,5 +1,6 @@
+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-05-21 16:10:54.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"
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 000000000..d8d23ad5c
--- /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 000000000..56a247e60
--- /dev/null
+++ b/sci-visualization/scigraphica/files/scigraphica-2.1.0-intl.patch
@@ -0,0 +1,38 @@
+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:16:47.000000000 +0100
++++ scigraphica-2.1.0.new/configure.in 2006-06-08 17:18:24.000000000 +0100
+@@ -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/Makefile.am scigraphica-2.1.0.new/Makefile.am
+--- scigraphica-2.1.0/Makefile.am 2006-06-08 17:16:47.000000000 +0100
++++ scigraphica-2.1.0.new/Makefile.am 2006-06-08 17:18:24.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/po/POTFILES.in scigraphica-2.1.0.new/po/POTFILES.in
+--- scigraphica-2.1.0/po/POTFILES.in 1970-01-01 01:00:00.000000000 +0100
++++ scigraphica-2.1.0.new/po/POTFILES.in 2006-06-08 17:18:24.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 000000000..fe3dfd1a1
--- /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/metadata.xml b/sci-visualization/scigraphica/metadata.xml
new file mode 100644
index 000000000..2dc044b63
--- /dev/null
+++ b/sci-visualization/scigraphica/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+
+</pkgmetadata>
diff --git a/sci-visualization/scigraphica/scigraphica-2.1.0.ebuild b/sci-visualization/scigraphica/scigraphica-2.1.0-r1.ebuild
index a84b2223b..9996f042d 100644
--- a/sci-visualization/scigraphica/scigraphica-2.1.0.ebuild
+++ b/sci-visualization/scigraphica/scigraphica-2.1.0-r1.ebuild
@@ -11,19 +11,32 @@ HOMEPAGE="http://scigraphica.sourceforge.net/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~ppc"
-
+IUSE=""
DEPEND=">=sci-libs/libscigraphica-2.1.0
- >=dev-python/pygtk-2.8.1-r1
+ >=dev-python/pygtk-2.6.1-r1
>=media-libs/imlib-1.9.7"
src_unpack() {
+
unpack "${A}"
cd "${S}"
- epatch "${FILESDIR}"/${P}-configure.in.patch
+
+ # 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"
- eautoreconf || die "eautoreconf failed"
+
+ einfo "Running intltoolize --copy --force --automake"
+ intltoolize --copy --force --automake || die "intltoolize failed"
+ eautoreconf
}
src_install() {
@@ -33,8 +46,7 @@ src_install() {
}
pkg_postinst() {
- ewarn "Please be shure to rm your old scigraphica"
+ ewarn "Please be sure to remove your old scigraphica"
ewarn "configuration directory."
- ewarn "Otherwise sg won't work."
- sleep 5
+ ewarn "Otherwise scigraphica won't work."
}