[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Ionen Wolkens]

commit: 45c54345133147897f4ec949343b15a395d31e08
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu May 30 15:20:11 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu May 30 15:52:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c54345

dev-util/qbs: add workaround for gcc:14 + -O3 build failure

Exact cause unknown, but no harm in doing this for now. Does
not seem needed for neither gcc:13 nor clang.

For anyone trying to reproduce, don't forget to drop this.

Bug: https://bugs.gentoo.org/933187
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-util/qbs/qbs-2.3.1.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-util/qbs/qbs-2.3.1.ebuild b/dev-util/qbs/qbs-2.3.1.ebuild
index 2e99070c6c0f..1eaaf83d9393 100644
--- a/dev-util/qbs/qbs-2.3.1.ebuild
+++ b/dev-util/qbs/qbs-2.3.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic python-any-r1
+inherit cmake flag-o-matic python-any-r1 toolchain-funcs
 
 DESCRIPTION="Modern build tool for software projects"
 HOMEPAGE="https://doc.qt.io/qbs/;
@@ -62,6 +62,10 @@ src_configure() {
# needs fixing in qtbase as *64 usage comes from its headers' macros
use elibc_musl && append-lfs-flags
 
+   # fails to build with gcc:14 and -O3 (bug #933187)
+   tc-is-gcc && [[ $(gcc-major-version) -ge 14 ]] &&
+   replace-flags -O3 -O2
+
local mycmakeargs=(
-DQBS_DOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
-DQBS_INSTALL_HTML_DOCS=$(usex doc)

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Ionen Wolkens]

commit: 996cb2fee9313fb3dc783b5cf523f8c18fecbbbd
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon May 13 00:55:51 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon May 13 05:48:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=996cb2fe

dev-util/qbs: enable py3.13

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-util/qbs/qbs-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/qbs/qbs-2.3.1.ebuild b/dev-util/qbs/qbs-2.3.1.ebuild
index ed014f09332d..2e99070c6c0f 100644
--- a/dev-util/qbs/qbs-2.3.1.ebuild
+++ b/dev-util/qbs/qbs-2.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit cmake flag-o-matic python-any-r1
 
 DESCRIPTION="Modern build tool for software projects"

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Ionen Wolkens]

commit: 10407b2da20749668473d648bd12dbbb8778c7dd
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun May 12 20:03:29 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun May 12 20:03:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10407b2d

dev-util/qbs: drop 1.19.1, 2.3.0

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-util/qbs/Manifest  |   2 -
 dev-util/qbs/qbs-1.19.1.ebuild | 124 -
 dev-util/qbs/qbs-2.3.0.ebuild  |  81 ---
 3 files changed, 207 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 15ea255dec65..f1834e3241d5 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1 @@
-DIST qbs-src-1.19.1.tar.gz 4961984 BLAKE2B 
2b9333ac8bba12f311ad47b1315d0a61ddf3b3a804888369f3fd868fbebca4ad13bd857451cb3fe3515fd9f9e69b42b84484289e79d3e7911c69720d7d08ab29
 SHA512 
b53dae9631c9d4ec1f799395948a67ce4b62ae88908cce3b00f42fb0213d80d32127c3429b95d5c32c9f7c1b861fc5a52ac6952046a6d91d035539d7412a5c4d
-DIST qbs-src-2.3.0.tar.gz 5615799 BLAKE2B 
f7e10d1dffe7d188c4ab5c6ed1b02837b41044f93083e052105638ed3c091a5be2d4f3bffeb39238baf6e8a1ba2cfc316fefea5f80871c851be3d7c873847c74
 SHA512 
6611ce02b0dc4f4a0cc68a13a7c684c07061d3fff57d2ca16470fffa253ff23f45349d86ad4ba4c0eab681f74f3c92cddd85daedf1f31fd1a7eae5bddb606cb6
 DIST qbs-src-2.3.1.tar.gz 5614581 BLAKE2B 
92fa24d75248a3732cbd99b660141e56654574f1388d50d5359afef7b442889fa59c4ab4f029f055ee618c0222f94faba47ae9fff85f0fae26e95f2ba34995f9
 SHA512 
27ba33805b942cf8180e55bdd6c37ccfd2aeaa2e8c01ca7e7485720030dfad7c5f1a3f92b77bff97a7ebf8878e455758c8729005e8b03959d18106f945d8d42c

diff --git a/dev-util/qbs/qbs-1.19.1.ebuild b/dev-util/qbs/qbs-1.19.1.ebuild
deleted file mode 100644
index 28e160fd13ed..
--- a/dev-util/qbs/qbs-1.19.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils toolchain-funcs
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Modern build tool for software projects"
-HOMEPAGE="https://doc.qt.io/qbs/;
-SRC_URI="https://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz;
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc examples gui test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   dev-qt/qtcore:5=
-   dev-qt/qtnetwork:5
-   dev-qt/qtscript:5
-   dev-qt/qtxml:5
-   gui? (
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-"
-DEPEND="${RDEPEND}
-   test? (
-   dev-qt/linguist-tools:5
-   dev-qt/qtdbus:5
-   dev-qt/qtdeclarative:5
-   dev-qt/qttest:5
-   )
-"
-BDEPEND="
-   dev-qt/qtcore:5
-   doc? (
-   dev-qt/qdoc:5
-   dev-qt/qthelp:5
-   )
-"
-
-src_prepare() {
-   default
-
-   if ! use examples; then
-   sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
-   fi
-
-   if ! use gui; then
-   sed -i -e '/SUBDIRS += config-ui/ d' src/app/app.pro || die
-   fi
-
-   echo "SUBDIRS = $(usev test auto)" >> tests/tests.pro
-
-   # skip several tests that fail and/or have additional deps
-   local SKIP_TESTS_ARGS=(
-   # requires zip and jar
-   -e 's/findArchiver(binaryName,.*/"";/'
-   # requires nodejs, bug 527652
-   -e 's/p\.value("nodejs\./true||&/'
-   # requires nodejs and typescript
-   -e 
's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/'
-   )
-   sed -i tests/auto/blackbox/tst_blackbox.cpp "${SKIP_TESTS_ARGS[@]}" || 
die
-   sed -i -re '/blackbox-(android|apple|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
-   $(usev 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=testProfile
-
-   "${S}"/bin/qbs-setup-toolchains "$(tc-getCC)" testToolchain || die
-   "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" 
${QBS_AUTOTEST_PROFILE} || die
-   "${S}"/bin/qbs-config 
profiles.${QBS_AUTOTEST_PROFILE}.qbs.targetPlatform linux || 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}"
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/files/, dev-util/qbs/

[Ionen Wolkens]

commit: 71e925a3cc39458ac21caf651460744649d88b20
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed May  8 17:26:45 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed May  8 18:42:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71e925a3

dev-util/qbs: prevent auto-selecting Qt version

DISABLE_FIND behaves badly here between being either
unused or preventing the fallback.

It normally tries Qt6 first, but given #931596 somehow
picked it despite qtbase:6 being installed and seemingly
not broken (given it built other Qt6 packages), let's
make sure.

May not necessarily fix #931596 but if whatever happened
happens again, there should be a more interesting output.

Doesn't hurt to ensure it won't ever pick Qt5 either way
to ensure it doesn't successfully build if Qt6 had issues.

Closes: https://bugs.gentoo.org/931596
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-util/qbs/files/qbs-2.3.1-qtver.patch | 9 +
 dev-util/qbs/qbs-2.3.1.ebuild| 5 +
 2 files changed, 14 insertions(+)

diff --git a/dev-util/qbs/files/qbs-2.3.1-qtver.patch 
b/dev-util/qbs/files/qbs-2.3.1-qtver.patch
new file mode 100644
index ..3117c432c544
--- /dev/null
+++ b/dev-util/qbs/files/qbs-2.3.1-qtver.patch
@@ -0,0 +1,9 @@
+https://bugs.gentoo.org/931596
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -29,3 +29,5 @@
+ 
++if (NOT DEFINED QT_VERSION_MAJOR)
+ find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
++endif()
+ 

diff --git a/dev-util/qbs/qbs-2.3.1.ebuild b/dev-util/qbs/qbs-2.3.1.ebuild
index c00fae7ed834..ed014f09332d 100644
--- a/dev-util/qbs/qbs-2.3.1.ebuild
+++ b/dev-util/qbs/qbs-2.3.1.ebuild
@@ -43,6 +43,10 @@ CMAKE_SKIP_TESTS=(
tst_language
 )
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.3.1-qtver.patch
+)
+
 python_check_deps() {
# _find_python_module in cmake/QbsDocumentation.cmake
python_has_version "dev-python/beautifulsoup4[${PYTHON_USEDEP}]" &&
@@ -64,6 +68,7 @@ src_configure() {
-DQBS_INSTALL_MAN_PAGE=yes
-DQBS_INSTALL_QCH_DOCS=$(usex doc)
-DQBS_LIB_INSTALL_DIR="$(get_libdir)"
+   -DQT_VERSION_MAJOR=6 #931596
-DWITH_TESTS=$(usex test)
-DWITH_UNIT_TESTS=$(usex test)
)

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Ionen Wolkens]

commit: cf87420fe79737aee0f2113ab0161377ddb1f229
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue May  7 19:25:33 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue May  7 19:25:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf87420f

dev-util/qbs: add 2.3.1

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-util/qbs/Manifest |  1 +
 dev-util/qbs/qbs-2.3.1.ebuild | 81 +++
 2 files changed, 82 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 8b601b078fc4..15ea255dec65 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1,3 @@
 DIST qbs-src-1.19.1.tar.gz 4961984 BLAKE2B 
2b9333ac8bba12f311ad47b1315d0a61ddf3b3a804888369f3fd868fbebca4ad13bd857451cb3fe3515fd9f9e69b42b84484289e79d3e7911c69720d7d08ab29
 SHA512 
b53dae9631c9d4ec1f799395948a67ce4b62ae88908cce3b00f42fb0213d80d32127c3429b95d5c32c9f7c1b861fc5a52ac6952046a6d91d035539d7412a5c4d
 DIST qbs-src-2.3.0.tar.gz 5615799 BLAKE2B 
f7e10d1dffe7d188c4ab5c6ed1b02837b41044f93083e052105638ed3c091a5be2d4f3bffeb39238baf6e8a1ba2cfc316fefea5f80871c851be3d7c873847c74
 SHA512 
6611ce02b0dc4f4a0cc68a13a7c684c07061d3fff57d2ca16470fffa253ff23f45349d86ad4ba4c0eab681f74f3c92cddd85daedf1f31fd1a7eae5bddb606cb6
+DIST qbs-src-2.3.1.tar.gz 5614581 BLAKE2B 
92fa24d75248a3732cbd99b660141e56654574f1388d50d5359afef7b442889fa59c4ab4f029f055ee618c0222f94faba47ae9fff85f0fae26e95f2ba34995f9
 SHA512 
27ba33805b942cf8180e55bdd6c37ccfd2aeaa2e8c01ca7e7485720030dfad7c5f1a3f92b77bff97a7ebf8878e455758c8729005e8b03959d18106f945d8d42c

diff --git a/dev-util/qbs/qbs-2.3.1.ebuild b/dev-util/qbs/qbs-2.3.1.ebuild
new file mode 100644
index ..c00fae7ed834
--- /dev/null
+++ b/dev-util/qbs/qbs-2.3.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic python-any-r1
+
+DESCRIPTION="Modern build tool for software projects"
+HOMEPAGE="https://doc.qt.io/qbs/;
+SRC_URI="https://download.qt.io/official_releases/qbs/${PV}/${PN}-src-${PV}.tar.gz;
+S=${WORKDIR}/${PN}-src-${PV}
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 ) BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   dev-qt/qt5compat:6
+   dev-qt/qtbase:6[concurrent,gui,network,widgets,xml]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   doc? (
+   $(python_gen_any_dep '
+   dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+   dev-python/lxml[${PYTHON_USEDEP}]
+   ')
+   dev-qt/qttools:6[assistant,qdoc]
+   )
+"
+
+CMAKE_SKIP_TESTS=(
+   # QBS does not inherit toolchain/flags knowlege from cmake, and
+   # while can use ${BUILD_DIR}/bin/qbs-config to improve this it
+   # remains very fickle and will fail in varied ways with clang,
+   # musl, -native-symlinks, and libc++. After consideration it is
+   # not worth worrying about affected tests here (even if notable).
+   tst_api
+   tst_blackbox # also skips blackbox-* (intended)
+   tst_language
+)
+
+python_check_deps() {
+   # _find_python_module in cmake/QbsDocumentation.cmake
+   python_has_version "dev-python/beautifulsoup4[${PYTHON_USEDEP}]" &&
+   python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+   use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+   # temporary workaround for musl-1.2.4 (bug #906929), this ideally
+   # needs fixing in qtbase as *64 usage comes from its headers' macros
+   use elibc_musl && append-lfs-flags
+
+   local mycmakeargs=(
+   -DQBS_DOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+   -DQBS_INSTALL_HTML_DOCS=$(usex doc)
+   -DQBS_INSTALL_MAN_PAGE=yes
+   -DQBS_INSTALL_QCH_DOCS=$(usex doc)
+   -DQBS_LIB_INSTALL_DIR="$(get_libdir)"
+   -DWITH_TESTS=$(usex test)
+   -DWITH_UNIT_TESTS=$(usex test)
+   )
+
+   cmake_src_configure
+}
+
+src_install() {
+   local DOCS=( README.md changelogs )
+   cmake_src_install
+
+   use !test || rm -- "${ED}"/usr/bin/{tst_*,qbs_*,clang-format-test} || 
die
+
+   docompress -x /usr/share/doc/${PF}/qbs.qch
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Ionen Wolkens]

commit: 332049c8113254daa4bc9fa99dbf6bd3aa9f4f60
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat May  4 19:11:57 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun May  5 02:40:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=332049c8

dev-util/qbs: add 2.3.0

ebuild redone from scratch due to cmake migration + Qt6, and kept
simple easier maintenance (e.g. skipping Qt5 support and inventing
options for optional gui/examples, also some tests that would need
extensive workarounds to pass with unusual toolchains even if do
like the old qbs ebuild did with qbs profiles)

Not 100% sure that all listed bugs are fixed given have not
attempted to reproduce with old version, but at least couldn't
with the new. Please file new bugs if needed so it can be up
to date and easier to handle.

Closes: https://bugs.gentoo.org/801541
Closes: https://bugs.gentoo.org/836894
Closes: https://bugs.gentoo.org/840290
Closes: https://bugs.gentoo.org/884575
Closes: https://bugs.gentoo.org/906929
Closes: https://bugs.gentoo.org/915787
Closes: https://bugs.gentoo.org/919395
Closes: https://bugs.gentoo.org/929071
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-util/qbs/Manifest |  1 +
 dev-util/qbs/qbs-2.3.0.ebuild | 81 +++
 2 files changed, 82 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 2d0dd5be8400..8b601b078fc4 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1 +1,2 @@
 DIST qbs-src-1.19.1.tar.gz 4961984 BLAKE2B 
2b9333ac8bba12f311ad47b1315d0a61ddf3b3a804888369f3fd868fbebca4ad13bd857451cb3fe3515fd9f9e69b42b84484289e79d3e7911c69720d7d08ab29
 SHA512 
b53dae9631c9d4ec1f799395948a67ce4b62ae88908cce3b00f42fb0213d80d32127c3429b95d5c32c9f7c1b861fc5a52ac6952046a6d91d035539d7412a5c4d
+DIST qbs-src-2.3.0.tar.gz 5615799 BLAKE2B 
f7e10d1dffe7d188c4ab5c6ed1b02837b41044f93083e052105638ed3c091a5be2d4f3bffeb39238baf6e8a1ba2cfc316fefea5f80871c851be3d7c873847c74
 SHA512 
6611ce02b0dc4f4a0cc68a13a7c684c07061d3fff57d2ca16470fffa253ff23f45349d86ad4ba4c0eab681f74f3c92cddd85daedf1f31fd1a7eae5bddb606cb6

diff --git a/dev-util/qbs/qbs-2.3.0.ebuild b/dev-util/qbs/qbs-2.3.0.ebuild
new file mode 100644
index ..c00fae7ed834
--- /dev/null
+++ b/dev-util/qbs/qbs-2.3.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic python-any-r1
+
+DESCRIPTION="Modern build tool for software projects"
+HOMEPAGE="https://doc.qt.io/qbs/;
+SRC_URI="https://download.qt.io/official_releases/qbs/${PV}/${PN}-src-${PV}.tar.gz;
+S=${WORKDIR}/${PN}-src-${PV}
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 ) BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   dev-qt/qt5compat:6
+   dev-qt/qtbase:6[concurrent,gui,network,widgets,xml]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   doc? (
+   $(python_gen_any_dep '
+   dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+   dev-python/lxml[${PYTHON_USEDEP}]
+   ')
+   dev-qt/qttools:6[assistant,qdoc]
+   )
+"
+
+CMAKE_SKIP_TESTS=(
+   # QBS does not inherit toolchain/flags knowlege from cmake, and
+   # while can use ${BUILD_DIR}/bin/qbs-config to improve this it
+   # remains very fickle and will fail in varied ways with clang,
+   # musl, -native-symlinks, and libc++. After consideration it is
+   # not worth worrying about affected tests here (even if notable).
+   tst_api
+   tst_blackbox # also skips blackbox-* (intended)
+   tst_language
+)
+
+python_check_deps() {
+   # _find_python_module in cmake/QbsDocumentation.cmake
+   python_has_version "dev-python/beautifulsoup4[${PYTHON_USEDEP}]" &&
+   python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+   use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+   # temporary workaround for musl-1.2.4 (bug #906929), this ideally
+   # needs fixing in qtbase as *64 usage comes from its headers' macros
+   use elibc_musl && append-lfs-flags
+
+   local mycmakeargs=(
+   -DQBS_DOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+   -DQBS_INSTALL_HTML_DOCS=$(usex doc)
+   -DQBS_INSTALL_MAN_PAGE=yes
+   -DQBS_INSTALL_QCH_DOCS=$(usex doc)
+   -DQBS_LIB_INSTALL_DIR="$(get_libdir)"
+   -DWITH_TESTS=$(usex test)
+   -DWITH_UNIT_TESTS=$(usex test)
+   )
+
+   cmake_src_configure
+}
+
+src_install() {
+   local DOCS=( README.md changelogs )
+   cmake_src_install
+
+   use !test || rm -- "${ED}"/usr/bin/{tst_*,qbs_*,clang-format-test} || 
die
+
+   docompress -x /usr/share/doc/${PF}/qbs.qch
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Ionen Wolkens]

commit: 0528c2532526e96c983be09350abf00e39ed208e
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat May  4 19:07:59 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun May  5 02:40:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0528c253

dev-util/qbs: add github upstream metadata

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-util/qbs/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/qbs/metadata.xml b/dev-util/qbs/metadata.xml
index 7899bcd24454..e07e064c9841 100644
--- a/dev-util/qbs/metadata.xml
+++ b/dev-util/qbs/metadata.xml
@@ -22,5 +22,6 @@

https://bugreports.qt.io/
https://doc.qt.io/qbs/
+   qbs/qbs

 

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Sam James]

commit: 190ab28b73cc8f2e8f51fde63b494dd570f8cd2b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Aug 30 06:22:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 30 06:33:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=190ab28b

dev-util/qbs: remove comment inside substitution

Signed-off-by: Arthur Zamarin  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/32525
Signed-off-by: Sam James  gentoo.org>

 dev-util/qbs/qbs-1.19.1.ebuild | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/dev-util/qbs/qbs-1.19.1.ebuild b/dev-util/qbs/qbs-1.19.1.ebuild
index 3339bb574287..28e160fd13ed 100644
--- a/dev-util/qbs/qbs-1.19.1.ebuild
+++ b/dev-util/qbs/qbs-1.19.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -58,11 +58,15 @@ src_prepare() {
echo "SUBDIRS = $(usev test auto)" >> tests/tests.pro
 
# skip several tests that fail and/or have additional deps
-   sed -i \
-   -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
+   local SKIP_TESTS_ARGS=(
+   # requires zip and jar
+   -e 's/findArchiver(binaryName,.*/"";/'
+   # requires nodejs, bug 527652
+   -e 's/p\.value("nodejs\./true||&/'
+   # requires nodejs and typescript
+   -e 
's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/'
+   )
+   sed -i tests/auto/blackbox/tst_blackbox.cpp "${SKIP_TESTS_ARGS[@]}" || 
die
sed -i -re '/blackbox-(android|apple|java)\.pro/ d' tests/auto/auto.pro 
|| die
 }
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Andreas Sturmlechner]

commit: cf51240663192e974801725e2a3be8f4d4efdc88
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jul 25 17:37:54 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug  8 09:40:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf512406

dev-util/qbs: drop 1.18.0

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/qbs/Manifest  |   1 -
 dev-util/qbs/qbs-1.18.0.ebuild | 112 -
 2 files changed, 113 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index bfcc02f2c5b5..2d0dd5be8400 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1 @@
-DIST qbs-src-1.18.0.tar.gz 4921432 BLAKE2B 
4c081434596c58d433e52ca9e335e3b4d62b75e401290895719b7fbe4f3c20cf8b34ab0753ae79a34b4e29c8859751a6276da8d6dbd5f3c711581af16ab61415
 SHA512 
bdef30200c7e74749c363b1d68232fd90d1dfc998722bee0e058ffcaff8e003599e0404b49f86cbeae098d59ccb5663316db5094d77b50a217fcf4ab5ae64d83
 DIST qbs-src-1.19.1.tar.gz 4961984 BLAKE2B 
2b9333ac8bba12f311ad47b1315d0a61ddf3b3a804888369f3fd868fbebca4ad13bd857451cb3fe3515fd9f9e69b42b84484289e79d3e7911c69720d7d08ab29
 SHA512 
b53dae9631c9d4ec1f799395948a67ce4b62ae88908cce3b00f42fb0213d80d32127c3429b95d5c32c9f7c1b861fc5a52ac6952046a6d91d035539d7412a5c4d

diff --git a/dev-util/qbs/qbs-1.18.0.ebuild b/dev-util/qbs/qbs-1.18.0.ebuild
deleted file mode 100644
index 5dfbdf982a61..
--- a/dev-util/qbs/qbs-1.18.0.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils toolchain-funcs
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Modern build tool for software projects"
-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 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-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
-"
-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
-   dev-qt/qttest: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(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
-   sed -i -re '/blackbox-(android|apple|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=testProfile
-
-   "${S}"/bin/qbs-setup-toolchains "$(tc-getCC)" testToolchain || die
-   "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" 
${QBS_AUTOTEST_PROFILE} || die
-   "${S}"/bin/qbs-config 
profiles.${QBS_AUTOTEST_PROFILE}.qbs.targetPlatform linux || 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 -j1 INSTALL_ROOT="${D}" install
-
-   dodoc -r changelogs CONTRIBUTING.md README.md
-
-   # 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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 42bbd1ff5eeb2a4dc46b271571e14c48fdc9397c
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Jul 10 20:58:13 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Jul 10 21:00:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42bbd1ff

dev-util/qbs: add 1.19.1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-util/qbs/Manifest  |   1 +
 dev-util/qbs/metadata.xml  |  12 +++--
 dev-util/qbs/qbs-1.19.1.ebuild | 120 +
 3 files changed, 129 insertions(+), 4 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 142b017fb2d..5243f5419bd 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1,3 @@
 DIST qbs-src-1.16.0.tar.gz 4571788 BLAKE2B 
4fb06314d0d0a532574e0d245ea85b6d596850ffe4b81b621406d1bc99e0529fc491bf5c7db514d90026c0bf4916f9fa102457aab2bbaaddbbe2e90c03aa04a4
 SHA512 
65c5398ffad54e10e251bed79a5b58abd722c0f95a031c536fc8647d915dd696923401c767a7a8ac029f4f571b6bbf96ef4b7493bb30768f675477bd68fcc21c
 DIST qbs-src-1.18.0.tar.gz 4921432 BLAKE2B 
4c081434596c58d433e52ca9e335e3b4d62b75e401290895719b7fbe4f3c20cf8b34ab0753ae79a34b4e29c8859751a6276da8d6dbd5f3c711581af16ab61415
 SHA512 
bdef30200c7e74749c363b1d68232fd90d1dfc998722bee0e058ffcaff8e003599e0404b49f86cbeae098d59ccb5663316db5094d77b50a217fcf4ab5ae64d83
+DIST qbs-src-1.19.1.tar.gz 4961984 BLAKE2B 
2b9333ac8bba12f311ad47b1315d0a61ddf3b3a804888369f3fd868fbebca4ad13bd857451cb3fe3515fd9f9e69b42b84484289e79d3e7911c69720d7d08ab29
 SHA512 
b53dae9631c9d4ec1f799395948a67ce4b62ae88908cce3b00f42fb0213d80d32127c3429b95d5c32c9f7c1b861fc5a52ac6952046a6d91d035539d7412a5c4d

diff --git a/dev-util/qbs/metadata.xml b/dev-util/qbs/metadata.xml
index 4311f5d8ba9..06efa80b24b 100644
--- a/dev-util/qbs/metadata.xml
+++ b/dev-util/qbs/metadata.xml
@@ -14,10 +14,14 @@
projects across multiple platforms. Qbs can be used for any software
project, regardless of programming language, toolkit, or libraries used.
 
-   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).
+   Qbs projects are specified in a QML dialect. QML is a concise, easy to
+   learn, and intuitive language that is used successfully in the Qt 
project.
+   Its core is declarative, but it can be extended with JavaScript snippets
+   for extra flexibility.
+
+   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).


https://bugreports.qt.io/

diff --git a/dev-util/qbs/qbs-1.19.1.ebuild b/dev-util/qbs/qbs-1.19.1.ebuild
new file mode 100644
index 000..3339bb57428
--- /dev/null
+++ b/dev-util/qbs/qbs-1.19.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils toolchain-funcs
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Modern build tool for software projects"
+HOMEPAGE="https://doc.qt.io/qbs/;
+SRC_URI="https://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz;
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples gui test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   dev-qt/qtcore:5=
+   dev-qt/qtnetwork:5
+   dev-qt/qtscript:5
+   dev-qt/qtxml:5
+   gui? (
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+"
+DEPEND="${RDEPEND}
+   test? (
+   dev-qt/linguist-tools:5
+   dev-qt/qtdbus:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qttest:5
+   )
+"
+BDEPEND="
+   dev-qt/qtcore:5
+   doc? (
+   dev-qt/qdoc:5
+   dev-qt/qthelp:5
+   )
+"
+
+src_prepare() {
+   default
+
+   if ! use examples; then
+   sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
+   fi
+
+   if ! use gui; then
+   sed -i -e '/SUBDIRS += config-ui/ d' src/app/app.pro || die
+   fi
+
+   echo "SUBDIRS = $(usev test auto)" >> tests/tests.pro
+
+   # skip several tests that fail and/or have additional deps
+   sed -i \
+   -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
+   sed -i -re '/blackbox-(android|apple|java)\.pro/ d' 

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: e8fe7830a84c047fe51a31c1c5bda5003cf543b5
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Jul 10 20:59:45 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Jul 10 21:00:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8fe7830

dev-util/qbs: drop 1.16.0

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-util/qbs/Manifest  |   1 -
 dev-util/qbs/qbs-1.16.0.ebuild | 116 -
 2 files changed, 117 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 5243f5419bd..bfcc02f2c5b 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,2 @@
-DIST qbs-src-1.16.0.tar.gz 4571788 BLAKE2B 
4fb06314d0d0a532574e0d245ea85b6d596850ffe4b81b621406d1bc99e0529fc491bf5c7db514d90026c0bf4916f9fa102457aab2bbaaddbbe2e90c03aa04a4
 SHA512 
65c5398ffad54e10e251bed79a5b58abd722c0f95a031c536fc8647d915dd696923401c767a7a8ac029f4f571b6bbf96ef4b7493bb30768f675477bd68fcc21c
 DIST qbs-src-1.18.0.tar.gz 4921432 BLAKE2B 
4c081434596c58d433e52ca9e335e3b4d62b75e401290895719b7fbe4f3c20cf8b34ab0753ae79a34b4e29c8859751a6276da8d6dbd5f3c711581af16ab61415
 SHA512 
bdef30200c7e74749c363b1d68232fd90d1dfc998722bee0e058ffcaff8e003599e0404b49f86cbeae098d59ccb5663316db5094d77b50a217fcf4ab5ae64d83
 DIST qbs-src-1.19.1.tar.gz 4961984 BLAKE2B 
2b9333ac8bba12f311ad47b1315d0a61ddf3b3a804888369f3fd868fbebca4ad13bd857451cb3fe3515fd9f9e69b42b84484289e79d3e7911c69720d7d08ab29
 SHA512 
b53dae9631c9d4ec1f799395948a67ce4b62ae88908cce3b00f42fb0213d80d32127c3429b95d5c32c9f7c1b861fc5a52ac6952046a6d91d035539d7412a5c4d

diff --git a/dev-util/qbs/qbs-1.16.0.ebuild b/dev-util/qbs/qbs-1.16.0.ebuild
deleted file mode 100644
index 2ecd2be09ac..000
--- a/dev-util/qbs/qbs-1.16.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils toolchain-funcs
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Modern build tool for software projects"
-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 )"
-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=testProfile
-
-   "${S}"/bin/qbs-setup-toolchains "$(tc-getCC)" testToolchain || die
-   "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" 
${QBS_AUTOTEST_PROFILE} || die
-   "${S}"/bin/qbs-config 
profiles.${QBS_AUTOTEST_PROFILE}.qbs.targetPlatform linux || 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 "\$@"

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: fff90c40f275efaef995dd4b9881a8ffa9674690
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Jan 13 06:57:20 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Wed Jan 13 07:02:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fff90c40

dev-util/qbs: add 1.18.0

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-util/qbs/Manifest  |   1 +
 dev-util/qbs/qbs-1.18.0.ebuild | 112 +
 2 files changed, 113 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index ed20307b545..1fb6bdf22a3 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -2,3 +2,4 @@ DIST qbs-src-1.12.2.tar.gz 4374830 BLAKE2B 
8ace5ac7fea9bcd944dd02280a36f0f275749
 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
+DIST qbs-src-1.18.0.tar.gz 4921432 BLAKE2B 
4c081434596c58d433e52ca9e335e3b4d62b75e401290895719b7fbe4f3c20cf8b34ab0753ae79a34b4e29c8859751a6276da8d6dbd5f3c711581af16ab61415
 SHA512 
bdef30200c7e74749c363b1d68232fd90d1dfc998722bee0e058ffcaff8e003599e0404b49f86cbeae098d59ccb5663316db5094d77b50a217fcf4ab5ae64d83

diff --git a/dev-util/qbs/qbs-1.18.0.ebuild b/dev-util/qbs/qbs-1.18.0.ebuild
new file mode 100644
index 000..5dfbdf982a6
--- /dev/null
+++ b/dev-util/qbs/qbs-1.18.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils toolchain-funcs
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Modern build tool for software projects"
+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 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+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
+"
+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
+   dev-qt/qttest: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(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
+   sed -i -re '/blackbox-(android|apple|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=testProfile
+
+   "${S}"/bin/qbs-setup-toolchains "$(tc-getCC)" testToolchain || die
+   "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" 
${QBS_AUTOTEST_PROFILE} || die
+   "${S}"/bin/qbs-config 
profiles.${QBS_AUTOTEST_PROFILE}.qbs.targetPlatform linux || die
+
+   einfo "Running autotests"
+
+   # simply exporting LD_LIBRARY_PATH doesn't work
+   # we have to use a custom testrunner 

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: e8f36206b449529c714b5adaee34025dc25017b5
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Jan 13 07:02:05 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Wed Jan 13 07:02:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8f36206

dev-util/qbs: drop old versions

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-util/qbs/Manifest  |   3 --
 dev-util/qbs/qbs-1.12.2.ebuild | 115 
 dev-util/qbs/qbs-1.14.1.ebuild | 115 
 dev-util/qbs/qbs-1.15.0.ebuild | 116 -
 4 files changed, 349 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 1fb6bdf22a3..142b017fb2d 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,5 +1,2 @@
-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
 DIST qbs-src-1.18.0.tar.gz 4921432 BLAKE2B 
4c081434596c58d433e52ca9e335e3b4d62b75e401290895719b7fbe4f3c20cf8b34ab0753ae79a34b4e29c8859751a6276da8d6dbd5f3c711581af16ab61415
 SHA512 
bdef30200c7e74749c363b1d68232fd90d1dfc998722bee0e058ffcaff8e003599e0404b49f86cbeae098d59ccb5663316db5094d77b50a217fcf4ab5ae64d83

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 c5815752c21..000
--- 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' '')
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 12a8ff4e14598d1ad9033a73855655c47b44984b
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jun 30 23:30:21 2020 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jun 30 23:31:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12a8ff4e

dev-util/qbs: add 1.16.0

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-util/qbs/Manifest  |   1 +
 dev-util/qbs/metadata.xml  |   4 +-
 dev-util/qbs/qbs-1.16.0.ebuild | 116 +
 3 files changed, 119 insertions(+), 2 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index aacb348c605..ed20307b545 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,4 @@
 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

diff --git a/dev-util/qbs/metadata.xml b/dev-util/qbs/metadata.xml
index eb2faf76929..4311f5d8ba9 100644
--- a/dev-util/qbs/metadata.xml
+++ b/dev-util/qbs/metadata.xml
@@ -12,7 +12,7 @@

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.
+   project, regardless of programming language, toolkit, or libraries used.
 
Qbs is an all-in-one tool that generates a build graph from a
high-level project description (like qmake or cmake) and additionally
@@ -21,6 +21,6 @@


https://bugreports.qt.io/
-   http://doc.qt.io/qbs/
+   https://doc.qt.io/qbs/

 

diff --git a/dev-util/qbs/qbs-1.16.0.ebuild b/dev-util/qbs/qbs-1.16.0.ebuild
new file mode 100644
index 000..2ecd2be09ac
--- /dev/null
+++ b/dev-util/qbs/qbs-1.16.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils toolchain-funcs
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Modern build tool for software projects"
+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 )"
+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

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: c56d4c9de8b543dd245a6b7d38bbd0b32428a12c
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Jan  3 03:46:46 2020 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Fri Jan  3 05:57:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c56d4c9d

dev-util/qbs: remove 1.13.1

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-util/qbs/Manifest  |   1 -
 dev-util/qbs/qbs-1.13.1.ebuild | 123 -
 2 files changed, 124 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index b574101fcda..ab1f44a2a46 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,2 @@
 DIST qbs-src-1.12.2.tar.gz 4374830 BLAKE2B 
8ace5ac7fea9bcd944dd02280a36f0f275749512e44ab9e3221e154d80ccf8aa25e3452eb90b1396323b540ec97e4b72c29b3a1d4727a72791a0e267bd89df13
 SHA512 
eb8c5db94f6b4e2300951d9cb6e092b873381421a1bff31a9e8422859aee3c0b3d038b6a2927a4f5c8fd871a0a7d283f7b7c3be74834dd30d640a1ed9c87a147
-DIST qbs-src-1.13.1.tar.gz 4324622 BLAKE2B 
d64145f38aea95f4b7539a9652c276f4dddb4af8424142b45df77083c2c8821f0858827c6d8390ca70835e9bbd3eda02163b7e180ebb82eb90976afe727b4dd7
 SHA512 
1626a218665d380a8030bf4930be857399806643e7868bace6cafe269054ec560eb47e37e358acdb3edbbb15bc8f4ec9af55142d6bfe2ab5db0c8a08aa40d597
 DIST qbs-src-1.14.1.tar.gz 4365537 BLAKE2B 
5a51ddea64023c76b6934634f72ab19d54a3e857efe30d7698a3970d099e436599b53b369d81434cc8e721606513bd487010047e60ccfa289574f606cf020dc5
 SHA512 
df9031e2749ba598129daef0a6b4322ad964c87a33bfd079bb231170da49c42708740ec63e351607b7e9da1dd11310802b14917eaf2ec97bb747a6df9890f2f3

diff --git a/dev-util/qbs/qbs-1.13.1.ebuild b/dev-util/qbs/qbs-1.13.1.ebuild
deleted file mode 100644
index 0ce9c72b16a..000
--- a/dev-util/qbs/qbs-1.13.1.ebuild
+++ /dev/null
@@ -1,123 +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
-
-   # 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
-
-   # respect LDFLAGS
-   sed -i -e '/QMAKE_LFLAGS =/ s/ = / += /' src/lib/library.pri || 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 

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 4fdcff7df36ba40bd1932aabf34f7cd827608f7a
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Jan  3 05:55:38 2020 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Fri Jan  3 05:57:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fdcff7d

dev-util/qbs: add 1.15.0

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-util/qbs/Manifest  |   1 +
 dev-util/qbs/qbs-1.15.0.ebuild | 116 +
 2 files changed, 117 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index ab1f44a2a46..aacb348c605 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/dev-util/qbs/qbs-1.15.0.ebuild b/dev-util/qbs/qbs-1.15.0.ebuild
new file mode 100644
index 000..5fa4f467db3
--- /dev/null
+++ b/dev-util/qbs/qbs-1.15.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils toolchain-funcs
+
+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=testProfile
+
+   "${S}"/bin/qbs-setup-toolchains "$(tc-getCC)" testToolchain || die
+   "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" 
${QBS_AUTOTEST_PROFILE} || die
+   "${S}"/bin/qbs-config 
profiles.${QBS_AUTOTEST_PROFILE}.qbs.targetPlatform linux || 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 "\$@"
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: d71887bc283f232636fa15931f17e340ce868813
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Nov 28 19:24:48 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Nov 28 19:24:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d71887bc

dev-util/qbs: fix MissingTestRestrict QA warning

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-util/qbs/qbs-1.12.2.ebuild | 1 +
 dev-util/qbs/qbs-1.13.1.ebuild | 1 +
 dev-util/qbs/qbs-1.14.1.ebuild | 1 +
 3 files changed, 3 insertions(+)

diff --git a/dev-util/qbs/qbs-1.12.2.ebuild b/dev-util/qbs/qbs-1.12.2.ebuild
index 03606d77523..c5815752c21 100644
--- a/dev-util/qbs/qbs-1.12.2.ebuild
+++ b/dev-util/qbs/qbs-1.12.2.ebuild
@@ -15,6 +15,7 @@ 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="

diff --git a/dev-util/qbs/qbs-1.13.1.ebuild b/dev-util/qbs/qbs-1.13.1.ebuild
index 0eea5267ba7..0ce9c72b16a 100644
--- a/dev-util/qbs/qbs-1.13.1.ebuild
+++ b/dev-util/qbs/qbs-1.13.1.ebuild
@@ -15,6 +15,7 @@ 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="

diff --git a/dev-util/qbs/qbs-1.14.1.ebuild b/dev-util/qbs/qbs-1.14.1.ebuild
index 027cbeacc66..689ab954a11 100644
--- a/dev-util/qbs/qbs-1.14.1.ebuild
+++ b/dev-util/qbs/qbs-1.14.1.ebuild
@@ -15,6 +15,7 @@ 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="

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 392e810a89b7e9e7d7dfe85e00ef9ab993581fe5
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Nov 28 18:53:01 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Nov 28 18:53:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=392e810a

dev-util/qbs: add 1.14.1

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-util/qbs/Manifest  |   1 +
 dev-util/qbs/qbs-1.14.1.ebuild | 114 +
 2 files changed, 115 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 0572b8821bc..b574101fcda 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1,3 @@
 DIST qbs-src-1.12.2.tar.gz 4374830 BLAKE2B 
8ace5ac7fea9bcd944dd02280a36f0f275749512e44ab9e3221e154d80ccf8aa25e3452eb90b1396323b540ec97e4b72c29b3a1d4727a72791a0e267bd89df13
 SHA512 
eb8c5db94f6b4e2300951d9cb6e092b873381421a1bff31a9e8422859aee3c0b3d038b6a2927a4f5c8fd871a0a7d283f7b7c3be74834dd30d640a1ed9c87a147
 DIST qbs-src-1.13.1.tar.gz 4324622 BLAKE2B 
d64145f38aea95f4b7539a9652c276f4dddb4af8424142b45df77083c2c8821f0858827c6d8390ca70835e9bbd3eda02163b7e180ebb82eb90976afe727b4dd7
 SHA512 
1626a218665d380a8030bf4930be857399806643e7868bace6cafe269054ec560eb47e37e358acdb3edbbb15bc8f4ec9af55142d6bfe2ab5db0c8a08aa40d597
+DIST qbs-src-1.14.1.tar.gz 4365537 BLAKE2B 
5a51ddea64023c76b6934634f72ab19d54a3e857efe30d7698a3970d099e436599b53b369d81434cc8e721606513bd487010047e60ccfa289574f606cf020dc5
 SHA512 
df9031e2749ba598129daef0a6b4322ad964c87a33bfd079bb231170da49c42708740ec63e351607b7e9da1dd11310802b14917eaf2ec97bb747a6df9890f2f3

diff --git a/dev-util/qbs/qbs-1.14.1.ebuild b/dev-util/qbs/qbs-1.14.1.ebuild
new file mode 100644
index 000..027cbeacc66
--- /dev/null
+++ b/dev-util/qbs/qbs-1.14.1.ebuild
@@ -0,0 +1,114 @@
+# 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/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 

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 64dabe7ca391ead53fefa05d783c85e57aeca482
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jun 23 18:48:55 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jun 23 18:51:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64dabe7c

dev-util/qbs: add missing deps with USE=test

TestBlackboxQt tries to run lrelease and qdbusxml2cpp

Closes: https://bugs.gentoo.org/688534
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-util/qbs/qbs-1.13.1.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-util/qbs/qbs-1.13.1.ebuild b/dev-util/qbs/qbs-1.13.1.ebuild
index 3c56ccf1eec..0eea5267ba7 100644
--- a/dev-util/qbs/qbs-1.13.1.ebuild
+++ b/dev-util/qbs/qbs-1.13.1.ebuild
@@ -31,7 +31,11 @@ DEPEND="${RDEPEND}
dev-qt/qdoc:5
dev-qt/qthelp:5
)
-   test? ( dev-qt/qtdeclarative:5 )
+   test? (
+   dev-qt/linguist-tools:5
+   dev-qt/qtdbus:5
+   dev-qt/qtdeclarative:5
+   )
 "
 
 S=${WORKDIR}/${MY_P}

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 213ec8df46a3decaf784e3000e1a540608442ef2
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Jun 22 23:36:17 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jun 23 00:04:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=213ec8df

