From 894a7e01865173510ce614691f9d82e418365627 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 10 Oct 2010 16:55:37 +0000 Subject: Removed old, Corrected qt-assistent-4.7 DEP, 335756; keyworded for ~-linux prefix (Portage version: 2.2_rc91/cvs/Linux x86_64) --- sci-visualization/qtiplot/ChangeLog | 7 +- sci-visualization/qtiplot/qtiplot-0.9.7.12.ebuild | 186 -------------------- .../qtiplot/qtiplot-0.9.7.14-r1.ebuild | 4 +- sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild | 6 +- sci-visualization/qtiplot/qtiplot-0.9.8.ebuild | 191 --------------------- 5 files changed, 11 insertions(+), 383 deletions(-) delete mode 100644 sci-visualization/qtiplot/qtiplot-0.9.7.12.ebuild delete mode 100644 sci-visualization/qtiplot/qtiplot-0.9.8.ebuild (limited to 'sci-visualization/qtiplot') diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog index 712140a0205d..0ac6ca0c653e 100644 --- a/sci-visualization/qtiplot/ChangeLog +++ b/sci-visualization/qtiplot/ChangeLog @@ -1,6 +1,11 @@ # 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.68 2010/09/19 19:41:02 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.69 2010/10/10 16:55:37 jlec Exp $ + + 10 Oct 2010; Justin Lecher -qtiplot-0.9.7.12.ebuild, + qtiplot-0.9.7.14-r1.ebuild, -qtiplot-0.9.8.ebuild, qtiplot-0.9.8.2.ebuild: + Removed old, Corrected qt-assistent-4.7 DEP, 335756; keyworded for ~-linux + prefix 19 Sep 2010; Justin Lecher qtiplot-0.9.8.2.ebuild: Removed not really needed dependencies for python support, 337471 diff --git a/sci-visualization/qtiplot/qtiplot-0.9.7.12.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.12.ebuild deleted file mode 100644 index 7152a43482a9..000000000000 --- a/sci-visualization/qtiplot/qtiplot-0.9.7.12.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# 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.12.ebuild,v 1.3 2010/05/18 13:52:51 arfrever 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-20090406: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}/${P}-system-QTeXEngine.patch" - "${FILESDIR}/${P}-system-liborigin.patch" - "${FILESDIR}/${P}-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 - - 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" -} diff --git a/sci-visualization/qtiplot/qtiplot-0.9.7.14-r1.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.14-r1.ebuild index 98e515709d67..fad34cfb7dc3 100644 --- a/sci-visualization/qtiplot/qtiplot-0.9.7.14-r1.ebuild +++ b/sci-visualization/qtiplot/qtiplot-0.9.7.14-r1.ebuild @@ -1,6 +1,6 @@ # 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-r1.ebuild,v 1.3 2010/07/12 20:12:23 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.14-r1.ebuild,v 1.4 2010/10/10 16:55:37 jlec Exp $ EAPI=2 @@ -29,7 +29,7 @@ done CDEPEND=" x11-libs/qt-opengl:4 x11-libs/qt-qt3support:4 - x11-libs/qt-assistant:4 + || ( >=x11-libs/qt-assistant-4.7.0:4[compat] =x11-libs/gl2ps-1.3.5 >=dev-cpp/muParser-1.32 diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild index 2ec6ec0dff13..191f87369507 100644 --- a/sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild +++ b/sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild @@ -1,6 +1,6 @@ # 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.8.2.ebuild,v 1.3 2010/09/19 19:41:02 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild,v 1.4 2010/10/10 16:55:37 jlec Exp $ EAPI=3 @@ -14,7 +14,7 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2" LICENSE="GPL-2 GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc python ods" LANGS="cn cz de es fr ro ru ja sv" @@ -29,7 +29,7 @@ done CDEPEND=" x11-libs/qt-opengl:4 x11-libs/qt-qt3support:4 - x11-libs/qt-assistant:4 + || ( >=x11-libs/qt-assistant-4.7.0:4[compat] =x11-libs/gl2ps-1.3.5 >=dev-cpp/muParser-1.32 diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.ebuild deleted file mode 100644 index 4a967dc76339..000000000000 --- a/sci-visualization/qtiplot/qtiplot-0.9.8.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# 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.8.ebuild,v 1.3 2010/09/03 06:12:37 jlec Exp $ - -EAPI=3 - -PYTHON_DEPEND="python? 2" - -inherit eutils qt4-r2 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" - -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-20100630:2 - sci-libs/gsl - dev-libs/boost - dev-tex/qtexengine - 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-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" - ) - -pkg_setup() { - use python && python_set_active_version 2 -} - -src_prepare() { - qt4-r2_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 = "${EPREFIX}/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 = "${EPREFIX}/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 - if use ods; then - echo "QUAZIP_INCLUDEPATH = ${EPREFIX}/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 - - 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 ${PN} -} - -pkg_postrm() { - fdo-mime_desktop_database_update - python_mod_cleanup ${PN} -} -- cgit v1.2.3-65-gdbad