gentoo resync : 28.04.2018

4 files changed, 9 insertions, 146 deletions

diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-3.600.0.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-3.600.0.ebuild
deleted file mode 100644
index 867b2e76022d..000000000000
--- a/dev-perl/Lab-Measurement/Lab-Measurement-3.600.0.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="http://www.labmeasurement.de/"
-
-SLOT="0"
-IUSE="test"
-
-DZIL_PLUGINS=( Git SurgicalPodWeaver RPM 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/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/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
-"
-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.613.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-3.631.ebuild
index 6f68ebe8c073..ae26b9fe6562 100644
--- a/dev-perl/Lab-Measurement/Lab-Measurement-3.613.ebuild
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-3.631.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,6 +46,7 @@ RDEPEND="
 	>=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
@@ -62,6 +63,8 @@ RDEPEND="
 	>=dev-perl/namespace-autoclean-0.200.0
 	virtual/perl-parent
 	sci-visualization/gnuplot
+	dev-perl/Lab-VXI11
+	dev-perl/USB-TMC
 "
 DEPEND="
 	${RDEPEND}
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
index 9f57ceaba96c..ae26b9fe6562 100644
--- a/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
@@ -63,6 +63,8 @@ RDEPEND="
 	>=dev-perl/namespace-autoclean-0.200.0
 	virtual/perl-parent
 	sci-visualization/gnuplot
+	dev-perl/Lab-VXI11
+	dev-perl/USB-TMC
 "
 DEPEND="
 	${RDEPEND}
diff --git a/dev-perl/Lab-Measurement/Manifest b/dev-perl/Lab-Measurement/Manifest
index aeb392dc524a..46c70da6215f 100644
--- a/dev-perl/Lab-Measurement/Manifest
+++ b/dev-perl/Lab-Measurement/Manifest
@@ -1,6 +1,4 @@
-DIST Lab-Measurement-3.600.tar.gz 513213 BLAKE2B 6ab87bc4b7f99864c02bd6bcc9f83a586e6db950af566a9af811906d621755973aef7b89e774bdfb865c27d357b4eed1f41a7bf37868354b0289242b0565d0fe SHA512 427e99594a9916e0e1f95d58d84d21e62ea619d9887badb3a8472c780842227acb0f50d2e5ab68c01b7fab487ca32585a83475de920d88936dd9fad65447a8d5
-DIST Lab-Measurement-3.613.tar.gz 548651 BLAKE2B 386b4ced272ed12620246eb08c3f21fe65be859e277f5dc26a056709746274459a3be9029290e06ff6b7c88ee8fd28338aceaf741bfeb15b9059f313b1b66fd8 SHA512 9645b9de7c845b3c4743cb27d572aa912f533a45a220cc21f1d60d051e18cf260676a990483adc0090d53c0dd305679d03e8497292a0801575c2bae28f87915b
-EBUILD Lab-Measurement-3.600.0.ebuild 3517 BLAKE2B 9f0634be05af884272252609b9a4645053e2c8dc5a0b93f295821fe98822adcb1f40039e70fe4ce4e9e68eb4d23e2ea25e7f1ca8464471ea0cd1d9ee4356cfe1 SHA512 fe3dfa6fa4e7e23c9a728b0c781be7f9262871e136dfc3de0040fcf5fe41ecf4f3475e6f0d6b770704cfb88883c407ab20d5d02d43be5a6c28ac72e617cb5b03
-EBUILD Lab-Measurement-3.613.ebuild 3575 BLAKE2B 40573d130a8b00d0e308f8139c1aeebe83c286eca7d0c17628add75448c9911062fd6fcab58fe95eaa2723cbb0ba82bc407eacaaa29e7ee937d4b4da1b3d9700 SHA512 edd1701afa2b6e5e7c002ce7ef6ef43d3fef4583365203fb3167dd03ccf5d12579b1e4d6d49aa4709ff6298bbfe44b35da79decaa5d20fce84cef1a82a8d24c3
-EBUILD Lab-Measurement-9999.ebuild 3610 BLAKE2B 8c60f3fe383e7e24b9eec9cc3cbe9c707e1e2b10b6aa2ba3b2ec24ff8ff5921b71bd6acc20fe2eadb140bfba4925e87468c4f4e01fd9f456acdffe66dd6d7752 SHA512 d29034f355e96a13b7c58a4c7b61e500f4c16e0565bff54bd22cb2f6d637d798a365d328e078bc7222ffa6256a78b337c1423fe2f0b7eb9eaf4b78141d62b8f4
+DIST Lab-Measurement-3.631.tar.gz 576050 BLAKE2B 1535dfedb6c3ed1aaa266f3b8d924195b2bfd4d5fa101b4aa1d1f9fa5156ab2fd2678f628dbbe0d66b51796fa3a0a1e679478f1eadb39df58c5d64eb1fe17954 SHA512 201a1782ecdb0d14a9a6274130af970535c2131c894469999d4f910ec8b345b4c68434a9b458e85b2f1e14e6426fe9b64aad7e898836583d346f2b088b2ba411
+EBUILD Lab-Measurement-3.631.ebuild 3648 BLAKE2B bc0fbf38b97e6bed14e12434d19fb0aaf72ff0ff19120ea348ddf1e043581148024f723ad463c6443a06f8f9cdf895c253ef5466f48e375a677aed891d6236e2 SHA512 a728917f7f2e4693112b08ae77b844c02b5906ad9b09c1c58158054c3ebb639b32becfa8e13ba2677c3473649e4d984e86854aff05d40da08cfc09bfd01e4a68
+EBUILD Lab-Measurement-9999.ebuild 3648 BLAKE2B bc0fbf38b97e6bed14e12434d19fb0aaf72ff0ff19120ea348ddf1e043581148024f723ad463c6443a06f8f9cdf895c253ef5466f48e375a677aed891d6236e2 SHA512 a728917f7f2e4693112b08ae77b844c02b5906ad9b09c1c58158054c3ebb639b32becfa8e13ba2677c3473649e4d984e86854aff05d40da08cfc09bfd01e4a68
 MISC metadata.xml 3205 BLAKE2B d8be34e0b381d155cc4706306a50222a523e80a742616351e984cbeb8fbe9ea15fd626ef23163da0ab2f681998756e97e7bba412432c908008b1f34f1b201242 SHA512 cefb77a0d38bc965c8e4a5c9346eb0218a7b9cccc66535b460219fd52359df0db750e96eb88337d425caf5114b7cfcba9f8d3666c7d9e3c052bc2ae1a9e2ceae