gentoo resync : 01.12.2017

5 files changed, 4 insertions, 235 deletions

diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-3.531.0.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-3.531.0.ebuild
deleted file mode 100644
index 96a89157dad5..000000000000
--- a/dev-perl/Lab-Measurement/Lab-Measurement-3.531.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ "${PV}" != "9999" ]]; then
-	DIST_VERSION=3.531
-	DIST_AUTHOR="AKHUETTEL"
-	KEYWORDS="~amd64 ~x86"
-	inherit perl-module
-else
-	EGIT_REPO_URI="https://github.com/lab-measurement/lab-measurement.git"
-	EGIT_BRANCH="master"
-	inherit perl-module git-r3
-	S=${WORKDIR}/${P}/Measurement
-fi
-
-DESCRIPTION="Measurement control and automation with Perl"
-HOMEPAGE="http://www.labmeasurement.de/"
-
-SLOT="0"
-IUSE="test +xpression"
-
-RDEPEND="
-	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
-	dev-perl/Hook-LexWrap
-	dev-perl/List-MoreUtils
-	>=dev-perl/Moose-2.121.300
-	>=dev-perl/MooseX-Params-Validate-0.180.0
-	>=dev-perl/namespace-autoclean-0.200.0
-	>=dev-perl/Role-Tiny-1.3.4
-	dev-perl/Statistics-Descriptive
-	dev-perl/Term-ANSIScreen
-	>=dev-perl/TermReadKey-2.320.0
-	dev-perl/TeX-Encode
-	virtual/perl-Time-HiRes
-	>=dev-perl/Try-Tiny-0.220.0
-	dev-perl/XML-DOM
-	dev-perl/XML-Generator
-	dev-perl/XML-Twig
-	dev-perl/YAML
-	dev-perl/aliased
-	>=dev-perl/YAML-LibYAML-0.410.0
-	sci-visualization/gnuplot
-	!dev-perl/Lab-Instrument
-	!dev-perl/Lab-Tools
-	xpression? (
-		dev-perl/Wx
-	)
-"
-DEPEND="
-	${RDEPEND}
-	dev-perl/Module-Build
-	test? (
-		dev-perl/File-Slurper
-		dev-perl/Test-Files
-		>=dev-perl/Test-Fatal-0.12.0
-	)
-"
-
-pkg_postinst() {
-	if ( ! has_version sci-libs/linuxgpib ) && ( ! has_version dev-perl/Lab-VISA ) ; then
-		elog "You may want to install one or more backend driver modules. Supported are"
-		elog "    sci-libs/linuxgpib    Open-source GPIB hardware driver"
-		elog "    dev-perl/Lab-VISA     Bindings for the NI proprietary VISA driver"
-		elog "                          stack (dilfridge overlay)"
-	fi
-}
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-3.550.0.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-3.550.0.ebuild
deleted file mode 100644
index cc693e6fcba0..000000000000
--- a/dev-perl/Lab-Measurement/Lab-Measurement-3.550.0.ebuild
+++ /dev/null
@@ -1,151 +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 PodWeaver )
-
-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-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
-		# Uses git sources in WORKDIR/rex-git
-		# to generate a CPAN-style tree in ${S}
-		# before letting perl-module.eclass do the rest
-		dzil_to_distdir "${EGIT_CHECKOUT_DIR}/Measurement" "${S}"
-	fi
-	cd "${S}" || die "Can't enter build dir"
-	perl-module_src_prepare
-}
-
-pkg_postinst() {
-	if ( ! has_version sci-libs/linuxgpib ) && ( ! has_version dev-perl/Lab-VISA ) ; then
-		elog "You may want to install one or more backend driver modules. Supported are"
-		elog "    sci-libs/linuxgpib    Open-source GPIB hardware driver"
-		elog "    dev-perl/Lab-VISA     Bindings for the NI proprietary VISA driver"
-		elog "                          stack (dilfridge overlay)"
-	fi
-}
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-3.600.0.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-3.600.0.ebuild
index 5acf5dfbf16d..867b2e76022d 100644
--- a/dev-perl/Lab-Measurement/Lab-Measurement-3.600.0.ebuild
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-3.600.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 if [[ "${PV}" != "9999" ]]; then
 	DIST_VERSION=${PV%.0}
 	DIST_AUTHOR="AKHUETTEL"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	inherit perl-module
 else
 	EGIT_REPO_URI="https://github.com/lab-measurement/Lab-Measurement.git"
