Fixed installation of plugins, fixed non-installation of python scripts, translations, some cleanup

Package-Manager: portage-2.1.4.3

4 files changed, 122 insertions, 4 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index 7c6569b4ede4..39714bffd1ca 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/qtiplot
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.14 2008/01/14 18:20:41 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.15 2008/02/12 11:41:53 bicatali Exp $
+
+*qtiplot-0.9.2-r1 (12 Feb 2008)
+
+  12 Feb 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  files/qtiplot-0.9.2-systemlibs.patch, +qtiplot-0.9.2-r1.ebuild:
+  Fixed installation of plugins, fixed non-installation of python scripts,
+  translations, some cleanup
 
   14 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org>
   files/qtiplot-0.9.2-systemlibs.patch, qtiplot-0.9.2.ebuild:
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index f38af952d3aa..86f97b64faa6 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -1,12 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qtiplot-0.7.7-qmake.patch 11384 RMD160 fa0491bd504d3445645817871fa831d0b70b4602 SHA1 5cd18e99d39664ef48e0d18069d89cb4b417a175 SHA256 2d89427ab1304b1ec8165d6ceaedf474a48ba59d55dafbb4977b5ddaab8509ca
 AUX qtiplot-0.8.5-qmake.patch 467 RMD160 00b5de4a8ab62eb3d2b3b7cb4a0a69a92d42cb44 SHA1 6fdb19a48c501b3f1256e7105d383f567f17182e SHA256 51230401a221a49371db906d37eca2b2734346ff82684dc572e37294fbd1ed0f
-AUX qtiplot-0.9.2-systemlibs.patch 4667 RMD160 cd9a1fb03548aa316e40488b889625f4f1f21e1a SHA1 26ce159b345c009d141f438bfb659a1d30dcc1f1 SHA256 c42c88105a8344d6b4b21def0a62e3b7ceaaa92db6868149db653c3546f1c19a
+AUX qtiplot-0.9.2-systemlibs.patch 4666 RMD160 e6fcf31a5d807e167c858c68847768e3e8fce093 SHA1 e27ab1c0bf647d35778440dc3964fdb6892d47d1 SHA256 3310cbc330e03ee8b2bb1337a1414bb8eff645743dc623a58452d0587d696e84
 DIST qtiplot-0.7.7.zip 812738 RMD160 6f62b32059eec57bf931b5bae9f524672d436ee9 SHA1 b201e600ec057ff0f7b4b4572850b0b072a0e0fb SHA256 937849c42cc3047df3975d1cb7a26a2503a499d548066937589340f55bd1ab01
 DIST qtiplot-0.8.5.tar.bz2 530579 RMD160 72f4f60f1171c57e6c2614a1a5a7b6dfc3bda4f5 SHA1 d8142877bfc86fad8a43e64f6f3e0a16126e5f0a SHA256 81831d8dfaddbdf32d85a6e7eaf0e54e2321e2fba6ffaabfe6943bc326a6f874
 DIST qtiplot-0.9.2-manual-en.tar.bz2 5233394 RMD160 9e3bbd5b71e8549cef627230d0e78e2e53636053 SHA1 f0b64cb56cb6d2581871a15e712452ee4f0b8d2b SHA256 39ab4baeeebec24b8a42e3cffb9354a24b0f1987bd0cb470f1e1954b13661b7d
 DIST qtiplot-0.9.2.tar.bz2 897629 RMD160 5b1a71f87a3d6801aa26337fbb5932191aed228c SHA1 5e3bcfd4c2555472f6dedf68e52e24a079aba60e SHA256 051a55e3e120ad53b2463a3a9295d22f9d36d1146468c5ebd869a5f180c145fd
 EBUILD qtiplot-0.7.7.ebuild 1051 RMD160 d1cd62584b4ae4b61fa53d6623e59fd002ab18b0 SHA1 3fe8bd35d4a961b69cc0f2517b62c7a4bf7a159c SHA256 f9832d9e8938d8076ac81b98435dcdbd925cbf9c7a8605ce3134c572145822db
 EBUILD qtiplot-0.8.5.ebuild 1168 RMD160 d33cca7e753c802f98386f4066fb033b4f494598 SHA1 8a24cdf46852c32cba96ad78e960b2193ad6c795 SHA256 172baa2403f9fddcc33339ee51333b9a84ad3909772f9e1d7815d035f33e665b
+EBUILD qtiplot-0.9.2-r1.ebuild 2497 RMD160 8f7f364ad6cb8370d22e1568378cae11f78f1700 SHA1 c844de681cd75bca89e295147ec40e4ab4674e51 SHA256 7e07586ec20569c3446c39cdd562b972f23091c2fc01625d7ee4e9adbe76844e
 EBUILD qtiplot-0.9.2.ebuild 2426 RMD160 064ffc74acbf61b6ab5b1cc79e6efe0d50f67dd7 SHA1 302af9c9bacc0d8e6637ced6862e5fa85969bb47 SHA256 a57a5aa1333d3b0840b8f0b6a16102ff2663c97a1924cd38cb115ddc5003e42d
