summaryrefslogtreecommitdiff
path: root/dev-util/qbs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-03-24 10:19:03 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-03-24 10:19:03 +0000
commitb279bbe94522565b8feb19b8e5f377d3ea76f157 (patch)
treee4790abc54cd850232f7d7de49e371fdfe8976c7 /dev-util/qbs
parentc5283d322accc6097afec74eab24550829788bab (diff)
gentoo resync : 24.03.2018
Diffstat (limited to 'dev-util/qbs')
-rw-r--r--dev-util/qbs/Manifest6
-rw-r--r--dev-util/qbs/qbs-1.10.0.ebuild120
-rw-r--r--dev-util/qbs/qbs-1.10.1.ebuild2
-rw-r--r--dev-util/qbs/qbs-1.9.1.ebuild115
4 files changed, 2 insertions, 241 deletions
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 5283ba214780..2443a6e10afe 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,7 +1,3 @@
-DIST qbs-src-1.10.0.tar.gz 4130630 BLAKE2B 9a692dc3cd65cbe8b8f09ca86e8da1ea47fa6770dbcdfc5fc34d65156f8a92932893fa382f510e516fe67a77b95024052d442d3e295a22423a544b61ff2eaf25 SHA512 a7d15acb46b5b32f0c54b40e4a5469f68cdcff54b062a46656174694d7abbade682b66f5dc4cdfa9ac87b9573ed3947d775d55638cfc1b4ffc24101ebea85618
DIST qbs-src-1.10.1.tar.gz 4140847 BLAKE2B cbd9770d426fdf70645f5c40fbc8956309845980776b920a0e5e612d0cbf63a9a1352e5ab43a98afd9a5a9db396d0b7bbd840b4581787aaafabad0982c6edca8 SHA512 e2019f59124cf8409c12bc108982f1c4c99dcff9d6272c26bee9d690327dea28990c4081857b1b2bfec57e3b557d83e0b8085823dbd4d0988c483d971dc06bac
-DIST qbs-src-1.9.1.tar.gz 4007946 BLAKE2B fa7744a321fec2f7b928b89e511aa542d935a61af79714d730e0c4c5fdab1f62e0da5cccf055622997cfbe441e5375212aa9cd8af3b1d69af933c438c94b8d21 SHA512 6b400a06b4f2c2cb531095a0c3eadb112335fe0f91c2077f01c7d2dc6ea329d250e7af70f70ebeb972368aa8fa0ee9548b84b75dc877230de6dea0b10468b7fd
-EBUILD qbs-1.10.0.ebuild 2975 BLAKE2B 53d92b0f1a40adf3d8bbebf98353589fee3c8dbbd16b62d01a4fe9f76efb1e81a8dcc17c6ad42e467233fed37144809ed5682af722604af6f5987efece017f0f SHA512 f587fbc48e2ea72b76ec0c3a2b2ba3239f51d066c8d21d7540078ca3e589e297b8b63f7d1c8ecff69722db8e17639de0626887cef72708c1e0299d593f5620ae
-EBUILD qbs-1.10.1.ebuild 3012 BLAKE2B 349e583003f8f8e54fe97b311965487413e7520f9384b098227425c772be2317e07ab9bb09eb5c7931b7dda4a0ff0abc005a1b60c42bd2e7b948a0eceb3f39c0 SHA512 3cfbead7109404dddee730e6bec48c22d95ed3862c0245a9647a7f9389f78cef8f8ac156f1db79ce951fe12f7872231dcb8ee3a57cd20940baac5dd690271b9b
-EBUILD qbs-1.9.1.ebuild 2865 BLAKE2B a090c3f484cce5bc105d5e7078975f3f79af9264cf68abe8c3ff79d73741f7c8e9156b21770a87d3ffe9372834598e3444d9bbff1b592dc1ff5b5093cdd1a6ad SHA512 28df0a53335da532fcdc0585587d642abdf66207d74815421f60e1d04381ef2b6e2d64af6f425590ee928ff47c80ddfbb8039193c5895493b090d62baa0b3d9e
+EBUILD qbs-1.10.1.ebuild 3011 BLAKE2B 6bfbb42ef28d3a0a74a6aaf1472e65e32639682c612d1e37a62340598883b1802e7c6717fe57e4340bbad4170a06ddcc1e2f22b35953b019ddc38bd77d3af042 SHA512 c947d0203b748ca2bfceb814322f1369497829a8c0506066cba15878fec019f2f81a566abdd87e2a3c2a828fbde8516e809db79dbcba5b235a087067fa8030c3
MISC metadata.xml 920 BLAKE2B ba6000d6db0ee2a6fb2edd9b999fe406e427ebf14f8ccf0dca6f21338dd98b8173c71b3599858a9f89e063c3138a307ac281413e671d5a6c706c93118c2db99e SHA512 ca8c93f9630e818e2f567388fd5f61f47882b843eee39a78f2882ec0ba8c310e0689fb70925762da7548040892d606ef21497503c6fb2a655af608b36bcc98da
diff --git a/dev-util/qbs/qbs-1.10.0.ebuild b/dev-util/qbs/qbs-1.10.0.ebuild
deleted file mode 100644
index 5b93b79331cc..000000000000
--- a/dev-util/qbs/qbs-1.10.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Modern build tool for software projects"
-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
-
- # don't add /usr/include to INCLUDEPATH
- # avoids a build failure in qt-creator with gcc-6 (bug 618424)
- sed -i -e '/^INCLUDEPATH/ s:$${PWD}/\.\.::' src/lib/corelib/use_installed_corelib.pri || die
-
- 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
-
- # TestApi seems broken in 1.10.0
- sed -i -e '/\<api\>/ d' tests/auto/auto.pro || die
-
- # 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
-
- dodoc -r changelogs
-
- # install documentation
- if use doc; then
- emake docs
- dodoc -r doc/qbs/html
- dodoc doc/qbs.qch
- docompress -x /usr/share/doc/${PF}/qbs.qch
- fi
-}
diff --git a/dev-util/qbs/qbs-1.10.1.ebuild b/dev-util/qbs/qbs-1.10.1.ebuild
index 6f49fe08ac2e..55632d81072a 100644
--- a/dev-util/qbs/qbs-1.10.1.ebuild
+++ b/dev-util/qbs/qbs-1.10.1.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 ~arm ~x86"
IUSE="doc examples test"
# see bug 581874 for the qttest dep in RDEPEND
diff --git a/dev-util/qbs/qbs-1.9.1.ebuild b/dev-util/qbs/qbs-1.9.1.ebuild
deleted file mode 100644
index cba25cda6a75..000000000000
--- a/dev-util/qbs/qbs-1.9.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Modern build tool for software projects"
-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
-
- # don't add /usr/include to INCLUDEPATH
- # avoids a build failure in qt-creator with gcc-6 (bug 618424)
- sed -i -e '/^INCLUDEPATH/ s:$${PWD}/\.\.::' src/lib/corelib/use_installed_corelib.pri || die
-
- 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/qbs/html
- dodoc doc/qbs.qch
- docompress -x /usr/share/doc/${PF}/qbs.qch
- fi
-}