diff --git a/dev-perl/Lab-Measurement/Manifest b/dev-perl/Lab-Measurement/Manifest
index b7e7df34940a..0af0584ddc41 100644
--- a/dev-perl/Lab-Measurement/Manifest
+++ b/dev-perl/Lab-Measurement/Manifest
@@ -1,8 +1,4 @@
-DIST Lab-Measurement-3.531.tar.gz 483289 SHA256 656cab0028f840065120ac67975e70c2f42739fa0e6788f4f07e93fd8d518d3c SHA512 28db6db91db281aec1b57d48f94d31c7f01731ad944b891332496329f91b4b5985ab474b645fa70ed396dd5662d5086722128cf1db9d88c5a766d500694ef5c7 WHIRLPOOL e1e85ef42a531e60cb04e715924e574925e78a9a45e58603e78627953d154d5df5569ab2991f48a3b9b3fa92994c432966f300a074b507f3669fe816d6204a4b
-DIST Lab-Measurement-3.550.tar.gz 510971 SHA256 5204bcd88db31156fec717b546eb4ed6e4a43a781d36a28141c5477d3c714768 SHA512 e3ab254909b5d6644ac0938233b643ccfa851631b54de0f409175020d4d577e61f90af2b797ad1418366b3876c917c7cc30109abc8b13f1d3b93fdcad439acaa WHIRLPOOL 7c9dbee0743fa6b21c0041ea67cbb0d5e6e083c8d81bc9fd5f0bd11dd12daf79856a174145a61f11916668a59d82f1d2e8cf6c372295cbc2eafddf12d6487c68
-DIST Lab-Measurement-3.600.tar.gz 513213 SHA256 06ab0e17fa929fb2f2c73cf455370306034d93614b4ee2e32ec9f468235364a7 SHA512 427e99594a9916e0e1f95d58d84d21e62ea619d9887badb3a8472c780842227acb0f50d2e5ab68c01b7fab487ca32585a83475de920d88936dd9fad65447a8d5 WHIRLPOOL bcbde2e7b7b78b64f5023f51be1e18811c8d384ac557bc90b2760fdd5bccfaa235ac0115e6ec2b1523429c16169214900e1f4a3ec1eea2221ccaad28c74d00e7
-EBUILD Lab-Measurement-3.531.0.ebuild 1835 BLAKE2B 4bab9e42f69c42a01db6c06196fdd9b302623acff6d8ac916a0149c368b2455d14928fc1aba7002842873e2b26764c6dab09fd8a98df9a02e36e9c178c26a83c SHA512 3b5f84cce308b12b1e3d64df5fb7eb47eed0042d67be7b48d382a4582e7456c8e0f2eab411a6ded483f3c5d375cdb4d02794a3aa6ed5ea8c9da42bc2f93ce755
-EBUILD Lab-Measurement-3.550.0.ebuild 4009 BLAKE2B 0b797a3f5dd474b6ae244c88e2728389dbc9d6d2fcb9c7dac1a6e3a71b5eba97cb136b05adabf24988fc7d18880cac4ae9d477dbc82b97bacb95ab84bdbfa3e9 SHA512 d26245ed21b7460b541bd2f219ff96e54d7ee5c2879d292acd30f9d5d57428f5e63f575885dbf46295bc35a7570cb22cec2dae748ec3812396c33a440cf7c9dd
-EBUILD Lab-Measurement-3.600.0.ebuild 3518 BLAKE2B b06dd8ffa0a7cf38f5f514f5bb5bdfa06ef958944509de175d15f2f3de990641493e5f4d5e6013d7f5abf5f0649b94e36ea535d4a13737faee97c78b36da0d42 SHA512 a4d2a881955befee0906d967baacb4fcb8387cfff7d5d367c3965748e4f66a1c65abcc4374ed6eed29881c09c0d6ffec613f35cafa5cf83350a063c818e499ee
+DIST Lab-Measurement-3.600.tar.gz 513213 BLAKE2B 6ab87bc4b7f99864c02bd6bcc9f83a586e6db950af566a9af811906d621755973aef7b89e774bdfb865c27d357b4eed1f41a7bf37868354b0289242b0565d0fe SHA512 427e99594a9916e0e1f95d58d84d21e62ea619d9887badb3a8472c780842227acb0f50d2e5ab68c01b7fab487ca32585a83475de920d88936dd9fad65447a8d5
+EBUILD Lab-Measurement-3.600.0.ebuild 3517 BLAKE2B 9f0634be05af884272252609b9a4645053e2c8dc5a0b93f295821fe98822adcb1f40039e70fe4ce4e9e68eb4d23e2ea25e7f1ca8464471ea0cd1d9ee4356cfe1 SHA512 fe3dfa6fa4e7e23c9a728b0c781be7f9262871e136dfc3de0040fcf5fe41ecf4f3475e6f0d6b770704cfb88883c407ab20d5d02d43be5a6c28ac72e617cb5b03
 EBUILD Lab-Measurement-9999.ebuild 3543 BLAKE2B edee95899d19f735c2a7e794ebc37828cdd422185b10dfb1fb9e0bffa3e4dd6629194dcf40461397fda727021befe7bf770059d790907906135715ed6fde9139 SHA512 9fce64a24d3ad3375b9b45d58b9148efaaba54969142bb962e767c54b31b38d8929727a5113a6cdea0f3c060c487c9a16e2537a8292dfc71c91fcd5c0e670390
-MISC metadata.xml 3300 BLAKE2B b1e55c1b7df057f0f88501a3ef854e0bf91f788df7fe9b9e3b444195f2f8321e0ee3db4e5900e16119d22d65b9367a3213ccb2fa6755f37b5b512af2ed617166 SHA512 2166ffdc8f917146ad3c8c5cfd6776b1b366987bff5774034277c8f0317d94b991145f3e367c6e4b5c025758ec25ba7e944f6ccb9e7d3d3e5c3aae03830e84ab
+MISC metadata.xml 3205 BLAKE2B d8be34e0b381d155cc4706306a50222a523e80a742616351e984cbeb8fbe9ea15fd626ef23163da0ab2f681998756e97e7bba412432c908008b1f34f1b201242 SHA512 cefb77a0d38bc965c8e4a5c9346eb0218a7b9cccc66535b460219fd52359df0db750e96eb88337d425caf5114b7cfcba9f8d3666c7d9e3c052bc2ae1a9e2ceae
diff --git a/dev-perl/Lab-Measurement/metadata.xml b/dev-perl/Lab-Measurement/metadata.xml
index db52697d121b..c2cf1eb288e7 100644
--- a/dev-perl/Lab-Measurement/metadata.xml
+++ b/dev-perl/Lab-Measurement/metadata.xml
@@ -9,9 +9,6 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <use>
-    <flag name="xpression">Install the Xpression measurement framework</flag>
-  </use>
   <upstream>
     <remote-id type="cpan">Lab-Measurement</remote-id>
     <remote-id type="cpan-module">Lab::Bus</remote-id>