gentoo resync : 25.10.2021

4 files changed, 10 insertions, 161 deletions

diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-3.751.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-3.751.ebuild
deleted file mode 100644
index e3f434a03ec7..000000000000
--- a/dev-perl/Lab-Measurement/Lab-Measurement-3.751.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_EXAMPLES=( "examples/*" )
-
-if [[ "${PV}" != "9999" ]]; then
-	DIST_VERSION=${PV%.0}
-	DIST_AUTHOR="AKHUETTEL"
-	KEYWORDS="~amd64 ~x86"
-	inherit perl-module
-else
-	EGIT_REPO_URI="https://github.com/lab-measurement/Lab-Measurement.git"
-	EGIT_BRANCH="master"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-git"
-	inherit perl-module git-r3
-fi
-
-DESCRIPTION="Measurement control and automation with Perl"
-HOMEPAGE="https://www.labmeasurement.de"
-
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DZIL_PLUGINS=( Git PodWeaver AuthorsFromGit )
-
-RDEPEND="
-	virtual/perl-Carp
-	dev-perl/Class-ISA
-	>=dev-perl/Class-Method-Modifiers-2.110.0
-	>=dev-perl/Clone-0.310.0
-	virtual/perl-Data-Dumper
-	virtual/perl-Encode
-	>=dev-perl/Exception-Class-1.0.0
-	virtual/perl-Exporter
-	virtual/perl-File-Path
-	virtual/perl-File-Spec
-	virtual/perl-Getopt-Long
-	dev-perl/Hook-LexWrap
-	virtual/perl-IO
-	>=dev-perl/IO-Socket-Timeout-0.320.0
-	dev-perl/List-MoreUtils
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Math-Complex
-	>=virtual/perl-Module-Load-0.260.0
-	>=dev-perl/Moose-2.121.300
-	>=dev-perl/MooseX-Params-Validate-0.180.0
-	dev-perl/MooseX-StrictConstructor
-	>=dev-perl/PDL-2.7.0
-	dev-perl/PDL-Graphics-Gnuplot
-	>=dev-perl/Role-Tiny-1.3.4
-	virtual/perl-Socket
-	dev-perl/Statistics-Descriptive
-	virtual/perl-Storable
-	>=dev-perl/TermReadKey-2.300.0
-	virtual/perl-Thread-Semaphore
-	virtual/perl-Time-HiRes
-	dev-perl/Time-Monotonic
-	virtual/perl-Time-Piece
-	>=dev-perl/Try-Tiny-0.220.0
-	>=dev-perl/YAML-LibYAML-0.410.0
-	virtual/perl-autodie
-	>=dev-perl/namespace-autoclean-0.200.0
-	virtual/perl-parent
-	sci-visualization/gnuplot
-	dev-perl/Lab-VXI11
-	dev-perl/USB-TMC
-"
-DEPEND="
-	${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		dev-perl/File-Slurper
-		virtual/perl-File-Temp
-		dev-perl/Test-Fatal
-		dev-perl/Test-File
-		virtual/perl-Test-Simple
-		dev-perl/Text-Diff
-		dev-perl/aliased
-	)
-"
-if [[ "${PV}" == "9999" ]]; then
-	DEPEND="${DEPEND}
-		dev-perl/Dist-Zilla"
-	for dzp in "${DZIL_PLUGINS[@]}" ; do
-		DEPEND="${DEPEND}
-		dev-perl/Dist-Zilla-Plugin-${dzp}"
-	done
-fi
-
-src_unpack() {
-	if [[ "${PV}" == "9999" ]]; then
-		git-r3_src_unpack
-		mkdir -p "${S}" || die "Can't make ${S}"
-	else
-		default
-	fi
-}
-
-dzil_to_distdir() {
-	local dzil_root dest has_missing modname dzil_version
-	dzil_root="$1"
-	dest="$2"
-
-	cd "${dzil_root}" || die "Can't enter git workdir '${dzil_root}'";
-
-	dzil_version="$(dzil version)" || die "Error invoking 'dzil version'"
-	einfo "Generating CPAN dist with ${dzil_version}"
-
-	has_missing=""
-
-	einfo "Checking dzil authordeps"
-	while IFS= read -d $'\n' -r modname; do
-		if [[ -z "${has_missing}" ]]; then
-			has_missing=1
-			eerror "'dzil authordeps' indicates missing build dependencies"
-			eerror "These will prevent building, please report a bug"
-			eerror "Missing:"
-		fi
-		eerror "  ${modname}"
-	done < <( dzil authordeps --missing --versions )
-
-	[[ -z "${has_missing}" ]] || die "Satisfy all missing authordeps first"
-
-	einfo "Checking dzil build deps"
-	while IFS= read -d $'\n' -r modname; do
-		if [[ -z "${has_missing}" ]]; then
-			has_missing=1
-			ewarn "'dzil listdeps' indicates missing build dependencies"
-			ewarn "These may prevent building, please report a bug if they do"
-			ewarn "Missing:"
-		fi
-		ewarn "  ${modname}"
-	done < <( dzil listdeps --missing --versions --author )
-
-	einfo "Generating release"
-	dzil build --notgz --in "${dest}" || die "Unable to build CPAN dist in '${dest}'"
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999 ]]; then
-		dzil_to_distdir "${EGIT_CHECKOUT_DIR}" "${S}"
-	fi
-	cd "${S}" || die "Can't enter build dir"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-3.741.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-3.780.ebuild
index e3f434a03ec7..77af54a66108 100644
--- a/dev-perl/Lab-Measurement/Lab-Measurement-3.741.ebuild
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-3.780.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DZIL_PLUGINS=( Git PodWeaver AuthorsFromGit )
+DZIL_PLUGINS=( Git PodWeaver AuthorsFromGit RPM )
 
 RDEPEND="
 	virtual/perl-Carp
