4 files changed, 10 insertions, 155 deletions
diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index db1b8848ec97..0bbc9c6ca05d 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -1,7 +1,6 @@
 AUX libsigrok-0.5.2-check-0.15.patch 917 BLAKE2B 39d042e99dc5a71fa79def033f7a30621967294ed8198b00ca9e7a21caf7ee77f07e3f6d1e27c3a4d2629539835ec1b4e7bc3fdfe2ce1e98d7e97b4a897131ce SHA512 1729653f153ebdec08c0b987a0cf15a50ed6ce8948805b2a9ddf122ba591426e830329bfb47527ef253c19f9b8e98693ab0258e9ac19906473d3605d61c8983d
 AUX libsigrok-0.5.2-swig-4.patch 1484 BLAKE2B 94c9bbde14f3175252677dedd50a7f3ff17bcc734382d93fbe3c65c71989dc72d0568535343bcb7764053075a2bac9c9f2d4e480d582a5371ac0d4a12bcab4a2 SHA512 34e568351624aeada4c3894be8a60cc0111be7c20ebe8e5395a1f81b2fc453a6a8228f575b95faad5140162a9d4fc5fc570546f42673f7275cb3910c73ffc8de
 DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092
-EBUILD libsigrok-0.5.2-r2.ebuild 3213 BLAKE2B ff302b0059872446f68498358daa0ebdf46e753830a23a454d97219f5edf4403e8ba79b007aefdea9e956d47defd9505d79911bd036efd018e92c8098368664e SHA512 4765d80f71cc66355c035148d922ff0523bebcce2db550e216b5aabd242f70a57edf5708aa253c5c0907b4b95e8884a2879eb2ee37298778e60dc7bd3f2428b6
-EBUILD libsigrok-0.5.2-r3.ebuild 3370 BLAKE2B 37c33f89d9c9ff0dd37fd2a488d556907a2038c28053549e3fa0c9f5f29ea5b6262502cb65605cb09e0c9392e70aaff7079c3dd2bbf6e94fe843ed2b7c53643d SHA512 e62e03f9ee808f4acc33f5dd7d1f43e43eb9ca82fd56a68a83481ccbd2f41be477b88d1f0fc5fe29b5d647b04b971323723827efe5d54d4da580f005b5a2f8de
-EBUILD libsigrok-9999.ebuild 3288 BLAKE2B 9e7fcb0ce9069a2fd66d1f7950e6763228615c0e1457411a15a393f1ea4e0a3e7d24f0f4149986b115399e8424acc4f5a4daf40dffcfdeaa2be92045abbe8a63 SHA512 c86e715928a9a04a4c2fac2d18905b60e58cec4a3155aa435ff7304c3348903ca9ee89e3a41046eead5fd05661535bcfa9fd2d31e88388c6cbd6fcc8ea9e0111
+EBUILD libsigrok-0.5.2-r3.ebuild 3397 BLAKE2B ece29201900dd28c9ca6dc90b3203a4fc7f0a9a8ee17dd9ac8ae9669cef74b3d98f41c1bea015b78485171d3d558a323c2ccaf609ad79c08dd22c83fb4438b0a SHA512 173484a330c20aabf3807b76d95479a87660746f0e9eb10cd75a3c265f98d2035c97d67d6d13942bf3df41be168d41f4c1717bb36cc3b22e6f8aee9f02514894
+EBUILD libsigrok-9999.ebuild 3315 BLAKE2B 9545f2fe112cf738746ca97ac6ff2d7d6fcf3607cf1fb700173230e9e0ff23a0c78b510c67063cbbcf30e0699fb8f4d0f4a3b2c26aeb7ae734f6be9251f88d02 SHA512 ef0d1c82b5e108ee023d2acb5f10399161989d5be18bacddaee753c505c9769c11958fc45f2db967ad8b1453adc7f9941a739e207b614624571e805558f79bf3
 MISC metadata.xml 886 BLAKE2B cb7cece1f79a4affb612e55f147eb93895a805e43aed6bbabfed2e3b925b0714d64651c00294da2742f8c09ce9984a58888b89025d73712400c8bd026296b2cb SHA512 79c9697b3fe6954108cb60ae79c06cee280ef6d73bcd9e35ab148750a4fa55c8e5118c21cdb4e3ae009d4c160a26c98132448476ef90ac6d7a19a79138c3b2f6
diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild
deleted file mode 100644
index ef282ece33cc..000000000000
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_9 )
-
-inherit python-r1 java-pkg-opt-2 udev xdg-utils
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support"
-HOMEPAGE="https://sigrok.org/wiki/Libsigrok"
-
-LICENSE="GPL-3"
-SLOT="0/4"
-IUSE="+cxx ftdi java parport python serial static-libs test +udev usb"
-REQUIRED_USE="java? ( cxx )
-	python? ( cxx ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-# We also support librevisa, but that isn't in the tree ...
-LIB_DEPEND="
-	>=dev-libs/glib-2.32.0[static-libs(+)]
-	>=dev-libs/libzip-0.8:=[static-libs(+)]
-	cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-	ftdi? ( dev-embedded/libftdi:1[static-libs(+)] )
-	parport? ( sys-libs/libieee1284[static-libs(+)] )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}]
-	)
-	serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
-	usb? ( virtual/libusb:1[static-libs(+)] )
-"
-RDEPEND="
-	java? ( >=virtual/jre-1.8:* )
-	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	static-libs? ( ${LIB_DEPEND} )
-"
-DEPEND="${LIB_DEPEND//\[static-libs(+)]}
-	cxx? ( app-doc/doxygen )
-	java? (
-		>=dev-lang/swig-3.0.6
-		>=virtual/jdk-1.8:*
-	)
-	python? (
-		>=dev-lang/swig-3.0.6
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-	test? ( >=dev-libs/check-0.9.4 )
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}"/${P}
-
-PATCHES=(
-	# https://sigrok.org/bugzilla/show_bug.cgi?id=1527
-	"${FILESDIR}/${P}-swig-4.patch"
-	# https://sigrok.org/bugzilla/show_bug.cgi?id=1526
-	"${FILESDIR}/${P}-check-0.15.patch"
-)
-
-pkg_setup() {
-	use python && python_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	[[ ${PV} == *9999* ]] && git-r3_src_unpack || default
-}
-
-sigrok_src_prepare() {
-	[[ ${PV} == *9999* ]] && eautoreconf
-}
-
-src_prepare() {
-	default
-	sigrok_src_prepare
-	use python && python_copy_sources
-}
-
-sigrok_src_configure() {
-	econf \
-		$(use_with ftdi libftdi) \
-		$(use_with parport libieee1284) \
-		$(use_with serial libserialport) \
-		$(use_with usb libusb) \
-		$(use_enable cxx) \
-		$(use_enable java) \
-		$(use_enable static-libs static) \
-		"${@}"
-}
-
-each_python_configure() {
-	cd "${BUILD_DIR}"
-	sigrok_src_configure --disable-ruby --enable-python
-}
-
-src_configure() {
-	sigrok_src_configure --disable-ruby --disable-python
-	use python && python_foreach_impl each_python_configure
-}
-
-each_python_compile() {
-	cd "${BUILD_DIR}"
-	emake python-build
-}
-
-src_compile() {
-	default
-	use python && python_foreach_impl each_python_compile
-}
-
-src_test() {
-	emake check
-}
-
-each_python_install() {
-	cd "${BUILD_DIR}"
-	emake python-install DESTDIR="${D}"
-	python_optimize
-}
-
-src_install() {
-	default
-	use python && python_foreach_impl each_python_install
-	use udev && udev_dorules contrib/*.rules
-	find "${D}" -name '*.la' -type f -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
index f4fa7b02de2c..8a010fd267af 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit autotools python-r1 java-pkg-opt-2 udev xdg-utils
 
@@ -144,9 +144,11 @@ src_install() {
 pkg_postinst() {
 	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
+	udev_reload
 }
 
 pkg_postrm() {
 	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
+	udev_reload
 }
diff --git a/sci-libs/libsigrok/libsigrok-9999.ebuild b/sci-libs/libsigrok/libsigrok-9999.ebuild
index 32e030d01b3b..242b275a45d7 100644
--- a/sci-libs/libsigrok/libsigrok-9999.ebuild
+++ b/sci-libs/libsigrok/libsigrok-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit python-r1 java-pkg-opt-2 udev xdg-utils
 
@@ -139,9 +139,11 @@ src_install() {
 pkg_postinst() {
 	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
+	udev_reload
 }
 
 pkg_postrm() {
 	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
+	udev_reload
 }