From fcd3149c718d44717bdb1e5eabab0fbed559c8ca Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Wed, 18 Mar 2015 20:39:40 +0000 Subject: Version bump. Upstream dropped support for building with Qt4. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!) --- dev-util/qbs/ChangeLog | 8 ++- dev-util/qbs/qbs-1.3.3.ebuild | 116 ------------------------------------------ dev-util/qbs/qbs-1.3.4.ebuild | 95 ++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+), 117 deletions(-) delete mode 100644 dev-util/qbs/qbs-1.3.3.ebuild create mode 100644 dev-util/qbs/qbs-1.3.4.ebuild (limited to 'dev-util') diff --git a/dev-util/qbs/ChangeLog b/dev-util/qbs/ChangeLog index 927bf0129eac..679887e42147 100644 --- a/dev-util/qbs/ChangeLog +++ b/dev-util/qbs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/qbs # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.12 2015/02/03 07:28:03 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.13 2015/03/18 20:39:40 pesa Exp $ + +*qbs-1.3.4 (18 Mar 2015) + + 18 Mar 2015; Davide Pesavento +qbs-1.3.4.ebuild, + -qbs-1.3.3.ebuild: + Version bump. Upstream dropped support for building with Qt4. 03 Feb 2015; Mikle Kolyada qbs-1.3.3.ebuild: Add ~arm keyword diff --git a/dev-util/qbs/qbs-1.3.3.ebuild b/dev-util/qbs/qbs-1.3.3.ebuild deleted file mode 100644 index 53fe1236ce6d..000000000000 --- a/dev-util/qbs/qbs-1.3.3.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# 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.2 2015/02/03 07:28:03 zlogene 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 ~arm ~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 -} diff --git a/dev-util/qbs/qbs-1.3.4.ebuild b/dev-util/qbs/qbs-1.3.4.ebuild new file mode 100644 index 000000000000..fb238e746c50 --- /dev/null +++ b/dev-util/qbs/qbs-1.3.4.ebuild @@ -0,0 +1,95 @@ +# 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.4.ebuild,v 1.1 2015/03/18 20:39:40 pesa Exp $ + +EAPI=5 + +inherit multilib pax-utils qmake-utils + +DESCRIPTION="Qt Build Suite" +HOMEPAGE="http://wiki.qt.io/Qbs" +SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${P}.src.tar.gz" + +LICENSE="|| ( LGPL-2.1 LGPL-3 )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="doc test" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtscript:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 +" +DEPEND="${RDEPEND} + doc? ( + dev-qt/qdoc:5 + dev-qt/qthelp:5 + ) + test? ( + 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)" + ) + eqmake5 "${myqmakeargs[@]}" +} + +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) + + "${S}"/bin/qbs-setup-toolchains "${EROOT}usr/bin/gcc" gcc || die + "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" 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