gentoo resync : 25.08.2020

1 files changed, 27 insertions, 14 deletions

diff --git a/sci-electronics/pulseview/pulseview-9999.ebuild b/sci-electronics/pulseview/pulseview-9999.ebuild
index 570474071f06..e67387d52ebe 100644
--- a/sci-electronics/pulseview/pulseview-9999.ebuild
+++ b/sci-electronics/pulseview/pulseview-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+inherit cmake python-single-r1 xdg-utils
 
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
 	inherit git-r3
 else
@@ -23,39 +23,52 @@ SLOT="0"
 IUSE="+decode static"
 REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
 RDEPEND="
+	>=dev-cpp/glibmm-2.28.0:2
 	>=dev-libs/boost-1.55:=
 	>=dev-libs/glib-2.28.0:2
-	>=dev-cpp/glibmm-2.28.0:2
-	>=sci-libs/libsigrok-0.6.0:=[cxx]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
 	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	>=sci-libs/libsigrok-0.6.0:=[cxx]
 	decode? (
-		>=sci-libs/libsigrokdecode-0.6.0:=[${PYTHON_SINGLE_USEDEP}]
 		${PYTHON_DEPS}
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+		>=sci-libs/libsigrokdecode-0.6.0:=[${PYTHON_SINGLE_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
 
 DOCS=( HACKING NEWS README )
 
+pkg_setup() {
+	use decode && python_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory manual
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DDISABLE_WERROR=TRUE
 		-DENABLE_DECODE=$(usex decode)
 		-DSTATIC_PKGDEPS_LIBS=$(usex static)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }