From 4bb8e882ee0a1ce661d29b7cf6157f38f98410a0 Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Sun, 18 Jan 2015 04:05:17 +0000 Subject: Version bump. Use only one USE flag to choose whether to build against Qt4 or Qt5. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xDADED6B2671CB57D! --- dev-util/qbs/ChangeLog | 11 +++- dev-util/qbs/Manifest | 34 ++++++------- dev-util/qbs/qbs-1.3.2.ebuild | 112 ---------------------------------------- dev-util/qbs/qbs-1.3.3.ebuild | 116 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 142 insertions(+), 131 deletions(-) delete mode 100644 dev-util/qbs/qbs-1.3.2.ebuild create mode 100644 dev-util/qbs/qbs-1.3.3.ebuild (limited to 'dev-util/qbs') diff --git a/dev-util/qbs/ChangeLog b/dev-util/qbs/ChangeLog index 7c9a1d96ffe8..080dd1a09b1c 100644 --- a/dev-util/qbs/ChangeLog +++ b/dev-util/qbs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-util/qbs -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.10 2014/11/03 02:59:50 pesa Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.11 2015/01/18 04:05:08 pesa Exp $ + +*qbs-1.3.3 (18 Jan 2015) + + 18 Jan 2015; Davide Pesavento +qbs-1.3.3.ebuild, + -qbs-1.3.2.ebuild: + Version bump. Use only one USE flag to choose whether to build against Qt4 or + Qt5. 03 Nov 2014; Davide Pesavento qbs-1.3.2.ebuild: Disable tests that require nodejs (bug 527652). diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest index 5ff8bb12400c..e80124028ce0 100644 --- a/dev-util/qbs/Manifest +++ b/dev-util/qbs/Manifest @@ -1,26 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST qbs-1.3.2.src.tar.gz 710058 SHA256 03ce02bc1e5d6985e79318a7e49b95052166de5fe464c9149ce2828368292a9f SHA512 689507d4caa951b29e1f06cd7f0bae14d483b00e21d82b53fb9410b7c50f8b0d1bfb71d102dc4bcb733f91b7e6e817d128f1c56fd85caec54c797cd7cbc5a05a WHIRLPOOL 2f4e72a80da930d7ad71b10a385476d367ab419165e6821bbedd097069359e83935a1ec677b857e601991a04654599497aa52c311351cd8ea420dbe3afe66242 -EBUILD qbs-1.3.2.ebuild 2322 SHA256 d82276a25d3e90ece22b15f5ea985fead015f762ef32f6d0d0699030e028783e SHA512 4646117e42daf353c1a05e00e2c50b29a6c9bac97d26d3a9b8f601eb9027aacfdd7c7f7d8514f078f6ba88f102a93595f3a451352ad19be46c8906add70856ce WHIRLPOOL d9162acb5cd991213473dcd87dda753e647d2430222d08d023dad1858704deab540808569b861ed9172ec131846dd2fd0c0f5ac0d26a628ac4e91627df647f03 -MISC ChangeLog 1679 SHA256 2e1295208059f8b1b47e5ef853c0e5a450a8f8d7c376ddf581dd91e5b5df5650 SHA512 033f4da74243113dae896d3bc26977ce94b08eca3badbfd77686338246f409ee5beaa1b82d7ad3de84b2fe26023a5b8944ed581156def275d2b959fd7ad892f1 WHIRLPOOL c58f0799c54a555fa967ed53d204b3153cd6bb7fa44869a87da4bca80395465d387f34df197f68b6a508e6636e02be64c945a07317f8ad1fcadd3c41c452d914 +DIST qbs-1.3.3.src.tar.gz 718418 SHA256 6d3372d088f2328cb2f51f77321f98d20068e91a0334b4c176d85d000a78036a SHA512 15aa1c781030ba81236ec6520ecfd596b943aa674256ce02d1e439e84548766080c4bf1579998fd5a154200c0ca729178b83f2354c996b92eda7d3252f1d7a49 WHIRLPOOL 96579110bdde6c3d4b390e08cc6700e6cc5fa6e2da4175d3a69c683b2cd2f1f0313c25020c0886ea026297ce5d7ba0950f0d925b6786430a256eed0eaafdd7ad +EBUILD qbs-1.3.3.ebuild 2312 SHA256 2c6b1ea8ff5b304119f8ba80f3008e9177057a5cac619e78a6c6e84afc78ebf2 SHA512 7de5710c8c6230b86282fe9f73ae17d2287c0db6569223c4bc68b7af918dddc1a149984edf37202d719d3cf02ea9a4db8b8cfab1430d4ab2f98df6f1225c65f0 WHIRLPOOL e1e74ddc29ee97dc3e2dff833a6cef0abfecefc63416204e178c874b15013207cd24ad438c4e7bdba24aab45e13fcc1fe2d8ae9d80156e8e94857d770aec641e +MISC ChangeLog 1883 SHA256 6b3085b375dc51cfd0c231b85b69d85167fdbb23c83563a30b6fcda5d23e053f SHA512 ae149bacc8b715af812b60633853822bdf5be223bd18e993097c99ec20ee43370ae1dfc1c1c070c427901ed7b15e98882aedeea7b8c1aa1619a05105226e854e WHIRLPOOL 30e38b5225abcaab89301c424e8315303efede1aa2e2f104428676b936db97c0a200ae2f4be8fb958b92c6b050bf1f9d419adf570fdf9dbf6d51c315c2670cab MISC metadata.xml 155 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7 SHA512 f05c8982778167c3667c9246b9730ba49fec2967731ed2c615e31a7fddc220fcea8c0843caa70a14957c8c4910892c512b6f2e00a9724d65e6032e1289f4562a WHIRLPOOL 25ccd49f04da07c8525fe18b21229764bb4104938abefc6c953bf9caa533dd5c10ae7b3f80a1251182e6c1520c09383d9f1d0ac1dc74832a99299c9be27406c4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJUVu+vXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJUuzD9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE -QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV99YwQAJe/n4vNXnm6eF7fCaDn/P1N -i55M11OdsUkel5yCcQEpFa+Chlrt602FsP+9NhPbj8cI9Bb1T4q/mCS5+0FayD6R -ypxgW3oghlt3GdQVn/wAKRK54OKd9Jo6w4K9qU+pb22vGWign25Gb2HdA1vg+DtO -KBh+WKFwcji+ZQCyZoYALbJEXpEPgWrSawTzSqN3eCXCRgC10gMYUiniBCR1IyPe -X1zXXRnHa4BYm0i0uNc5XvxSPlFehxj5JxrFLnNRY8hX5fN/nPs8FVt+jxCW0z1z -IFumlHIiTAaGS0jypiuOKvjxJ4v2xPepatDFTKApKSgT/vWQpnCQ9emTEhU71yQi -zjvNM1bD9kQXxyy9tmJeBE68JwPHdeoQBRYQEFgQEovz/iGOqk7+9ZoI5Sx1m38h -oroVEmn0E3vfpncvlwSKfFBQbdyhbuzjUxHjqhTVOErawOtX6hdPA68zl0JqyJYq -SUzSxcGUbN3dSNmES9CIQHItXpxlXHL4WqeqfWwZCgm8GWuv6MwGif9dUtVG0YJi -AzX1nvMpW6Yuj81AJHWFa8yNHon9P3yojQKwGe3KbwO6IQtIT77bjlzAPICQcFkV -prBlW2mcMnPMH0m/zsbC6BEs+xHP13gARZm8N/+uYGm15jdiWcbeXRf54G4gcc47 -Yt+6wBTW/FgOjDGdyFSP -=vY5O +QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9BGUP/Rh1ruSoiU3jPjHOlSqLCVW/ +iS+W4lhLhCge9ogpRMotmo7KP3eyczuMXiihJ8vJkYOMJ8dM7+V5O97HXlHWtFyI +B2IiAABNBnOekcG+hlvTWnwCNoC8VbJm0ruTv/Q/CxlJSw0GMY8gg+kXL8htNGCg +QJKVOPvVQaNDoGiWJ3wqxEhEZls2SCa572xod0FUncSUNcJnD07jGCoVtkzsj3ek +3WguYGQY485ETKF69QC8Se7S1v/Tmveyr4Tvd153JIswdn2j65pJSVtc/g5KnoFT +WZiLZirGRzQBoO8ckO8Rv9GAdtmn+YbTq9CtLqo5EcuoLYl8qORQHE6qEEEoOyk6 +xgsD0BXQqSlD9e9XQGGG5X5gD8DLMCZuA0zw45fJoGZiirXnOnUPiSpvTNfgSpvZ +iL41LhHNjZENv94CpmZ/7bRKjTHv6xINYBJqDlWGcM7IjF0b5ySQbsciia1tZES8 +vi9ZI8Phwr+2Z0YnuceVe4vuhksCArkByi5teQA0Kmx/G3EbnGYra5qM0hyCN7u3 +Fn0+ENOqDNh5N+3egb0WaQTjxVBAO5LIA5Qz6sVyHNc0IaJW00IH1QUvfUadQysp +IHauXF5hyGbUViVSzkQ2Gom7h+yX1iz9zADKz7W8IbPajdSJL3fsp95orUkDKq9M +Bt/isdlyyph83HaV4cKD +=4Bv5 -----END PGP SIGNATURE----- diff --git a/dev-util/qbs/qbs-1.3.2.ebuild b/dev-util/qbs/qbs-1.3.2.ebuild deleted file mode 100644 index 66e46ff86bf4..000000000000 --- a/dev-util/qbs/qbs-1.3.2.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.3.2.ebuild,v 1.4 2014/11/03 02:59:50 pesa Exp $ - -EAPI=5 - -inherit multilib pax-utils qmake-utils - -DESCRIPTION="Qt Build Suite" -HOMEPAGE="http://qt-project.org/wiki/qbs" -SRC_URI="http://download.qt-project.org/official_releases/${PN}/${PV}/${P}.src.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc +qt4 qt5 test" - -RDEPEND=" - qt4? ( - >=dev-qt/qtcore-4.8:4 - >=dev-qt/qtgui-4.8:4 - >=dev-qt/qtscript-4.8:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtscript:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) -" -DEPEND="${RDEPEND} - doc? ( - qt4? ( >=dev-qt/qthelp-4.8:4 ) - qt5? ( dev-qt/qthelp:5 ) - ) - test? ( - qt4? ( >=dev-qt/qttest-4.8:4 ) - qt5? ( dev-qt/qttest:5 ) - ) -" - -REQUIRED_USE="^^ ( qt4 qt5 )" - -src_prepare() { - # fix plugins libdir - sed -i -e "/destdirPrefix/ s:/lib:/$(get_libdir):" \ - src/plugins/plugins.pri || die - - # disable tests that require nodejs (bug 527652) - sed -i -e 's/!haveNodeJs()/true/' \ - tests/auto/blackbox/tst_blackbox.cpp || die - - if ! use test; then - sed -i -e '/SUBDIRS = auto/d' \ - tests/tests.pro || die - fi -} - -src_configure() { - local myqmakeargs=( - qbs.pro # bug 523218 - -recursive - CONFIG+=disable_rpath - QBS_INSTALL_PREFIX="${EPREFIX}/usr" - QBS_LIBRARY_DIRNAME="$(get_libdir)" - ) - - if use qt4; then - eqmake4 "${myqmakeargs[@]}" - elif use qt5; then - eqmake5 "${myqmakeargs[@]}" - fi -} - -src_compile() { - default - - # disable mprotect wrt bug 526664 - pax-mark m "${S}"/bin/qbs{,-config,-config-ui} -} - -src_test() { - # disable mprotect wrt bug 526664 - pax-mark m "${S}"/bin/tst_* - - einfo "Setting up test environment in ${T}" - - export HOME=${T} - export LD_LIBRARY_PATH=${S}/$(get_libdir) - - local qmakepath=${EROOT}usr/$(get_libdir)/$(usev qt4 || usev qt5)/bin/qmake - [[ -x ${qmakepath} ]] || qmakepath=${EROOT}usr/bin/qmake - - "${S}"/bin/qbs-setup-toolchains "${EROOT}usr/bin/gcc" gcc || die - "${S}"/bin/qbs-setup-qt "${qmakepath}" qbs_autotests || die - - einfo "Running autotests" - default -} - -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.3.3.ebuild b/dev-util/qbs/qbs-1.3.3.ebuild new file mode 100644 index 000000000000..3282dc69e347 --- /dev/null +++ b/dev-util/qbs/qbs-1.3.3.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.3.3.ebuild,v 1.1 2015/01/18 04:05:08 pesa Exp $ + +EAPI=5 + +inherit multilib pax-utils qmake-utils + +DESCRIPTION="Qt Build Suite" +HOMEPAGE="http://qt-project.org/wiki/qbs" +SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${P}.src.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc qt5 test" + +RDEPEND=" + !qt5? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-qt/qtscript:4 + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtscript:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + ) +" +DEPEND="${RDEPEND} + doc? ( + !qt5? ( dev-qt/qthelp:4 ) + qt5? ( dev-qt/qdoc:5 dev-qt/qthelp:5 ) + ) + test? ( + !qt5? ( + dev-qt/qtdeclarative:4 + dev-qt/qttest:4 + ) + qt5? ( + dev-qt/qtdeclarative:5 + dev-qt/qttest:5 + ) + ) +" + +src_prepare() { + # fix plugins libdir + sed -i -e "/destdirPrefix/ s:/lib:/$(get_libdir):" \ + src/plugins/plugins.pri || die + + # disable tests that require nodejs (bug 527652) + sed -i -e 's/!haveNodeJs()/true/' \ + tests/auto/blackbox/tst_blackbox.cpp || die + + if ! use test; then + sed -i -e '/SUBDIRS = auto/d' \ + tests/tests.pro || die + fi +} + +src_configure() { + local myqmakeargs=( + qbs.pro # bug 523218 + -recursive + CONFIG+=disable_rpath + QBS_INSTALL_PREFIX="${EPREFIX}/usr" + QBS_LIBRARY_DIRNAME="$(get_libdir)" + ) + + if use qt5; then + eqmake5 "${myqmakeargs[@]}" + else + eqmake4 "${myqmakeargs[@]}" + fi +} + +src_compile() { + default + + # disable mprotect wrt bug 526664 + pax-mark m "${S}"/bin/qbs{,-config,-config-ui} +} + +src_test() { + # disable mprotect wrt bug 526664 + pax-mark m "${S}"/bin/tst_* + + einfo "Setting up test environment in ${T}" + + export HOME=${T} + export LD_LIBRARY_PATH=${S}/$(get_libdir) + + local qmakepath=${EROOT}usr/$(get_libdir)/$(usev qt5 || echo qt4)/bin/qmake + [[ -x ${qmakepath} ]] || qmakepath=${EROOT}usr/bin/qmake + + "${S}"/bin/qbs-setup-toolchains "${EROOT}usr/bin/gcc" gcc || die + "${S}"/bin/qbs-setup-qt "${qmakepath}" qbs_autotests || die + + einfo "Running autotests" + default +} + +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