| 1 |
commit: 6c753079c0b542fdac3950424c1fb7f80938ae0c |
| 2 |
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
| 3 |
AuthorDate: Sun Nov 7 13:55:09 2021 +0000 |
| 4 |
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
| 5 |
CommitDate: Sun Nov 7 13:56:25 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6c753079 |
| 7 |
|
| 8 |
dev-util/gammaray: add 2.11.3, drop 2.11.2 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/800632 |
| 11 |
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> |
| 12 |
|
| 13 |
dev-util/gammaray/Manifest | 2 +- |
| 14 |
...mmaray-2.11.2.ebuild => gammaray-2.11.3.ebuild} | 74 +++++++++++++--------- |
| 15 |
dev-util/gammaray/metadata.xml | 2 +- |
| 16 |
3 files changed, 46 insertions(+), 32 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-util/gammaray/Manifest b/dev-util/gammaray/Manifest |
| 19 |
index 2cab5136d..51f6fd33e 100644 |
| 20 |
--- a/dev-util/gammaray/Manifest |
| 21 |
+++ b/dev-util/gammaray/Manifest |
| 22 |
@@ -1 +1 @@ |
| 23 |
-DIST gammaray-2.11.2.tar.gz 10333340 BLAKE2B 8dbb83e22826cd08e3a7105bfe910d9862ea47e3709e0c61c22ed9fe4974d27412f79a587de0ac6bb092f0edf07476c10717ca40dd8e7b43903aa44686158489 SHA512 788a4bb6c96e8c5d9a6762d94ad0a452c95d20c79b4b10a1b774950fb047633f040707d984c5e769b8c47ab6a2b9f9c338b0700ad17315588b1275f226a04f51 |
| 24 |
+DIST gammaray-2.11.3.tar.gz 10841865 BLAKE2B 07a8c6a1257417d8daed5d7bfdd7e9aaaa353a0edfc0f20a73ac61fcf64e45030346f2268c50ecc220aeaffad38c3ecac788192c491778eca31d07ef9166329e SHA512 1fb16678ae4695567ffe6cca7870b3fcf8b82c2e9f15f005932586696a3e24f64e657ce25b0ebb87ba25646a6bdfe1c9b35a3604f341839e7c5183df859c05a0 |
| 25 |
|
| 26 |
diff --git a/dev-util/gammaray/gammaray-2.11.2.ebuild b/dev-util/gammaray/gammaray-2.11.3.ebuild |
| 27 |
similarity index 50% |
| 28 |
rename from dev-util/gammaray/gammaray-2.11.2.ebuild |
| 29 |
rename to dev-util/gammaray/gammaray-2.11.3.ebuild |
| 30 |
index 3abfc5281..98c015610 100644 |
| 31 |
--- a/dev-util/gammaray/gammaray-2.11.2.ebuild |
| 32 |
+++ b/dev-util/gammaray/gammaray-2.11.3.ebuild |
| 33 |
@@ -1,9 +1,10 @@ |
| 34 |
# Copyright 1999-2021 Gentoo Authors |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
|
| 37 |
-EAPI=7 |
| 38 |
+EAPI=8 |
| 39 |
|
| 40 |
-inherit xdg cmake |
| 41 |
+CMAKE_REMOVE_MODULES_LIST=( BackwardConfig ) |
| 42 |
+inherit cmake optfeature xdg |
| 43 |
|
| 44 |
DESCRIPTION="High-level runtime introspection tool for Qt applications" |
| 45 |
HOMEPAGE="https://www.kdab.com/gammaray https://github.com/KDAB/GammaRay" |
| 46 |
@@ -16,11 +17,16 @@ else |
| 47 |
KEYWORDS="~amd64" |
| 48 |
fi |
| 49 |
|
| 50 |
-LICENSE="GPL-2+" |
| 51 |
+LICENSE="BSD-2 GPL-2+ MIT" |
| 52 |
SLOT=0 |
| 53 |
IUSE="3d bluetooth designer doc geolocation printsupport script scxml svg test qml wayland webengine" |
| 54 |
-RESTRICT="!test? ( test )" |
| 55 |
|
| 56 |
+# broken tests |
| 57 |
+RESTRICT="test" |
| 58 |
+ |
| 59 |
+DOCS=( CHANGES CONTRIBUTORS.txt README.txt ) |
| 60 |
+ |
| 61 |
+# TODO: fix automagic sci-libs/vtk (and many other) dependencies |
| 62 |
RDEPEND=" |
| 63 |
dev-qt/qtcore:5 |
| 64 |
dev-qt/qtconcurrent:5 |
| 65 |
@@ -47,46 +53,54 @@ DEPEND="${RDEPEND} |
| 66 |
" |
| 67 |
|
| 68 |
src_prepare(){ |
| 69 |
- sed -i "/BackwardMacros.cmake/d" CMakeLists.txt || die |
| 70 |
+ sed -i \ |
| 71 |
+ -e "/BackwardConfig.cmake/d" \ |
| 72 |
+ -e "/set(KDE_INSTALL_USE_QT_SYS_PATHS/d" -i CMakeLists.txt || die |
| 73 |
sed -i "/add_backward(gammaray_core)/d" core/CMakeLists.txt || die |
| 74 |
- # Don't install into deprecated /usr/share/appdata/ |
| 75 |
- sed -i "s|/appdata|/metainfo|g" {CMakeLists.txt,gammaray.spec} || die |
| 76 |
+ |
| 77 |
cmake_src_prepare |
| 78 |
} |
| 79 |
|
| 80 |
src_configure(){ |
| 81 |
local mycmakeargs=( |
| 82 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DAnimation=$(usex !3d) |
| 83 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DExtras=$(usex !3d) |
| 84 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DInput=$(usex !3d) |
| 85 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DLogic=$(usex !3d) |
| 86 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DRender=$(usex !3d) |
| 87 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DQuick=$(usex !3d) |
| 88 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Bluetooth=$(usex !bluetooth) |
| 89 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=$(usex !designer) |
| 90 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=$(usex !geolocation) |
| 91 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5PrintSupport=$(usex !printsupport) |
| 92 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Qml=$(usex !qml) |
| 93 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Quick=$(usex !qml) |
| 94 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickWidgets=$(usex !qml) |
| 95 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Script=$(usex !script) |
| 96 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Svg=$(usex !svg) |
| 97 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Scxml=$(usex !scxml) |
| 98 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=$(usex !test) |
| 99 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WaylandCompositor=$(usex !wayland) |
| 100 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=$(usex !webengine) |
| 101 |
+ $(cmake_use_find_package 3d Qt53DAnimation) |
| 102 |
+ $(cmake_use_find_package 3d Qt53DExtras) |
| 103 |
+ $(cmake_use_find_package 3d Qt53DInput) |
| 104 |
+ $(cmake_use_find_package 3d Qt53DLogic) |
| 105 |
+ $(cmake_use_find_package 3d Qt53DRender) |
| 106 |
+ $(cmake_use_find_package 3d Qt53DQuick) |
| 107 |
+ $(cmake_use_find_package bluetooth Qt5Bluetooth) |
| 108 |
+ $(cmake_use_find_package designer Qt5Designer) |
| 109 |
+ $(cmake_use_find_package geolocation Qt5Positioning) |
| 110 |
+ $(cmake_use_find_package printsupport Qt5PrintSupport) |
| 111 |
+ $(cmake_use_find_package qml Qt5Qml) |
| 112 |
+ $(cmake_use_find_package qml Qt5Quick) |
| 113 |
+ $(cmake_use_find_package qml Qt5QuickWidgets) |
| 114 |
+ $(cmake_use_find_package script Qt5Script) |
| 115 |
+ $(cmake_use_find_package svg Qt5Svg) |
| 116 |
+ $(cmake_use_find_package scxml Qt5Scxml) |
| 117 |
+ $(cmake_use_find_package test Qt5Test) |
| 118 |
+ $(cmake_use_find_package wayland Qt5WaylandCompositor) |
| 119 |
+ $(cmake_use_find_package webengine Qt5WebEngineWidgets) |
| 120 |
-DGAMMARAY_BUILD_DOCS=$(usex doc) |
| 121 |
-DGAMMARAY_BUILD_UI=ON |
| 122 |
-DGAMMARAY_DISABLE_FEEDBACK=ON |
| 123 |
+ |
| 124 |
+ # fix install paths |
| 125 |
+# -DDOC_INSTALL_DIR="doc/${PF}" |
| 126 |
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON |
| 127 |
) |
| 128 |
+ |
| 129 |
cmake_src_configure |
| 130 |
} |
| 131 |
|
| 132 |
+src_install() { |
| 133 |
+ cmake_src_install |
| 134 |
+ rm -r "${ED}"/usr/share/doc/${PN} || die |
| 135 |
+} |
| 136 |
+ |
| 137 |
pkg_postinst() { |
| 138 |
xdg_pkg_postinst |
| 139 |
|
| 140 |
- elog |
| 141 |
- elog "Install dev-util/kdstatemachineeditor as optional dependency" |
| 142 |
- elog "for graphical state machine debugging support" |
| 143 |
- elog |
| 144 |
+ optfeature "graphical state machine debugging support" dev-util/kdstatemachineeditor |
| 145 |
} |
| 146 |
|
| 147 |
diff --git a/dev-util/gammaray/metadata.xml b/dev-util/gammaray/metadata.xml |
| 148 |
index 5566fb812..bbe46102d 100644 |
| 149 |
--- a/dev-util/gammaray/metadata.xml |
| 150 |
+++ b/dev-util/gammaray/metadata.xml |
| 151 |
@@ -1,5 +1,5 @@ |
| 152 |
<?xml version="1.0" encoding="UTF-8"?> |
| 153 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 154 |
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
| 155 |
<pkgmetadata> |
| 156 |
<maintainer type="person"> |
| 157 |
<email>rossbridger.cc@×××××.com</email> |
Archives