dev-util/qbs: bump to 1.13.1

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-util/qbs/Manifest | 2 +-
 dev-util/qbs/{qbs-1.13.0.ebuild => qbs-1.13.1.ebuild} | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 5ec4ad7c7b0..0572b8821bc 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1,2 @@
 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
+DIST qbs-src-1.13.1.tar.gz 4324622 BLAKE2B 
d64145f38aea95f4b7539a9652c276f4dddb4af8424142b45df77083c2c8821f0858827c6d8390ca70835e9bbd3eda02163b7e180ebb82eb90976afe727b4dd7
 SHA512 
1626a218665d380a8030bf4930be857399806643e7868bace6cafe269054ec560eb47e37e358acdb3edbbb15bc8f4ec9af55142d6bfe2ab5db0c8a08aa40d597

diff --git a/dev-util/qbs/qbs-1.13.0.ebuild b/dev-util/qbs/qbs-1.13.1.ebuild
similarity index 96%
rename from dev-util/qbs/qbs-1.13.0.ebuild
rename to dev-util/qbs/qbs-1.13.1.ebuild
index 01828115c96..3c56ccf1eec 100644
--- a/dev-util/qbs/qbs-1.13.0.ebuild
+++ b/dev-util/qbs/qbs-1.13.1.ebuild
@@ -48,6 +48,9 @@ src_prepare() {
-e '/qbslibdir =/ s:/lib:/$$QBS_LIBRARY_DIRNAME:' \
static-res.pro || die
 
+   # respect LDFLAGS
+   sed -i -e '/QMAKE_LFLAGS =/ s/ = / += /' src/lib/library.pri || die
+
echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro
 
# skip several tests that fail and/or have additional deps

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 5bf677c280fb8f4683045a512eb9796040dc232b
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Jun  7 05:10:34 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Fri Jun  7 05:10:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bf677c2

dev-util/qbs: remove 1.11.1

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-util/qbs/Manifest  |   1 -
 dev-util/qbs/qbs-1.11.1.ebuild | 118 -
 2 files changed, 119 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index d09741c5cf7..5ec4ad7c7b0 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,2 @@
-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

diff --git a/dev-util/qbs/qbs-1.11.1.ebuild b/dev-util/qbs/qbs-1.11.1.ebuild
deleted file mode 100644
index 9a19d31b66e..000
--- a/dev-util/qbs/qbs-1.11.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 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
-
-   # 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 

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 816fa02e6c7ec62f90dd357d4a88e64920592db3
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Jun  7 05:04:28 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Fri Jun  7 05:04:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=816fa02e

dev-util/qbs: stabilize 1.12.2 on amd64

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-util/qbs/qbs-1.12.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/qbs/qbs-1.12.2.ebuild b/dev-util/qbs/qbs-1.12.2.ebuild
index 73267519de4..03606d77523 100644
--- a/dev-util/qbs/qbs-1.12.2.ebuild
+++ b/dev-util/qbs/qbs-1.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ 
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"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc examples test"
 
 # see bug 581874 for the qttest dep in RDEPEND

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 4d0345757b496c32ea0b79de920f20548c6680c6
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Apr 28 19:37:26 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Apr 28 19:37:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d034575

dev-util/qbs: add 1.13.0

Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-util/qbs/Manifest  |   1 +
 dev-util/qbs/qbs-1.13.0.ebuild | 115 +
 2 files changed, 116 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 21adc7e9241..d09741c5cf7 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1,3 @@
 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

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 000..01828115c96
--- /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}"
+
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 493f70bf9958d7c9a285f81eff472d43e27cc97d
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Dec 23 18:42:21 2018 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Dec 23 18:42:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=493f70bf

dev-util/qbs: remove 1.12.0

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-util/qbs/Manifest  |   1 -
 dev-util/qbs/qbs-1.12.0.ebuild | 114 -
 2 files changed, 115 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 47dc67e0f8a..21adc7e9241 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,2 @@
 DIST qbs-src-1.11.1.tar.gz 4299125 BLAKE2B 
a2b2670b47bb122ccc586fee0c61d941533dc2dbc5e59028a7ab765eb18fe4a71b85cbd7373f88231b9cd75178982a17dddab0ba965de84ca197c49b2c9eefdf
 SHA512 
90833792cb29b7b886df491263b620d2933c398ad8b2f495d0e5ae6acdde3f816ecd25638ae2e74d3efbf517a762644f751b7c01633aed3369bd7bf85c033ff5
-DIST qbs-src-1.12.0.tar.gz 4368992 BLAKE2B 
5fce4052f349ed787a0948541fbe1397ed8dde5bb6191e6ba37718e4d803b30b1f7a4ba3abb00d0d10078b1cfddeedb45a4c5dc86d800b5a8b941abffb0a5804
 SHA512 
2d9f23231e3824d67f63f290e4d22bd3d56f161c32b9002e23e615cb2793678eadde033d6e2b744e89ad69f4b6104c69e80095881601d498d9587d3db06c2103
 DIST qbs-src-1.12.2.tar.gz 4374830 BLAKE2B 
8ace5ac7fea9bcd944dd02280a36f0f275749512e44ab9e3221e154d80ccf8aa25e3452eb90b1396323b540ec97e4b72c29b3a1d4727a72791a0e267bd89df13
 SHA512 
eb8c5db94f6b4e2300951d9cb6e092b873381421a1bff31a9e8422859aee3c0b3d038b6a2927a4f5c8fd871a0a7d283f7b7c3be74834dd30d640a1ed9c87a147

diff --git a/dev-util/qbs/qbs-1.12.0.ebuild b/dev-util/qbs/qbs-1.12.0.ebuild
deleted file mode 100644
index 87c294f4160..000
--- a/dev-util/qbs/qbs-1.12.0.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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
-
-   # 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 

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 11e7c7786e432908b9d3a1936c9ee891a6a041a0
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Dec 15 21:59:42 2018 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Dec 15 21:59:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11e7c778

dev-util/qbs: bump to 1.12.2

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-util/qbs/Manifest  |   1 +
 dev-util/qbs/qbs-1.12.2.ebuild | 114 +
 2 files changed, 115 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index a738f2f0031..47dc67e0f8a 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1,3 @@
 DIST qbs-src-1.11.1.tar.gz 4299125 BLAKE2B 
a2b2670b47bb122ccc586fee0c61d941533dc2dbc5e59028a7ab765eb18fe4a71b85cbd7373f88231b9cd75178982a17dddab0ba965de84ca197c49b2c9eefdf
 SHA512 
90833792cb29b7b886df491263b620d2933c398ad8b2f495d0e5ae6acdde3f816ecd25638ae2e74d3efbf517a762644f751b7c01633aed3369bd7bf85c033ff5
 DIST qbs-src-1.12.0.tar.gz 4368992 BLAKE2B 
5fce4052f349ed787a0948541fbe1397ed8dde5bb6191e6ba37718e4d803b30b1f7a4ba3abb00d0d10078b1cfddeedb45a4c5dc86d800b5a8b941abffb0a5804
 SHA512 
2d9f23231e3824d67f63f290e4d22bd3d56f161c32b9002e23e615cb2793678eadde033d6e2b744e89ad69f4b6104c69e80095881601d498d9587d3db06c2103
+DIST qbs-src-1.12.2.tar.gz 4374830 BLAKE2B 
8ace5ac7fea9bcd944dd02280a36f0f275749512e44ab9e3221e154d80ccf8aa25e3452eb90b1396323b540ec97e4b72c29b3a1d4727a72791a0e267bd89df13
 SHA512 
eb8c5db94f6b4e2300951d9cb6e092b873381421a1bff31a9e8422859aee3c0b3d038b6a2927a4f5c8fd871a0a7d283f7b7c3be74834dd30d640a1ed9c87a147

diff --git a/dev-util/qbs/qbs-1.12.2.ebuild b/dev-util/qbs/qbs-1.12.2.ebuild
new file mode 100644
index 000..73267519de4
--- /dev/null
+++ b/dev-util/qbs/qbs-1.12.2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 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
+
+   # 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 "\$@"
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 6fd0b4ce6a2b28b65fdb8900f5f0a5d5f60c6e8d
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Jul 20 04:45:35 2018 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Fri Jul 20 04:46:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fd0b4ce

dev-util/qbs: 1.12.0 version bump

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 dev-util/qbs/Manifest  |   1 +
 dev-util/qbs/qbs-1.12.0.ebuild | 114 +
 2 files changed, 115 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 7cb561198cb..a738f2f0031 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1 +1,2 @@
 DIST qbs-src-1.11.1.tar.gz 4299125 BLAKE2B 
a2b2670b47bb122ccc586fee0c61d941533dc2dbc5e59028a7ab765eb18fe4a71b85cbd7373f88231b9cd75178982a17dddab0ba965de84ca197c49b2c9eefdf
 SHA512 
90833792cb29b7b886df491263b620d2933c398ad8b2f495d0e5ae6acdde3f816ecd25638ae2e74d3efbf517a762644f751b7c01633aed3369bd7bf85c033ff5
+DIST qbs-src-1.12.0.tar.gz 4368992 BLAKE2B 
5fce4052f349ed787a0948541fbe1397ed8dde5bb6191e6ba37718e4d803b30b1f7a4ba3abb00d0d10078b1cfddeedb45a4c5dc86d800b5a8b941abffb0a5804
 SHA512 
2d9f23231e3824d67f63f290e4d22bd3d56f161c32b9002e23e615cb2793678eadde033d6e2b744e89ad69f4b6104c69e80095881601d498d9587d3db06c2103

diff --git a/dev-util/qbs/qbs-1.12.0.ebuild b/dev-util/qbs/qbs-1.12.0.ebuild
new file mode 100644
index 000..87c294f4160
--- /dev/null
+++ b/dev-util/qbs/qbs-1.12.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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
+
+   # 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
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 6b3d91ceb4ab6d850940e387c70760d51d4fbf32
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Jul 20 02:50:59 2018 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Fri Jul 20 02:57:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b3d91ce

dev-util/qbs: drop 1.10.1

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 dev-util/qbs/Manifest  |   1 -
 dev-util/qbs/qbs-1.10.1.ebuild | 120 -
 2 files changed, 121 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 95f43e8774d..7cb561198cb 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1 @@
-DIST qbs-src-1.10.1.tar.gz 4140847 BLAKE2B 
cbd9770d426fdf70645f5c40fbc8956309845980776b920a0e5e612d0cbf63a9a1352e5ab43a98afd9a5a9db396d0b7bbd840b4581787aaafabad0982c6edca8
 SHA512 
e2019f59124cf8409c12bc108982f1c4c99dcff9d6272c26bee9d690327dea28990c4081857b1b2bfec57e3b557d83e0b8085823dbd4d0988c483d971dc06bac
 DIST qbs-src-1.11.1.tar.gz 4299125 BLAKE2B 
a2b2670b47bb122ccc586fee0c61d941533dc2dbc5e59028a7ab765eb18fe4a71b85cbd7373f88231b9cd75178982a17dddab0ba965de84ca197c49b2c9eefdf
 SHA512 
