reinit the tree, so we can have metadata

5 files changed, 321 insertions, 0 deletions

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
new file mode 100644
index 000000000000..c5bb0b3585f3
--- /dev/null
+++ b/dev-util/qbs/Manifest
@@ -0,0 +1,8 @@
+AUX 1.8.1-Install-missing-public-header.patch 1815 SHA256 5b8d5d943f09c720b3d33d446c282cca5597ec62613307e0baeb7086807028a5 SHA512 fa54a14f1ac455ef9a8c502f473f9c45df955d515ea4ec1452f41e2e2d39c6a7e52c06d1178a228482dfbd2d66d0f202b066f55183bb1638d139dca708c879ad WHIRLPOOL 62b070c3ccfc470b6efa41ea96b41f4ba8c8d0afc81348a5a49ddc7c91eb434400a20e5455a0fcd70ba001ab5569b3d470db10128c3d80d52231931357bbcc6c
+DIST qbs-src-1.8.1.tar.gz 1053395 SHA256 3e94460ecbd1ca43974d62a0ecf691d48866049787c465944866baf52d5b16fc SHA512 2b4657475803e56f911f0bc373692b70f9376ed520499f1c4e7040e4dedddc417bd4e72208c925ed7fdc7fcf0b96434dab8d8f87c454ae08da80d6438dbcbc5c WHIRLPOOL 1a5fa2cc7518b3b324d163224b259e7f44b91599e58ff3c9e2d52d3322d68b0fbb2b0e0ec5abee17e95a4a51a00d10a84397a49d5cf31ec37fbab4759dba7259
+DIST qbs-src-1.9.1.tar.gz 4007946 SHA256 970048842581bc004eec9ac9777a49380c03f4e01ef7ad309813aa1054870073 SHA512 6b400a06b4f2c2cb531095a0c3eadb112335fe0f91c2077f01c7d2dc6ea329d250e7af70f70ebeb972368aa8fa0ee9548b84b75dc877230de6dea0b10468b7fd WHIRLPOOL 3c265433f514fa6bf9ad3f3f901fe2fc6ec88180277af05af6fd1ca66481a5ca86cdc046835a2b7d99d23efd4e57d479494df4d24f32c7b3f20832644ee523b4
+EBUILD qbs-1.8.1-r1.ebuild 2948 SHA256 0469adf887c8b02ebf5039652bcbc96314960e17bae603315e9c26b5427f952c SHA512 8ce928a55a420659ed73ae5f6e537f71059dfb6542bfcb0ed8f0253a62f6fc0d629a83bd8828113b76a565acdc78e05fb44a3362bb1bf912a91061b948c6457f WHIRLPOOL 372227a7f026647303f9aa3132df4ab09a4f82c63a6e7b94d7750fdd712dd3859e7ebc552e5096e5fe58dfaab0be2580f65b38a228857796b4953ceea7852d64
+EBUILD qbs-1.9.1.ebuild 2866 SHA256 fa9850b0a0b5276c478e1fc12a2fcffc1267748c23569d2ac3ad8b8b13cef844 SHA512 b81d2f56e10be6d34c67e0b2bb78161793a53cc1fe03e45df55fdfbcdc48d8f93b9750d6602569fee40d93124a19113d75234465b74e4f8f875c67831eca8a82 WHIRLPOOL 6347a84aebfaf69a462f5543ceabd6eb7b1eeba9c26413d6c41a1d8ab44394f8cc89772ecaa063fe2d5abb5f3af6a89d4ff7357e3f2e6da8362b4daad92877a0
+MISC ChangeLog 6169 SHA256 d1e22ef15b74cbc097ac79c0762e3b7caed82cb9d9670e6b3e79198d50e0f73b SHA512 251c0efd2d7a2c41f0bf3023eda572a9116fa8c8eba71c942ceedb17e7cde90803752eb7a9157a9b93e7858d8ab60eeecebc9ecaf18b15dc2dafd305796e743b WHIRLPOOL 522685377e675b8976c2e403dc3da3b580a234c1d297bdd787a8f1215ff444ae6823392d218ed3f2ea708b6d598f771f66eccbdaaf64d7b1126dfedfefee4862
+MISC ChangeLog-2015 3445 SHA256 0d98ad28a296ea6d92039646c964707ed7f72ae525e77cd0aa92f8b0b7010236 SHA512 d4e66063b67cabfe975f16ec2f17520adf98d5cbb806ff5afb9a4c2e17d8cfa9f87c0e7edffce9cf486897549f979204619a5e8eb3a823ff121e20b0315e68b5 WHIRLPOOL 65a8d86612961047cf19d2a9c45c8f0b0bc4bbca3221f3192409fbdba70758b819ba4fd7b8c5aa09f0f2f4269dc2a49fcd451adf9931ab5209675dddc400a129
+MISC metadata.xml 920 SHA256 d06e39a293694874ef3f6df50067dd3d68fddbda799de049e0a91438e4feda3c SHA512 ca8c93f9630e818e2f567388fd5f61f47882b843eee39a78f2882ec0ba8c310e0689fb70925762da7548040892d606ef21497503c6fb2a655af608b36bcc98da WHIRLPOOL 7ae6d26e82df8a28b2369e36036197178b99b5bc4ebc58e2a2d7a5c94399e603f9c3c1ade9ffbcd28acce1f1add7ce158aa9e2edee9e89c6022b2142d06fe8bb
diff --git a/dev-util/qbs/files/1.8.1-Install-missing-public-header.patch b/dev-util/qbs/files/1.8.1-Install-missing-public-header.patch
new file mode 100644
index 000000000000..09aa6aec519e
--- /dev/null
+++ b/dev-util/qbs/files/1.8.1-Install-missing-public-header.patch
@@ -0,0 +1,52 @@
+From 4143de9ab93283c6331418610902da4648db5b67 Mon Sep 17 00:00:00 2001
+From: Joerg Bornemann <joerg.bornemann@qt.io>
+Date: Mon, 10 Jul 2017 09:49:19 +0200
+Subject: [PATCH] Install missing public header
+
+Since commit 7ccc08f3, tools/version.h is needed by a public header.
+It must be installed.
+
+Change-Id: I79cb243463abb9390a581144467b3cd89f46eadd
+Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
+---
+ src/lib/corelib/corelib.qbs     | 2 +-
+ src/lib/corelib/tools/tools.pri | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs
+index 1b137925..6dd6f082 100644
+--- a/src/lib/corelib/corelib.qbs
++++ b/src/lib/corelib/corelib.qbs
+@@ -405,7 +405,6 @@ QbsLibrary {
+             "stlutils.h",
+             "toolchains.cpp",
+             "version.cpp",
+-            "version.h",
+             "visualstudioversioninfo.cpp",
+             "visualstudioversioninfo.h",
+             "vsenvironmentdetector.cpp",
+@@ -435,6 +434,7 @@ QbsLibrary {
+             "settingsmodel.h",
+             "setupprojectparameters.h",
+             "toolchains.h",
++            "version.h",
+         ]
+         qbs.install: qbsbuildconfig.installApiHeaders
+         qbs.installDir: headerInstallPrefix + "/tools"
+diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri
+index 0fa91147..fb0c225b 100644
+--- a/src/lib/corelib/tools/tools.pri
++++ b/src/lib/corelib/tools/tools.pri
+@@ -125,7 +125,8 @@ qbs_enable_unit_tests {
+         $$PWD/generatorpluginmanager.h \
+         $$PWD/installoptions.h \
+         $$PWD/setupprojectparameters.h \
+-        $$PWD/toolchains.h
++        $$PWD/toolchains.h \
++        $$PWD/version.h
+     tools_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/tools
+     INSTALLS += tools_headers
+ }
+-- 
+2.14.1
+
diff --git a/dev-util/qbs/metadata.xml b/dev-util/qbs/metadata.xml
new file mode 100644
index 000000000000..eb2faf769298
--- /dev/null
+++ b/dev-util/qbs/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pesa@gentoo.org</email>
+		<name>Davide Pesavento</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<longdescription lang="en">
+	Qbs is a tool that helps simplify the build process for developing
+	projects across multiple platforms. Qbs can be used for any software
+	project, whether it is written in Qt or not.
+
+	Qbs is an all-in-one tool that generates a build graph from a
+	high-level project description (like qmake or cmake) and additionally
+	undertakes the task of executing the commands in the low-level build
+	graph (like make).
+	</longdescription>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>http://doc.qt.io/qbs/</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/qbs/qbs-1.8.1-r1.ebuild b/dev-util/qbs/qbs-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..4cad93eff2cb
--- /dev/null
+++ b/dev-util/qbs/qbs-1.8.1-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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}
+
+PATCHES=(
+	# bug 625640
+	"${FILESDIR}/1.8.1-Install-missing-public-header.patch"
+)
+
+src_prepare() {
+	default
+
+	# don't add /usr/include to INCLUDEPATH
+	# avoids a build failure in qt-creator with gcc-6 (bug 618424)
+	sed -i -e '/^INCLUDEPATH/ s:$${PWD}/\.\.::' src/lib/corelib/use_installed_corelib.pri || 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
+
+	# 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)
+
+	"${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die
+	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_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
+
+	# 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.9.1.ebuild b/dev-util/qbs/qbs-1.9.1.ebuild
new file mode 100644
index 000000000000..881b9a2b5bd7
--- /dev/null
+++ b/dev-util/qbs/qbs-1.9.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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
+
+	# don't add /usr/include to INCLUDEPATH
+	# avoids a build failure in qt-creator with gcc-6 (bug 618424)
+	sed -i -e '/^INCLUDEPATH/ s:$${PWD}/\.\.::' src/lib/corelib/use_installed_corelib.pri || 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
+
+	# 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)
+
+	"${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die
+	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_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
+
+	# 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
+}