From: Justin Lecher Date: Thu, 22 Dec 2011 15:45:25 +0000 (+0000) Subject: Version Bump, #395621 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d4f10d6d31335ca959bdfa35b4ad5ab8ba0f9779;p=gentoo.git Version Bump, #395621 Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64 --- diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog index 71f8459f687c..5aeb5a4f809a 100644 --- a/sci-visualization/qtiplot/ChangeLog +++ b/sci-visualization/qtiplot/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-visualization/qtiplot # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.85 2011/10/30 19:33:53 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.86 2011/12/22 15:45:25 jlec Exp $ + +*qtiplot-0.9.8.9 (22 Dec 2011) + + 22 Dec 2011; Justin Lecher +qtiplot-0.9.8.9.ebuild: + Version Bump, #395621 30 Oct 2011; Andreas K. Huettel qtiplot-0.9.8.8.ebuild: diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest index 7d7ee1996514..d5e33bd5316f 100644 --- a/sci-visualization/qtiplot/Manifest +++ b/sci-visualization/qtiplot/Manifest @@ -27,6 +27,7 @@ DIST qtiplot-0.9.8.5.tar.bz2 10399116 RMD160 56647644c8433fbe97b3d7f36a75919da5a DIST qtiplot-0.9.8.6.tar.bz2 10415560 RMD160 830c4bb911a0680771a078dfe1796b4cd6889397 SHA1 e8a5ea1e1fb0e87cf76985f63b25e263b03f5fa9 SHA256 3fef0e8796e6045aad5404b156bf1e125e9732a034cb3e61c58dcebd5079985f DIST qtiplot-0.9.8.7.tar.bz2 10439239 RMD160 8f56f2b92bc46a99ecddb68a521ffd72867ab079 SHA1 f143b6e1f240cf3ed6b6145e161c2839c093420f SHA256 2dd29616016fbb302ce8fb20080d86fc15fdeb69572a1c92bb46f21cd5ba0e39 DIST qtiplot-0.9.8.8.tar.bz2 10437325 RMD160 400b958581bf75bdcea5cfb829ebebf842de345c SHA1 02801cdf31b543c0f5d7ef1b1f358f0738d93d48 SHA256 cc4c96aff68dd6124374f228eb3866c2f6d0cd478cfb9242b43fca012ecbb0c3 +DIST qtiplot-0.9.8.9.tar.bz2 16202943 RMD160 6f78160aabc94fc8f01d4f5fb65f5cb4a718eae2 SHA1 73b17dd9195c3d86750d5f1f5bdd4d5483c5fe30 SHA256 a523ea259516d7581abaf2fe376507d152db32f71d88176cff18f5bc391b9ef0 EBUILD qtiplot-0.9.7.14-r1.ebuild 5294 RMD160 1c7ed30f4a15a469fcd7153dd3d2b42c18069ed2 SHA1 911b55806849db16a2e8032606ac73ea4a2a79b1 SHA256 f90ab5b808466118e16d5ba23a2743b75270c881d1ee7553d374530d47e7f43f EBUILD qtiplot-0.9.8.2.ebuild 5401 RMD160 ec3aaa60bd9f48b4202980c86d41352cfa93ce1b SHA1 c698f5425ff1e3c613782cbc45a44e0a92ae3829 SHA256 860833f9f224c29cdcdbb081909803bb1df3ea8240a4cee2bed7614f8ee9b8a1 EBUILD qtiplot-0.9.8.3.ebuild 6193 RMD160 c8a6667d60c79028592cef5573ad59daf8e6a66b SHA1 ff25d80ed0ecf5a8bb2485232c597e1660531721 SHA256 37920e863c3efb3bcb978cf2983a8ba8652177c187fbcd957d7368c0a9896f2f @@ -35,22 +36,13 @@ EBUILD qtiplot-0.9.8.5.ebuild 5331 RMD160 28fd64588c35cb641c64e9100bb0a4e749aa10 EBUILD qtiplot-0.9.8.6.ebuild 5588 RMD160 c2ecf35156578918fc6bd92628af341e28a5d40f SHA1 dade73496bf579d3c18a1fc5e881cfedd8222432 SHA256 8e49b91599c4334a7a454ad07b30214783ff94dc63acd4892521d61e4e1ff5bd EBUILD qtiplot-0.9.8.7.ebuild 5561 RMD160 81e8cac2a30b289a957ff8f8770de9771a9eb858 SHA1 6bcb4900edf5bbe3e5b539e561ac6427aea09eb1 SHA256 bff735cd67a777db17882442cfc461588319b55e2c6244b83a6989e1c0f7ba65 EBUILD qtiplot-0.9.8.8.ebuild 5605 RMD160 97def6b6c419cf44a9c5854a5c756b0d807a9ab0 SHA1 ef151e1241b4883a767fb644cfde44da20da7341 SHA256 a7568b7bceebd1ccc6a2955258e9eb86dee90a1eca69033cd181d4d852e3359d -MISC ChangeLog 20604 RMD160 22e6b19b424f9d088601e61aa62727d47b03b2b1 SHA1 0d512d42a00e710599f7b192ea2f9cc4754fa340 SHA256 931bad2bdfc27c911744f6359a54feeb0ab492841191e1a719f09df3c710e7a2 +EBUILD qtiplot-0.9.8.9.ebuild 5609 RMD160 e2cd1cbdc865c27ae49edc797e6c0c255be982d8 SHA1 3a1ec5ef3d671d651f869eec0852a1b8a6d87781 SHA256 eb2541d996b2fb1f407a47b16f83152d6022e71808871c23b462901625069c28 +MISC ChangeLog 20728 RMD160 b89f02eb74dcb6dc5f2177654d7eec023873110f SHA1 48d5ea29915d960570aae93c8b89e060a6c4cd84 SHA256 5f9bbc43518305a619d4f1c3cb8e9872135278754725b4aa704fbd0983aef0b3 MISC metadata.xml 919 RMD160 d5a42a5872798c2f2f3a0c8ca241a15444a6f8b9 SHA1 1117f722c109e074538193ded0c6a5c5c8334dc7 SHA256 379fdffaca2a9a4769a8bfd3d6c38efca329faf1382b9e9013a2b1f4262a42ec -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCgAGBQJOraasAAoJENwGBM22xffe2SsP/RhrRd5Lc2nyJZdyuyvKHgw2 -HEr1RKvGyDGf3n3HvDdYPziTI/UHfeEFzSyiOoaAVpW6vc8g9wpLjNr7ZsVq/02T -jZ3t1uo/q/hJq1Y5oqtGIvDyaCO6oouJXS6IdRX01sJFOs3LHWesZaEVcPMxFqI9 -JxaT5AI8mjhUTQJUfbsdmXKq3tN4DIdJ5hv1QXEtWKf2XsZeAwo21j29k99aD3fO -ulGNfTg10j7sZF+Ili6pCGy3zh+/tp+S4oC21OUhJiByq2EKBHFqMpb5ElbNGHSF -U9kC+hvBE2UUpIpl9XbXAo6espkJs/Pf2++Dfec6/Zfb1NqCnZWJpefWdyROdPj6 -5pzy8WGFKiTTpJYN/ypKbqtUaRadJPuLDnrEyXaEibs2oQzo/AbtEYdHBjX/hdex -vlDF+7NlKX1zTVIll6LJXvP8MPYd7uTYDVTcqvd0y2hqx5BP6Qq8t/aNhTGSK5m7 -0vGn+x6azk6xzewXzq+Pr10HtVGw3o+igRsVDyxtvYxSFX1Ew/CVlyYCtx4QxN6a -1uk8ZzqDMoslHKzBQ/lfeBvcqQB7pRUS2DlLXrdSeeOHdAC1NqeFXGjZ4L21sVdp -mQZcWMCJ6VRx/06k68IYeiM0PzYCgwNumLa8j0w4YEgyBDD8HgVDVEVabF1T49Tx -sF95A894vGzvfRUWufB8 -=V6nb +iEYEAREKAAYFAk7zUKEACgkQgAnW8HDreRZ6nwCguoXw/Ff01boJRgBLTENGmyQG +gQAAnjBn+pZsRd0kBoSg9C7v5nkJLzIs +=BJh/ -----END PGP SIGNATURE----- diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild new file mode 100644 index 000000000000..2b6d21309452 --- /dev/null +++ b/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild @@ -0,0 +1,206 @@ +# Copyright 1999-2011 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.9.ebuild,v 1.1 2011/12/22 15:45:25 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="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2" + +LICENSE="GPL-2 GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="bindist doc mono latex python" + +LANGS="cn cz de es fr ja ro ru 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-assistant + x11-libs/qt-gui + x11-libs/qt-opengl:4 + x11-libs/qt-qt3support:4 + || ( >=x11-libs/qt-assistant-4.7.0:4[compat] =x11-libs/gl2ps-1.3.5[png] + >=dev-cpp/muParser-1.32 + >=dev-libs/boost-1.35.0 + dev-libs/quazip + media-libs/libpng + sci-libs/gsl + sci-libs/tamu_anova + latex? ( dev-tex/qtexengine ) + mono? ( dev-dotnet/libgdiplus )" +DEPEND="${CDEPEND} + dev-util/pkgconfig + python? ( >=dev-python/sip-4.9 ) + doc? ( + >=app-text/docbook-sgml-utils-0.6.14-r1 + >=app-text/docbook-xml-dtd-4.4-r2:4.4 )" + +RDEPEND="${CDEPEND} + python? ( dev-python/PyQt4[X] )" + +PATCHES=( + "${FILESDIR}/${PN}-0.9.8.8-system-gl2ps.patch" + "${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch" + "${FILESDIR}/${PN}-0.9.8.6-gold.patch" + "${FILESDIR}/${PN}-0.9.8.7-kde.patch" + ) + +pkg_setup() { + use python && python_set_active_version 2 +} + +src_prepare() { + local mylibs + + qt4-r2_src_prepare + + rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost} || die + sed \ + -e "s:dll:static:g" \ + -e "/INSTALLS/d" \ + -i 3rdparty/qwtplot3d/*.pro + + mylibs="${mylibs} -lquazip" + use mono && mylibs="${mylibs} $(pkg-config --libs libgdiplus)" + + # 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) + 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 + SYS_LIBS = -lgl2ps ${mylibs} + + PYTHON = python + LUPDATE = lupdate + LRELEASE = lrelease + + SCRIPTING_LANGS += muParser + + CONFIG += release + CONFIG += CustomInstall + DEFINES += SCRIPTING_CONSOLE + + EOF + + use bindist && echo "DEFINES += QTIPLOT_SUPPORT" >> build.conf + use bindist || echo "DEFINES += QTIPLOT_PRO" >> build.conf + use python && echo "SCRIPTING_LANGS += Python" >> build.conf + use latex && echo "TEX_ENGINE_LIBS = -lQTeXEngine" >> build.conf + echo "LIBPNG_LIBS = -lpng" >> build.conf + echo "TAMUANOVA_LIBS = -ltamuanova" >> build.conf && \ + echo "TAMUANOVA_INCLUDEPATH = \"${EPREFIX}/usr/include/tamu_anova\"" >> build.conf + + sed \ + -e "s:doc/${PN}/manual:doc/${PN}/html:" \ + -e "s:/usr/local/${PN}:${EPREFIX}$(python_get_sitedir)/qtiplot:" \ + -e '/INSTALLS.*documentation/d' \ + -e '/INSTALLS.*manual/d' \ + -e "/INSTALLBASE/s: /usr: ${EPREFIX}/usr:g" \ + -e 's:/usr/local/qtiplot:$$INSTALLBASE:g' \ + -i qtiplot/qtiplot.pro || die + + sed \ + -e "/^target.path/s:/usr:${EPREFIX}/usr:g" \ + -i fitPlugins/*/*.pro || die + + sed -e '/manual/d' -i qtiplot.pro || die + + sed -e "s:QTIPLOT_PRO:QTIPLOT_PROFESSIONAL:g" -i qtiplot/src/core/main.cpp || 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 + + sed \ + -e '1i#define OF(x) x' \ + -i 3rdparty/zlib/minigzip.c || 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() { + qt4-r2_src_install + 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() { + if use python; then + elog "You might want to emerge" + elog "\t dev-python/pygsl" + elog "\t dev-python/rpy" + elog "\t sci-libs/scipy and" + elog "\t dev-python/sympy" + elog "to gain full python support." + fi + + fdo-mime_desktop_database_update + use python && python_mod_optimize ${PN} +} + +pkg_postrm() { + fdo-mime_desktop_database_update + use python && python_mod_cleanup ${PN} +}