90833792cb29b7b886df491263b620d2933c398ad8b2f495d0e5ae6acdde3f816ecd25638ae2e74d3efbf517a762644f751b7c01633aed3369bd7bf85c033ff5

diff --git a/dev-util/qbs/qbs-1.10.1.ebuild b/dev-util/qbs/qbs-1.10.1.ebuild
deleted file mode 100644
index 55632d81072..000
--- a/dev-util/qbs/qbs-1.10.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 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
-
-   # since 1.10, TestApi is either broken or requires more configuration
-   sed -i -e '/\/ d' tests/auto/auto.pro || die
-
-   # 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
-
-   dodoc -r 

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 7d1311e3db7d1e3dcead9247fea6d2f5670c24b4
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Jul 20 02:50:13 2018 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Fri Jul 20 02:50:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d1311e3

dev-util/qbs: stabilize 1.11.1 on amd64

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 dev-util/qbs/qbs-1.11.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/qbs/qbs-1.11.1.ebuild b/dev-util/qbs/qbs-1.11.1.ebuild
index 4971aeed820..9a19d31b66e 100644
--- a/dev-util/qbs/qbs-1.11.1.ebuild
+++ b/dev-util/qbs/qbs-1.11.1.ebuild
@@ -13,7 +13,7 @@ 
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"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc examples test"
 
 # see bug 581874 for the qttest dep in RDEPEND

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 1f7933e67042aa4e91b904ce3f1a767df4731848
Author: Asgeir Bjarni Ingvarsson  fundinn  org>
AuthorDate: Sat May  5 10:13:39 2018 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun May 13 03:26:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f7933e6

dev-util/qbs: bump to 1.11.1; remove broken version

This fixes a missing tool header install among other things

