commit: 6c753079c0b542fdac3950424c1fb7f80938ae0c Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> AuthorDate: Sun Nov 7 13:55:09 2021 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Sun Nov 7 13:56:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6c753079
dev-util/gammaray: add 2.11.3, drop 2.11.2 Closes: https://bugs.gentoo.org/800632 Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> dev-util/gammaray/Manifest | 2 +- ...mmaray-2.11.2.ebuild => gammaray-2.11.3.ebuild} | 74 +++++++++++++--------- dev-util/gammaray/metadata.xml | 2 +- 3 files changed, 46 insertions(+), 32 deletions(-) diff --git a/dev-util/gammaray/Manifest b/dev-util/gammaray/Manifest index 2cab5136d..51f6fd33e 100644 --- a/dev-util/gammaray/Manifest +++ b/dev-util/gammaray/Manifest @@ -1 +1 @@ -DIST gammaray-2.11.2.tar.gz 10333340 BLAKE2B 8dbb83e22826cd08e3a7105bfe910d9862ea47e3709e0c61c22ed9fe4974d27412f79a587de0ac6bb092f0edf07476c10717ca40dd8e7b43903aa44686158489 SHA512 788a4bb6c96e8c5d9a6762d94ad0a452c95d20c79b4b10a1b774950fb047633f040707d984c5e769b8c47ab6a2b9f9c338b0700ad17315588b1275f226a04f51 +DIST gammaray-2.11.3.tar.gz 10841865 BLAKE2B 07a8c6a1257417d8daed5d7bfdd7e9aaaa353a0edfc0f20a73ac61fcf64e45030346f2268c50ecc220aeaffad38c3ecac788192c491778eca31d07ef9166329e SHA512 1fb16678ae4695567ffe6cca7870b3fcf8b82c2e9f15f005932586696a3e24f64e657ce25b0ebb87ba25646a6bdfe1c9b35a3604f341839e7c5183df859c05a0 diff --git a/dev-util/gammaray/gammaray-2.11.2.ebuild b/dev-util/gammaray/gammaray-2.11.3.ebuild similarity index 50% rename from dev-util/gammaray/gammaray-2.11.2.ebuild rename to dev-util/gammaray/gammaray-2.11.3.ebuild index 3abfc5281..98c015610 100644 --- a/dev-util/gammaray/gammaray-2.11.2.ebuild +++ b/dev-util/gammaray/gammaray-2.11.3.ebuild @@ -1,9 +1,10 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit xdg cmake +CMAKE_REMOVE_MODULES_LIST=( BackwardConfig ) +inherit cmake optfeature xdg DESCRIPTION="High-level runtime introspection tool for Qt applications" HOMEPAGE="https://www.kdab.com/gammaray https://github.com/KDAB/GammaRay"; @@ -16,11 +17,16 @@ else KEYWORDS="~amd64" fi -LICENSE="GPL-2+" +LICENSE="BSD-2 GPL-2+ MIT" SLOT=0 IUSE="3d bluetooth designer doc geolocation printsupport script scxml svg test qml wayland webengine" -RESTRICT="!test? ( test )" +# broken tests +RESTRICT="test" + +DOCS=( CHANGES CONTRIBUTORS.txt README.txt ) + +# TODO: fix automagic sci-libs/vtk (and many other) dependencies RDEPEND=" dev-qt/qtcore:5 dev-qt/qtconcurrent:5 @@ -47,46 +53,54 @@ DEPEND="${RDEPEND} " src_prepare(){ - sed -i "/BackwardMacros.cmake/d" CMakeLists.txt || die + sed -i \ + -e "/BackwardConfig.cmake/d" \ + -e "/set(KDE_INSTALL_USE_QT_SYS_PATHS/d" -i CMakeLists.txt || die sed -i "/add_backward(gammaray_core)/d" core/CMakeLists.txt || die - # Don't install into deprecated /usr/share/appdata/ - sed -i "s|/appdata|/metainfo|g" {CMakeLists.txt,gammaray.spec} || die + cmake_src_prepare } src_configure(){ local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DAnimation=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DExtras=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DInput=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DLogic=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DRender=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DQuick=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Bluetooth=$(usex !bluetooth) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=$(usex !designer) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=$(usex !geolocation) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5PrintSupport=$(usex !printsupport) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Qml=$(usex !qml) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Quick=$(usex !qml) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickWidgets=$(usex !qml) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Script=$(usex !script) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Svg=$(usex !svg) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Scxml=$(usex !scxml) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=$(usex !test) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WaylandCompositor=$(usex !wayland) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=$(usex !webengine) + $(cmake_use_find_package 3d Qt53DAnimation) + $(cmake_use_find_package 3d Qt53DExtras) + $(cmake_use_find_package 3d Qt53DInput) + $(cmake_use_find_package 3d Qt53DLogic) + $(cmake_use_find_package 3d Qt53DRender) + $(cmake_use_find_package 3d Qt53DQuick) + $(cmake_use_find_package bluetooth Qt5Bluetooth) + $(cmake_use_find_package designer Qt5Designer) + $(cmake_use_find_package geolocation Qt5Positioning) + $(cmake_use_find_package printsupport Qt5PrintSupport) + $(cmake_use_find_package qml Qt5Qml) + $(cmake_use_find_package qml Qt5Quick) + $(cmake_use_find_package qml Qt5QuickWidgets) + $(cmake_use_find_package script Qt5Script) + $(cmake_use_find_package svg Qt5Svg) + $(cmake_use_find_package scxml Qt5Scxml) + $(cmake_use_find_package test Qt5Test) + $(cmake_use_find_package wayland Qt5WaylandCompositor) + $(cmake_use_find_package webengine Qt5WebEngineWidgets) -DGAMMARAY_BUILD_DOCS=$(usex doc) -DGAMMARAY_BUILD_UI=ON -DGAMMARAY_DISABLE_FEEDBACK=ON + + # fix install paths +# -DDOC_INSTALL_DIR="doc/${PF}" + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON ) + cmake_src_configure } +src_install() { + cmake_src_install + rm -r "${ED}"/usr/share/doc/${PN} || die +} + pkg_postinst() { xdg_pkg_postinst - elog - elog "Install dev-util/kdstatemachineeditor as optional dependency" - elog "for graphical state machine debugging support" - elog + optfeature "graphical state machine debugging support" dev-util/kdstatemachineeditor } diff --git a/dev-util/gammaray/metadata.xml b/dev-util/gammaray/metadata.xml index 5566fb812..bbe46102d 100644 --- a/dev-util/gammaray/metadata.xml +++ b/dev-util/gammaray/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <maintainer type="person"> <email>[email protected]</email>