@@ -44,6 +44,7 @@ RDEPEND="
 	dev-perl/List-MoreUtils
 	virtual/perl-Scalar-List-Utils
 	virtual/perl-Math-Complex
+	dev-perl/Math-Round
 	>=virtual/perl-Module-Load-0.260.0
 	>=dev-perl/Moose-2.121.300
 	>=dev-perl/MooseX-Params-Validate-0.180.0
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
index 77af54a66108..dd02cae02296 100644
--- a/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DIST_EXAMPLES=( "examples/*" )
 
 if [[ "${PV}" != "9999" ]]; then
 	DIST_VERSION=${PV%.0}
-	DIST_AUTHOR="AKHUETTEL"
+	DIST_AUTHOR=AKHUETTEL
 	KEYWORDS="~amd64 ~x86"
 	inherit perl-module
 else
@@ -21,10 +21,8 @@ DESCRIPTION="Measurement control and automation with Perl"
 HOMEPAGE="https://www.labmeasurement.de"
 
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DZIL_PLUGINS=( Git PodWeaver AuthorsFromGit RPM )
+DZIL_PLUGINS=( Git PodWeaver AuthorsFromGit RPM Test-ReportPrereqs )
 
 RDEPEND="
 	virtual/perl-Carp
@@ -69,8 +67,7 @@ RDEPEND="
 	dev-perl/Lab-VXI11
 	dev-perl/USB-TMC
 "
-DEPEND="
-	${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
 		dev-perl/File-Slurper
@@ -82,6 +79,7 @@ DEPEND="
 		dev-perl/aliased
 	)
 "
+
 if [[ "${PV}" == "9999" ]]; then
 	DEPEND="${DEPEND}
 		dev-perl/Dist-Zilla"
diff --git a/dev-perl/Lab-Measurement/Manifest b/dev-perl/Lab-Measurement/Manifest
index b9de74e13006..e424f2ab3923 100644
--- a/dev-perl/Lab-Measurement/Manifest
+++ b/dev-perl/Lab-Measurement/Manifest
@@ -1,8 +1,6 @@
-DIST Lab-Measurement-3.741.tar.gz 621051 BLAKE2B bcde314015e410aec93e4bace1990621f58bc81dc3f010f27a37295b70432f3f65b0d46382e18bb57b18b00c3001a1757647a9f35cfe8a214036dd57bc27a64f SHA512 f1b43177c720a10567c99edfba78c0c35659f1b82b2eb03f66e383767a9ef5b415c9014b50013ba5caddf67bb4bd87dadea4295923a161f53a85d23ae8d8c6a0
-DIST Lab-Measurement-3.751.tar.gz 622310 BLAKE2B 5bac81b956aa457e8c6ba03c82b628495ab514aaf0d87f59c55afe7f7630f7df746f95d4165f734e980eb6b6921d31cf9ffe5285c38f968860310941ce06a597 SHA512 220dacb27799b222601eb12b666b637da7b47068191ee9779ee029ec21e1cb15908ab82bba18b499e0be7538469fe99ffe7f9eaa6b78ebe349fe5e30079ded70
 DIST Lab-Measurement-3.762.tar.gz 651690 BLAKE2B 9cced9cb51c45149db353a46ad2c253da5c9d1d2ec82889b9221b010a5fae3fffa54afe65f2f08b66238d1970b842ec913d8464c988938fee55b47423298467d SHA512 df9ee0f9535fbff44be18b61978c6b2735acbbeee510715d6b34812576053022a24be52ec04d1dba04edcd79fa6eaa13706e173dc2b3b4c0352fa7bdccb5d96e