Closes: https://github.com/gentoo/gentoo/pull/8232
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-util/qbs/Manifest | 2 +-
 dev-util/qbs/{qbs-1.11.0.ebuild => qbs-1.11.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index f646edf215f..95f43e8774d 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1,2 @@
 DIST qbs-src-1.10.1.tar.gz 4140847 BLAKE2B 
cbd9770d426fdf70645f5c40fbc8956309845980776b920a0e5e612d0cbf63a9a1352e5ab43a98afd9a5a9db396d0b7bbd840b4581787aaafabad0982c6edca8
 SHA512 
e2019f59124cf8409c12bc108982f1c4c99dcff9d6272c26bee9d690327dea28990c4081857b1b2bfec57e3b557d83e0b8085823dbd4d0988c483d971dc06bac
-DIST qbs-src-1.11.0.tar.gz 4299668 BLAKE2B 
b17e5d0e65fd0c29bf7837d53eb5c5470e6f3a243b4cbd215a528c6657e5c4831e49b369034133f784122e358cce723bd78b26df8bd580ed570a71590a73af7d
 SHA512 
123319aca79c4816fcfd839a7c7f3029c55eac4dc2c2a2bae7df891c15ef81de22bb7f6ad04bbdb39401473a3df15e41b88adcd0d5d2462c2ef3e62bf5e0f80a
+DIST qbs-src-1.11.1.tar.gz 4299125 BLAKE2B 
a2b2670b47bb122ccc586fee0c61d941533dc2dbc5e59028a7ab765eb18fe4a71b85cbd7373f88231b9cd75178982a17dddab0ba965de84ca197c49b2c9eefdf
 SHA512 
90833792cb29b7b886df491263b620d2933c398ad8b2f495d0e5ae6acdde3f816ecd25638ae2e74d3efbf517a762644f751b7c01633aed3369bd7bf85c033ff5

diff --git a/dev-util/qbs/qbs-1.11.0.ebuild b/dev-util/qbs/qbs-1.11.1.ebuild
similarity index 100%
rename from dev-util/qbs/qbs-1.11.0.ebuild
rename to dev-util/qbs/qbs-1.11.1.ebuild

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: a06cdf4161b4dae04afb2cb5e2487df8c9c83147
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Apr 30 03:05:07 2018 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Apr 30 03:09:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a06cdf41

dev-util/qbs: fix and reenable TestApi tests

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 dev-util/qbs/qbs-1.11.0.ebuild | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dev-util/qbs/qbs-1.11.0.ebuild b/dev-util/qbs/qbs-1.11.0.ebuild
index bfadc6296da..4971aeed820 100644
--- a/dev-util/qbs/qbs-1.11.0.ebuild
+++ b/dev-util/qbs/qbs-1.11.0.ebuild
@@ -53,9 +53,6 @@ src_prepare() {
 
echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro
 
-   # since 1.10, TestApi is either broken or requires more configuration
-   sed -i -e '/\/ d' tests/auto/auto.pro || die
-
# skip several tests that fail and/or have additional deps
sed -i \
-e 's/findArchiver("7z")/""/'   `# requires p7zip, 
fails` \
@@ -86,9 +83,10 @@ src_test() {
 
export HOME=${T}
export LD_LIBRARY_PATH=${S}/$(get_libdir)
+   export QBS_AUTOTEST_PROFILE=autotests
 
-   "${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die
-   "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
+   "${S}"/bin/qbs-setup-toolchains --detect || die
+   "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" autotests || die
 
einfo "Running autotests"
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: f7476b34e47b693e304aa3e404f5fe85fe2a9f8f
Author: Asgeir Bjarni Ingvarsson  fundinn  org>
AuthorDate: Mon Apr 30 02:15:37 2018 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Apr 30 03:09:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7476b34

dev-util/qbs: 1.11 version bump

Closes: https://github.com/gentoo/gentoo/pull/8209
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 dev-util/qbs/Manifest  |   1 +
 dev-util/qbs/qbs-1.11.0.ebuild | 120 +
 2 files changed, 121 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 44d5445ca18..f646edf215f 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1 +1,2 @@
 DIST qbs-src-1.10.1.tar.gz 4140847 BLAKE2B 
cbd9770d426fdf70645f5c40fbc8956309845980776b920a0e5e612d0cbf63a9a1352e5ab43a98afd9a5a9db396d0b7bbd840b4581787aaafabad0982c6edca8
 SHA512 
e2019f59124cf8409c12bc108982f1c4c99dcff9d6272c26bee9d690327dea28990c4081857b1b2bfec57e3b557d83e0b8085823dbd4d0988c483d971dc06bac
+DIST qbs-src-1.11.0.tar.gz 4299668 BLAKE2B 
b17e5d0e65fd0c29bf7837d53eb5c5470e6f3a243b4cbd215a528c6657e5c4831e49b369034133f784122e358cce723bd78b26df8bd580ed570a71590a73af7d
 SHA512 
123319aca79c4816fcfd839a7c7f3029c55eac4dc2c2a2bae7df891c15ef81de22bb7f6ad04bbdb39401473a3df15e41b88adcd0d5d2462c2ef3e62bf5e0f80a

diff --git a/dev-util/qbs/qbs-1.11.0.ebuild b/dev-util/qbs/qbs-1.11.0.ebuild
new file mode 100644
index 000..bfadc6296da
--- /dev/null
+++ b/dev-util/qbs/qbs-1.11.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 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
+
+   # 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
+
+   # since 1.10, TestApi is either broken or requires more configuration
+   sed -i -e '/\/ d' tests/auto/auto.pro || die
+
+   # 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 

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 4ce477216d0ad384fee5bb963ef72177ad6e8346
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Mar 24 01:29:13 2018 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Mar 24 01:29:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ce47721

dev-util/qbs: remove old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-util/qbs/Manifest  |   2 -
 dev-util/qbs/qbs-1.10.0.ebuild | 120 -
 dev-util/qbs/qbs-1.9.1.ebuild  | 115 ---
 3 files changed, 237 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 8941a147af4..44d5445ca18 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1 @@
-DIST qbs-src-1.10.0.tar.gz 4130630 BLAKE2B 
9a692dc3cd65cbe8b8f09ca86e8da1ea47fa6770dbcdfc5fc34d65156f8a92932893fa382f510e516fe67a77b95024052d442d3e295a22423a544b61ff2eaf25
 SHA512 
a7d15acb46b5b32f0c54b40e4a5469f68cdcff54b062a46656174694d7abbade682b66f5dc4cdfa9ac87b9573ed3947d775d55638cfc1b4ffc24101ebea85618
 DIST qbs-src-1.10.1.tar.gz 4140847 BLAKE2B 
cbd9770d426fdf70645f5c40fbc8956309845980776b920a0e5e612d0cbf63a9a1352e5ab43a98afd9a5a9db396d0b7bbd840b4581787aaafabad0982c6edca8
 SHA512 
e2019f59124cf8409c12bc108982f1c4c99dcff9d6272c26bee9d690327dea28990c4081857b1b2bfec57e3b557d83e0b8085823dbd4d0988c483d971dc06bac
-DIST qbs-src-1.9.1.tar.gz 4007946 BLAKE2B 
fa7744a321fec2f7b928b89e511aa542d935a61af79714d730e0c4c5fdab1f62e0da5cccf055622997cfbe441e5375212aa9cd8af3b1d69af933c438c94b8d21
 SHA512 
6b400a06b4f2c2cb531095a0c3eadb112335fe0f91c2077f01c7d2dc6ea329d250e7af70f70ebeb972368aa8fa0ee9548b84b75dc877230de6dea0b10468b7fd

diff --git a/dev-util/qbs/qbs-1.10.0.ebuild b/dev-util/qbs/qbs-1.10.0.ebuild
deleted file mode 100644
index 5b93b79331c..000
--- a/dev-util/qbs/qbs-1.10.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# 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
-
-   # TestApi seems broken in 1.10.0
-   sed -i -e '/\/ d' tests/auto/auto.pro || die
-
-   # 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 

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: a03d82d175d98ff479a8a69bf17bccaedcd57483
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Mar 24 01:23:01 2018 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Mar 24 01:23:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a03d82d1

dev-util/qbs: stabilize 1.10.1 on amd64

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-util/qbs/qbs-1.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/qbs/qbs-1.10.1.ebuild b/dev-util/qbs/qbs-1.10.1.ebuild
index 6f49fe08ac2..55632d81072 100644
--- a/dev-util/qbs/qbs-1.10.1.ebuild
+++ b/dev-util/qbs/qbs-1.10.1.ebuild
@@ -13,7 +13,7 @@ 
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"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc examples test"
 
 # see bug 581874 for the qttest dep in RDEPEND

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 3aaa296f30aeb514e10a9d40d1bed17af4048ec2
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Mar 16 19:44:39 2018 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Fri Mar 16 20:07:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aaa296f

dev-util/qbs: version bump

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-util/qbs/Manifest  |   1 +
 dev-util/qbs/qbs-1.10.1.ebuild | 120 +
 2 files changed, 121 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 7c82dec9a4c..8941a147af4 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1,3 @@
 DIST qbs-src-1.10.0.tar.gz 4130630 BLAKE2B 
9a692dc3cd65cbe8b8f09ca86e8da1ea47fa6770dbcdfc5fc34d65156f8a92932893fa382f510e516fe67a77b95024052d442d3e295a22423a544b61ff2eaf25
 SHA512 
a7d15acb46b5b32f0c54b40e4a5469f68cdcff54b062a46656174694d7abbade682b66f5dc4cdfa9ac87b9573ed3947d775d55638cfc1b4ffc24101ebea85618
+DIST qbs-src-1.10.1.tar.gz 4140847 BLAKE2B 
cbd9770d426fdf70645f5c40fbc8956309845980776b920a0e5e612d0cbf63a9a1352e5ab43a98afd9a5a9db396d0b7bbd840b4581787aaafabad0982c6edca8
 SHA512 
e2019f59124cf8409c12bc108982f1c4c99dcff9d6272c26bee9d690327dea28990c4081857b1b2bfec57e3b557d83e0b8085823dbd4d0988c483d971dc06bac
 DIST qbs-src-1.9.1.tar.gz 4007946 BLAKE2B 
fa7744a321fec2f7b928b89e511aa542d935a61af79714d730e0c4c5fdab1f62e0da5cccf055622997cfbe441e5375212aa9cd8af3b1d69af933c438c94b8d21
 SHA512 
6b400a06b4f2c2cb531095a0c3eadb112335fe0f91c2077f01c7d2dc6ea329d250e7af70f70ebeb972368aa8fa0ee9548b84b75dc877230de6dea0b10468b7fd

diff --git a/dev-util/qbs/qbs-1.10.1.ebuild b/dev-util/qbs/qbs-1.10.1.ebuild
new file mode 100644
index 000..6f49fe08ac2
--- /dev/null
+++ b/dev-util/qbs/qbs-1.10.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 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
+
+   # since 1.10, TestApi is either broken or requires more configuration
+   sed -i -e '/\/ d' tests/auto/auto.pro || die
+
+   # 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 > 

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: d09e129e0b178f011616383826f530f7a93321c1
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jan 23 21:27:37 2018 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jan 23 23:06:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d09e129e

dev-util/qbs: stabilize 1.9.1 on amd64

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 dev-util/qbs/qbs-1.9.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/qbs/qbs-1.9.1.ebuild b/dev-util/qbs/qbs-1.9.1.ebuild
index 881b9a2b5bd..cba25cda6a7 100644
--- a/dev-util/qbs/qbs-1.9.1.ebuild
+++ b/dev-util/qbs/qbs-1.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ 
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"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc examples test"
 
 # see bug 581874 for the qttest dep in RDEPEND

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/files/, dev-util/qbs/

[Davide Pesavento]

commit: ceb6ee8c339cf48bae37e17551e4095ec6a2fd3e
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jan 23 23:05:55 2018 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jan 23 23:06:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceb6ee8c

dev-util/qbs: remove 1.8.1-r1

x86 is demoted to ~arch

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 dev-util/qbs/Manifest  |   1 -
 .../1.8.1-Install-missing-public-header.patch  |  52 -
 dev-util/qbs/qbs-1.8.1-r1.ebuild   | 120 -
 3 files changed, 173 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index cd1b6823d11..7c82dec9a4c 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,2 @@
 DIST qbs-src-1.10.0.tar.gz 4130630 BLAKE2B 
9a692dc3cd65cbe8b8f09ca86e8da1ea47fa6770dbcdfc5fc34d65156f8a92932893fa382f510e516fe67a77b95024052d442d3e295a22423a544b61ff2eaf25
 SHA512 
a7d15acb46b5b32f0c54b40e4a5469f68cdcff54b062a46656174694d7abbade682b66f5dc4cdfa9ac87b9573ed3947d775d55638cfc1b4ffc24101ebea85618
-DIST qbs-src-1.8.1.tar.gz 1053395 BLAKE2B 
1ec3840c206ec253779f016f9bdc2b806007cc0774442e2bf75a62c3148771fcf356d14c7743c1aefcbda0379f632ddaa309f48b7998387b8c37649fdf750d06
 SHA512 
2b4657475803e56f911f0bc373692b70f9376ed520499f1c4e7040e4dedddc417bd4e72208c925ed7fdc7fcf0b96434dab8d8f87c454ae08da80d6438dbcbc5c
 DIST qbs-src-1.9.1.tar.gz 4007946 BLAKE2B 
fa7744a321fec2f7b928b89e511aa542d935a61af79714d730e0c4c5fdab1f62e0da5cccf055622997cfbe441e5375212aa9cd8af3b1d69af933c438c94b8d21
 SHA512 
6b400a06b4f2c2cb531095a0c3eadb112335fe0f91c2077f01c7d2dc6ea329d250e7af70f70ebeb972368aa8fa0ee9548b84b75dc877230de6dea0b10468b7fd

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
deleted file mode 100644
index 09aa6aec519..000
--- a/dev-util/qbs/files/1.8.1-Install-missing-public-header.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 4143de9ab93283c6331418610902da4648db5b67 Mon Sep 17 00:00:00 2001
-From: Joerg Bornemann 
-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 

- 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/qbs-1.8.1-r1.ebuild b/dev-util/qbs/qbs-1.8.1-r1.ebuild
deleted file mode 100644
index 4cad93eff2c..000
--- a/dev-util/qbs/qbs-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# 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=(
-  

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 08eae8acbbeccec136b1fa341a3a127a70cb78ad
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Dec 11 01:23:10 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Dec 11 01:23:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08eae8ac

dev-util/qbs: version bump

Package-Manager: Portage-2.3.17, Repoman-2.3.6

 dev-util/qbs/Manifest  |   1 +
 dev-util/qbs/qbs-1.10.0.ebuild | 120 +
 2 files changed, 121 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 3f189ebd4a8..cd1b6823d11 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1,3 @@
+DIST qbs-src-1.10.0.tar.gz 4130630 BLAKE2B 
9a692dc3cd65cbe8b8f09ca86e8da1ea47fa6770dbcdfc5fc34d65156f8a92932893fa382f510e516fe67a77b95024052d442d3e295a22423a544b61ff2eaf25
 SHA512 
a7d15acb46b5b32f0c54b40e4a5469f68cdcff54b062a46656174694d7abbade682b66f5dc4cdfa9ac87b9573ed3947d775d55638cfc1b4ffc24101ebea85618
 DIST qbs-src-1.8.1.tar.gz 1053395 BLAKE2B 
1ec3840c206ec253779f016f9bdc2b806007cc0774442e2bf75a62c3148771fcf356d14c7743c1aefcbda0379f632ddaa309f48b7998387b8c37649fdf750d06
 SHA512 
2b4657475803e56f911f0bc373692b70f9376ed520499f1c4e7040e4dedddc417bd4e72208c925ed7fdc7fcf0b96434dab8d8f87c454ae08da80d6438dbcbc5c
 DIST qbs-src-1.9.1.tar.gz 4007946 BLAKE2B 
fa7744a321fec2f7b928b89e511aa542d935a61af79714d730e0c4c5fdab1f62e0da5cccf055622997cfbe441e5375212aa9cd8af3b1d69af933c438c94b8d21
 SHA512 
6b400a06b4f2c2cb531095a0c3eadb112335fe0f91c2077f01c7d2dc6ea329d250e7af70f70ebeb972368aa8fa0ee9548b84b75dc877230de6dea0b10468b7fd

diff --git a/dev-util/qbs/qbs-1.10.0.ebuild b/dev-util/qbs/qbs-1.10.0.ebuild
new file mode 100644
index 000..5b93b79331c
--- /dev/null
+++ b/dev-util/qbs/qbs-1.10.0.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}
+
+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
+
+   # TestApi seems broken in 1.10.0
+   sed -i -e '/\/ d' tests/auto/auto.pro || die
+
+   # 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
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: c9bb860aca99e8fcc95642b897635230dc0cdaad
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Oct  5 19:33:33 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Oct  5 19:33:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9bb860a

dev-util/qbs: version bump

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 dev-util/qbs/Manifest |   1 +
 dev-util/qbs/qbs-1.9.1.ebuild | 115 ++
 2 files changed, 116 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 4b21db89a05..1023d1ac796 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1 +1,2 @@
 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

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 000..881b9a2b5bd
--- /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
+
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 3a3d89a3edcf82de11790e9c4b567d24312611a4
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Oct  5 19:07:42 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Oct  5 19:08:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a3d89a3

dev-util/qbs: remove old

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 dev-util/qbs/Manifest |   1 -
 dev-util/qbs/qbs-1.4.5.ebuild | 109 --
 2 files changed, 110 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index f1a3c2cb91b..4b21db89a05 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1 @@
-DIST qbs-src-1.4.5.tar.gz 825278 SHA256 
f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 
ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a
 WHIRLPOOL 
2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca
 DIST qbs-src-1.8.1.tar.gz 1053395 SHA256 
3e94460ecbd1ca43974d62a0ecf691d48866049787c465944866baf52d5b16fc SHA512 
2b4657475803e56f911f0bc373692b70f9376ed520499f1c4e7040e4dedddc417bd4e72208c925ed7fdc7fcf0b96434dab8d8f87c454ae08da80d6438dbcbc5c
 WHIRLPOOL 
1a5fa2cc7518b3b324d163224b259e7f44b91599e58ff3c9e2d52d3322d68b0fbb2b0e0ec5abee17e95a4a51a00d10a84397a49d5cf31ec37fbab4759dba7259

diff --git a/dev-util/qbs/qbs-1.4.5.ebuild b/dev-util/qbs/qbs-1.4.5.ebuild
deleted file mode 100644
index 48554c80581..000
--- a/dev-util/qbs/qbs-1.4.5.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Cross-platform build tool"
-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/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
-
-   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("java\./true||&/'`# requires jdk, fails, 
bug 585398` \
-   -e 's/!haveMakeNsis/true/'  `# requires nsis` \
-   -e 's/!haveWiX(profile)/true/'  `# requires wix` \
-   -e 's/!haveNodeJs()/true/'  `# requires nodejs, bug 
527652` \
-   tests/auto/blackbox/tst_blackbox.cpp || 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/html
-   dodoc doc/qbs.qch
-   docompress -x /usr/share/doc/${PF}/qbs.qch
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: dff3a1a5393979124fed2f90a0edebd4a1b5ad47
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Sep 16 20:59:53 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Sep 16 21:02:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff3a1a5

dev-util/qbs: remove old

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-util/qbs/Manifest|   1 -
 dev-util/qbs/qbs-1.8.0-r1.ebuild | 111 ---
 2 files changed, 112 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index ce2c4b4c21d..f1a3c2cb91b 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,2 @@
-DIST qbs-1.8.0.tar.gz 1049245 SHA256 
4721f7d4f6411f1609df34b6975bc6b1eac3ffabaccc2b273d3c14586749d697 SHA512 
500e2f6fed28327c86012c18d3eaa5b92e41046b6e98005b4d47ff16da24ccfaac0c1bf9f24b69bced2810965b7a852ae0cb9d41c77e547f114e7f88a4306af7
 WHIRLPOOL 
4b83fc428fb157e13e259611fc1048af802a7883baa27e40725c0bc9f5cf47d0120b533a4e53c0f1254483da2bbb81b9c2061dc077eb11c2f8635f6992e6c062
 DIST qbs-src-1.4.5.tar.gz 825278 SHA256 
f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 
ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a
 WHIRLPOOL 
2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca
 DIST qbs-src-1.8.1.tar.gz 1053395 SHA256 
3e94460ecbd1ca43974d62a0ecf691d48866049787c465944866baf52d5b16fc SHA512 
2b4657475803e56f911f0bc373692b70f9376ed520499f1c4e7040e4dedddc417bd4e72208c925ed7fdc7fcf0b96434dab8d8f87c454ae08da80d6438dbcbc5c
 WHIRLPOOL 
1a5fa2cc7518b3b324d163224b259e7f44b91599e58ff3c9e2d52d3322d68b0fbb2b0e0ec5abee17e95a4a51a00d10a84397a49d5cf31ec37fbab4759dba7259

diff --git a/dev-util/qbs/qbs-1.8.0-r1.ebuild b/dev-util/qbs/qbs-1.8.0-r1.ebuild
deleted file mode 100644
index ee6d9372baf..000
--- a/dev-util/qbs/qbs-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Modern build tool for software projects"
-HOMEPAGE="https://wiki.qt.io/Qbs;
-SRC_URI="https://github.com/qt-labs/${PN}/archive/v${PV}.tar.gz -> ${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 )
-"
-
-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 

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: b3d398d92eaa61b47913bdedb865da43cb795043
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Sep 16 20:58:38 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Sep 16 21:02:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3d398d9

dev-util/qbs: stabilize 1.8.1-r1 on amd64 and x86

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-util/qbs/qbs-1.8.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/qbs/qbs-1.8.1-r1.ebuild b/dev-util/qbs/qbs-1.8.1-r1.ebuild
index 434c804c9c8..4cad93eff2c 100644
--- a/dev-util/qbs/qbs-1.8.1-r1.ebuild
+++ b/dev-util/qbs/qbs-1.8.1-r1.ebuild
@@ -13,7 +13,7 @@ 
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"
+KEYWORDS="amd64 ~arm x86"
 IUSE="doc examples test"
 
 # see bug 581874 for the qttest dep in RDEPEND

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/files/, dev-util/qbs/

[Davide Pesavento]

commit: 4e752962e5bd8e0270ae8f2614e979cbcbd72624
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Aug 19 16:39:45 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Aug 19 16:39:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e752962

dev-util/qbs: backport upstream patch to install missing header

Gentoo-Bug: 625640
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../1.8.1-Install-missing-public-header.patch  |  52 +
 dev-util/qbs/qbs-1.8.1-r1.ebuild   | 120 +
 2 files changed, 172 insertions(+)

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 000..09aa6aec519
--- /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 
+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 
+---
+ 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/qbs-1.8.1-r1.ebuild b/dev-util/qbs/qbs-1.8.1-r1.ebuild
new file mode 100644
index 000..434c804c9c8
--- /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` \
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 6a31f8953e398ec6d3ac539cedb79e98419a4541
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Aug 19 16:41:26 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Aug 19 16:41:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a31f895

dev-util/qbs: remove broken 1.8.1

Gentoo-Bug: 625640
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-util/qbs/qbs-1.8.1.ebuild | 115 --
 1 file changed, 115 deletions(-)

diff --git a/dev-util/qbs/qbs-1.8.1.ebuild b/dev-util/qbs/qbs-1.8.1.ebuild
deleted file mode 100644
index 881b9a2b5bd..000
--- a/dev-util/qbs/qbs-1.8.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: b0c4d47a7779e5a7423c212fed0ec9409c4e091f
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jul 18 18:42:38 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jul 18 18:43:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0c4d47a

dev-util/qbs: remove old

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-util/qbs/Manifest |   1 -
 dev-util/qbs/qbs-1.7.0.ebuild | 111 --
 2 files changed, 112 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index b1428c751dd..ce2c4b4c21d 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,4 +1,3 @@
 DIST qbs-1.8.0.tar.gz 1049245 SHA256 
4721f7d4f6411f1609df34b6975bc6b1eac3ffabaccc2b273d3c14586749d697 SHA512 
500e2f6fed28327c86012c18d3eaa5b92e41046b6e98005b4d47ff16da24ccfaac0c1bf9f24b69bced2810965b7a852ae0cb9d41c77e547f114e7f88a4306af7
 WHIRLPOOL 
4b83fc428fb157e13e259611fc1048af802a7883baa27e40725c0bc9f5cf47d0120b533a4e53c0f1254483da2bbb81b9c2061dc077eb11c2f8635f6992e6c062
 DIST qbs-src-1.4.5.tar.gz 825278 SHA256 
f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 
ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a
 WHIRLPOOL 
2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca
-DIST qbs-src-1.7.0.tar.gz 992213 SHA256 
a7271e35f35c015f6deda3bf5b614031019018572cebb9904920f251b583c3ef SHA512 
cab913d07be30d147851c9b439cf5b292d4ef92cd0dc23ba184b4f6c476c0d94412581cff79eb7f5525cbb5b940bbe1318f292a585d591124702a1acc863087f
 WHIRLPOOL 
e107b2b2a1f233fe2fbb77ebdd31bdf6130ada26a29b4094f6d92cd6cb44039af035791db1830f65b37093529e056f7e1fb80d5b6be74f624992a6bb5ee5f7f6
 DIST qbs-src-1.8.1.tar.gz 1053395 SHA256 
3e94460ecbd1ca43974d62a0ecf691d48866049787c465944866baf52d5b16fc SHA512 
2b4657475803e56f911f0bc373692b70f9376ed520499f1c4e7040e4dedddc417bd4e72208c925ed7fdc7fcf0b96434dab8d8f87c454ae08da80d6438dbcbc5c
 WHIRLPOOL 
1a5fa2cc7518b3b324d163224b259e7f44b91599e58ff3c9e2d52d3322d68b0fbb2b0e0ec5abee17e95a4a51a00d10a84397a49d5cf31ec37fbab4759dba7259

diff --git a/dev-util/qbs/qbs-1.7.0.ebuild b/dev-util/qbs/qbs-1.7.0.ebuild
deleted file mode 100644
index 5f4b6e25c99..000
--- a/dev-util/qbs/qbs-1.7.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Cross-platform build tool"
-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
-
-   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("java\./true||&/'`# requires jdk, fails, 
bug 585398` \
-   -e 's/!haveMakeNsis/true/'  `# requires nsis` \
-   -e 's/!haveWiX(profile)/true/'  `# requires wix` \
-   -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
-}
-
-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)
-
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 81dd40d3316e9b98b7c31a74c6f18eab87b238ca
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jul 18 18:23:29 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jul 18 18:23:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81dd40d3

dev-util/qbs: version bump

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-util/qbs/Manifest |   1 +
 dev-util/qbs/qbs-1.8.1.ebuild | 115 ++
 2 files changed, 116 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 141cb8d9bc0..b1428c751dd 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,4 @@
 DIST qbs-1.8.0.tar.gz 1049245 SHA256 
4721f7d4f6411f1609df34b6975bc6b1eac3ffabaccc2b273d3c14586749d697 SHA512 
500e2f6fed28327c86012c18d3eaa5b92e41046b6e98005b4d47ff16da24ccfaac0c1bf9f24b69bced2810965b7a852ae0cb9d41c77e547f114e7f88a4306af7
 WHIRLPOOL 
4b83fc428fb157e13e259611fc1048af802a7883baa27e40725c0bc9f5cf47d0120b533a4e53c0f1254483da2bbb81b9c2061dc077eb11c2f8635f6992e6c062
 DIST qbs-src-1.4.5.tar.gz 825278 SHA256 
f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 
ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a
 WHIRLPOOL 
2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca
 DIST qbs-src-1.7.0.tar.gz 992213 SHA256 
a7271e35f35c015f6deda3bf5b614031019018572cebb9904920f251b583c3ef SHA512 
cab913d07be30d147851c9b439cf5b292d4ef92cd0dc23ba184b4f6c476c0d94412581cff79eb7f5525cbb5b940bbe1318f292a585d591124702a1acc863087f
 WHIRLPOOL 
e107b2b2a1f233fe2fbb77ebdd31bdf6130ada26a29b4094f6d92cd6cb44039af035791db1830f65b37093529e056f7e1fb80d5b6be74f624992a6bb5ee5f7f6
+DIST qbs-src-1.8.1.tar.gz 1053395 SHA256 
3e94460ecbd1ca43974d62a0ecf691d48866049787c465944866baf52d5b16fc SHA512 
2b4657475803e56f911f0bc373692b70f9376ed520499f1c4e7040e4dedddc417bd4e72208c925ed7fdc7fcf0b96434dab8d8f87c454ae08da80d6438dbcbc5c
 WHIRLPOOL 
1a5fa2cc7518b3b324d163224b259e7f44b91599e58ff3c9e2d52d3322d68b0fbb2b0e0ec5abee17e95a4a51a00d10a84397a49d5cf31ec37fbab4759dba7259

diff --git a/dev-util/qbs/qbs-1.8.1.ebuild b/dev-util/qbs/qbs-1.8.1.ebuild
new file mode 100644
index 000..881b9a2b5bd
--- /dev/null
+++ b/dev-util/qbs/qbs-1.8.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 

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 4f84411563fb37fc8d199226f99b0f19d99550a3
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat May 27 16:47:48 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat May 27 16:48:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f844115

dev-util/qbs: fix install phase with USE=doc

Thanks to Sven Eden for reporting.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-util/qbs/qbs-1.8.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/qbs/qbs-1.8.0-r1.ebuild b/dev-util/qbs/qbs-1.8.0-r1.ebuild
index d2cb3eae1ea..ee6d9372baf 100644
--- a/dev-util/qbs/qbs-1.8.0-r1.ebuild
+++ b/dev-util/qbs/qbs-1.8.0-r1.ebuild
@@ -104,7 +104,7 @@ src_install() {
# install documentation
if use doc; then
emake docs
-   dodoc -r doc/html
+   dodoc -r doc/qbs/html
dodoc doc/qbs.qch
docompress -x /usr/share/doc/${PF}/qbs.qch
fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 9eda51b648cb728c5b9a5e2d4ae2b962e670f69f
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat May 27 00:24:16 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat May 27 00:24:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eda51b6

dev-util/qbs: tentative fix for bug 618424

Gentoo-Bug: 618424
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-util/qbs/{qbs-1.8.0.ebuild => qbs-1.8.0-r1.ebuild} | 4 
 1 file changed, 4 insertions(+)

diff --git a/dev-util/qbs/qbs-1.8.0.ebuild b/dev-util/qbs/qbs-1.8.0-r1.ebuild
similarity index 92%
rename from dev-util/qbs/qbs-1.8.0.ebuild
rename to dev-util/qbs/qbs-1.8.0-r1.ebuild
index 34a26df32fd..d2cb3eae1ea 100644
--- a/dev-util/qbs/qbs-1.8.0.ebuild
+++ b/dev-util/qbs/qbs-1.8.0-r1.ebuild
@@ -35,6 +35,10 @@ DEPEND="${RDEPEND}
 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

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[David Seifert]

commit: 691a95a7ccbfd2f95346f9e16ec0cd12080dc2d6
Author: David Seifert  gentoo  org>
AuthorDate: Fri May 26 10:30:01 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri May 26 10:30:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=691a95a7

Revert "dev-util/qbs: [QA] Put 'test?' USE conditional in DEPEND"

This reverts commit 694438813f1588b11244fb6f9bb95641c78d4453.

 dev-util/qbs/qbs-1.4.5.ebuild | 8 +++-
 dev-util/qbs/qbs-1.7.0.ebuild | 8 +++-
 dev-util/qbs/qbs-1.8.0.ebuild | 6 ++
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/dev-util/qbs/qbs-1.4.5.ebuild b/dev-util/qbs/qbs-1.4.5.ebuild
index f852245f8e5..48554c80581 100644
--- a/dev-util/qbs/qbs-1.4.5.ebuild
+++ b/dev-util/qbs/qbs-1.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,16 +23,14 @@ RDEPEND="
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
-   dev-qt/qttest:5
-   )
+   test? ( dev-qt/qtdeclarative:5 )
 "
 
 S=${WORKDIR}/${MY_P}

diff --git a/dev-util/qbs/qbs-1.7.0.ebuild b/dev-util/qbs/qbs-1.7.0.ebuild
index 2213f1d68f9..5f4b6e25c99 100644
--- a/dev-util/qbs/qbs-1.7.0.ebuild
+++ b/dev-util/qbs/qbs-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,16 +24,14 @@ RDEPEND="
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
-   dev-qt/qttest:5
-   )
+   test? ( dev-qt/qtdeclarative:5 )
 "
 
 S=${WORKDIR}/${MY_P}

diff --git a/dev-util/qbs/qbs-1.8.0.ebuild b/dev-util/qbs/qbs-1.8.0.ebuild
index ea9c1209572..34a26df32fd 100644
--- a/dev-util/qbs/qbs-1.8.0.ebuild
+++ b/dev-util/qbs/qbs-1.8.0.ebuild
@@ -22,16 +22,14 @@ RDEPEND="
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
-   dev-qt/qttest:5
-   )
+   test? ( dev-qt/qtdeclarative:5 )
 "
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[David Seifert]

commit: 694438813f1588b11244fb6f9bb95641c78d4453
Author: David Seifert  gentoo  org>
AuthorDate: Fri May 26 09:45:55 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri May 26 09:45:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69443881

dev-util/qbs: [QA] Put 'test?' USE conditional in DEPEND

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-util/qbs/qbs-1.4.5.ebuild | 8 +---
 dev-util/qbs/qbs-1.7.0.ebuild | 8 +---
 dev-util/qbs/qbs-1.8.0.ebuild | 6 --
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/dev-util/qbs/qbs-1.4.5.ebuild b/dev-util/qbs/qbs-1.4.5.ebuild
index 48554c80581..f852245f8e5 100644
--- a/dev-util/qbs/qbs-1.4.5.ebuild
+++ b/dev-util/qbs/qbs-1.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,14 +23,16 @@ RDEPEND="
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 )
+   test? (
+   dev-qt/qtdeclarative:5
+   dev-qt/qttest:5
+   )
 "
 
 S=${WORKDIR}/${MY_P}