-MISC ChangeLog 4785 RMD160 f5d0ca7a40e095edfc5cce976b9137401a8c5564 SHA1 ed6c2a0c014908f1c2a21664ccdbe36a7d28d525 SHA256 dffbcb774e45548c4240f50b7103a6489c85250c7c66205bdb1549cf39e998bc
+MISC ChangeLog 5044 RMD160 123658c0deb7c43265a3cb7dbd920d55f4ecd26f SHA1 490a48aee2b0080921b6be54ce8ab81d28da2795 SHA256 39cedf9b61a7c9c87578e2f7c344224fac09d27f14f4be6517a249732fb3cb7b
 MISC metadata.xml 604 RMD160 1e0ed48d48668781cafc44ef8a14c3fb1e41eb28 SHA1 0f1b65755c3b923539a54b7e05dfda9679c4d758 SHA256 094795782ea49d41a8c4106510bb80d360f1bdaae3ab89c23c369def31bab56c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHsYYK1ycZbhPLE2ARAjV0AJ9f3oSNauuBR95fBLWKk6j41uxUtgCglB5h
+onnnTqNOY/F9X7VqRmIYhQI=
+=Kbz4
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.2-systemlibs.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.2-systemlibs.patch
index 0bf440077a6a..74f518ca66e8 100644
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.2-systemlibs.patch
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.2-systemlibs.patch
@@ -84,7 +84,7 @@
  

  #dynamically link against GSL installed system-wide

 -#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas

-+unix:LIBS += $$(system pkg-config --libs gsl)

++unix:LIBS += $$system(pkg-config --libs gsl)

  

  target.path=/usr/lib$${libsuff}/qtiplot/plugins

  INSTALLS += target

diff --git a/sci-visualization/qtiplot/qtiplot-0.9.2-r1.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..95a85cd2a7a7
--- /dev/null
+++ b/sci-visualization/qtiplot/qtiplot-0.9.2-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.2-r1.ebuild,v 1.1 2008/02/12 11:41:53 bicatali Exp $
+
+inherit eutils multilib qt4 python
+
+DESCRIPTION="Qt based clone of the Origin plotting package"
+HOMEPAGE="http://soft.proindependent.com/qtiplot.html"
+SRC_URI="http://soft.proindependent.com/src/${P}.tar.bz2
+	doc? ( mirror://gentoo/${P}-manual-en.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python doc"
+
+LANGS="de es fr ja ru sv"
+for l in ${LANGS}; do
+	IUSE="${IUSE} linguas_${l}"
+done
+
+CDEPEND=">=x11-libs/qwt-5.0.2
+	>=x11-libs/qwtplot3d-0.2.7
+	>=dev-cpp/muParser-1.28
+	>=sci-libs/liborigin-20071119
+	>=sci-libs/gsl-1.10"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	python? ( >=dev-python/sip-4.5.2 )"
+
+RDEPEND="${CDEPEND}
+	python? ( >=dev-lang/python-2.5
+		dev-python/PyQt4
+		dev-python/pygsl
+		sci-libs/scipy )"
+
+QT4_BUILT_WITH_USE_CHECK="qt3support"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-systemlibs.patch
+	if ! use python; then
+		sed -i \
+			-e '/^SCRIPTING_LANGS += Python/d' \
+			-e '/sipcmd/d' \
+			${PN}/${PN}.pro || die "sed for python option failed"
+	fi
+
+	# the lib$$suff did not work in the fitRational*.pro files
+	sed -i \
+		-e "s|/usr/lib\$\${libsuff}|/usr/$(get_libdir)|g" \
+		fitPlugins/fit*/fitRational*.pro \
+		|| die "sed fitRational* failed"
+}
+
+src_compile() {
+	eqmake4 ${PN}.pro || die "eqmake4 failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die 'emake install failed'
+
+	newicon qtiplot_logo.png qtiplot.png
+	make_desktop_entry qtiplot QtiPlot qtiplot "Education;Science;Math;Qt"
+	doman qtiplot.1 || die "doman failed"
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r "${WORKDIR}"/manual-en || die "install manual failed"
+	fi
+
+	for l in ${LANGS}; do
+		if use linguas_${l}; then
+			insinto /usr/share/${PN}/translations
+			doins ${PN}/translations/*${l}*.qm || die "install ${l} failed"
+		fi
+	done
+
+	if use python; then
+		cd "${S}"/${PN}
+		insinto /etc
+		doins qtiplotrc.py || die
+		python_version
+		insinto /usr/$(get_libdir)/python${PYVER}/site-packages
+		doins qtiUtil.py || die
+	fi
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize \
+		"${ROOT}"/usr/$(get_libdir)/python${PYVER}/site-packages/qtiUtil.py
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup \
+		"${ROOT}"/usr/$(get_libdir)/python${PYVER}/site-packages/qtiUtil*
+}