From 54375c80a2652245530418502abaec0924a37c92 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 8 Aug 2022 14:14:07 +0100 Subject: gentoo auto-resync : 08:08:2022 - 14:14:07 --- dev-util/Manifest.gz | Bin 67964 -> 67964 bytes dev-util/cutter/Manifest | 2 +- dev-util/cutter/cutter-2.1.0.ebuild | 7 +-- dev-util/qbs/Manifest | 2 - dev-util/qbs/qbs-1.18.0.ebuild | 112 ------------------------------------ 5 files changed, 4 insertions(+), 119 deletions(-) delete mode 100644 dev-util/qbs/qbs-1.18.0.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index a71a1ca6cf88..16c103fff9a7 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest index 51b34dc312e2..d3cbde1e89e8 100644 --- a/dev-util/cutter/Manifest +++ b/dev-util/cutter/Manifest @@ -1,4 +1,4 @@ DIST cutter-2.1.0.tar.gz 2732264 BLAKE2B 463e0f8968c61c7d3b7e3c7a570c9f7c625e4c024306c0284665d39de460bc6780eedd114f51ec722bec6ab7d43077362b676562d0a89665886fbabc3240def1 SHA512 444e27005b9348397097c0c2fd047a557dfd5e8d5d43df6a2ab345da48e26537025ce6f81b256fe765dc59bf5944952965637b84e96136b3025c3dc5bca3f2d6 DIST cutter-translations-974298653ba71b958e1b6c83f6011f5fefff6236.tar.gz 595073 BLAKE2B 4445c4c16c47a05c74816d88a68fda97037c45caf7508fc1162f4978a0b3cb194653e879b77f6fc5be2f264a929ac11c4fc2aee68ceed6a23447094d0b249cdd SHA512 11450631602e7bd81132650b3edd028d56b2f6343a9561fe8bf3281427d8d22b0296651414756236b8544f719c8d4fc11be44a843532c8c32fe21dd7a82066d2 -EBUILD cutter-2.1.0.ebuild 1604 BLAKE2B 42bf18f1b71b956a2e389af08aa4fe5dd3de41cb1271c42b7a7fefe2b9a22d33ca4e5e70f9d6a620fbae800ca45ac85566fff087ce34bafdda97287eaea2745d SHA512 0411c7eb4e02ace56bd5808f7ed0287233abb8a52708f7acba3322241c059cfc4983f05c313c311b4d1885c963036109f147e3d76a97ad21f52c36da66f37f81 +EBUILD cutter-2.1.0.ebuild 1573 BLAKE2B ef62857706daa30e21094ae4ca1e669d34dc579bbfe887d641fd2a10ff3866a7881434736010cdd6bcde37905f06acad32d8c399861ac16b4b836cdea2f21802 SHA512 b65eaf5fee5d31b2293e3baa365147c1c9cfa9b69e9c85cf164ca34506b8cfe868fc1d2521e86bba027bc15adcaaf4175d23411bb51a4488beb234df24c9fba9 MISC metadata.xml 329 BLAKE2B ccc11908a8ba66fdc15f6fe8ea45e62e797050488dc82de159525338cb4ffc4d52609bd815dd0a2ad3ad23a915e5bf631dc3db640a0e7c314fb5fa66cfe5b2b7 SHA512 208b070fdb02df4825d364ee5d86c3be7658fb6c84420d53b5e4f72427de0a2b8c201e46a6bae9d923eb5e9b0f195fb639336452c89dd4affc5527908cd152fb diff --git a/dev-util/cutter/cutter-2.1.0.ebuild b/dev-util/cutter/cutter-2.1.0.ebuild index 4c7fdfec26b1..706ec46206de 100644 --- a/dev-util/cutter/cutter-2.1.0.ebuild +++ b/dev-util/cutter/cutter-2.1.0.ebuild @@ -19,7 +19,7 @@ KEYWORDS="amd64 ~x86" IUSE="graphviz" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -COMMON_DEPEND="${PYTHON_DEPS} +DEPEND="${PYTHON_DEPS} dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 @@ -27,9 +27,8 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-qt/qtwidgets:5 >=dev-util/rizin-0.4.0:= graphviz? ( media-gfx/graphviz )" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5" -RDEPEND="${COMMON_DEPEND}" +RDEPEND="${DEPEND}" +BDEPEND="dev-qt/linguist-tools:5" src_prepare() { rmdir "${S}/src/translations" || die diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest index da84051a003f..835056ac9351 100644 --- a/dev-util/qbs/Manifest +++ b/dev-util/qbs/Manifest @@ -1,5 +1,3 @@ -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 -EBUILD qbs-1.18.0.ebuild 2734 BLAKE2B c7333128929e27c74b86805b232e392c271796994d9caa09131ba51f5586177f67928d0d215ce256e3b6f1787a73b318341025eb7832dff566556756a6c40369 SHA512 dbdcff5f53ed0c0877062c603250f1776ffa025453f4780e2a41fb2c5eed042f162852112debac6517d962a31df06296913fba2aec1475d48738341dfff0288c EBUILD qbs-1.19.1.ebuild 2861 BLAKE2B 6866b411f7034cd1cc94204d7ee3ed4c761148fe90d300a5860445b2c2b4320982b9ec4b2d1809e1f4f91574b24fd2f55e11b405a54539a1d08ba0734f14e9f4 SHA512 6044e182fcbd25d88e69a93a21c49e7bca0385f67c197caba10d13a2e464d530c1a34f35d09e26c80a072caedf9e12798695074d6a3df96e0df09ba1447ce067 MISC metadata.xml 1196 BLAKE2B 41f5ec6a39d69a013a04736318be673832398e04903785a8f5144c2a932b216eeb0eef43fa96fbe2c2df32a2c1da85b15f901dad53770382f37ffdfa4b53da71 SHA512 182d0c0b450cf4e1edb0004c7b8c8cb279d5f0a2364ba81bcae9d0ba1632ba1a55f18a1d3758690077cb35590d4eb17d5f70c3470437ccf214d403a58adbaeba 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..000000000000 --- 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 -} -- cgit v1.2.3