diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-21 18:59:32 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-21 18:59:32 +0100 |
| commit | 520a5b56dff7c24c9d42eafec142cb78b44f8e3e (patch) | |
| tree | f562f705600dbd2292e97c0b4145787c2a8d1f97 /dev-util/qbs | |
| parent | 3811bc3072bf19e2be351d2c63f81532945c0f21 (diff) | |
gentoo resync : 21.07.2018
Diffstat (limited to 'dev-util/qbs')
| -rw-r--r-- | dev-util/qbs/Manifest | 6 | ||||
| -rw-r--r-- | dev-util/qbs/qbs-1.11.1.ebuild | 2 | ||||
| -rw-r--r-- | dev-util/qbs/qbs-1.12.0.ebuild (renamed from dev-util/qbs/qbs-1.10.1.ebuild) | 24 |
3 files changed, 13 insertions, 19 deletions
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest index 84dacb172d2e..83a43477b34b 100644 --- a/dev-util/qbs/Manifest +++ b/dev-util/qbs/Manifest @@ -1,5 +1,5 @@ -DIST qbs-src-1.10.1.tar.gz 4140847 BLAKE2B cbd9770d426fdf70645f5c40fbc8956309845980776b920a0e5e612d0cbf63a9a1352e5ab43a98afd9a5a9db396d0b7bbd840b4581787aaafabad0982c6edca8 SHA512 e2019f59124cf8409c12bc108982f1c4c99dcff9d6272c26bee9d690327dea28990c4081857b1b2bfec57e3b557d83e0b8085823dbd4d0988c483d971dc06bac DIST qbs-src-1.11.1.tar.gz 4299125 BLAKE2B a2b2670b47bb122ccc586fee0c61d941533dc2dbc5e59028a7ab765eb18fe4a71b85cbd7373f88231b9cd75178982a17dddab0ba965de84ca197c49b2c9eefdf SHA512 90833792cb29b7b886df491263b620d2933c398ad8b2f495d0e5ae6acdde3f816ecd25638ae2e74d3efbf517a762644f751b7c01633aed3369bd7bf85c033ff5 -EBUILD qbs-1.10.1.ebuild 3011 BLAKE2B 6bfbb42ef28d3a0a74a6aaf1472e65e32639682c612d1e37a62340598883b1802e7c6717fe57e4340bbad4170a06ddcc1e2f22b35953b019ddc38bd77d3af042 SHA512 c947d0203b748ca2bfceb814322f1369497829a8c0506066cba15878fec019f2f81a566abdd87e2a3c2a828fbde8516e809db79dbcba5b235a087067fa8030c3 -EBUILD qbs-1.11.1.ebuild 3067 BLAKE2B c3e28908a89e224589cb89293c50df616cb5b20b733faf80b47ef2f25a7c7e9f676169d5cfa143de51dd85f5d103ac37dde40878899d992522b693eb548764d0 SHA512 4118b383ab47c790f2354667db16e4f1c689a411efa57dacdded76f42ba8f339485c04923d43fc6a15acb60c5e73640d8036a4ba86a88b8f36f849d79bec74a7 +DIST qbs-src-1.12.0.tar.gz 4368992 BLAKE2B 5fce4052f349ed787a0948541fbe1397ed8dde5bb6191e6ba37718e4d803b30b1f7a4ba3abb00d0d10078b1cfddeedb45a4c5dc86d800b5a8b941abffb0a5804 SHA512 2d9f23231e3824d67f63f290e4d22bd3d56f161c32b9002e23e615cb2793678eadde033d6e2b744e89ad69f4b6104c69e80095881601d498d9587d3db06c2103 +EBUILD qbs-1.11.1.ebuild 3066 BLAKE2B 0f44337978b215817f91a6bb6d2bc278a8d7765ef0c7c8ff450a64d2c0324267ddf3a3a7f00ace808db44da440d91bd6949513e7aac56d7afc0387f4beedf3a4 SHA512 09f81791a84a2fd9905b9e7cf9a9271cb88221321be12f69c887215789763de7f77df65a0d37402262aaa0015f68128875b5c1c3ed7b36ceb7d750203d2840d2 +EBUILD qbs-1.12.0.ebuild 2867 BLAKE2B fc50c95d5c2cf7b4e198c3c1dd9c2da64cb7067ff3bd26ebcc771b9e9e1129691d1b32eed98fbbf9f2382febcb09f238764689354a1f3c8fc1035b57e386954c SHA512 1fb957e2c1d777315dee3f9dc705ebe6f9c5f24ea90ea8ef5ec8a8adda63f9df9242b605564c5867ee1a719e0d42d3ddbfee4be92c68c3091f74c4291a9d5cdf MISC metadata.xml 920 BLAKE2B ba6000d6db0ee2a6fb2edd9b999fe406e427ebf14f8ccf0dca6f21338dd98b8173c71b3599858a9f89e063c3138a307ac281413e671d5a6c706c93118c2db99e SHA512 ca8c93f9630e818e2f567388fd5f61f47882b843eee39a78f2882ec0ba8c310e0689fb70925762da7548040892d606ef21497503c6fb2a655af608b36bcc98da diff --git a/dev-util/qbs/qbs-1.11.1.ebuild b/dev-util/qbs/qbs-1.11.1.ebuild index 4971aeed8202..9a19d31b66e5 100644 --- a/dev-util/qbs/qbs-1.11.1.ebuild +++ b/dev-util/qbs/qbs-1.11.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.10.1.ebuild b/dev-util/qbs/qbs-1.12.0.ebuild index 55632d81072a..87c294f41601 100644 --- a/dev-util/qbs/qbs-1.10.1.ebuild +++ b/dev-util/qbs/qbs-1.12.0.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit qmake-utils @@ -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 @@ -39,22 +39,15 @@ 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 + # the qbsres target uses the newly built qbs binary, so we have to tell it where to find its libraries + sed -i -e '/qbsres\.commands =/ a\LD_LIBRARY_PATH=$$shell_quote($$shell_path($$QBS_LIBRARY_DIRNAME)) \\' \ + static-res.pro || die - # since 1.10, TestApi is either broken or requires more configuration - sed -i -e '/\<api\>/ d' tests/auto/auto.pro || die + echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro # skip several tests that fail and/or have additional deps sed -i \ @@ -86,9 +79,10 @@ src_test() { export HOME=${T} export LD_LIBRARY_PATH=${S}/$(get_libdir) + export QBS_AUTOTEST_PROFILE=autotests - "${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die - "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die + "${S}"/bin/qbs-setup-toolchains --detect || die + "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" autotests || die einfo "Running autotests" |