pesa 15/05/04 14:02:12 Modified: ChangeLog Added: qbs-1.4.0-r1.ebuild Removed: qbs-1.4.0.ebuild Log: Backport two upstream patches, one of which fixes bug 548086. Thanks to RazrFalcon for reporting and Jake Petroules for the quick fix. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Revision Changes Path 1.17 dev-util/qbs/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/ChangeLog?rev=1.17&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/ChangeLog?rev=1.17&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/ChangeLog?r1=1.16&r2=1.17 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ChangeLog 3 May 2015 11:40:23 -0000 1.16 +++ ChangeLog 4 May 2015 14:02:12 -0000 1.17 @@ -1,6 +1,15 @@ # 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.16 2015/05/03 11:40:23 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.17 2015/05/04 14:02:12 pesa Exp $ + +*qbs-1.4.0-r1 (04 May 2015) + + 04 May 2015; Davide Pesavento <[email protected]> + +files/1.4.0-fix-plugins-destdir.patch, + +files/1.4.0-install-missing-header.patch, +qbs-1.4.0-r1.ebuild, + -qbs-1.4.0.ebuild: + Backport two upstream patches, one of which fixes bug 548086. Thanks to + RazrFalcon for reporting and Jake Petroules for the quick fix. 03 May 2015; Davide Pesavento <[email protected]> qbs-1.4.0.ebuild: Add examples USE flag. 1.1 dev-util/qbs/qbs-1.4.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/qbs-1.4.0-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/qbs-1.4.0-r1.ebuild?rev=1.1&content-type=text/plain Index: qbs-1.4.0-r1.ebuild =================================================================== # 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.4.0-r1.ebuild,v 1.1 2015/05/04 14:02:12 pesa Exp $ EAPI=5 inherit eutils 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 examples 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() { epatch "${FILESDIR}"/${PV}-fix-plugins-destdir.patch epatch "${FILESDIR}"/${PV}-install-missing-header.patch # disable tests that require nodejs (bug 527652) sed -i -e 's/!haveNodeJs()/true/' \ tests/auto/blackbox/tst_blackbox.cpp || 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 } src_configure() { local myqmakeargs=( qbs.pro # bug 523218 -recursive CONFIG+=qbs_disable_rpath CONFIG+=qbs_enable_project_file_updates 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 }
