Make this unified live/non-live ebuild actually work...

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

4 files changed, 29 insertions, 27 deletions

diff --git a/dev-perl/Lab-Measurement/ChangeLog b/dev-perl/Lab-Measurement/ChangeLog
index b00b8916c70c..cfeb67513dad 100644
--- a/dev-perl/Lab-Measurement/ChangeLog
+++ b/dev-perl/Lab-Measurement/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/Lab-Measurement
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/ChangeLog,v 1.2 2012/01/30 00:45:24 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/ChangeLog,v 1.3 2012/01/30 00:55:41 dilfridge Exp $
+
+  30 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  Lab-Measurement-2.94.ebuild, Lab-Measurement-9999.ebuild:
+  Make this unified live/non-live ebuild actually work...
 
   30 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   Lab-Measurement-2.94.ebuild, Lab-Measurement-9999.ebuild:
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-2.94.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-2.94.ebuild
index bbcab069cd9c..5b9c6fc2fa59 100644
--- a/dev-perl/Lab-Measurement/Lab-Measurement-2.94.ebuild
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-2.94.ebuild
@@ -1,19 +1,20 @@
 # 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-2.94.ebuild,v 1.2 2012/01/30 00:45:24 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-2.94.ebuild,v 1.3 2012/01/30 00:55:41 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
 
-inherit perl-module git-2
-
 DESCRIPTION="Measurement control and automation with Perl"
 HOMEPAGE="http://www.labmeasurement.de/"
 
@@ -43,8 +44,6 @@ DEPEND="
 	virtual/perl-Module-Build
 "
 
-S=${WORKDIR}/${P}/Measurement
-
 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"
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
index f3f52e504313..d46481e38a8c 100644
--- a/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
@@ -1,19 +1,20 @@
 # 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-9999.ebuild,v 1.2 2012/01/30 00:45:24 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild,v 1.3 2012/01/30 00:55:41 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
 
-inherit perl-module git-2
-
 DESCRIPTION="Measurement control and automation with Perl"
 HOMEPAGE="http://www.labmeasurement.de/"
 
@@ -43,8 +44,6 @@ DEPEND="
 	virtual/perl-Module-Build
 "
 
-S=${WORKDIR}/${P}/Measurement
-
 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"
diff --git a/dev-perl/Lab-Measurement/Manifest b/dev-perl/Lab-Measurement/Manifest
index 7852a24a6a6f..a633df109a14 100644
--- a/dev-perl/Lab-Measurement/Manifest
+++ b/dev-perl/Lab-Measurement/Manifest
@@ -2,24 +2,24 @@
 Hash: SHA512
 
 DIST Lab-Measurement-2.94.tar.gz 125394 RMD160 32b0f1c7e044ab791fb6bc50d4e9dcca4ca4c35a SHA1 13a8e5a88ad2136b9b2706ae02340c71a2c5b3ff SHA256 179ade2764af5e896d74d2218162a431c7d541f5732334b28bf52f2e9f6b567f
-EBUILD Lab-Measurement-2.94.ebuild 1356 RMD160 cf6da47e14aa8f7e99359d8e885d3c4e4e534903 SHA1 720bf59bb05826cd77ed228dfae9fffd1822de60 SHA256 2a7a5acbfd78b0d4dd8f52f27b5c1244a9427c35c2fcc36a58e96455c4ec5fb1
-EBUILD Lab-Measurement-9999.ebuild 1356 RMD160 384db691326055f0c686b7d7992ff84eb59d45ca SHA1 376af92be3df8a23e5474885d67152beea250549 SHA256 35f22cd89ee3210823818a551ee8ab9281bdd1fb0e4e8357cc1809ac00b5179c
-MISC ChangeLog 603 RMD160 f5d4690c46665a4676e1820240647c3e60f16c24 SHA1 555e613630b1dcc7f23bd76fa5a83078512d372a SHA256 ef05f06a4c1202f867a4d6a4a0837e97af6b534499af091ff8ba37979ea3545b
+EBUILD Lab-Measurement-2.94.ebuild 1377 RMD160 e490a9ae230e056550cbd110485b95ccf760382a SHA1 f5ad428f3ef307752dab77d7a42384d5c104d7ba SHA256 55a2840baac2052d82f9730fc183dd238d2ce0464e02f4b2f5c858e908ced086
+EBUILD Lab-Measurement-9999.ebuild 1377 RMD160 d3520fdf2aaed59e3b72b64d0fbbf894bc500bc8 SHA1 cbace9f116da33220af1ae1f2b4478749d981f03 SHA256 83db0790dba7b84218aa537772c51ed49d8717928fbdf114fef167f9fab794e7
+MISC ChangeLog 779 RMD160 80b6e1d8c8856a08c9d6445a644ac10319554efd SHA1 4bb626943a3af99ef8394c1f67353d636d1c8350 SHA256 29c77864426133f1bf36f35b0a65457836095d01b9b7b826a3f99940fa3b6118
 MISC metadata.xml 258 RMD160 0c68f5fe3ac9ddaed4725fd9f83820846a357666 SHA1 8096efa78c2c95d9a7ac54964591eb25bd6bd112 SHA256 503c5c542a8646c1a214c9cefe3beaf91b7264de196d3553fb0307c8e9ddcdfe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPJeh6AAoJENwGBM22xffeZ1cQAIVSbQVljOO37MRsSq+zhVUd
