gentoo resync : 22.01.2021

4 files changed, 8 insertions, 246 deletions

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index b4e8e2db8225..16e8e8d61f45 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,9 +1,5 @@
-DIST qbs-src-1.12.2.tar.gz 4374830 BLAKE2B 8ace5ac7fea9bcd944dd02280a36f0f275749512e44ab9e3221e154d80ccf8aa25e3452eb90b1396323b540ec97e4b72c29b3a1d4727a72791a0e267bd89df13 SHA512 eb8c5db94f6b4e2300951d9cb6e092b873381421a1bff31a9e8422859aee3c0b3d038b6a2927a4f5c8fd871a0a7d283f7b7c3be74834dd30d640a1ed9c87a147
-DIST qbs-src-1.14.1.tar.gz 4365537 BLAKE2B 5a51ddea64023c76b6934634f72ab19d54a3e857efe30d7698a3970d099e436599b53b369d81434cc8e721606513bd487010047e60ccfa289574f606cf020dc5 SHA512 df9031e2749ba598129daef0a6b4322ad964c87a33bfd079bb231170da49c42708740ec63e351607b7e9da1dd11310802b14917eaf2ec97bb747a6df9890f2f3
-DIST qbs-src-1.15.0.tar.gz 4531882 BLAKE2B 95ef24a3c63972a5c4111b68c19d57d83552c8c2fd771bda6291d99564c2e3e80488700ceaf88e64bf6edca1d156dc912757ebe682cb5e3d5aec015640e8641f SHA512 461ac2e1574c163149b080936233144b3941024e7f61c2b2514e58089b7fa100e576c0336e16a3c51a0f4b77e575081350550e23b543e86a2023d524aba18d07
 DIST qbs-src-1.16.0.tar.gz 4571788 BLAKE2B 4fb06314d0d0a532574e0d245ea85b6d596850ffe4b81b621406d1bc99e0529fc491bf5c7db514d90026c0bf4916f9fa102457aab2bbaaddbbe2e90c03aa04a4 SHA512 65c5398ffad54e10e251bed79a5b58abd722c0f95a031c536fc8647d915dd696923401c767a7a8ac029f4f571b6bbf96ef4b7493bb30768f675477bd68fcc21c
-EBUILD qbs-1.12.2.ebuild 2890 BLAKE2B 3ffa01f8ebc8ed8f762f5823f846fedf560db1c49d2488a4c0956b7176f70bcfe521863360c6d04a74754bb354538018b7e2a6ab172f74cbd4354a22374456ef SHA512 9c0a50d5bacb06238ef04f6b788130d228e7d8ad230691b41af62c986394fc65655a2c580ebfa0613f52df41d024c5439697365ca6e2077ee8eafee60b4547e5
-EBUILD qbs-1.14.1.ebuild 2701 BLAKE2B 6c7453e1fd3997007f7edfcc3b2ac563413ad4c8078e5ed80d271f6e6ca7f1f8b12aef7219db16a3ee7fca43c8c37d75e22586751b602256645f8f67a3de859c SHA512 70c27376061cf0c1f0ee98ac176560b5d8cf103879a33e607b46f5c00330c5e390c5dc43e47046d2937585bad7913192160905bc11cd0f9d47053d630622ea18
-EBUILD qbs-1.15.0.ebuild 2840 BLAKE2B d0a706886502a5034865421025271088de9fbe5da10fea012bfbe844766b2f712b84df8a3af66b39d3988b72644b24752a51854ee23eb25ee026264105b968a0 SHA512 98b927b20cd37dce72b3fda3089b2de83433af471d61369c65537bce1c99c9db31933cd8297a1028ff67997e4b2e20840abfb5ada415741c9ec3671b2c5b3e2c
+DIST qbs-src-1.18.0.tar.gz 4921432 BLAKE2B 4c081434596c58d433e52ca9e335e3b4d62b75e401290895719b7fbe4f3c20cf8b34ab0753ae79a34b4e29c8859751a6276da8d6dbd5f3c711581af16ab61415 SHA512 bdef30200c7e74749c363b1d68232fd90d1dfc998722bee0e058ffcaff8e003599e0404b49f86cbeae098d59ccb5663316db5094d77b50a217fcf4ab5ae64d83
 EBUILD qbs-1.16.0.ebuild 2850 BLAKE2B 82b62eb6de4f2d0061ce036a5a88162095bfd7a3d8283d8c5e66bb031245f8164d2e65260de5bffa597ac22faea2c7f9697c3ee64f0a9410cebd4cab35cbfd0a SHA512 e44b46ad21d97356fad8d6e884afb9bae9444b1acab8d979aa7820a541d0f334f6911ca56279a636fcb9cb667de5f60e49680193f8d2cc0463d1e66e810af100
