gentoo resync : 04.05.2019

2 files changed, 117 insertions, 0 deletions

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index c35fae279431..a3a52ba8a0a7 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,5 +1,7 @@
 DIST qbs-src-1.11.1.tar.gz 4299125 BLAKE2B a2b2670b47bb122ccc586fee0c61d941533dc2dbc5e59028a7ab765eb18fe4a71b85cbd7373f88231b9cd75178982a17dddab0ba965de84ca197c49b2c9eefdf SHA512 90833792cb29b7b886df491263b620d2933c398ad8b2f495d0e5ae6acdde3f816ecd25638ae2e74d3efbf517a762644f751b7c01633aed3369bd7bf85c033ff5
 DIST qbs-src-1.12.2.tar.gz 4374830 BLAKE2B 8ace5ac7fea9bcd944dd02280a36f0f275749512e44ab9e3221e154d80ccf8aa25e3452eb90b1396323b540ec97e4b72c29b3a1d4727a72791a0e267bd89df13 SHA512 eb8c5db94f6b4e2300951d9cb6e092b873381421a1bff31a9e8422859aee3c0b3d038b6a2927a4f5c8fd871a0a7d283f7b7c3be74834dd30d640a1ed9c87a147
+DIST qbs-src-1.13.0.tar.gz 4323291 BLAKE2B ae5e20e38d2667acc3c6b9c62c06ec7733c94d8c8dcc7a9145e288b507e529b12afab27ea2e2761604605609d678d1f1dc0fb3f0e1448bc1aeac9fd4ea3fa37d SHA512 98207b39bb9e5926e218a4fc4da2c7b38160bdd8eac563ef3135be63076bd09763c895f23c3ef3d1640adb04bdc1977e1a66d10b6a9d243adc0414e7dffd4ade
 EBUILD qbs-1.11.1.ebuild 3066 BLAKE2B 0f44337978b215817f91a6bb6d2bc278a8d7765ef0c7c8ff450a64d2c0324267ddf3a3a7f00ace808db44da440d91bd6949513e7aac56d7afc0387f4beedf3a4 SHA512 09f81791a84a2fd9905b9e7cf9a9271cb88221321be12f69c887215789763de7f77df65a0d37402262aaa0015f68128875b5c1c3ed7b36ceb7d750203d2840d2
 EBUILD qbs-1.12.2.ebuild 2864 BLAKE2B c1b70e58f81cde7889ae07c5e0bee1f5b3d36fcd9b1b404b315090cf19f4eaea9c56367be5f24c99bb1ba56b2c66605b802bef946c5e4f3adfa6feecd9ca7f97 SHA512 2530d59f4a71ad0ba083b588943305af6a063d67aad509328428b2f9126e6438bc44faed40c89bceb2ec72be84e7ae052e224ff3bc71f93106cf675a9b2862ae
+EBUILD qbs-1.13.0.ebuild 2809 BLAKE2B 6072be9c788ec4f6d7e7427dcb3779595d733d2476d543de5ef1add7ccf0f7e2cd1e3e6dbf42257849f228e86951010b73b20f0d6a19bdd36b466250391c2639 SHA512 26798ae3683306f9979255c073058dd1efef270efe923ca7deba82da1d2fae77a4862ce6888bf84c78382b89afe3bcadc3c66795b3846a44df2fb1e628bd21ae
 MISC metadata.xml 920 BLAKE2B ba6000d6db0ee2a6fb2edd9b999fe406e427ebf14f8ccf0dca6f21338dd98b8173c71b3599858a9f89e063c3138a307ac281413e671d5a6c706c93118c2db99e SHA512 ca8c93f9630e818e2f567388fd5f61f47882b843eee39a78f2882ec0ba8c310e0689fb70925762da7548040892d606ef21497503c6fb2a655af608b36bcc98da
diff --git a/dev-util/qbs/qbs-1.13.0.ebuild b/dev-util/qbs/qbs-1.13.0.ebuild
new file mode 100644
index 000000000000..01828115c967
--- /dev/null
+++ b/dev-util/qbs/qbs-1.13.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+
+	if ! use examples; then
+		sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
+	fi
+
+	# replace hardcoded "lib" with QBS_LIBRARY_DIRNAME
+	sed -i -e '1i include(src/library_dirname.pri)' \
+		-e '/qbslibdir =/ s:/lib:/$$QBS_LIBRARY_DIRNAME:' \
+		static-res.pro || die
+
+	echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro
+
+	# 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)
+	export QBS_AUTOTEST_PROFILE=autotests
+
+	"${S}"/bin/qbs-setup-toolchains --detect || die
+	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" 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
+}