-MMoE4lv38Jd3FHh1pq2tLd0+6/Ujm7uUu1TvlGjm5l5hpGEuiPaXVR59zOkaE2Ub
-NB7+s6veB0x7rCbsGK/CCxezpjwPRsuUkI8AYB/qIPlx0VvaFirEB3tXJbKmuc3p
-d/KBADyHQbo0Yp2nnqJCqgnEbPlRP8uXGl2bQXkyv6EY8QS1UtzzdWTczXxM+I9C
-sNRyuAozDGxABkOkrd0Ari1/biv76SzWWFWPmVPvn8xztKwlJetrc8S0Wkamz36h
-K821X6uPktAFXxwCD9Qu0zhFgnBIUTmnGZR7WHQJbVa6avUf0SjiGeE2d4Ny9dLy
-nyX1XhomUz5IwySDO47TjvOSGqSG3SUz0JwaD0diamkUDE03sPciDAk4gGWr9luc
-YurKAccjTXoxGfxU/wBAYTaTgHLsATeqDJDB7+XiA4/n62Cu0ntuU31KkgTZ1KLv
-s87nJUNOzxMuUeLuoqkzkkEqQViSJi6UmpY3Zyls8Q75NLwv++Lt8oD9wRBO6nK/
-5/dE/cT7an/rRRcGMpUqf31byCv4d2S3TV65lHtVgwdadfn9BR4bZ+BbkEPiywFw
-qQCMQyQmVOAS5GuWiEaGsl5wT9VJsdV7KyPt0Dsvbil6mBOXfpcx13y7QQBB+g7U
-80SAr1qPGJZTqFOoLx75
-=bWsb
+iQIcBAEBCgAGBQJPJerbAAoJENwGBM22xffeV00P/1qxsTFEUMDhE2K+rYXtUMBP
+Vmpa7ipwLzHhMHbjbCGEptuevph3YyNximJ58xy+ynSFYurfoO+ff5ICPEch6nk8
+dEkHC0nDVTpwMjGIG+1Ol+5AqkJoKvbCcbnafk8yXP4zUH7GA4B32fF7npgJBq2h
+PwPG2q1bvxtYkCCThvSBhjSnhQen/ZdWBqjF/1qzWYd6mb7JsPuEjLN/2G5LYLAz
+31oGioSQa79+1Tv9NrR/pZEGhYofryR6JZWzwTgPsjNsxTpoUQw5eLuYbf/hFlUB
+54i5D7Jt+ONHSbpqcCbZg0iB44mwLhgy2UHmHzgWVI2ErhZ8pB2eQR5xB22qqmjg
+pYQZYKVxoPTPNG+8UkK+117a+uR+XlQgxctBHiGl5bHqix9TWEr5AJ5nEI3sKhuk
+u/Alyg5wsUd7f52PCjPbnFINKjdFAVZWQBZw+xnCBRqVZWND3UO2lzRIqaluICsf
+kX1ssCUwdWu3ZNCijYESwgTRj7K1tcyZAQbYf3BCUNWh6ktssEnMDULjzB16t7RJ
+8sz69H69Z90EtoKcg+ZS7VQ2tPKW7vxVD6BjU9YfovYscSCAXynwCl184Ie974/W
+aoExbcBrgTXWIPq+IEimezbzMKU7l/lW8gPAYxvqytL5CWoQvmNDSofH5ZApM/oW
+vS4I+jagAtEvEytXLq2M
+=hdzx
 -----END PGP SIGNATURE-----