+EBUILD qbs-1.18.0.ebuild 2734 BLAKE2B c7333128929e27c74b86805b232e392c271796994d9caa09131ba51f5586177f67928d0d215ce256e3b6f1787a73b318341025eb7832dff566556756a6c40369 SHA512 dbdcff5f53ed0c0877062c603250f1776ffa025453f4780e2a41fb2c5eed042f162852112debac6517d962a31df06296913fba2aec1475d48738341dfff0288c
 MISC metadata.xml 949 BLAKE2B 9952ba0471f53c5cfc8c25aec8efa9fb49802b2281a2c8f0d881d2ed6e6f02a3613476ecab2649450f9fab10ed3ed7b7e049fbf903c253de0443bd46fc457555 SHA512 f3aedd229fde8cde837f5958888fa6db0a46106cae33887e20a2c0688bf97142453e27401f5334295ca618ed3ccbf69e98cb333a9a079c0a38b1125f97363a3f
diff --git a/dev-util/qbs/qbs-1.12.2.ebuild b/dev-util/qbs/qbs-1.12.2.ebuild
deleted file mode 100644
index c5815752c219..000000000000
--- a/dev-util/qbs/qbs-1.12.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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"
-RESTRICT="!test? ( 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
-
-	# 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
-
-	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
-}
diff --git a/dev-util/qbs/qbs-1.14.1.ebuild b/dev-util/qbs/qbs-1.14.1.ebuild
deleted file mode 100644
index 689ab954a115..000000000000
--- a/dev-util/qbs/qbs-1.14.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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"
-RESTRICT="!test? ( 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/linguist-tools:5
-		dev-qt/qtdbus:5
-		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
-
-	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
-}
diff --git a/dev-util/qbs/qbs-1.15.0.ebuild b/dev-util/qbs/qbs-1.18.0.ebuild
index 5fa4f467db39..5dfbdf982a61 100644
--- a/dev-util/qbs/qbs-1.15.0.ebuild
+++ b/dev-util/qbs/qbs-1.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit qmake-utils toolchain-funcs
 MY_P=${PN}-src-${PV}
 
 DESCRIPTION="Modern build tool for software projects"
-HOMEPAGE="https://wiki.qt.io/Qbs"
+HOMEPAGE="https://doc.qt.io/qbs/"
 SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
@@ -17,7 +17,6 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
-# see bug 581874 for the qttest dep in RDEPEND
 RDEPEND="
 	dev-qt/qtcore:5=
 	dev-qt/qtgui:5
@@ -25,7 +24,6 @@ RDEPEND="
 	dev-qt/qtscript:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	test? ( dev-qt/qttest:5 )
 "
 DEPEND="${RDEPEND}
 	doc? (
@@ -36,6 +34,7 @@ DEPEND="${RDEPEND}
 		dev-qt/linguist-tools:5
 		dev-qt/qtdbus:5
 		dev-qt/qtdeclarative:5
+		dev-qt/qttest:5
 	)
 "
 
@@ -52,14 +51,11 @@ src_prepare() {
 
 	# 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
+	sed -i -re '/blackbox-(android|apple|java)\.pro/ d' tests/auto/auto.pro || die
 }
 
 src_configure() {
@@ -102,9 +98,9 @@ src_test() {
 }
 
 src_install() {
-	emake INSTALL_ROOT="${D}" install
+	emake -j1 INSTALL_ROOT="${D}" install
 
-	dodoc -r changelogs
+	dodoc -r changelogs CONTRIBUTING.md README.md
 
 	# install documentation
 	if use doc; then