diff --git a/dev-util/qbs/qbs-1.7.0.ebuild b/dev-util/qbs/qbs-1.7.0.ebuild
index 5f4b6e25c99..2213f1d68f9 100644
--- a/dev-util/qbs/qbs-1.7.0.ebuild
+++ b/dev-util/qbs/qbs-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,14 +24,16 @@ RDEPEND="
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 )
+   test? (
+   dev-qt/qtdeclarative:5
+   dev-qt/qttest:5
+   )
 "
 
 S=${WORKDIR}/${MY_P}

diff --git a/dev-util/qbs/qbs-1.8.0.ebuild b/dev-util/qbs/qbs-1.8.0.ebuild
index 34a26df32fd..ea9c1209572 100644
--- a/dev-util/qbs/qbs-1.8.0.ebuild
+++ b/dev-util/qbs/qbs-1.8.0.ebuild
@@ -22,14 +22,16 @@ RDEPEND="
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 )
+   test? (
+   dev-qt/qtdeclarative:5
+   dev-qt/qttest:5
+   )
 "
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 95bf1f6e1221c7a74f63b8406602cb9d1be0105d
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri May 26 05:00:31 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Fri May 26 05:00:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95bf1f6e

dev-util/qbs: version bump

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-util/qbs/Manifest |   1 +
 dev-util/qbs/qbs-1.8.0.ebuild | 107 ++
 2 files changed, 108 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 8c5808a3cae..141cb8d9bc0 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1,3 @@
+DIST qbs-1.8.0.tar.gz 1049245 SHA256 
4721f7d4f6411f1609df34b6975bc6b1eac3ffabaccc2b273d3c14586749d697 SHA512 
500e2f6fed28327c86012c18d3eaa5b92e41046b6e98005b4d47ff16da24ccfaac0c1bf9f24b69bced2810965b7a852ae0cb9d41c77e547f114e7f88a4306af7
 WHIRLPOOL 
4b83fc428fb157e13e259611fc1048af802a7883baa27e40725c0bc9f5cf47d0120b533a4e53c0f1254483da2bbb81b9c2061dc077eb11c2f8635f6992e6c062
 DIST qbs-src-1.4.5.tar.gz 825278 SHA256 
f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 
ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a
 WHIRLPOOL 
2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca
 DIST qbs-src-1.7.0.tar.gz 992213 SHA256 
a7271e35f35c015f6deda3bf5b614031019018572cebb9904920f251b583c3ef SHA512 
cab913d07be30d147851c9b439cf5b292d4ef92cd0dc23ba184b4f6c476c0d94412581cff79eb7f5525cbb5b940bbe1318f292a585d591124702a1acc863087f
 WHIRLPOOL 
e107b2b2a1f233fe2fbb77ebdd31bdf6130ada26a29b4094f6d92cd6cb44039af035791db1830f65b37093529e056f7e1fb80d5b6be74f624992a6bb5ee5f7f6

diff --git a/dev-util/qbs/qbs-1.8.0.ebuild b/dev-util/qbs/qbs-1.8.0.ebuild
new file mode 100644
index 000..34a26df32fd
--- /dev/null
+++ b/dev-util/qbs/qbs-1.8.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Modern build tool for software projects"
+HOMEPAGE="https://wiki.qt.io/Qbs;
+SRC_URI="https://github.com/qt-labs/${PN}/archive/v${PV}.tar.gz -> ${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 )
+"
+
+src_prepare() {
+   default
+
+   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}"
+
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: b8aef6d2458bd490c9c79bc7d0215847bd0daf35
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Mar 14 22:32:58 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Mar 14 22:33:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8aef6d2

dev-util/qbs: remove old

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 dev-util/qbs/Manifest |   2 -
 dev-util/qbs/qbs-1.5.2.ebuild | 111 --
 dev-util/qbs/qbs-1.6.1.ebuild | 111 --
 3 files changed, 224 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 795f3b286cb..8c5808a3cae 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,4 +1,2 @@
 DIST qbs-src-1.4.5.tar.gz 825278 SHA256 
f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 
ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a
 WHIRLPOOL 
2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca
-DIST qbs-src-1.5.2.tar.gz 902972 SHA256 
059b4f64c1f599379a17bbf859dd9658fafe8cb2b65b31634974ff1c381928c1 SHA512 
80aa32a4951703bf08f217c216006b057c3c866e5f10cda687714edadb39a8316b63866a493bb947093bb55406ab38269b46bc2ce2e9e09629a68b2e57440d70
 WHIRLPOOL 
0545aef4a14f804a00287cd6aa9f5a0d9139857badfd5169f541fd9a980a78938956936ed1faaf070f00febafd54b35983af3f5e10ba2209b2c538bcb99b43b3
-DIST qbs-src-1.6.1.tar.gz 934229 SHA256 
72bbba4ac0ede177df52e44e79692752016ecd1c26b9ae86c76b0df1e18cbb10 SHA512 
6ccece4d2be457fb4a476cc134fcb997dc74d2d64b2a78ad281a618407f045562ef44257cebba05ff4cc0cfe019f6b4ba83096f2b76a7633aa78039c1dca6b7a
 WHIRLPOOL 
928085e54826bb2f7f5e74c78fb392901c73a093115f733b8682a447d39479f08294483e288d3beb77963730f065961b6b1c2fcf3c2a4dd556677d7a7cb1360d
 DIST qbs-src-1.7.0.tar.gz 992213 SHA256 
a7271e35f35c015f6deda3bf5b614031019018572cebb9904920f251b583c3ef SHA512 
cab913d07be30d147851c9b439cf5b292d4ef92cd0dc23ba184b4f6c476c0d94412581cff79eb7f5525cbb5b940bbe1318f292a585d591124702a1acc863087f
 WHIRLPOOL 
e107b2b2a1f233fe2fbb77ebdd31bdf6130ada26a29b4094f6d92cd6cb44039af035791db1830f65b37093529e056f7e1fb80d5b6be74f624992a6bb5ee5f7f6

diff --git a/dev-util/qbs/qbs-1.5.2.ebuild b/dev-util/qbs/qbs-1.5.2.ebuild
deleted file mode 100644
index 5f4b6e25c99..000
--- a/dev-util/qbs/qbs-1.5.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Cross-platform build tool"
-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
-
-   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("java\./true||&/'`# requires jdk, fails, 
bug 585398` \
-   -e 's/!haveMakeNsis/true/'  `# requires nsis` \
-   -e 's/!haveWiX(profile)/true/'  `# requires wix` \
-   -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
-}
-
-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}"
-
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: b0f451b3ce07943fbcc1893e542163480d75adb5
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Dec 17 05:05:48 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Dec 17 05:06:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0f451b3

dev-util/qbs: version bump

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-util/qbs/Manifest |   1 +
 dev-util/qbs/qbs-1.7.0.ebuild | 112 ++
 2 files changed, 113 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 1a3a5d7..795f3b2 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,4 @@
 DIST qbs-src-1.4.5.tar.gz 825278 SHA256 
f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 
ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a
 WHIRLPOOL 
2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca
 DIST qbs-src-1.5.2.tar.gz 902972 SHA256 
059b4f64c1f599379a17bbf859dd9658fafe8cb2b65b31634974ff1c381928c1 SHA512 
80aa32a4951703bf08f217c216006b057c3c866e5f10cda687714edadb39a8316b63866a493bb947093bb55406ab38269b46bc2ce2e9e09629a68b2e57440d70
 WHIRLPOOL 
0545aef4a14f804a00287cd6aa9f5a0d9139857badfd5169f541fd9a980a78938956936ed1faaf070f00febafd54b35983af3f5e10ba2209b2c538bcb99b43b3
 DIST qbs-src-1.6.1.tar.gz 934229 SHA256 
72bbba4ac0ede177df52e44e79692752016ecd1c26b9ae86c76b0df1e18cbb10 SHA512 
6ccece4d2be457fb4a476cc134fcb997dc74d2d64b2a78ad281a618407f045562ef44257cebba05ff4cc0cfe019f6b4ba83096f2b76a7633aa78039c1dca6b7a
 WHIRLPOOL 
928085e54826bb2f7f5e74c78fb392901c73a093115f733b8682a447d39479f08294483e288d3beb77963730f065961b6b1c2fcf3c2a4dd556677d7a7cb1360d
+DIST qbs-src-1.7.0.tar.gz 992213 SHA256 
a7271e35f35c015f6deda3bf5b614031019018572cebb9904920f251b583c3ef SHA512 
cab913d07be30d147851c9b439cf5b292d4ef92cd0dc23ba184b4f6c476c0d94412581cff79eb7f5525cbb5b940bbe1318f292a585d591124702a1acc863087f
 WHIRLPOOL 
e107b2b2a1f233fe2fbb77ebdd31bdf6130ada26a29b4094f6d92cd6cb44039af035791db1830f65b37093529e056f7e1fb80d5b6be74f624992a6bb5ee5f7f6

diff --git a/dev-util/qbs/qbs-1.7.0.ebuild b/dev-util/qbs/qbs-1.7.0.ebuild
new file mode 100644
index ..930b211
--- /dev/null
+++ b/dev-util/qbs/qbs-1.7.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Cross-platform build tool"
+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
+
+   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("java\./true||&/'`# requires jdk, fails, 
bug 585398` \
+   -e 's/!haveMakeNsis/true/'  `# requires nsis` \
+   -e 's/!haveWiX(profile)/true/'  `# requires wix` \
+   -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
+}
+
+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)
+
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 3da7c340a51f3a72e6b99f5e099cc8cbc1b4a599
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Nov 22 09:08:14 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Nov 22 09:08:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3da7c340

dev-util/qbs: remove old

Package-Manager: portage-2.3.2

 dev-util/qbs/Manifest |   1 -
 dev-util/qbs/qbs-1.6.0.ebuild | 114 --
 2 files changed, 115 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index cbac34d..1a3a5d7 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,4 +1,3 @@
 DIST qbs-src-1.4.5.tar.gz 825278 SHA256 
f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 
ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a
 WHIRLPOOL 
2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca
 DIST qbs-src-1.5.2.tar.gz 902972 SHA256 
059b4f64c1f599379a17bbf859dd9658fafe8cb2b65b31634974ff1c381928c1 SHA512 
80aa32a4951703bf08f217c216006b057c3c866e5f10cda687714edadb39a8316b63866a493bb947093bb55406ab38269b46bc2ce2e9e09629a68b2e57440d70
 WHIRLPOOL 
0545aef4a14f804a00287cd6aa9f5a0d9139857badfd5169f541fd9a980a78938956936ed1faaf070f00febafd54b35983af3f5e10ba2209b2c538bcb99b43b3
-DIST qbs-src-1.6.0.tar.gz 928684 SHA256 
ae850e957e4a811a193b02a067321722dd0e5fc50b7c370ec34273c1565e78ab SHA512 
20e3a0837a5503db9a150df566122b85bb74a8f4e604afd32b83464ddbb36eb4ea93de0b057f7403477f56664326f8e43bdf92d9a3a15512918e83e5c56a
 WHIRLPOOL 
cba7b95a3aa3941336f2e14f315634c8910a4f205ecf60c99ef2d75dbb69eff24209d9cad41096cb3912fa37c8d011cc6c44b5b229ece55d5cf936e898ec0a4c
 DIST qbs-src-1.6.1.tar.gz 934229 SHA256 
72bbba4ac0ede177df52e44e79692752016ecd1c26b9ae86c76b0df1e18cbb10 SHA512 
6ccece4d2be457fb4a476cc134fcb997dc74d2d64b2a78ad281a618407f045562ef44257cebba05ff4cc0cfe019f6b4ba83096f2b76a7633aa78039c1dca6b7a
 WHIRLPOOL 
928085e54826bb2f7f5e74c78fb392901c73a093115f733b8682a447d39479f08294483e288d3beb77963730f065961b6b1c2fcf3c2a4dd556677d7a7cb1360d

diff --git a/dev-util/qbs/qbs-1.6.0.ebuild b/dev-util/qbs/qbs-1.6.0.ebuild
deleted file mode 100644
index 8ef1ef8..
--- a/dev-util/qbs/qbs-1.6.0.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Cross-platform build tool"
-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"
-
-# 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
-
-   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("java\./true||&/'`# requires jdk, fails, 
bug 585398` \
-   -e 's/!haveMakeNsis/true/'  `# requires nsis` \
-   -e 's/!haveWiX(profile)/true/'  `# requires wix` \
-   -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
-}
-
-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)
-
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 8db0f32fb60f86f6d3aaa38cd4e84fe0e576f754
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 21 20:17:49 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 21 20:17:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8db0f32f

dev-util/qbs: version bump

Package-Manager: portage-2.3.2

 dev-util/qbs/Manifest |   1 +
 dev-util/qbs/qbs-1.6.1.ebuild | 112 ++
 2 files changed, 113 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 122f6c5..cbac34d 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,4 @@
 DIST qbs-src-1.4.5.tar.gz 825278 SHA256 
f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 
ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a
 WHIRLPOOL 
2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca
 DIST qbs-src-1.5.2.tar.gz 902972 SHA256 
059b4f64c1f599379a17bbf859dd9658fafe8cb2b65b31634974ff1c381928c1 SHA512 
80aa32a4951703bf08f217c216006b057c3c866e5f10cda687714edadb39a8316b63866a493bb947093bb55406ab38269b46bc2ce2e9e09629a68b2e57440d70
 WHIRLPOOL 
0545aef4a14f804a00287cd6aa9f5a0d9139857badfd5169f541fd9a980a78938956936ed1faaf070f00febafd54b35983af3f5e10ba2209b2c538bcb99b43b3
 DIST qbs-src-1.6.0.tar.gz 928684 SHA256 
ae850e957e4a811a193b02a067321722dd0e5fc50b7c370ec34273c1565e78ab SHA512 
20e3a0837a5503db9a150df566122b85bb74a8f4e604afd32b83464ddbb36eb4ea93de0b057f7403477f56664326f8e43bdf92d9a3a15512918e83e5c56a
 WHIRLPOOL 
cba7b95a3aa3941336f2e14f315634c8910a4f205ecf60c99ef2d75dbb69eff24209d9cad41096cb3912fa37c8d011cc6c44b5b229ece55d5cf936e898ec0a4c
+DIST qbs-src-1.6.1.tar.gz 934229 SHA256 
72bbba4ac0ede177df52e44e79692752016ecd1c26b9ae86c76b0df1e18cbb10 SHA512 
6ccece4d2be457fb4a476cc134fcb997dc74d2d64b2a78ad281a618407f045562ef44257cebba05ff4cc0cfe019f6b4ba83096f2b76a7633aa78039c1dca6b7a
 WHIRLPOOL 
928085e54826bb2f7f5e74c78fb392901c73a093115f733b8682a447d39479f08294483e288d3beb77963730f065961b6b1c2fcf3c2a4dd556677d7a7cb1360d

diff --git a/dev-util/qbs/qbs-1.6.1.ebuild b/dev-util/qbs/qbs-1.6.1.ebuild
new file mode 100644
index ..930b211
--- /dev/null
+++ b/dev-util/qbs/qbs-1.6.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Cross-platform build tool"
+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
+
+   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("java\./true||&/'`# requires jdk, fails, 
bug 585398` \
+   -e 's/!haveMakeNsis/true/'  `# requires nsis` \
+   -e 's/!haveWiX(profile)/true/'  `# requires wix` \
+   -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
+}
+
+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 

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 62df0481ab364d6f7ad0e2a5731851c380458a08
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Sep 11 11:37:57 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Sep 11 11:43:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62df0481

dev-util/qbs: version bump

Package-Manager: portage-2.3.0

 dev-util/qbs/Manifest |   1 +
 dev-util/qbs/qbs-1.6.0.ebuild | 114 ++
 2 files changed, 115 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 506d597..122f6c5 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1,3 @@
 DIST qbs-src-1.4.5.tar.gz 825278 SHA256 
f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 
ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a
 WHIRLPOOL 
2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca
 DIST qbs-src-1.5.2.tar.gz 902972 SHA256 
059b4f64c1f599379a17bbf859dd9658fafe8cb2b65b31634974ff1c381928c1 SHA512 
80aa32a4951703bf08f217c216006b057c3c866e5f10cda687714edadb39a8316b63866a493bb947093bb55406ab38269b46bc2ce2e9e09629a68b2e57440d70
 WHIRLPOOL 
0545aef4a14f804a00287cd6aa9f5a0d9139857badfd5169f541fd9a980a78938956936ed1faaf070f00febafd54b35983af3f5e10ba2209b2c538bcb99b43b3
+DIST qbs-src-1.6.0.tar.gz 928684 SHA256 
ae850e957e4a811a193b02a067321722dd0e5fc50b7c370ec34273c1565e78ab SHA512 
20e3a0837a5503db9a150df566122b85bb74a8f4e604afd32b83464ddbb36eb4ea93de0b057f7403477f56664326f8e43bdf92d9a3a15512918e83e5c56a
 WHIRLPOOL 
cba7b95a3aa3941336f2e14f315634c8910a4f205ecf60c99ef2d75dbb69eff24209d9cad41096cb3912fa37c8d011cc6c44b5b229ece55d5cf936e898ec0a4c

diff --git a/dev-util/qbs/qbs-1.6.0.ebuild b/dev-util/qbs/qbs-1.6.0.ebuild
new file mode 100644
index ..8ef1ef8
--- /dev/null
+++ b/dev-util/qbs/qbs-1.6.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Cross-platform build tool"
+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"
+
+# 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
+
+   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("java\./true||&/'`# requires jdk, fails, 
bug 585398` \
+   -e 's/!haveMakeNsis/true/'  `# requires nsis` \
+   -e 's/!haveWiX(profile)/true/'  `# requires wix` \
+   -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
+}
+
+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
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 1c44304a1d8b8def8c69031c2bb98409770d417e
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Jul  9 13:59:59 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Jul  9 14:06:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c44304a

