* [gentoo-commits] gentoo-x86 commit in sci-visualization/qtiplot: qtiplot-0.9.7.14.ebuild ChangeLog
@ 2010-04-23 8:16 Peter Volkov (pva)
0 siblings, 0 replies; 2+ messages in thread
From: Peter Volkov (pva) @ 2010-04-23 8:16 UTC (permalink / raw
To: gentoo-commits
pva 10/04/23 08:16:45
Modified: ChangeLog
Added: qtiplot-0.9.7.14.ebuild
Log:
Version bump, bug #316661, thank Justin Lecher for report.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.56 sci-visualization/qtiplot/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/ChangeLog?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/ChangeLog?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/ChangeLog?r1=1.55&r2=1.56
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- ChangeLog 17 Mar 2010 15:18:42 -0000 1.55
+++ ChangeLog 23 Apr 2010 08:16:45 -0000 1.56
@@ -1,6 +1,12 @@
# ChangeLog for sci-visualization/qtiplot
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.55 2010/03/17 15:18:42 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.56 2010/04/23 08:16:45 pva Exp $
+
+*qtiplot-0.9.7.14 (23 Apr 2010)
+
+ 23 Apr 2010; Peter Volkov <pva@gentoo.org> +qtiplot-0.9.7.14.ebuild,
+ +files/qtiplot-0.9.7.14-system-liborigin.patch:
+ Version bump, bug #316661, thank Justin Lecher for report.
*qtiplot-0.9.7.13 (17 Mar 2010)
1.1 sci-visualization/qtiplot/qtiplot-0.9.7.14.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.14.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.14.ebuild?rev=1.1&content-type=text/plain
Index: qtiplot-0.9.7.14.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.14.ebuild,v 1.1 2010/04/23 08:16:45 pva Exp $
EAPI=2
inherit eutils qt4 fdo-mime python
DESCRIPTION="Qt based clone of the Origin plotting package"
HOMEPAGE="http://soft.proindependent.com/qtiplot.html"
SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
LICENSE="GPL-2 GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc python ods xls"
LANGS="cn cz de es fr ro ru ja sv"
for l in ${LANGS}; do
lu=${l/cz/cs}
lu=${lu/cn/zh_CN}
IUSE="${IUSE} linguas_${lu}"
done
# qwtplot3d much modified from original upstream
# >=x11-libs/qwt-5.3 they are using trunk checkouts
CDEPEND="
x11-libs/qt-opengl:4
x11-libs/qt-qt3support:4
x11-libs/qt-assistant:4
x11-libs/qt-svg:4
>=x11-libs/gl2ps-1.3.5
>=dev-cpp/muParser-1.32
>=dev-libs/boost-1.35.0
>=sci-libs/liborigin-20100420:2
sci-libs/gsl
dev-libs/boost
dev-tex/qtexengine
xls? ( dev-libs/libxls )
ods? ( dev-libs/quazip )"
# Still unable to build
# emf? ( media-libs/libemf
# media-libs/emfengine )
DEPEND="${CDEPEND}
dev-util/pkgconfig
python? ( >=dev-python/sip-4.9 )
doc? ( app-text/docbook-sgml-utils
>=app-text/docbook-xml-dtd-4.4-r2:4.4 )"
RDEPEND="${CDEPEND}
python? ( >=dev-lang/python-2.5
dev-python/PyQt4[X]
dev-python/pygsl
dev-python/rpy
sci-libs/scipy )"
PATCHES=(
"${FILESDIR}/${PN}-0.9.7.12-system-QTeXEngine.patch"
"${FILESDIR}/${PN}-0.9.7.14-system-liborigin.patch"
"${FILESDIR}/${PN}-0.9.7.12-system-gl2ps.patch"
"${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch"
)
src_prepare() {
qt4_src_prepare
rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/}
# Check build.conf for changes on bump.
cat >build.conf <<-EOF
# Automatically generated by Gentoo ebuild
isEmpty( QTI_ROOT ) {
message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" )
}
MUPARSER_LIBS = \$\$system(pkg-config --libs muparser)
GSL_LIBS = \$\$system(pkg-config --libs gsl)
BOOST_INCLUDEPATH = /usr/include/boost
BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt
QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src
QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include
QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2
LIB_ORIGIN_LIBS = -lorigin2
QTEXENGINE_LIBS = -lQTeXEngine
SYS_LIBS = -lgl2ps
PYTHON = python
LUPDATE = lupdate
LRELEASE = lrelease
SCRIPTING_LANGS += muParser
CONFIG += release
CONFIG += CustomInstall
DEFINES += SCRIPTING_CONSOLE
EOF
use python && echo "SCRIPTING_LANGS += Python" >> build.conf
use xls && echo "XLS_LIBS = -lxlsreader" >> build.conf
if use ods; then
echo "QUAZIP_INCLUDEPATH = /usr/include/quazip" >> build.conf
echo "QUAZIP_LIBS = -lquazip" >> build.conf
fi
sed '/^INSTALLS/d;' -i 3rdparty/qwtplot3d/qwtplot3d.pro || die
# Fails to build...
#if use emf; then
# echo "EMF_ENGINE_INCLUDEPATH = /usr/include/libEMF" >> build.conf
# echo "EMF_ENGINE_LIBS = -lEMF" >> build.conf
#fi
python_version
sed -e "s:doc/${PN}/manual:doc/${PN}/html:" \
-e "s:/usr/local/${PN}:$(python_get_sitedir)/qtiplot:" \
-i qtiplot/qtiplot.pro || die
sed -e '/INSTALLS.*documentation/d' \
-e '/INSTALLS.*manual/d' \
-i qtiplot/qtiplot.pro || die
sed -e '/manual/d' -i qtiplot.pro || die
# Drop langs only if LINGUAS is not empty
if [[ -n ${LINGUAS} ]]; then
for l in ${LANGS}; do
lu=${l/cz/cs}
lu=${lu/cn/zh_CN}
use linguas_${lu} || \
sed -e "s:translations/qtiplot_${l}.[tq][sm]::" \
-i qtiplot/qtiplot.pro || die
done
fi
chmod -x qtiplot/qti_wordlist.txt
# sed out debian paths
sed -e 's:\(/usr/share/sgml/\)docbook/stylesheet/dsssl/modular\(/html/docbook.dsl\):\1stylesheets/dsssl/docbook\2:' \
-i manual/qtiplot.dsl || die
sed -e 's:\(/usr/share/\)xml/docbook/stylesheet/nwalsh\(/html/chunk.xsl\):\1sgml/docbook/xsl-stylesheets\2:' \
-i manual/qtiplot_html.xsl || die
}
src_configure() {
use amd64 && export QMAKESPEC="linux-g++-64"
eqmake4
}
src_compile() {
emake || die "emake failed"
lrelease qtiplot/qtiplot.pro || die
if use doc; then
cd manual
emake web || die "html docbook building failed"
fi
}
src_install() {
emake INSTALL_ROOT="${D}" install || die 'emake install failed'
newicon qtiplot_logo.png qtiplot.png
make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot
if use doc; then
insinto /usr/share/doc/${PN}/html
doins -r manual/html/* || die "install manual failed"
fi
if [[ -n ${LINGUAS} ]]; then
insinto /usr/share/${PN}/translations
for l in ${LANGS}; do
lu=${l/cz/cs}
lu=${lu/cn/zh_CN}
use linguas_${lu} && \
doins qtiplot/translations/qtiplot_${l}.qm
done
fi
}
pkg_postinst() {
fdo-mime_desktop_database_update
python_mod_optimize "$(python_get_sitedir)/qtiplot"
}
pkg_postrm() {
fdo-mime_desktop_database_update
python_mod_cleanup "$(python_get_sitedir)/qtiplot"
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-visualization/qtiplot: qtiplot-0.9.7.14.ebuild ChangeLog
@ 2010-05-18 7:03 Justin Lecher (jlec)
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2010-05-18 7:03 UTC (permalink / raw
To: gentoo-commits
jlec 10/05/18 07:03:11
Modified: qtiplot-0.9.7.14.ebuild ChangeLog
Log:
Fix for new python ABIs, #316259
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.2 sci-visualization/qtiplot/qtiplot-0.9.7.14.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.14.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.14.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.14.ebuild?r1=1.1&r2=1.2
Index: qtiplot-0.9.7.14.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.14.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtiplot-0.9.7.14.ebuild 23 Apr 2010 08:16:45 -0000 1.1
+++ qtiplot-0.9.7.14.ebuild 18 May 2010 07:03:11 -0000 1.2
@@ -1,8 +1,11 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.14.ebuild,v 1.1 2010/04/23 08:16:45 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.14.ebuild,v 1.2 2010/05/18 07:03:11 jlec Exp $
EAPI=2
+
+PYTHON_DEPEND="python? 2"
+
inherit eutils qt4 fdo-mime python
DESCRIPTION="Qt based clone of the Origin plotting package"
@@ -48,7 +51,7 @@
>=app-text/docbook-xml-dtd-4.4-r2:4.4 )"
RDEPEND="${CDEPEND}
- python? ( >=dev-lang/python-2.5
+ python? (
dev-python/PyQt4[X]
dev-python/pygsl
dev-python/rpy
@@ -61,6 +64,11 @@
"${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch"
)
+pkg_setup() {
+ python_set_active_version 2
+ qt4_pkg_setup
+}
+
src_prepare() {
qt4_src_prepare
@@ -113,8 +121,6 @@
# echo "EMF_ENGINE_LIBS = -lEMF" >> build.conf
#fi
- python_version
-
sed -e "s:doc/${PN}/manual:doc/${PN}/html:" \
-e "s:/usr/local/${PN}:$(python_get_sitedir)/qtiplot:" \
-i qtiplot/qtiplot.pro || die
1.58 sci-visualization/qtiplot/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/qtiplot/ChangeLog?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/qtiplot/ChangeLog?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/qtiplot/ChangeLog?r1=1.57&r2=1.58
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ChangeLog 26 Apr 2010 20:40:42 -0000 1.57
+++ ChangeLog 18 May 2010 07:03:11 -0000 1.58
@@ -1,6 +1,9 @@
# ChangeLog for sci-visualization/qtiplot
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.57 2010/04/26 20:40:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.58 2010/05/18 07:03:11 jlec Exp $
+
+ 18 May 2010; Justin Lecher <jlec@gentoo.org> qtiplot-0.9.7.14.ebuild:
+ Fix for new python ABIs, #316259
26 Apr 2010; Markus Meier <maekke@gentoo.org> qtiplot-0.9.7.12.ebuild:
amd64/x86 stable, bug #309717
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-05-18 7:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-23 8:16 [gentoo-commits] gentoo-x86 commit in sci-visualization/qtiplot: qtiplot-0.9.7.14.ebuild ChangeLog Peter Volkov (pva)
-- strict thread matches above, loose matches on Subject: below --
2010-05-18 7:03 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox