From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1458705-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D6A8F158020 for <garchives@archives.gentoo.org>; Sun, 20 Nov 2022 11:07:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EBD35E0869; Sun, 20 Nov 2022 11:07:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C91F1E0869 for <gentoo-commits@lists.gentoo.org>; Sun, 20 Nov 2022 11:07:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CFAB8340C43 for <gentoo-commits@lists.gentoo.org>; Sun, 20 Nov 2022 11:07:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B5EA073B for <gentoo-commits@lists.gentoo.org>; Sun, 20 Nov 2022 11:07:37 +0000 (UTC) From: "Thomas Beierlein" <tomjbe@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Beierlein" <tomjbe@gentoo.org> Message-ID: <1668942188.d97b8662a04fac7755d460d90fcf3d91b8669f60.tomjbe@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-scopy/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/gr-scopy/Manifest net-wireless/gr-scopy/gr-scopy-0.0_p20220602.ebuild net-wireless/gr-scopy/gr-scopy-9999.ebuild X-VCS-Directories: net-wireless/gr-scopy/ X-VCS-Committer: tomjbe X-VCS-Committer-Name: Thomas Beierlein X-VCS-Revision: d97b8662a04fac7755d460d90fcf3d91b8669f60 X-VCS-Branch: master Date: Sun, 20 Nov 2022 11:07:37 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d48352fd-dab6-43fc-af4d-d7c7331ed9a2 X-Archives-Hash: 1072fc50943ab10428f645d0898cb794 commit: d97b8662a04fac7755d460d90fcf3d91b8669f60 Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> AuthorDate: Sun Nov 20 11:02:27 2022 +0000 Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> CommitDate: Sun Nov 20 11:03:08 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d97b8662 net-wireless/gr-scopy: Add gr-3.10 support Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org> net-wireless/gr-scopy/Manifest | 1 + .../{gr-scopy-9999.ebuild => gr-scopy-0.0_p20220602.ebuild} | 9 +++++---- net-wireless/gr-scopy/gr-scopy-9999.ebuild | 9 +++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/net-wireless/gr-scopy/Manifest b/net-wireless/gr-scopy/Manifest index bac2b331b822..624db6f795f1 100644 --- a/net-wireless/gr-scopy/Manifest +++ b/net-wireless/gr-scopy/Manifest @@ -1 +1,2 @@ DIST gr-scopy-0.0_p20201005.tar.gz 204034 BLAKE2B 17d797822c7920186a6d875119d582fda7b74f9c23248d9821ba172f59b1df1433520e723e4dc6b1eca1f08fb7256893767794b584d7c0bd53aa2ede80cd2b92 SHA512 12c0e76008b0a7570a85707afe28a102541e02f10a55346c76cb7984e8435e20281e6406c86ee22e8b4fbe0211bb6657f88f36bdf6b3b76d4e24b2a3f12e6350 +DIST gr-scopy-0.0_p20220602.tar.gz 213557 BLAKE2B 9dcd1b1beb62fa8f18c478f8990339cbe064a6c60c2e68516f49634d838f42559f2b25527fed78b124b9373be5f9c475c66a4dcc57ea30e69127e7227220742f SHA512 28983f1380943b1cc02c34fe21c7f295e5d4bbf4611fdddc313b9f63624845485a8366bcae6e215d9fe228a51f004d051895af756b157d382c6da2f51a1ca432 diff --git a/net-wireless/gr-scopy/gr-scopy-9999.ebuild b/net-wireless/gr-scopy/gr-scopy-0.0_p20220602.ebuild similarity index 77% copy from net-wireless/gr-scopy/gr-scopy-9999.ebuild copy to net-wireless/gr-scopy/gr-scopy-0.0_p20220602.ebuild index f633fe307051..0ad510927c21 100644 --- a/net-wireless/gr-scopy/gr-scopy-9999.ebuild +++ b/net-wireless/gr-scopy/gr-scopy-0.0_p20220602.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9,10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit cmake python-single-r1 @@ -11,9 +11,10 @@ DESCRIPTION="Scopy IIO blocks for GNU Radio" HOMEPAGE="https://github.com/analogdevicesinc/gr-scopy" if [ "${PV}" = "9999" ]; then EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-scopy.git" + EGIT_BRANCH="3.10" inherit git-r3 else - COMMIT="f48b45cabe2a81f491137dbc220032ea65f080c3" + COMMIT="a69ccb22578621a69acc187fc0d006b5a030a744" SRC_URI="https://github.com/analogdevicesinc/gr-scopy/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" KEYWORDS="~amd64 ~x86" @@ -23,13 +24,13 @@ SLOT="0" REQUIRED_USE=${PYTHON_REQUIRED_USE} RDEPEND="${PYTHON_DEPS} - =net-wireless/gnuradio-3.8*:= + >=net-wireless/gnuradio-3.9.0.0:=[analog] sci-libs/volk:= - dev-libs/log4cpp:= " DEPEND="${RDEPEND}" src_install() { cmake_src_install python_optimize + mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}" } diff --git a/net-wireless/gr-scopy/gr-scopy-9999.ebuild b/net-wireless/gr-scopy/gr-scopy-9999.ebuild index f633fe307051..0ad510927c21 100644 --- a/net-wireless/gr-scopy/gr-scopy-9999.ebuild +++ b/net-wireless/gr-scopy/gr-scopy-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9,10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit cmake python-single-r1 @@ -11,9 +11,10 @@ DESCRIPTION="Scopy IIO blocks for GNU Radio" HOMEPAGE="https://github.com/analogdevicesinc/gr-scopy" if [ "${PV}" = "9999" ]; then EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-scopy.git" + EGIT_BRANCH="3.10" inherit git-r3 else - COMMIT="f48b45cabe2a81f491137dbc220032ea65f080c3" + COMMIT="a69ccb22578621a69acc187fc0d006b5a030a744" SRC_URI="https://github.com/analogdevicesinc/gr-scopy/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" KEYWORDS="~amd64 ~x86" @@ -23,13 +24,13 @@ SLOT="0" REQUIRED_USE=${PYTHON_REQUIRED_USE} RDEPEND="${PYTHON_DEPS} - =net-wireless/gnuradio-3.8*:= + >=net-wireless/gnuradio-3.9.0.0:=[analog] sci-libs/volk:= - dev-libs/log4cpp:= " DEPEND="${RDEPEND}" src_install() { cmake_src_install python_optimize + mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}" }