dev-util/qbs: version bump

Package-Manager: portage-2.3.0

 dev-util/qbs/Manifest   | 2 +-
 dev-util/qbs/{qbs-1.5.1.ebuild => qbs-1.5.2.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 83b827a..506d597 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1,2 @@
 DIST qbs-src-1.4.5.tar.gz 825278 SHA256 
f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 
ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a
 WHIRLPOOL 
2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca
-DIST qbs-src-1.5.1.tar.gz 900544 SHA256 
ac6b9cf56d19245c9c1e0f6b1bf5b36f8194838faf2b4a7d9dbe85373bdbeabe SHA512 
54bd80169c8b66476acfd73611e029ed6fc19b668456c8c8ee8f76bd229e9b40b81cd5f10ab3db6a7e520673029b5167c45a47d649700058cf1f3e819b5ba305
 WHIRLPOOL 
f660ba58253d273fb0320707c1ae55c96c1435ab0ef62dca90668026c2eb6200110d6aeafe65867a9236eb76f6d6e3976c95ac8663a97f7cd79aae66c480f3b1
+DIST qbs-src-1.5.2.tar.gz 902972 SHA256 
059b4f64c1f599379a17bbf859dd9658fafe8cb2b65b31634974ff1c381928c1 SHA512 
80aa32a4951703bf08f217c216006b057c3c866e5f10cda687714edadb39a8316b63866a493bb947093bb55406ab38269b46bc2ce2e9e09629a68b2e57440d70
 WHIRLPOOL 
0545aef4a14f804a00287cd6aa9f5a0d9139857badfd5169f541fd9a980a78938956936ed1faaf070f00febafd54b35983af3f5e10ba2209b2c538bcb99b43b3

diff --git a/dev-util/qbs/qbs-1.5.1.ebuild b/dev-util/qbs/qbs-1.5.2.ebuild
similarity index 100%
rename from dev-util/qbs/qbs-1.5.1.ebuild
rename to dev-util/qbs/qbs-1.5.2.ebuild

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 4a677bebaa2420e10fc5ec725e65542d9c21a491
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Jun 16 15:03:04 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Jun 16 15:03:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a677beb

dev-util/qbs: remove old

Package-Manager: portage-2.3.0_rc1

 dev-util/qbs/Manifest |   1 -
 dev-util/qbs/qbs-1.4.2.ebuild | 103 --
 2 files changed, 104 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 97f3408..83b827a 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,2 @@
-DIST qbs-src-1.4.2.tar.gz 821001 SHA256 
b9d36118c3ae0f7d4df6bf7239a0a0163c0340b701d00191fa5f832cef341ce5 SHA512 
dc4514f28843d159b695e4da2b94619da91656b57ba839fa62901cd3a48309ffd3a3b5203b7ae1c5f35cab515a6149017fd43093ae9395846b3e46b2f53b93ec
 WHIRLPOOL 
0431823cc54dd7a372473e76d8269207cf439a5ba27d3c099df63a19d222067a41a62299415cae9c9798e5bf5ebf38c27dffa8f23135675a564f51047cecfc67
 DIST qbs-src-1.4.5.tar.gz 825278 SHA256 
f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 
ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a
 WHIRLPOOL 
2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca
 DIST qbs-src-1.5.1.tar.gz 900544 SHA256 
ac6b9cf56d19245c9c1e0f6b1bf5b36f8194838faf2b4a7d9dbe85373bdbeabe SHA512 
54bd80169c8b66476acfd73611e029ed6fc19b668456c8c8ee8f76bd229e9b40b81cd5f10ab3db6a7e520673029b5167c45a47d649700058cf1f3e819b5ba305
 WHIRLPOOL 
f660ba58253d273fb0320707c1ae55c96c1435ab0ef62dca90668026c2eb6200110d6aeafe65867a9236eb76f6d6e3976c95ac8663a97f7cd79aae66c480f3b1

diff --git a/dev-util/qbs/qbs-1.4.2.ebuild b/dev-util/qbs/qbs-1.4.2.ebuild
deleted file mode 100644
index dfdc928..000
--- a/dev-util/qbs/qbs-1.4.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Qt Build Suite"
-HOMEPAGE="http://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"
-
-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
-   )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-   # 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
-   $(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 "${EROOT}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=${S}/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/html
-   dodoc doc/qbs.qch
-   docompress -x /usr/share/doc/${PF}/qbs.qch
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Michael Palimaka]

commit: 0c160377ac218eff55adadb13a4e5ada519a94d3
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Jun 16 13:56:59 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Jun 16 13:57:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c160377

dev-util/qbs: amd64/x86 stable

Gentoo-bug: 581874

Package-Manager: portage-2.3.0_rc1

 dev-util/qbs/qbs-1.4.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/qbs/qbs-1.4.5.ebuild b/dev-util/qbs/qbs-1.4.5.ebuild
index 455a86e..e5c0088 100644
--- a/dev-util/qbs/qbs-1.4.5.ebuild
+++ b/dev-util/qbs/qbs-1.4.5.ebuild
@@ -14,7 +14,7 @@ 
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"
+KEYWORDS="amd64 ~arm x86"
 IUSE="doc examples test"
 
 # see bug 581874 for the qttest dep in RDEPEND

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: d513a36c3b3326f5000d9fb29cfde820b42564d4
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Jun 16 11:26:57 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Jun 16 11:26:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d513a36c

dev-util/qbs: revert previous commit, it's not correct and was never authorized

This reverts commit b73d0a35d4b73d0a32a45bfdd6b9167445c05219.

 dev-util/qbs/qbs-1.4.5.ebuild | 4 ++--
 dev-util/qbs/qbs-1.5.1.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-util/qbs/qbs-1.4.5.ebuild b/dev-util/qbs/qbs-1.4.5.ebuild
index 3883f3b..455a86e 100644
--- a/dev-util/qbs/qbs-1.4.5.ebuild
+++ b/dev-util/qbs/qbs-1.4.5.ebuild
@@ -24,14 +24,14 @@ RDEPEND="
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
-   dev-qt/qttest:5 )
+   test? ( dev-qt/qtdeclarative:5 )
 "
 
 S=${WORKDIR}/${MY_P}

diff --git a/dev-util/qbs/qbs-1.5.1.ebuild b/dev-util/qbs/qbs-1.5.1.ebuild
index a83dce5..930b211 100644
--- a/dev-util/qbs/qbs-1.5.1.ebuild
+++ b/dev-util/qbs/qbs-1.5.1.ebuild
@@ -25,14 +25,14 @@ RDEPEND="
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
-   dev-qt/qttest:5 )
+   test? ( dev-qt/qtdeclarative:5 )
 "
 
 S=${WORKDIR}/${MY_P}

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Patrick Lauer]

commit: b73d0a35d4b73d0a32a45bfdd6b9167445c05219
Author: Patrick Lauer  gentoo  org>
AuthorDate: Thu Jun 16 06:06:47 2016 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Thu Jun 16 06:06:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b73d0a35

dev-util/qbs: Fix dependencies

Package-Manager: portage-2.3.0_rc1

 dev-util/qbs/qbs-1.4.5.ebuild | 4 ++--
 dev-util/qbs/qbs-1.5.1.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-util/qbs/qbs-1.4.5.ebuild b/dev-util/qbs/qbs-1.4.5.ebuild
index 455a86e..3883f3b 100644
--- a/dev-util/qbs/qbs-1.4.5.ebuild
+++ b/dev-util/qbs/qbs-1.4.5.ebuild
@@ -24,14 +24,14 @@ RDEPEND="
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 )
+   test? ( dev-qt/qtdeclarative:5
+   dev-qt/qttest:5 )
 "
 
 S=${WORKDIR}/${MY_P}

diff --git a/dev-util/qbs/qbs-1.5.1.ebuild b/dev-util/qbs/qbs-1.5.1.ebuild
index 930b211..a83dce5 100644
--- a/dev-util/qbs/qbs-1.5.1.ebuild
+++ b/dev-util/qbs/qbs-1.5.1.ebuild
@@ -25,14 +25,14 @@ RDEPEND="
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 )
+   test? ( dev-qt/qtdeclarative:5
+   dev-qt/qttest:5 )
 "
 
 S=${WORKDIR}/${MY_P}

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 1ffe27368ea16216067b7a4f92c82e57d6baff10
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Jun 16 00:56:59 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Jun 16 00:56:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ffe2736

dev-util/qbs: qttest is also an RDEPEND when building with USE=test

https://bugs.gentoo.org/show_bug.cgi?id=581874

Package-Manager: portage-2.3.0_rc1

 dev-util/qbs/qbs-1.4.5.ebuild | 7 +++
 dev-util/qbs/qbs-1.5.1.ebuild | 7 +++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/dev-util/qbs/qbs-1.4.5.ebuild b/dev-util/qbs/qbs-1.4.5.ebuild
index 48dd8e1..455a86e 100644
--- a/dev-util/qbs/qbs-1.4.5.ebuild
+++ b/dev-util/qbs/qbs-1.4.5.ebuild
@@ -17,22 +17,21 @@ 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/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
-   dev-qt/qttest:5
-   )
+   test? ( dev-qt/qtdeclarative:5 )
 "
 
 S=${WORKDIR}/${MY_P}

diff --git a/dev-util/qbs/qbs-1.5.1.ebuild b/dev-util/qbs/qbs-1.5.1.ebuild
index c5c4488..930b211 100644
--- a/dev-util/qbs/qbs-1.5.1.ebuild
+++ b/dev-util/qbs/qbs-1.5.1.ebuild
@@ -17,6 +17,7 @@ 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
@@ -24,16 +25,14 @@ RDEPEND="
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
-   dev-qt/qttest:5
-   )
+   test? ( dev-qt/qtdeclarative:5 )
 "
 
 S=${WORKDIR}/${MY_P}

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 855d6ced9b2c4eb84ec2b2db0742b111a7a3ff3a
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Jun 10 01:44:40 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Fri Jun 10 01:45:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=855d6ced

dev-util/qbs: expand metadata

Package-Manager: portage-2.3.0_rc1

 dev-util/qbs/metadata.xml | 30 ++
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/dev-util/qbs/metadata.xml b/dev-util/qbs/metadata.xml
index c6a1777..eb2faf7 100644
--- a/dev-util/qbs/metadata.xml
+++ b/dev-util/qbs/metadata.xml
@@ -1,12 +1,26 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   p...@gentoo.org
-   Davide Pesavento
-
-
-   q...@gentoo.org
-   Gentoo Qt Project
-
+   
+   p...@gentoo.org
+   Davide Pesavento
+   
+   
+   q...@gentoo.org
+   Gentoo Qt Project
+   
+   
+   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).
+   
+   
+   https://bugreports.qt.io/
+   http://doc.qt.io/qbs/
+   
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: b702c020c0bc03268469db9c0f332cf3be262e83
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Jun 10 01:10:50 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Fri Jun 10 01:44:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b702c020

dev-util/qbs: update DESCRIPTION; use https in HOMEPAGE

Package-Manager: portage-2.3.0_rc1

 dev-util/qbs/qbs-1.4.5.ebuild | 4 ++--
 dev-util/qbs/qbs-1.5.1.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-util/qbs/qbs-1.4.5.ebuild b/dev-util/qbs/qbs-1.4.5.ebuild
index f789f54..48dd8e1 100644
--- a/dev-util/qbs/qbs-1.4.5.ebuild
+++ b/dev-util/qbs/qbs-1.4.5.ebuild
@@ -8,8 +8,8 @@ inherit qmake-utils
 
 MY_P=${PN}-src-${PV}
 
-DESCRIPTION="Qt Build Suite"
-HOMEPAGE="http://wiki.qt.io/Qbs;
+DESCRIPTION="Cross-platform build tool"
+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 )"

diff --git a/dev-util/qbs/qbs-1.5.1.ebuild b/dev-util/qbs/qbs-1.5.1.ebuild
index 0f9c5e4..c5c4488 100644
--- a/dev-util/qbs/qbs-1.5.1.ebuild
+++ b/dev-util/qbs/qbs-1.5.1.ebuild
@@ -8,8 +8,8 @@ inherit qmake-utils
 
 MY_P=${PN}-src-${PV}
 
-DESCRIPTION="Qt Build Suite"
-HOMEPAGE="http://wiki.qt.io/Qbs;
+DESCRIPTION="Cross-platform build tool"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: fd00b08db60014a148bf2884b5ca8665b05e91bf
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Jun 10 00:45:01 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Fri Jun 10 00:54:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd00b08d

dev-util/qbs: version bump