-EBUILD Lab-Measurement-3.741.ebuild 3685 BLAKE2B 417593af0c162353e3c992809aef259995b523e54d086984442f2950cc43b66d6df503fb0281e6ec9436cc43ac585239f41d4418bd266d3cdeb1a459dcaf692a SHA512 edd6fca1f295a975c14e825a9bf011895bf6a66faca6b50804d235417cdef1ff3a7fd7d6d79130a1e2555209f03b6c74208bd53b8c56abcea36a6ec591c6258e
-EBUILD Lab-Measurement-3.751.ebuild 3685 BLAKE2B 417593af0c162353e3c992809aef259995b523e54d086984442f2950cc43b66d6df503fb0281e6ec9436cc43ac585239f41d4418bd266d3cdeb1a459dcaf692a SHA512 edd6fca1f295a975c14e825a9bf011895bf6a66faca6b50804d235417cdef1ff3a7fd7d6d79130a1e2555209f03b6c74208bd53b8c56abcea36a6ec591c6258e
+DIST Lab-Measurement-3.780.tar.gz 641884 BLAKE2B b0d5117eeb022a7d58ffe975ba943a29689436911210eba63385df7e4536f850b5cc3a021e26ca60c9fc9cf19f359e2a648927ec5fc68ab2dea3a66fc1ac903c SHA512 260d670e7f67448c49fb82900fc0605978c6fcd39a6813c091a84977972f0965e25f14dd3568860cfe136f4628047e0720ea69710693513c5e567eeac10ddf97
 EBUILD Lab-Measurement-3.762.ebuild 3709 BLAKE2B 64882fb00fbf50a870c3d1d4b9b31f8ef03af0c05f57cf0f38df29fe7417343ff725028f9673da124a9ffeed0f3f386e6e1a46d46a45a6a457c957e4e2802108 SHA512 4c9f49d3d5ad8ea9ae0eca97cdf1d73236ec1a83c05598cff3d161dc51964953bb9fd26f1cf1d2d2a1d8a7565de93f98f4e5b925093d61cf71897d5524bf9fd7
-EBUILD Lab-Measurement-9999.ebuild 3710 BLAKE2B 7d337189ede2ec8331f67766518fb73cebd220727ae75ff2de3bb346eaa893edde47aa07d31b58a3ba1505834f08236a2c2f72ad9a190a636ec75b4a6d22469d SHA512 9f53a569f0443703d40d73ce4947e1acfd73d8ebabee5692df198e57e77dcca4f97a7b8c35ee471f299ccde9a51ee8767727a418677d93da5fbcb9834fc9329b
+EBUILD Lab-Measurement-3.780.ebuild 3710 BLAKE2B 7d337189ede2ec8331f67766518fb73cebd220727ae75ff2de3bb346eaa893edde47aa07d31b58a3ba1505834f08236a2c2f72ad9a190a636ec75b4a6d22469d SHA512 9f53a569f0443703d40d73ce4947e1acfd73d8ebabee5692df198e57e77dcca4f97a7b8c35ee471f299ccde9a51ee8767727a418677d93da5fbcb9834fc9329b
+EBUILD Lab-Measurement-9999.ebuild 3688 BLAKE2B c302ac3b99bee47bd6c1677b75cd37a838fc80aa35be506e04c95a0e94b7f582b53262780b1752134e7b567d03b720077df0a74af5c6632f31ff983a1aa05cab SHA512 6b71b90cfffa1ffc9817fedf9d2630a4a0fe5abd9e43297ceb61f214e0d3a7fcabb1206756d62fa5828a381f283ed97e578e9dc0ea00ab4a35b9aab760c913fc
 MISC metadata.xml 3206 BLAKE2B 2da1f725a31d55caf7e021116aa4898a1d94d050014e8e357d4856bfe8135ef6b4fc45c58c9dcd5c04888ee71742b617925522684021b061f603b2ac6b28ecb2 SHA512 1446148605c3aec2f193494e495345e6e9770699726a5aed5150528da8d04ca71ff316986237b512a9b01a250d28a126f06b5f884434569c4b0f5395f7752093