public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas HAttel (dilfridge)" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in dev-perl/Lab-Measurement: ChangeLog Lab-Measurement-9999.ebuild Lab-Measurement-2.94.ebuild
Date: Mon, 30 Jan 2012 00:55:41 +0000 (UTC)	[thread overview]
Message-ID: <20120130005541.C307F2004B@flycatcher.gentoo.org> (raw)

dilfridge    12/01/30 00:55:41

  Modified:             ChangeLog Lab-Measurement-9999.ebuild
                        Lab-Measurement-2.94.ebuild
  Log:
  Make this unified live/non-live ebuild actually work...
  
  (Portage version: 2.1.10.44/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  dev-perl/Lab-Measurement/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/Lab-Measurement/ChangeLog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/Lab-Measurement/ChangeLog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/Lab-Measurement/ChangeLog?r1=1.2&r2=1.3

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog	30 Jan 2012 00:45:24 -0000	1.2
+++ ChangeLog	30 Jan 2012 00:55:41 -0000	1.3
@@ -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:



1.3                  dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild?r1=1.2&r2=1.3

Index: Lab-Measurement-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Lab-Measurement-9999.ebuild	30 Jan 2012 00:45:24 -0000	1.2
+++ Lab-Measurement-9999.ebuild	30 Jan 2012 00:55:41 -0000	1.3
@@ -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 @@
 	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"



1.3                  dev-perl/Lab-Measurement/Lab-Measurement-2.94.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-2.94.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-2.94.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-2.94.ebuild?r1=1.2&r2=1.3

Index: Lab-Measurement-2.94.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-2.94.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Lab-Measurement-2.94.ebuild	30 Jan 2012 00:45:24 -0000	1.2
+++ Lab-Measurement-2.94.ebuild	30 Jan 2012 00:55:41 -0000	1.3
@@ -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 @@
 	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"






             reply	other threads:[~2012-01-30  0:55 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-30  0:55 Andreas HAttel (dilfridge) [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-01-30  0:45 [gentoo-commits] gentoo-x86 commit in dev-perl/Lab-Measurement: ChangeLog Lab-Measurement-9999.ebuild Lab-Measurement-2.94.ebuild Andreas HAttel (dilfridge)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120130005541.C307F2004B@flycatcher.gentoo.org \
    --to=dilfridge@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox