From: Peter Volkov Date: Fri, 23 Apr 2010 08:16:45 +0000 (+0000) Subject: Version bump, bug #316661, thank Justin Lecher for report. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ecd73ad7b5828bda12b846603deac23910c1c6a6;p=gentoo.git Version bump, bug #316661, thank Justin Lecher for report. Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog index bc33561bc5ee..7e1a81a37f1e 100644 --- a/sci-visualization/qtiplot/ChangeLog +++ b/sci-visualization/qtiplot/ChangeLog @@ -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 +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) diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest index bf2263c6c665..c044358ca041 100644 --- a/sci-visualization/qtiplot/Manifest +++ b/sci-visualization/qtiplot/Manifest @@ -2,9 +2,12 @@ AUX qtiplot-0.9.7.10-dont-install-qwt.patch 605 RMD160 e68908d5ca887e64fe99bed21 AUX qtiplot-0.9.7.12-system-QTeXEngine.patch 2390 RMD160 4e96caac6fe930b27dfd503354417078bfedfe34 SHA1 25f548a4c6e76a39dc72b44c4e975f13897f1d8f SHA256 9bb277a4bee32037067561ac19a1eb4bd8cf4f7b53edcea896c9f0c036dcccff AUX qtiplot-0.9.7.12-system-gl2ps.patch 1594 RMD160 4ed03493199239a9c3b745132b5aeb202214e025 SHA1 548c1edc50fe96e46f6a676ff9f794ffff7dd7f7 SHA256 b1997f61759e647bfa25f3b926bedd88102a8d56595d515edef2c6988dd97a22 AUX qtiplot-0.9.7.12-system-liborigin.patch 3242 RMD160 03ea38fe2b26034ad1bc08fb296eabdd76823409 SHA1 17085d3a32281dcac5a594a054265ae5c9d80445 SHA256 cf2595152c23c9c67513a115d9981e03d472c0b93e101d6e9e4e778de97df731 +AUX qtiplot-0.9.7.14-system-liborigin.patch 4089 RMD160 1473539c2146766b43f1cfea7e31c3bb0e2602bf SHA1 2280685fb5fe59c300eebfc16c5e2cc08a259833 SHA256 d268297f50bbde162b66c1fd9fff93f54cbc73ce988ee88e25203a5e06b671c9 DIST qtiplot-0.9.7.12.tar.bz2 8221079 RMD160 af04944a1a6671e3133d0a8caec0f4c430f452ff SHA1 fe54f737ac857a470f7f00a53a73270d20f203a9 SHA256 29cf8e3dbd5539019b3351893c8b2fafa1e1283333d4b055b711b3a7ea85d935 DIST qtiplot-0.9.7.13.tar.bz2 8093399 RMD160 db226c26e923268424d4d0a834a8917306798ca1 SHA1 739418ea39f063f723d8b04aed508844996b1ad4 SHA256 02be55dee70cb79165b18ac22e1cf041435168eda16a1d10c5a9aba1a2143053 +DIST qtiplot-0.9.7.14.tar.bz2 8119824 RMD160 09bf50211c77159dad674fcab4f9772fe4267947 SHA1 3e31b2c3fea827a573da96fb50118e6d9cc33f4b SHA256 10edfe55651d0e82f87b10b53fe068cee54782d1df2cbf482a7bafcc27eb3d18 EBUILD qtiplot-0.9.7.12.ebuild 5080 RMD160 713a34a6c3aeef2f2412fe4eaf03306750412193 SHA1 4d9dd1d495e64427d3df1a309e99bfb422de8978 SHA256 201fdd0efde627c07e33adc0da67aff11442f0b725228c50576909b968fa0b9d EBUILD qtiplot-0.9.7.13.ebuild 5110 RMD160 289c056d6fe35747f1bf37418767f9432a8b83d4 SHA1 baa29e34411233c0318213a2f25f516978a206a9 SHA256 e3bec3364049233a1ad4ce426505fb45fc287b4c574feb5236bd3dd33ebf5c89 -MISC ChangeLog 15795 RMD160 bb8e67338b596bd4f0713c4dcc0b69f86c541238 SHA1 58142f4dd60ca64ce995b1952ef4015fb0697374 SHA256 0f31238df8aa0d71855a51d815e1932c88a1e6d54d6ac02501687df593b93110 +EBUILD qtiplot-0.9.7.14.ebuild 5110 RMD160 cf402d7473de542d1d26d22aeede959b7990695d SHA1 17164d73184d9c2a6d2d0c25b2ff1d1229a33540 SHA256 e5619600893ebf1a0b3d95e8908be744490eadb24e48d50bd279ba47eb232d12 +MISC ChangeLog 16011 RMD160 9d43cf95ec90fab866744deb84eaa3d199cd6698 SHA1 d9eba67ea6839a15c1c99efc522aacf06ddfc257 SHA256 33cea7166a59f3d82f4a5d933cb9952a07c0310be6fdc192861d654a982ae434 MISC metadata.xml 857 RMD160 f0b19f02132816e5a98dade3c25c17b578ef5f33 SHA1 1a7a0769a7989384e15a2d098441966630652866 SHA256 d001c7b867a7bbc14047fc029821afe1dde7a65e2e8d146c3f467c57da26d24a diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.14-system-liborigin.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.14-system-liborigin.patch new file mode 100644 index 000000000000..e8fa4a3d714a --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.14-system-liborigin.patch @@ -0,0 +1,102 @@ +=== modified file 'build.conf.example' +--- build.conf.example 2010-04-22 18:57:40 +0000 ++++ build.conf.example 2010-04-22 18:58:06 +0000 +@@ -118,6 +118,14 @@ + EMF_ENGINE_LIBS = $$QTI_ROOT/3rdparty/EmfEngine/libEmfEngine.a + + ########################################################## ++## liborigin - keep commented if you wish to use local copy ++# http://sourceforge.net/projects/liborigin/ ++########################################################## ++ ++# LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2 ++# LIB_ORIGIN_LIBS = -lorigin2 ++ ++########################################################## + ## python - only used if python is needed + ########################################################## + + +=== modified file 'qtiplot/qtiplot.pro' +--- qtiplot/qtiplot.pro 2010-04-22 18:57:40 +0000 ++++ qtiplot/qtiplot.pro 2010-04-22 19:08:57 +0000 +@@ -16,6 +16,7 @@ + INCLUDEPATH += $$QWT_INCLUDEPATH + INCLUDEPATH += $$QWT3D_INCLUDEPATH + INCLUDEPATH += $$GSL_INCLUDEPATH ++INCLUDEPATH += $$LIB_ORIGIN_INCLUDEPATH + + # configurable libs + LIBS += $$MUPARSER_LIBS +@@ -23,6 +24,7 @@ + LIBS += $$QWT3D_LIBS + LIBS += $$QTEXENGINE_LIBS + LIBS += $$GSL_LIBS ++LIBS += $$LIB_ORIGIN_LIBS + + ############################################################################# + ###################### BASIC PROJECT PROPERTIES ############################# +@@ -150,6 +152,10 @@ + SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp + } + ++isEmpty(LIB_ORIGIN_LIBS) { ++ INCLUDEPATH += ../3rdparty/liborigin ++} ++ + ############################################################### + ##################### Scripting: PYTHON + SIP + PyQT ########## + ############################################################### + +=== modified file 'qtiplot/src/origin/origin.pri' +--- qtiplot/src/origin/origin.pri 2010-04-22 17:58:49 +0000 ++++ qtiplot/src/origin/origin.pri 2010-04-22 19:08:15 +0000 +@@ -4,24 +4,28 @@ + INCLUDEPATH += src/origin/ + + HEADERS += src/origin/importOPJ.h +-HEADERS += ../3rdparty/liborigin/OriginObj.h +-HEADERS += ../3rdparty/liborigin/OriginFile.h +-HEADERS += ../3rdparty/liborigin/OriginParser.h +-HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h +-HEADERS += ../3rdparty/liborigin/Origin600Parser.h +-HEADERS += ../3rdparty/liborigin/Origin610Parser.h +-HEADERS += ../3rdparty/liborigin/Origin700Parser.h +-HEADERS += ../3rdparty/liborigin/Origin750Parser.h +-HEADERS += ../3rdparty/liborigin/Origin800Parser.h +-HEADERS += ../3rdparty/liborigin/Origin810Parser.h + + SOURCES += src/origin/importOPJ.cpp +-SOURCES += ../3rdparty/liborigin/OriginFile.cpp +-SOURCES += ../3rdparty/liborigin/OriginParser.cpp +-SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp +-SOURCES += ../3rdparty/liborigin/Origin600Parser.cpp +-SOURCES += ../3rdparty/liborigin/Origin610Parser.cpp +-SOURCES += ../3rdparty/liborigin/Origin700Parser.cpp +-SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp +-SOURCES += ../3rdparty/liborigin/Origin800Parser.cpp +-SOURCES += ../3rdparty/liborigin/Origin810Parser.cpp ++ ++isEmpty(LIB_ORIGIN_LIBS) { ++ HEADERS += ../3rdparty/liborigin/OriginObj.h ++ HEADERS += ../3rdparty/liborigin/OriginFile.h ++ HEADERS += ../3rdparty/liborigin/OriginParser.h ++ HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h ++ HEADERS += ../3rdparty/liborigin/Origin600Parser.h ++ HEADERS += ../3rdparty/liborigin/Origin610Parser.h ++ HEADERS += ../3rdparty/liborigin/Origin700Parser.h ++ HEADERS += ../3rdparty/liborigin/Origin750Parser.h ++ HEADERS += ../3rdparty/liborigin/Origin800Parser.h ++ HEADERS += ../3rdparty/liborigin/Origin810Parser.h ++ ++ SOURCES += ../3rdparty/liborigin/OriginFile.cpp ++ SOURCES += ../3rdparty/liborigin/OriginParser.cpp ++ SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp ++ SOURCES += ../3rdparty/liborigin/Origin600Parser.cpp ++ SOURCES += ../3rdparty/liborigin/Origin610Parser.cpp ++ SOURCES += ../3rdparty/liborigin/Origin700Parser.cpp ++ SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp ++ SOURCES += ../3rdparty/liborigin/Origin800Parser.cpp ++ SOURCES += ../3rdparty/liborigin/Origin810Parser.cpp ++} + diff --git a/sci-visualization/qtiplot/qtiplot-0.9.7.14.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.14.ebuild new file mode 100644 index 000000000000..026cd443f1ac --- /dev/null +++ b/sci-visualization/qtiplot/qtiplot-0.9.7.14.ebuild @@ -0,0 +1,188 @@ +# 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" +}