dev-util/qbs: version bump

Package-Manager: Portage-2.3.6, Repoman-2.3.2

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 8c5808a3caeef1c28f9bb6a1c45b518a919caf1e..141cb8d9bc0e74b981da63c916f7401601cd8270 100644 (file)
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1,3 @@
+DIST qbs-1.8.0.tar.gz 1049245 SHA256 4721f7d4f6411f1609df34b6975bc6b1eac3ffabaccc2b273d3c14586749d697 SHA512 500e2f6fed28327c86012c18d3eaa5b92e41046b6e98005b4d47ff16da24ccfaac0c1bf9f24b69bced2810965b7a852ae0cb9d41c77e547f114e7f88a4306af7 WHIRLPOOL 4b83fc428fb157e13e259611fc1048af802a7883baa27e40725c0bc9f5cf47d0120b533a4e53c0f1254483da2bbb81b9c2061dc077eb11c2f8635f6992e6c062
 DIST qbs-src-1.4.5.tar.gz 825278 SHA256 f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a WHIRLPOOL 2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca
 DIST qbs-src-1.7.0.tar.gz 992213 SHA256 a7271e35f35c015f6deda3bf5b614031019018572cebb9904920f251b583c3ef SHA512 cab913d07be30d147851c9b439cf5b292d4ef92cd0dc23ba184b4f6c476c0d94412581cff79eb7f5525cbb5b940bbe1318f292a585d591124702a1acc863087f WHIRLPOOL e107b2b2a1f233fe2fbb77ebdd31bdf6130ada26a29b4094f6d92cd6cb44039af035791db1830f65b37093529e056f7e1fb80d5b6be74f624992a6bb5ee5f7f6

diff --git a/dev-util/qbs/qbs-1.8.0.ebuild b/dev-util/qbs/qbs-1.8.0.ebuild
new file mode 100644 (file)
index 0000000..34a26df
--- /dev/null
+++ b/dev-util/qbs/qbs-1.8.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Modern build tool for software projects"
+HOMEPAGE="https://wiki.qt.io/Qbs"
+SRC_URI="https://github.com/qt-labs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples test"
+
+# see bug 581874 for the qttest dep in RDEPEND
+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
+       test? ( dev-qt/qttest:5 )
+"
+DEPEND="${RDEPEND}
+       doc? (
+               dev-qt/qdoc:5
+               dev-qt/qthelp:5
+       )
+       test? ( dev-qt/qtdeclarative:5 )
+"
+
+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("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
+
+       # requires jdk, fails, bug 585398
+       sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || 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
+}