From 2fd57282f0262ca084e05b0f2c63fbada395d02b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jan 2022 20:27:28 +0000 Subject: gentoo resync : 16.01.2021 --- sci-electronics/pulseview/Manifest | 4 +- .../pulseview/pulseview-0.4.2-r1.ebuild | 69 +++++++++++++++++++ sci-electronics/pulseview/pulseview-0.4.2.ebuild | 79 ---------------------- sci-electronics/pulseview/pulseview-9999.ebuild | 16 +---- 4 files changed, 74 insertions(+), 94 deletions(-) create mode 100644 sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild delete mode 100644 sci-electronics/pulseview/pulseview-0.4.2.ebuild (limited to 'sci-electronics/pulseview') diff --git a/sci-electronics/pulseview/Manifest b/sci-electronics/pulseview/Manifest index a7a843c4efc2..3beedb34b520 100644 --- a/sci-electronics/pulseview/Manifest +++ b/sci-electronics/pulseview/Manifest @@ -1,6 +1,6 @@ AUX pulseview-0.4.2-glib-2.68.patch 579 BLAKE2B 1feab8b80bbfd158bc445fe32e72327451791e461a4f85129f125cb3fb3d247f581a54c517f9b26c6493d4536e412c245805583a998fb44d3ee6f43904c34888 SHA512 a8fccfe78c6ba09687db9b26bdb7c28ba8912098d7b4b41c62afdcc312462159bfe6f5f6055171f0e38fb96c64ad09dce66ed509286bc268bd785f8025ff7403 AUX pulseview-0.4.2-qt-5.15.patch 5193 BLAKE2B ea81ba54ca1a8b9d76d2e7751940d7b4e509adb75f903e5e85be49976106eefe1745908fe55d2aa206402494cd636879c71fe811e7dde874ebc40174ea8727cd SHA512 66c1e00f9470d4384bfa5dda2db7ada9d1e86cee2b2cd2a8517b44c1d6ee310d2f9a930033a7c93a30e006675c738b7cf75d6ee22ee09c7b8b52e831ca6571d0 DIST pulseview-0.4.2.tar.gz 1399718 BLAKE2B ebbefefa55bb7ce9d1bbdfa8ea44d9536fa4f9ca9f6f13175a5bb6122dcb431ddad7c668e631128ca57fd2231021f8ce1c686fac9fa746ace24cf69ef3d71e71 SHA512 79f653c9faad021c03b59b4a519b594190d5558dfb9be60cabcc2a35e991e66b733b337fec58a9248699e7aef0df3be1472c81f93274b25cec1fc6b73f8f033b -EBUILD pulseview-0.4.2.ebuild 1480 BLAKE2B ce2c73658a9772747c25a520f40951ec5405ae8e2b1b8efab67926bb17db5e8d6cd4852bd86edcea9dc6dc00dd960b2d9a691ceefabaf5822c74ac052fbe40f9 SHA512 e9f5fb99535b6609bfcfbefb2f765204cf7ac742cff191304eadf075b140ea4a78ff00816211df438e90a50d03eb3571ee323245a67fef75281d1efad7bfaffc -EBUILD pulseview-9999.ebuild 1390 BLAKE2B 3e1fa66fef132374204fe13d384ff6eeae42ca432a5de102728ae3abb0d01b1e80bfc2771223bc8577a541369f12712cba5cae238671ad588fe6d463e61bc14b SHA512 0ecf135b896b6a9bca05253b473bf1f93fe7a362b8734ae9ac76b33c2fd77be7c566e820d37c38e8247dd7ee4de9e381a0c1bcc5db80cccd8f1ce3001f9875ca +EBUILD pulseview-0.4.2-r1.ebuild 1288 BLAKE2B 40005c2d1fadfb4b18e89068e9cc03b7adb20229b58a9702bc805a52670fb3223138ee2846caa99e80baf084bdb53b4683148dd715141d7dd1b2d829999e7991 SHA512 4b2665a461d6f9a0935f9623daf5bb69a6c10d8f3df64ce75b45f7130585a1d1c16eaee8fe1e6d6a9b5bcf03bc5ffcf8d17f4dadb60832d23514c63c224ec378 +EBUILD pulseview-9999.ebuild 1198 BLAKE2B 98659838ee543004b4d0baa4cb19137c0d862c71d41dbb70207396eaf98ba3ecce31f0591f19dfe863317accd4853ed1f75ff866e627fe5b88d25f01ccc819e2 SHA512 8022ee769dd32d54c46301bf3cfccd184936559b17bb8fe43ef75f54783a55d742b4aa5f00be7aa760ab73d73dd9764646c9a348431cf43f23ca3e393582eea1 MISC metadata.xml 334 BLAKE2B 4b5f18089903f6ea4eed965b12843da3d32a72646831ec5a56d6fcd0c0beef5e574a85e16204b8210c6e1bc0ed2571352a6f9f1831e967b15f2f3fe085fd87a8 SHA512 9f93f66a742a6cd8afebdce63a9a9edacec75381bc846d0e71c6fece1af1f16c490721eff8cb9cc34b4b7ae0b226f42b7a1e166f9dd05921dd9d7b08408ea241 diff --git a/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild b/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild new file mode 100644 index 000000000000..a71826cfa065 --- /dev/null +++ b/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg-utils + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="git://sigrok.org/${PN}" + inherit git-r3 +else + SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Qt based logic analyzer GUI for sigrok" +HOMEPAGE="https://sigrok.org/wiki/PulseView" + +LICENSE="GPL-3" +SLOT="0" +IUSE="+decode static" + +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-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + >=sci-libs/libsigrok-0.5.1:=[cxx] + decode? ( >=sci-libs/libsigrokdecode-0.5.2:= ) +" +DEPEND="${RDEPEND}" + +DOCS=( HACKING NEWS README ) + +PATCHES=( + "${FILESDIR}/${P}-qt-5.15.patch" + "${FILESDIR}"/${PN}-0.4.2-glib-2.68.patch +) + +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_src_configure +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} diff --git a/sci-electronics/pulseview/pulseview-0.4.2.ebuild b/sci-electronics/pulseview/pulseview-0.4.2.ebuild deleted file mode 100644 index e96be770c575..000000000000 --- a/sci-electronics/pulseview/pulseview-0.4.2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit cmake python-single-r1 xdg-utils - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="git://sigrok.org/${PN}" - inherit git-r3 -else - SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Qt based logic analyzer GUI for sigrok" -HOMEPAGE="https://sigrok.org/wiki/PulseView" - -LICENSE="GPL-3" -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-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - >=sci-libs/libsigrok-0.5.1:=[cxx] - decode? ( - ${PYTHON_DEPS} - >=sci-libs/libsigrokdecode-0.5.2:=[${PYTHON_SINGLE_USEDEP}] - ) -" -DEPEND="${RDEPEND}" - -DOCS=( HACKING NEWS README ) - -PATCHES=( - "${FILESDIR}/${P}-qt-5.15.patch" - "${FILESDIR}"/${PN}-0.4.2-glib-2.68.patch -) - -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_src_configure -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/sci-electronics/pulseview/pulseview-9999.ebuild b/sci-electronics/pulseview/pulseview-9999.ebuild index 1b2ea98c17f8..330e533dbf89 100644 --- a/sci-electronics/pulseview/pulseview-9999.ebuild +++ b/sci-electronics/pulseview/pulseview-9999.ebuild @@ -1,11 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit cmake python-single-r1 xdg-utils +inherit cmake xdg-utils if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="git://sigrok.org/${PN}" @@ -21,7 +19,6 @@ HOMEPAGE="https://sigrok.org/wiki/PulseView" LICENSE="GPL-3" SLOT="0" IUSE="+decode static" -REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )" BDEPEND=" dev-qt/linguist-tools:5 @@ -36,19 +33,12 @@ RDEPEND=" dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sci-libs/libsigrok-0.6.0:=[cxx] - decode? ( - ${PYTHON_DEPS} - >=sci-libs/libsigrokdecode-0.6.0:=[${PYTHON_SINGLE_USEDEP}] - ) + decode? ( >=sci-libs/libsigrokdecode-0.6.0:= ) " DEPEND="${RDEPEND}" DOCS=( HACKING NEWS README ) -pkg_setup() { - use decode && python_setup -} - src_prepare() { cmake_src_prepare cmake_comment_add_subdirectory manual -- cgit v1.2.3