EAPI bump, use canonical Gentoo perl module versions

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)

5 files changed, 15 insertions, 115 deletions

diff --git a/dev-perl/Lab-Measurement/ChangeLog b/dev-perl/Lab-Measurement/ChangeLog
index d3b0f2e23c97..951aa1df9a32 100644
--- a/dev-perl/Lab-Measurement/ChangeLog
+++ b/dev-perl/Lab-Measurement/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-perl/Lab-Measurement
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/ChangeLog,v 1.13 2013/06/10 17:59:08 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/ChangeLog,v 1.14 2013/09/04 17:57:15 dilfridge Exp $
+
+*Lab-Measurement-3.110.0 (04 Sep 2013)
+
+  04 Sep 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  -Lab-Measurement-3.00.ebuild, -Lab-Measurement-3.10.ebuild,
+  -Lab-Measurement-3.11.ebuild, +Lab-Measurement-3.110.0.ebuild,
+  Lab-Measurement-9999.ebuild:
+  EAPI bump, use canonical Gentoo perl module versions
 
   10 Jun 2013; Andreas K. Huettel <dilfridge@gentoo.org>
   Lab-Measurement-9999.ebuild, metadata.xml:
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-3.00.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-3.00.ebuild
deleted file mode 100644
index 66db50c66708..000000000000
--- a/dev-perl/Lab-Measurement/Lab-Measurement-3.00.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-3.00.ebuild,v 1.1 2012/07/12 16:59:05 dilfridge Exp $
-
-if [[ "${PV}" != "9999" ]]; then
-	MODULE_AUTHOR="AKHUETTEL"
-	KEYWORDS="~amd64 ~x86"
-	inherit perl-module
-else
-	EGIT_REPO_URI="git://gitorious.org/lab-measurement/lab.git"
-	EGIT_BRANCH="master"
-	EGIT_SOURCEDIR=${S}
-	KEYWORDS=""
-	S=${WORKDIR}/${P}/Measurement
-	inherit perl-module git-2
-fi
-
-DESCRIPTION="Measurement control and automation with Perl"
-HOMEPAGE="http://www.labmeasurement.de/"
-
-# this is perl's license, whatever it means
-LICENSE="|| ( Artistic GPL-2 )"
-
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Clone
-	dev-perl/Exception-Class
-	dev-perl/TermReadKey
-	dev-perl/TeX-Encode
-	dev-perl/XML-Generator
-	dev-perl/XML-DOM
-	dev-perl/XML-Twig
-	dev-perl/encoding-warnings
-	perl-core/Switch
-	sci-visualization/gnuplot
-	virtual/perl-Data-Dumper
-	virtual/perl-Encode
-	virtual/perl-Switch
-	virtual/perl-Time-HiRes
-	!dev-perl/Lab-Instrument
-	!dev-perl/Lab-Tools
-"
-DEPEND="
-	${RDEPEND}
-	virtual/perl-Module-Build
-"
-
-pkg_postinst() {
-	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)"
-}
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-3.10.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-3.10.ebuild
deleted file mode 100644
index c56c6ad0baa7..000000000000
--- a/dev-perl/Lab-Measurement/Lab-Measurement-3.10.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-3.10.ebuild,v 1.1 2012/08/05 19:52:26 dilfridge Exp $
-
-if [[ "${PV}" != "9999" ]]; then
-	MODULE_AUTHOR="AKHUETTEL"
-	KEYWORDS="~amd64 ~x86"
-	inherit perl-module
-else
-	EGIT_REPO_URI="git://gitorious.org/lab-measurement/lab.git"
-	EGIT_BRANCH="master"
-	EGIT_SOURCEDIR=${S}
-	KEYWORDS=""
-	S=${WORKDIR}/${P}/Measurement
-	inherit perl-module git-2
-fi
-
-DESCRIPTION="Measurement control and automation with Perl"
-HOMEPAGE="http://www.labmeasurement.de/"
-
-# this is perl's license, whatever it means
-LICENSE="|| ( Artistic GPL-2 )"
-
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Clone
-	dev-perl/Exception-Class
-	dev-perl/TermReadKey
-	dev-perl/TeX-Encode
-	dev-perl/XML-Generator
-	dev-perl/XML-DOM
-	dev-perl/XML-Twig
-	dev-perl/encoding-warnings
-	perl-core/Switch
-	sci-visualization/gnuplot
-	virtual/perl-Data-Dumper
-	virtual/perl-Encode
-	virtual/perl-Switch
-	virtual/perl-Time-HiRes
-	!dev-perl/Lab-Instrument
-	!dev-perl/Lab-Tools
-"
-DEPEND="
-	${RDEPEND}
-	virtual/perl-Module-Build
-"
-
-pkg_postinst() {
-	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)"
-}
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-3.11.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-3.110.0.ebuild
index 734fb932ac49..142d9e9ab4c1 100644
--- a/dev-perl/Lab-Measurement/Lab-Measurement-3.11.ebuild
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-3.110.0.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-3.11.ebuild,v 1.1 2013/05/13 19:50:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-3.110.0.ebuild,v 1.1 2013/09/04 17:57:15 dilfridge Exp $
+
+EAPI=5
 
 if [[ "${PV}" != "9999" ]]; then
+	MODULE_VERSION=3.11
 	MODULE_AUTHOR="AKHUETTEL"
 	KEYWORDS="~amd64 ~x86"
 	inherit perl-module
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
index 821ca01f22d1..ba219e6502a2 100644
--- a/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild,v 1.8 2013/06/10 17:59:08 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild,v 1.9 2013/09/04 17:57:15 dilfridge Exp $
 
 EAPI=5
 
 if [[ "${PV}" != "9999" ]]; then
+	MODULE_VERSION=9999 # change this!!!
 	MODULE_AUTHOR="AKHUETTEL"
 	KEYWORDS="~amd64 ~x86"
 	inherit perl-module