commit:     b0f451b3ce07943fbcc1893e542163480d75adb5
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 17 05:05:48 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 05:06:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0f451b3

dev-util/qbs: version bump

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-util/qbs/Manifest         |   1 +
 dev-util/qbs/qbs-1.7.0.ebuild | 112 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 1a3a5d7..795f3b2 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,4 @@
 DIST qbs-src-1.4.5.tar.gz 825278 SHA256 
f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 
ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a
 WHIRLPOOL 
2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca
 DIST qbs-src-1.5.2.tar.gz 902972 SHA256 
059b4f64c1f599379a17bbf859dd9658fafe8cb2b65b31634974ff1c381928c1 SHA512 
80aa32a4951703bf08f217c216006b057c3c866e5f10cda687714edadb39a8316b63866a493bb947093bb55406ab38269b46bc2ce2e9e09629a68b2e57440d70
 WHIRLPOOL 
0545aef4a14f804a00287cd6aa9f5a0d9139857badfd5169f541fd9a980a78938956936ed1faaf070f00febafd54b35983af3f5e10ba2209b2c538bcb99b43b3
 DIST qbs-src-1.6.1.tar.gz 934229 SHA256 
72bbba4ac0ede177df52e44e79692752016ecd1c26b9ae86c76b0df1e18cbb10 SHA512 
6ccece4d2be457fb4a476cc134fcb997dc74d2d64b2a78ad281a618407f045562ef44257cebba05ff4cc0cfe019f6b4ba83096f2b76a7633aa78039c1dca6b7a
 WHIRLPOOL 
928085e54826bb2f7f5e74c78fb392901c73a093115f733b8682a447d39479f08294483e288d3beb77963730f065961b6b1c2fcf3c2a4dd556677d7a7cb1360d
+DIST qbs-src-1.7.0.tar.gz 992213 SHA256 
a7271e35f35c015f6deda3bf5b614031019018572cebb9904920f251b583c3ef SHA512 
cab913d07be30d147851c9b439cf5b292d4ef92cd0dc23ba184b4f6c476c0d94412581cff79eb7f5525cbb5b940bbe1318f292a585d591124702a1acc863087f
 WHIRLPOOL 
e107b2b2a1f233fe2fbb77ebdd31bdf6130ada26a29b4094f6d92cd6cb44039af035791db1830f65b37093529e056f7e1fb80d5b6be74f624992a6bb5ee5f7f6

diff --git a/dev-util/qbs/qbs-1.7.0.ebuild b/dev-util/qbs/qbs-1.7.0.ebuild
new file mode 100644
index 00000000..930b211
--- /dev/null
+++ b/dev-util/qbs/qbs-1.7.0.ebuild
@@ -0,0 +1,112 @@
+# 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="Cross-platform build tool"
+HOMEPAGE="https://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"
+
+# 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 )
+"
+
+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
+}

Reply via email to