Package-Manager: portage-2.3.0_rc1

 dev-util/qbs/Manifest   | 2 +-
 dev-util/qbs/{qbs-1.5.0.ebuild => qbs-1.5.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index b673f7f..97f3408 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,3 @@
 DIST qbs-src-1.4.2.tar.gz 821001 SHA256 
b9d36118c3ae0f7d4df6bf7239a0a0163c0340b701d00191fa5f832cef341ce5 SHA512 
dc4514f28843d159b695e4da2b94619da91656b57ba839fa62901cd3a48309ffd3a3b5203b7ae1c5f35cab515a6149017fd43093ae9395846b3e46b2f53b93ec
 WHIRLPOOL 
0431823cc54dd7a372473e76d8269207cf439a5ba27d3c099df63a19d222067a41a62299415cae9c9798e5bf5ebf38c27dffa8f23135675a564f51047cecfc67
 DIST qbs-src-1.4.5.tar.gz 825278 SHA256 
f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 
ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a
 WHIRLPOOL 
2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca
-DIST qbs-src-1.5.0.tar.gz 897221 SHA256 
541106d3e53429c5375a58f395413b3cd5a026d91a304a10f36d78b5e39d9085 SHA512 
26aa00bbe29e6455a13acbb606f735e3fa7fb867d4d81bb216f6929e87ebfba3e00565883f8a5e05c76c5836a8575eccc75582038e30ca1f94c005beb3baeb41
 WHIRLPOOL 
b109dc220a58ea3767be5a43d073e9ca772f4ce0eef06178613e1d173c979aa9d142186e9ed774dd5312d576dc2be9f33e614494bd292f1f417dba44e9fd854e
+DIST qbs-src-1.5.1.tar.gz 900544 SHA256 
ac6b9cf56d19245c9c1e0f6b1bf5b36f8194838faf2b4a7d9dbe85373bdbeabe SHA512 
54bd80169c8b66476acfd73611e029ed6fc19b668456c8c8ee8f76bd229e9b40b81cd5f10ab3db6a7e520673029b5167c45a47d649700058cf1f3e819b5ba305
 WHIRLPOOL 
f660ba58253d273fb0320707c1ae55c96c1435ab0ef62dca90668026c2eb6200110d6aeafe65867a9236eb76f6d6e3976c95ac8663a97f7cd79aae66c480f3b1

diff --git a/dev-util/qbs/qbs-1.5.0.ebuild b/dev-util/qbs/qbs-1.5.1.ebuild
similarity index 100%
rename from dev-util/qbs/qbs-1.5.0.ebuild
rename to dev-util/qbs/qbs-1.5.1.ebuild

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: af8bbe837be84424051c66815370eb411ba231c4
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Jun 10 00:36:34 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Fri Jun 10 00:54:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af8bbe83

dev-util/qbs: make sure we skip all tests that have automagic deps

...to avoid spurious failures.

Gentoo-Bug: 585398

Package-Manager: portage-2.3.0_rc1

 dev-util/qbs/qbs-1.4.5.ebuild | 18 --
 dev-util/qbs/qbs-1.5.0.ebuild | 13 -
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/dev-util/qbs/qbs-1.4.5.ebuild b/dev-util/qbs/qbs-1.4.5.ebuild
index bdbca00..f789f54 100644
--- a/dev-util/qbs/qbs-1.4.5.ebuild
+++ b/dev-util/qbs/qbs-1.4.5.ebuild
@@ -40,10 +40,6 @@ S=${WORKDIR}/${MY_P}
 src_prepare() {
default
 
-   # 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
@@ -53,6 +49,16 @@ src_prepare() {
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("java\./true||&/'`# requires jdk, fails, 
bug 585398` \
+   -e 's/!haveMakeNsis/true/'  `# requires nsis` \
+   -e 's/!haveWiX(profile)/true/'  `# requires wix` \
+   -e 's/!haveNodeJs()/true/'  `# requires nodejs, bug 
527652` \
+   tests/auto/blackbox/tst_blackbox.cpp || die
 }
 
 src_configure() {
@@ -74,14 +80,14 @@ src_test() {
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-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=${S}/gentoo-testrunner
+   local testrunner=${WORKDIR}/gentoo-testrunner
cat <<-EOF > "${testrunner}"
#!/bin/sh
export 
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"

diff --git a/dev-util/qbs/qbs-1.5.0.ebuild b/dev-util/qbs/qbs-1.5.0.ebuild
index 9913d03..0f9c5e4 100644
--- a/dev-util/qbs/qbs-1.5.0.ebuild
+++ b/dev-util/qbs/qbs-1.5.0.ebuild
@@ -50,6 +50,17 @@ src_prepare() {
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("java\./true||&/'`# requires jdk, fails, 
bug 585398` \
+   -e 's/!haveMakeNsis/true/'  `# requires nsis` \
+   -e 's/!haveWiX(profile)/true/'  `# requires wix` \
+   -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
 }
 
 src_configure() {
@@ -78,7 +89,7 @@ src_test() {
 
# simply exporting LD_LIBRARY_PATH doesn't work
# we have to use a custom testrunner script
-   local testrunner=${S}/gentoo-testrunner
+   local testrunner=${WORKDIR}/gentoo-testrunner
cat <<-EOF > "${testrunner}"
#!/bin/sh
export 
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 805b8a1aa1d4c0dda85af193b75fb197691c9bf2
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu May 12 17:38:31 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu May 12 17:38:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=805b8a1a

dev-util/qbs: version bump

Package-Manager: portage-2.2.28

 dev-util/qbs/Manifest |   1 +
 dev-util/qbs/qbs-1.5.0.ebuild | 102 ++
 2 files changed, 103 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 92cf5c9..b673f7f 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1,3 @@
 DIST qbs-src-1.4.2.tar.gz 821001 SHA256 
b9d36118c3ae0f7d4df6bf7239a0a0163c0340b701d00191fa5f832cef341ce5 SHA512 
dc4514f28843d159b695e4da2b94619da91656b57ba839fa62901cd3a48309ffd3a3b5203b7ae1c5f35cab515a6149017fd43093ae9395846b3e46b2f53b93ec
 WHIRLPOOL 
0431823cc54dd7a372473e76d8269207cf439a5ba27d3c099df63a19d222067a41a62299415cae9c9798e5bf5ebf38c27dffa8f23135675a564f51047cecfc67
 DIST qbs-src-1.4.5.tar.gz 825278 SHA256 
f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 
ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a
 WHIRLPOOL 
2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca
+DIST qbs-src-1.5.0.tar.gz 897221 SHA256 
541106d3e53429c5375a58f395413b3cd5a026d91a304a10f36d78b5e39d9085 SHA512 
26aa00bbe29e6455a13acbb606f735e3fa7fb867d4d81bb216f6929e87ebfba3e00565883f8a5e05c76c5836a8575eccc75582038e30ca1f94c005beb3baeb41
 WHIRLPOOL 
b109dc220a58ea3767be5a43d073e9ca772f4ce0eef06178613e1d173c979aa9d142186e9ed774dd5312d576dc2be9f33e614494bd292f1f417dba44e9fd854e

diff --git a/dev-util/qbs/qbs-1.5.0.ebuild b/dev-util/qbs/qbs-1.5.0.ebuild
new file mode 100644
index 000..9913d03
--- /dev/null
+++ b/dev-util/qbs/qbs-1.5.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Qt Build Suite"
+HOMEPAGE="http://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"
+
+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
+"
+DEPEND="${RDEPEND}
+   doc? (
+   dev-qt/qdoc:5
+   dev-qt/qthelp:5
+   )
+   test? (
+   dev-qt/qtdeclarative:5
+   dev-qt/qttest:5
+   )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+   default
+
+   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
+   $(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=${S}/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/html
+   dodoc doc/qbs.qch
+   docompress -x /usr/share/doc/${PF}/qbs.qch
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 66af71ae24b0aac7cffa180435f66de84848a1ce
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu May 12 14:12:08 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu May 12 14:13:13 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66af71ae

dev-util/qbs: add myself as primary maintainer

Package-Manager: portage-2.2.28

 dev-util/qbs/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/dev-util/qbs/metadata.xml b/dev-util/qbs/metadata.xml
index 32fe129..c6a1777 100644
--- a/dev-util/qbs/metadata.xml
+++ b/dev-util/qbs/metadata.xml
@@ -1,6 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+
+   p...@gentoo.org
+   Davide Pesavento
+
 
q...@gentoo.org
Gentoo Qt Project

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 4b0fa7678798ebf31e81bafa346f336caced47a7
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu May 12 14:12:44 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu May 12 14:13:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b0fa767

dev-util/qbs: remove old

Package-Manager: portage-2.2.28

 dev-util/qbs/Manifest |   1 -
 dev-util/qbs/qbs-1.4.3.ebuild | 103 --
 2 files changed, 104 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 8ded9a5..92cf5c9 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,2 @@
 DIST qbs-src-1.4.2.tar.gz 821001 SHA256 
b9d36118c3ae0f7d4df6bf7239a0a0163c0340b701d00191fa5f832cef341ce5 SHA512 
dc4514f28843d159b695e4da2b94619da91656b57ba839fa62901cd3a48309ffd3a3b5203b7ae1c5f35cab515a6149017fd43093ae9395846b3e46b2f53b93ec
 WHIRLPOOL 
0431823cc54dd7a372473e76d8269207cf439a5ba27d3c099df63a19d222067a41a62299415cae9c9798e5bf5ebf38c27dffa8f23135675a564f51047cecfc67
-DIST qbs-src-1.4.3.tar.gz 822899 SHA256 
0c47291ac578c1fc8f2bd6ab20fbeeb58630c4c6ddc085f6081ae570f825f787 SHA512 
b3c080a125cea39bebba3f5894ed603215dbfc0cf18edd2873eee873438b025acd1a1dcd5ab4db04681bf05ee710dc0827dff7789faac138011da788347bec6a
 WHIRLPOOL 
5151b534965009ac7ca8dc1f0cd38a349f131000bf4108d22c0e47a95957dbcebc0dc8759116cc43bc0c650b43513a489470546fdfa15d29ea5fba4130b5ca78
 DIST qbs-src-1.4.5.tar.gz 825278 SHA256 
f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 
ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a
 WHIRLPOOL 
2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca

diff --git a/dev-util/qbs/qbs-1.4.3.ebuild b/dev-util/qbs/qbs-1.4.3.ebuild
deleted file mode 100644
index b44324b..000
--- a/dev-util/qbs/qbs-1.4.3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Qt Build Suite"
-HOMEPAGE="http://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"
-
-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
-   )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-   # 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
-   $(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 "${EROOT}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=${S}/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/html
-   dodoc doc/qbs.qch
-   docompress -x /usr/share/doc/${PF}/qbs.qch
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 2da750f827b73e723988ed7766e8529165218a75
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Apr  2 18:09:24 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Apr  2 18:40:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2da750f8

dev-util/qbs: version bump

Package-Manager: portage-2.2.28

 dev-util/qbs/Manifest   | 2 +-
 dev-util/qbs/{qbs-1.4.4.ebuild => qbs-1.4.5.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index aa50bf4..8ded9a5 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,3 @@
 DIST qbs-src-1.4.2.tar.gz 821001 SHA256 
b9d36118c3ae0f7d4df6bf7239a0a0163c0340b701d00191fa5f832cef341ce5 SHA512 
dc4514f28843d159b695e4da2b94619da91656b57ba839fa62901cd3a48309ffd3a3b5203b7ae1c5f35cab515a6149017fd43093ae9395846b3e46b2f53b93ec
 WHIRLPOOL 
0431823cc54dd7a372473e76d8269207cf439a5ba27d3c099df63a19d222067a41a62299415cae9c9798e5bf5ebf38c27dffa8f23135675a564f51047cecfc67
 DIST qbs-src-1.4.3.tar.gz 822899 SHA256 
0c47291ac578c1fc8f2bd6ab20fbeeb58630c4c6ddc085f6081ae570f825f787 SHA512 
b3c080a125cea39bebba3f5894ed603215dbfc0cf18edd2873eee873438b025acd1a1dcd5ab4db04681bf05ee710dc0827dff7789faac138011da788347bec6a
 WHIRLPOOL 
5151b534965009ac7ca8dc1f0cd38a349f131000bf4108d22c0e47a95957dbcebc0dc8759116cc43bc0c650b43513a489470546fdfa15d29ea5fba4130b5ca78
-DIST qbs-src-1.4.4.tar.gz 823756 SHA256 
23fb37bfbe775907a2593f716b17151f25995ec37cd5bedabaf266781078b404 SHA512 
62c818fade7b6b556206c89201962e0c37590f972ff65d8656a2c293639dac9297c0100164584973e89d187904319d59b77699a85748784dca65a4fa27d339a6
 WHIRLPOOL 
4896c314ee76e7bdd3b97104b2f60665f25f064f679be4e2c2605d2785d1f4418cb9c44f9fa6612c6faef87616453c4ef03747098d2fd8ce1c80cdb9ea731a18
+DIST qbs-src-1.4.5.tar.gz 825278 SHA256 
f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 
ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a
 WHIRLPOOL 
2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca

diff --git a/dev-util/qbs/qbs-1.4.4.ebuild b/dev-util/qbs/qbs-1.4.5.ebuild
similarity index 98%
rename from dev-util/qbs/qbs-1.4.4.ebuild
rename to dev-util/qbs/qbs-1.4.5.ebuild
index 908ac26..bdbca00 100644
--- a/dev-util/qbs/qbs-1.4.4.ebuild
+++ b/dev-util/qbs/qbs-1.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: 2b2b12fe12460bb116f3648bdc42e24c54d58adb
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Dec 17 02:06:32 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Dec 17 02:34:39 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b2b12fe

dev-util/qbs: version bump, EAPI=6

Package-Manager: portage-2.2.26

 dev-util/qbs/Manifest |   1 +
 dev-util/qbs/qbs-1.4.4.ebuild | 105 ++
 2 files changed, 106 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 751949a..aa50bf4 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1,3 @@
 DIST qbs-src-1.4.2.tar.gz 821001 SHA256 
b9d36118c3ae0f7d4df6bf7239a0a0163c0340b701d00191fa5f832cef341ce5 SHA512 
dc4514f28843d159b695e4da2b94619da91656b57ba839fa62901cd3a48309ffd3a3b5203b7ae1c5f35cab515a6149017fd43093ae9395846b3e46b2f53b93ec
 WHIRLPOOL 
0431823cc54dd7a372473e76d8269207cf439a5ba27d3c099df63a19d222067a41a62299415cae9c9798e5bf5ebf38c27dffa8f23135675a564f51047cecfc67
 DIST qbs-src-1.4.3.tar.gz 822899 SHA256 
0c47291ac578c1fc8f2bd6ab20fbeeb58630c4c6ddc085f6081ae570f825f787 SHA512 
b3c080a125cea39bebba3f5894ed603215dbfc0cf18edd2873eee873438b025acd1a1dcd5ab4db04681bf05ee710dc0827dff7789faac138011da788347bec6a
 WHIRLPOOL 
5151b534965009ac7ca8dc1f0cd38a349f131000bf4108d22c0e47a95957dbcebc0dc8759116cc43bc0c650b43513a489470546fdfa15d29ea5fba4130b5ca78
+DIST qbs-src-1.4.4.tar.gz 823756 SHA256 
23fb37bfbe775907a2593f716b17151f25995ec37cd5bedabaf266781078b404 SHA512 
62c818fade7b6b556206c89201962e0c37590f972ff65d8656a2c293639dac9297c0100164584973e89d187904319d59b77699a85748784dca65a4fa27d339a6
 WHIRLPOOL 
4896c314ee76e7bdd3b97104b2f60665f25f064f679be4e2c2605d2785d1f4418cb9c44f9fa6612c6faef87616453c4ef03747098d2fd8ce1c80cdb9ea731a18

diff --git a/dev-util/qbs/qbs-1.4.4.ebuild b/dev-util/qbs/qbs-1.4.4.ebuild
new file mode 100644
index 000..908ac26
--- /dev/null
+++ b/dev-util/qbs/qbs-1.4.4.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Qt Build Suite"
+HOMEPAGE="http://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"
+
+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
+   )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+   default
+
+   # 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
+   $(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 "${EROOT}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=${S}/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/html
+   dodoc doc/qbs.qch
+   docompress -x /usr/share/doc/${PF}/qbs.qch
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: d42403b40cdce281e656968347b8eae152f87016
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Nov 20 00:04:31 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Fri Nov 20 00:04:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d42403b4

dev-util/qbs: version bump

Package-Manager: portage-2.2.25

 dev-util/qbs/Manifest |   1 +
 dev-util/qbs/qbs-1.4.3.ebuild | 103 ++
 2 files changed, 104 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 4aa9dcc..751949a 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1 +1,2 @@
 DIST qbs-src-1.4.2.tar.gz 821001 SHA256 
b9d36118c3ae0f7d4df6bf7239a0a0163c0340b701d00191fa5f832cef341ce5 SHA512 
dc4514f28843d159b695e4da2b94619da91656b57ba839fa62901cd3a48309ffd3a3b5203b7ae1c5f35cab515a6149017fd43093ae9395846b3e46b2f53b93ec
 WHIRLPOOL 
0431823cc54dd7a372473e76d8269207cf439a5ba27d3c099df63a19d222067a41a62299415cae9c9798e5bf5ebf38c27dffa8f23135675a564f51047cecfc67
+DIST qbs-src-1.4.3.tar.gz 822899 SHA256 
0c47291ac578c1fc8f2bd6ab20fbeeb58630c4c6ddc085f6081ae570f825f787 SHA512 
b3c080a125cea39bebba3f5894ed603215dbfc0cf18edd2873eee873438b025acd1a1dcd5ab4db04681bf05ee710dc0827dff7789faac138011da788347bec6a
 WHIRLPOOL 
5151b534965009ac7ca8dc1f0cd38a349f131000bf4108d22c0e47a95957dbcebc0dc8759116cc43bc0c650b43513a489470546fdfa15d29ea5fba4130b5ca78

diff --git a/dev-util/qbs/qbs-1.4.3.ebuild b/dev-util/qbs/qbs-1.4.3.ebuild
new file mode 100644
index 000..b44324b
--- /dev/null
+++ b/dev-util/qbs/qbs-1.4.3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Qt Build Suite"
+HOMEPAGE="http://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"
+
+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
+   )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+   # 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
+   $(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 "${EROOT}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=${S}/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/html
+   dodoc doc/qbs.qch
+   docompress -x /usr/share/doc/${PF}/qbs.qch
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: c14bb44349966a4c6e9c4d8cedbfdfec24d76f68
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Oct 17 16:42:50 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Oct 18 01:48:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c14bb443

dev-util/qbs: remove old

Package-Manager: portage-2.2.23

 dev-util/qbs/Manifest |   1 -
 dev-util/qbs/qbs-1.4.1.ebuild | 113 --
 2 files changed, 114 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index e5a35f1..4aa9dcc 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1 @@
-DIST qbs-src-1.4.1.tar.gz 802383 SHA256 
eea8e0c1b2ef71f295fa5f1798a04a9f0509a701094fec11a691a4d7ae0155a9 SHA512 
8fd48d27a2599c617ba19494e2716451c38253c964c24fc9685b5e31e75073f2606fb554400af57eab6b2e4e69e04e479dc8cfdf771eeeaf1068e3293ba691b2
 WHIRLPOOL 
f4236866683e378827faae9c30e9fdf35d061804ee69069280cb4da220dd83c1a740186920ec108d708fdb63d08a511364a658fcd8a25d893478e9b5f08e0b7a
 DIST qbs-src-1.4.2.tar.gz 821001 SHA256 
b9d36118c3ae0f7d4df6bf7239a0a0163c0340b701d00191fa5f832cef341ce5 SHA512 
dc4514f28843d159b695e4da2b94619da91656b57ba839fa62901cd3a48309ffd3a3b5203b7ae1c5f35cab515a6149017fd43093ae9395846b3e46b2f53b93ec
 WHIRLPOOL 
0431823cc54dd7a372473e76d8269207cf439a5ba27d3c099df63a19d222067a41a62299415cae9c9798e5bf5ebf38c27dffa8f23135675a564f51047cecfc67

diff --git a/dev-util/qbs/qbs-1.4.1.ebuild b/dev-util/qbs/qbs-1.4.1.ebuild
deleted file mode 100644
index 34b8819..000
--- a/dev-util/qbs/qbs-1.4.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib pax-utils qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Qt Build Suite"
-HOMEPAGE="http://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"
-
-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
-   )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-   # 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
-   $(usex test 'CONFIG+=qbs_enable_unit_tests' '')
-   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"
-
-   # simply exporting LD_LIBRARY_PATH doesn't work
-   # we have to use a custom testrunner script
-   local testrunner=${S}/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/html
-   dodoc doc/qbs.qch
-   docompress -x /usr/share/doc/${PF}/qbs.qch
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

[Davide Pesavento]

commit: d1a5193a26ca122ba787f39965dc79c5a15bbe60
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Sep 13 22:59:43 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Sep 13 22:59:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1a5193a

dev-util/qbs: version bump

PaX marking is no longer necessary. The problem was in the QML
engine JIT, which can now be turned off in qtdeclarative itself.

Package-Manager: portage-2.2.20.1

 dev-util/qbs/Manifest |   1 +
 dev-util/qbs/qbs-1.4.2.ebuild | 103 ++
 2 files changed, 104 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index a56c60b..e5a35f1 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1 +1,2 @@
 DIST qbs-src-1.4.1.tar.gz 802383 SHA256 
eea8e0c1b2ef71f295fa5f1798a04a9f0509a701094fec11a691a4d7ae0155a9 SHA512 
8fd48d27a2599c617ba19494e2716451c38253c964c24fc9685b5e31e75073f2606fb554400af57eab6b2e4e69e04e479dc8cfdf771eeeaf1068e3293ba691b2
 WHIRLPOOL 
f4236866683e378827faae9c30e9fdf35d061804ee69069280cb4da220dd83c1a740186920ec108d708fdb63d08a511364a658fcd8a25d893478e9b5f08e0b7a
+DIST qbs-src-1.4.2.tar.gz 821001 SHA256 
b9d36118c3ae0f7d4df6bf7239a0a0163c0340b701d00191fa5f832cef341ce5 SHA512 
dc4514f28843d159b695e4da2b94619da91656b57ba839fa62901cd3a48309ffd3a3b5203b7ae1c5f35cab515a6149017fd43093ae9395846b3e46b2f53b93ec
 WHIRLPOOL 
0431823cc54dd7a372473e76d8269207cf439a5ba27d3c099df63a19d222067a41a62299415cae9c9798e5bf5ebf38c27dffa8f23135675a564f51047cecfc67

diff --git a/dev-util/qbs/qbs-1.4.2.ebuild b/dev-util/qbs/qbs-1.4.2.ebuild
new file mode 100644
index 000..b44324b
--- /dev/null
+++ b/dev-util/qbs/qbs-1.4.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Qt Build Suite"
+HOMEPAGE="http://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"
+
+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
+   )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+   # 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
+   $(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 "${EROOT}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=${S}/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/html
+   dodoc doc/qbs.qch
+   docompress -x /usr/share/doc/${PF}/qbs.qch
+   fi
+}