From fd00b08db60014a148bf2884b5ca8665b05e91bf Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Fri, 10 Jun 2016 02:45:01 +0200 Subject: dev-util/qbs: version bump Package-Manager: portage-2.3.0_rc1 --- dev-util/qbs/Manifest | 2 +- dev-util/qbs/qbs-1.5.0.ebuild | 113 ------------------------------------------ dev-util/qbs/qbs-1.5.1.ebuild | 113 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 114 deletions(-) delete mode 100644 dev-util/qbs/qbs-1.5.0.ebuild create mode 100644 dev-util/qbs/qbs-1.5.1.ebuild (limited to 'dev-util/qbs') diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest index b673f7f4331d..97f3408bde46 100644 --- a/dev-util/qbs/Manifest +++ b/dev-util/qbs/Manifest @@ -1,3 +1,3 @@ DIST qbs-src-1.4.2.tar.gz 821001 SHA256 b9d36118c3ae0f7d4df6bf7239a0a0163c0340b701d00191fa5f832cef341ce5 SHA512 dc4514f28843d159b695e4da2b94619da91656b57ba839fa62901cd3a48309ffd3a3b5203b7ae1c5f35cab515a6149017fd43093ae9395846b3e46b2f53b93ec WHIRLPOOL 0431823cc54dd7a372473e76d8269207cf439a5ba27d3c099df63a19d222067a41a62299415cae9c9798e5bf5ebf38c27dffa8f23135675a564f51047cecfc67 DIST qbs-src-1.4.5.tar.gz 825278 SHA256 f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a WHIRLPOOL 2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca -DIST qbs-src-1.5.0.tar.gz 897221 SHA256 541106d3e53429c5375a58f395413b3cd5a026d91a304a10f36d78b5e39d9085 SHA512 26aa00bbe29e6455a13acbb606f735e3fa7fb867d4d81bb216f6929e87ebfba3e00565883f8a5e05c76c5836a8575eccc75582038e30ca1f94c005beb3baeb41 WHIRLPOOL b109dc220a58ea3767be5a43d073e9ca772f4ce0eef06178613e1d173c979aa9d142186e9ed774dd5312d576dc2be9f33e614494bd292f1f417dba44e9fd854e +DIST qbs-src-1.5.1.tar.gz 900544 SHA256 ac6b9cf56d19245c9c1e0f6b1bf5b36f8194838faf2b4a7d9dbe85373bdbeabe SHA512 54bd80169c8b66476acfd73611e029ed6fc19b668456c8c8ee8f76bd229e9b40b81cd5f10ab3db6a7e520673029b5167c45a47d649700058cf1f3e819b5ba305 WHIRLPOOL f660ba58253d273fb0320707c1ae55c96c1435ab0ef62dca90668026c2eb6200110d6aeafe65867a9236eb76f6d6e3976c95ac8663a97f7cd79aae66c480f3b1 diff --git a/dev-util/qbs/qbs-1.5.0.ebuild b/dev-util/qbs/qbs-1.5.0.ebuild deleted file mode 100644 index 0f9c5e4c18e3..000000000000 --- a/dev-util/qbs/qbs-1.5.0.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit qmake-utils - -MY_P=${PN}-src-${PV} - -DESCRIPTION="Qt Build Suite" -HOMEPAGE="http://wiki.qt.io/Qbs" -SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz" - -LICENSE="|| ( LGPL-2.1 LGPL-3 )" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="doc examples test" - -RDEPEND=" - dev-qt/qtcore:5= - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtscript:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 -" -DEPEND="${RDEPEND} - doc? ( - dev-qt/qdoc:5 - dev-qt/qthelp:5 - ) - test? ( - dev-qt/qtdeclarative:5 - dev-qt/qttest:5 - ) -" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - default - - if ! use examples; then - sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die - fi - - if use test; then - sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die - else - sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die - fi - - # skip several tests that fail and/or have additional deps - sed -i \ - -e 's/findArchiver("7z")/""/' `# requires p7zip, fails` \ - -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \ - -e 's/p\.value("java\./true||&/' `# requires jdk, fails, bug 585398` \ - -e 's/!haveMakeNsis/true/' `# requires nsis` \ - -e 's/!haveWiX(profile)/true/' `# requires wix` \ - -e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug 527652` \ - -e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \ - tests/auto/blackbox/tst_blackbox.cpp || die -} - -src_configure() { - local myqmakeargs=( - qbs.pro # bug 523218 - -recursive - CONFIG+=qbs_disable_rpath - CONFIG+=qbs_enable_project_file_updates - $(usex test 'CONFIG+=qbs_enable_unit_tests' '') - QBS_INSTALL_PREFIX="${EPREFIX}/usr" - QBS_LIBRARY_DIRNAME="$(get_libdir)" - ) - eqmake5 "${myqmakeargs[@]}" -} - -src_test() { - einfo "Setting up test environment in ${T}" - - export HOME=${T} - export LD_LIBRARY_PATH=${S}/$(get_libdir) - - "${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die - "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die - - einfo "Running autotests" - - # simply exporting LD_LIBRARY_PATH doesn't work - # we have to use a custom testrunner script - local testrunner=${WORKDIR}/gentoo-testrunner - cat <<-EOF > "${testrunner}" - #!/bin/sh - export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}" - exec "\$@" - EOF - chmod +x "${testrunner}" - - emake TESTRUNNER="'${testrunner}'" check -} - -src_install() { - emake INSTALL_ROOT="${D}" install - - # install documentation - if use doc; then - emake docs - dodoc -r doc/html - dodoc doc/qbs.qch - docompress -x /usr/share/doc/${PF}/qbs.qch - fi -} diff --git a/dev-util/qbs/qbs-1.5.1.ebuild b/dev-util/qbs/qbs-1.5.1.ebuild new file mode 100644 index 000000000000..0f9c5e4c18e3 --- /dev/null +++ b/dev-util/qbs/qbs-1.5.1.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit qmake-utils + +MY_P=${PN}-src-${PV} + +DESCRIPTION="Qt Build Suite" +HOMEPAGE="http://wiki.qt.io/Qbs" +SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz" + +LICENSE="|| ( LGPL-2.1 LGPL-3 )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="doc examples test" + +RDEPEND=" + dev-qt/qtcore:5= + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtscript:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 +" +DEPEND="${RDEPEND} + doc? ( + dev-qt/qdoc:5 + dev-qt/qthelp:5 + ) + test? ( + dev-qt/qtdeclarative:5 + dev-qt/qttest:5 + ) +" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + default + + if ! use examples; then + sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die + fi + + if use test; then + sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die + else + sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die + fi + + # skip several tests that fail and/or have additional deps + sed -i \ + -e 's/findArchiver("7z")/""/' `# requires p7zip, fails` \ + -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \ + -e 's/p\.value("java\./true||&/' `# requires jdk, fails, bug 585398` \ + -e 's/!haveMakeNsis/true/' `# requires nsis` \ + -e 's/!haveWiX(profile)/true/' `# requires wix` \ + -e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug 527652` \ + -e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \ + tests/auto/blackbox/tst_blackbox.cpp || die +} + +src_configure() { + local myqmakeargs=( + qbs.pro # bug 523218 + -recursive + CONFIG+=qbs_disable_rpath + CONFIG+=qbs_enable_project_file_updates + $(usex test 'CONFIG+=qbs_enable_unit_tests' '') + QBS_INSTALL_PREFIX="${EPREFIX}/usr" + QBS_LIBRARY_DIRNAME="$(get_libdir)" + ) + eqmake5 "${myqmakeargs[@]}" +} + +src_test() { + einfo "Setting up test environment in ${T}" + + export HOME=${T} + export LD_LIBRARY_PATH=${S}/$(get_libdir) + + "${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die + "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die + + einfo "Running autotests" + + # simply exporting LD_LIBRARY_PATH doesn't work + # we have to use a custom testrunner script + local testrunner=${WORKDIR}/gentoo-testrunner + cat <<-EOF > "${testrunner}" + #!/bin/sh + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}" + exec "\$@" + EOF + chmod +x "${testrunner}" + + emake TESTRUNNER="'${testrunner}'" check +} + +src_install() { + emake INSTALL_ROOT="${D}" install + + # install documentation + if use doc; then + emake docs + dodoc -r doc/html + dodoc doc/qbs.qch + docompress -x /usr/share/doc/${PF}/qbs.qch + fi +} -- cgit v1.2.3-65-gdbad