diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-3.631.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-3.631.ebuild
new file mode 100644
index 0000000000000..ae26b9fe65621
--- /dev/null
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-3.631.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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="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/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
+	>=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-9999.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
index 9f57ceaba96c7..ae26b9fe65621 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 e9d744190ef8f..726b73f903014 100644
--- a/dev-perl/Lab-Measurement/Manifest
+++ b/dev-perl/Lab-Measurement/Manifest
@@ -1,2 +1,3 @@
 DIST Lab-Measurement-3.600.tar.gz 513213 BLAKE2B 6ab87bc4b7f99864c02bd6bcc9f83a586e6db950af566a9af811906d621755973aef7b89e774bdfb865c27d357b4eed1f41a7bf37868354b0289242b0565d0fe SHA512 427e99594a9916e0e1f95d58d84d21e62ea619d9887badb3a8472c780842227acb0f50d2e5ab68c01b7fab487ca32585a83475de920d88936dd9fad65447a8d5
 DIST Lab-Measurement-3.613.tar.gz 548651 BLAKE2B 386b4ced272ed12620246eb08c3f21fe65be859e277f5dc26a056709746274459a3be9029290e06ff6b7c88ee8fd28338aceaf741bfeb15b9059f313b1b66fd8 SHA512 9645b9de7c845b3c4743cb27d572aa912f533a45a220cc21f1d60d051e18cf260676a990483adc0090d53c0dd305679d03e8497292a0801575c2bae28f87915b
+DIST Lab-Measurement-3.631.tar.gz 576050 BLAKE2B 1535dfedb6c3ed1aaa266f3b8d924195b2bfd4d5fa101b4aa1d1f9fa5156ab2fd2678f628dbbe0d66b51796fa3a0a1e679478f1eadb39df58c5d64eb1fe17954 SHA512 201a1782ecdb0d14a9a6274130af970535c2131c894469999d4f910ec8b345b4c68434a9b458e85b2f1e14e6426fe9b64aad7e898836583d346f2b088b2ba411