Use system kjsembed (bug #253477) and make it an optional dependency.

(Portage version: 2.2_rc23/cvs/Linux i686)

3 files changed, 78 insertions, 1 deletions

diff --git a/media-gfx/kst/ChangeLog b/media-gfx/kst/ChangeLog
index 8e8a0a3d621e..e6dc1d46b6fe 100644
--- a/media-gfx/kst/ChangeLog
+++ b/media-gfx/kst/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/kst
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/ChangeLog,v 1.20 2009/02/14 16:40:36 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/ChangeLog,v 1.21 2009/02/22 12:50:51 carlo Exp $
+
+*kst-1.7.0-r1 (22 Feb 2009)
+
+  22 Feb 2009; Carsten Lohrke <carlo@gentoo.org>
+  +files/kst-1.7.0-system-kjs.diff, +kst-1.7.0-r1.ebuild:
+  Use system kjsembed (bug #253477) and make it an optional dependency.
 
 *kst-1.7.0 (14 Feb 2009)
 
diff --git a/media-gfx/kst/files/kst-1.7.0-system-kjs.diff b/media-gfx/kst/files/kst-1.7.0-system-kjs.diff
new file mode 100644
index 000000000000..ce534002ae61
--- /dev/null
+++ b/media-gfx/kst/files/kst-1.7.0-system-kjs.diff
@@ -0,0 +1,32 @@
+--- kst/src/extensions/js/Makefile.am.orig	2009-02-22 02:33:24.000000000 +0100
++++ kst/src/extensions/js/Makefile.am	2009-02-22 02:35:31.000000000 +0100
+@@ -1,14 +1,7 @@
+-if include_kjse_internal
+-KJSEMBED_SUBDIR=kjsembed
+-endif
+-
+ SUBDIRS=$(KJSEMBED_SUBDIR) .
+ 
+-if include_kjse_internal
+-KJSEINCLUDES=-I$(srcdir)/kjsembed
+-else
+ JSEXTERN=js_extern.cpp
+-endif
++
+ INCLUDES=-I$(top_srcdir)/kst/src/libkstapp -I$(top_srcdir)/kst/src/libkst -I$(top_srcdir)/kst/src/libkstmath -I$(top_srcdir)/kst/src/extdate -I$(top_builddir)/kst/src/libkst -I$(top_builddir)/kst/src/libkstapp -I$(top_srcdir)/kst/src/widgets -I$(top_srcdir) -I$(top_srcdir)/kst/src/plugins/crossspectrum -I$(top_srcdir)/kst/src/plugins/binnedmap $(KMDI_INCLUDES) $(KJSEINCLUDES) $(all_includes)
+ 
+ kde_module_LTLIBRARIES=kstextension_js.la
+@@ -21,11 +14,9 @@
+ endif
+ 
+ kstextension_js_la_LDFLAGS=$(all_libraries) -module -avoid-version
+-if include_kjse_internal
+-kstextension_js_la_LIBADD=$(LIBREADLINE) ../../libkstapp/libkstapp.la kjsembed/libkjsembed.la
+-else
++
+ kstextension_js_la_LIBADD=$(LIBREADLINE) ../../libkstapp/libkstapp.la -lkjsembed
+-endif
++
+ kstextension_js_la_SOURCES= $(JSEXTERN) \
+ 			    js.cpp \
+ 			    jsiface.skel \
diff --git a/media-gfx/kst/kst-1.7.0-r1.ebuild b/media-gfx/kst/kst-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..9b49490ac823
--- /dev/null
+++ b/media-gfx/kst/kst-1.7.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/kst-1.7.0-r1.ebuild,v 1.1 2009/02/22 12:50:51 carlo Exp $
+
+EAPI="1"
+
+ARTS_REQUIRED="never"
+
+inherit kde flag-o-matic
+
+DESCRIPTION="A plotting and data viewing program for KDE."
+HOMEPAGE="http://kst.kde.org/"
+SRC_URI="mirror://kde/stable/apps/KDE3.x/scientific/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="javascript"
+
+DEPEND="javascript? ( kde-base/kjsembed:3.5 )
+	sys-libs/readline
+	sci-libs/gsl
+	>=sci-libs/netcdf-3.6.1-r1"
+RDEPEND="${DEPEND}"
+
+need-kde 3.5
+
+PATCHES=(
+	"${FILESDIR}/kst-1.7.0-desktop-file.diff"
+	"${FILESDIR}/kst-1.7.0-system-kjs.diff"
+	)
+
+src_unpack() {
+	kde_src_unpack
+	rm -f "${S}"/configure
+	use javascript || sed -e "s:KJSE_SUBDIR=js:KJSE_SUBDIR=:" -i kst/src/extensions/Makefile.am
+	# automagic dependency, ensure internel lib isn't used by mistake
+	echo "FAIL FOR GOOD" > "${S}"/kst/src/extensions/js/kjsembed/global.cpp
+}