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

Package-Manager: portage-2.2_rc23/cvs/Linux i686

4 files changed, 81 insertions, 2 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/Manifest b/media-gfx/kst/Manifest
index cba992b884ce..810791f0318c 100644
--- a/media-gfx/kst/Manifest
+++ b/media-gfx/kst/Manifest
@@ -1,5 +1,6 @@
 AUX kst-1.1.0-netcdf-fix.patch 2939 RMD160 52769e109c4555b0da28978fc5133663afc6c927 SHA1 1bdf0dadea850e9032596b4d600eecb2f31d256a SHA256 15b64d8192c1e7ef631af533e24515a9796b271c3ab582b3250a86f84136ba08
 AUX kst-1.7.0-desktop-file.diff 1203 RMD160 a1fde59e3756be79a37338cb45750476efc294d9 SHA1 a71de17b15e2c7b1d062f4f38c67025b2827bce4 SHA256 ef4b550e1db435d84dc10b9124876bb33738f1983f87f49dcdc8b6be097319f8
+AUX kst-1.7.0-system-kjs.diff 1203 RMD160 86adedc722fab04050cfa56d048e2d09a26703aa SHA1 01d8102a49af6ceb291aca480791a3fba3939c1e SHA256 542ba855b16df0c4f8c5ffda3cc1516ff13122d3cf38e8d6779db3d2ef3b7829
 DIST kst-0.97.tar.gz 1499985 RMD160 64446d67b05b8b92c8bc5cf4d713ebc3a80d6e1a SHA1 5e141578c6e5c9c0dce3005c70af18c6a1cbd7a8 SHA256 1525d3b760ef72242435218a8bdef499a549befa3bdee1ccde6f7471c6f746f1
 DIST kst-1.1.0.tar.gz 10598874 RMD160 1724f19bae83619727a3db152df2079452140e46 SHA1 a0765cbc347ec46e6b68e0d0af1bc23bec4661b4 SHA256 174a7a519978797eac83e0d7f40223d012b7ddc7a50e01225d789e27b9cc4311
 DIST kst-1.1.1.tar.gz 9547304 RMD160 c997a5e93a3f627935babf953e82d17229f18b9c SHA1 93bd35b074b8968f37f46c436f88ea5a2c1b2533 SHA256 ad74bb4b68bca3c244439b82bff7059f55e88862b14543c0b6d9185fe5b9f2d9
@@ -12,6 +13,7 @@ EBUILD kst-1.1.0.ebuild 541 RMD160 fd8ee78c3c886bb6df9de589ce72b7ec86eba298 SHA1
 EBUILD kst-1.1.1.ebuild 627 RMD160 16cfccf9eb2d03c31f28790ba92fb8a9c7dd804a SHA1 81fa3368aaad1b9196d002d85b5282815bd821e7 SHA256 dda9666475484af4852ddab1b22206c8e8010e0f0c06609b5a8330969d7e58f9
 EBUILD kst-1.4.0.ebuild 518 RMD160 5a4240ee2fe1454adf82ec9144719fecc981cf91 SHA1 d13b20ebed65444ef303069259200094cd6888ab SHA256 c7e0bd6b95e3e54921f46346a6945d35224ffb1dba6cd5d00311f077c1f92992
 EBUILD kst-1.6.0.ebuild 518 RMD160 baa812e7f3397cb94ccef3324284e5c534583c0a SHA1 cb7ab2390995d54db3e1d34adc67964d3db6255d SHA256 8280ef51d748cda1f1096813d6f6d4740750d101f5bc926c6cdd4d3faa24db4c
+EBUILD kst-1.7.0-r1.ebuild 1040 RMD160 cf678f555579d4c17b8891d6fcb7b4ebe1106d26 SHA1 a9f317b25053df3832f5571a110930e2a0fbdea8 SHA256 c55152d68dd930d6a0545526afce3cee15526ef85967e937eaf6a96ba6fe0f5e
 EBUILD kst-1.7.0.ebuild 614 RMD160 599514aedfef520336d5dcf603bd5e592ed5185d SHA1 6533a1e045bc5b7c244534ce7a957a962dc1a163 SHA256 ac48c0ce9618516d7ca61de8c3d0800c96b5d69f72a42c890af1cec6f6240056
-MISC ChangeLog 3986 RMD160 2a2f7637bfe31777f7e811d6ab9cc008b2bd1124 SHA1 62b5686e97f976ec65cda755fd0308028f6a971f SHA256 210aef20f52f76c9433e7fc8aeab129d183e7b4793e37de9749093cbeeacec2e
+MISC ChangeLog 4195 RMD160 e871d036b080901334cb40890021cebea940a425 SHA1 13990934a20015eef436e9672fc2b38564b7af8e SHA256 e75170c9df9a3f45cf2fe69995574c73e023b473034ccec20f0cf90114386cf2
 MISC metadata.xml 173 RMD160 2c44d67bec5e1a71d69b0d047235439817109d99 SHA1 ed014e13b4663db94fbe01400a2b9d615ffe6447 SHA256 54c85281e6ed7a935800439f474ea006370b24c1fe3e821ee57f17f02f714785
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
+}