From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 78A491396D1 for ; Sat, 16 Sep 2017 21:02:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6D721FC096; Sat, 16 Sep 2017 21:02:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 871C51FC096 for ; Sat, 16 Sep 2017 21:02:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 33843341699 for ; Sat, 16 Sep 2017 21:02:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E83C907D for ; Sat, 16 Sep 2017 21:02:12 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1505595725.dff3a1a5393979124fed2f90a0edebd4a1b5ad47.pesa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/qbs/Manifest dev-util/qbs/qbs-1.8.0-r1.ebuild X-VCS-Directories: dev-util/qbs/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: dff3a1a5393979124fed2f90a0edebd4a1b5ad47 X-VCS-Branch: master Date: Sat, 16 Sep 2017 21:02:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4f60abe8-49fe-4cd2-8ce6-8c4d4e4e7c5d X-Archives-Hash: 66aaea9ef33597db4fe67457b74f50f3 commit: dff3a1a5393979124fed2f90a0edebd4a1b5ad47 Author: Davide Pesavento gentoo org> AuthorDate: Sat Sep 16 20:59:53 2017 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sat Sep 16 21:02:05 2017 +0000 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..00000000000 --- 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 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 -}