[gentoo-commits] proj/qt:master commit in: dev-python/sip/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Davide Pesavento" <pesa@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-python/sip/
Date: Sun, 14 Oct 2012 20:17:37 +0000 (UTC)	[thread overview]
Message-ID: <1350245849.278fc9e62f7c7823366ad20c7da09a369be84ad2.pesa@gentoo> (raw)

commit:     278fc9e62f7c7823366ad20c7da09a369be84ad2
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Oct 14 20:17:29 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 20:17:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=278fc9e6

[dev-python/sip] Fix sub-slot sanity check for live ebuild.

(Portage version: 2.2.0_alpha137/git/Linux x86_64)

---
 dev-python/sip/sip-4.14.1_pre20121013.ebuild |    8 ++++----
 dev-python/sip/sip-4.9999.ebuild             |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev-python/sip/sip-4.14.1_pre20121013.ebuild b/dev-python/sip/sip-4.14.1_pre20121013.ebuild
index c69aa72..6e6f88e 100644
--- a/dev-python/sip/sip-4.14.1_pre20121013.ebuild
+++ b/dev-python/sip/sip-4.14.1_pre20121013.ebuild
@@ -41,6 +41,10 @@ DEPEND+=""
 RDEPEND=""
 
 src_prepare() {
+	if [[ ${PV} == *9999* ]]; then
+		$(PYTHON -2) build.py prepare || die
+	fi
+
 	# Sub-slot sanity check
 	local sub_slot=${SLOT#*/}
 	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
@@ -56,10 +60,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-4.9.3-darwin.patch
 	sed -i -e 's/-O2//g' specs/* || die
 
-	if [[ ${PV} == *9999* ]]; then
-		$(PYTHON -2) build.py prepare || die
-	fi
-
 	python_src_prepare
 }
 

diff --git a/dev-python/sip/sip-4.9999.ebuild b/dev-python/sip/sip-4.9999.ebuild
index 3a9255b..9394489 100644
--- a/dev-python/sip/sip-4.9999.ebuild
+++ b/dev-python/sip/sip-4.9999.ebuild
@@ -41,6 +41,10 @@ DEPEND+=""
 RDEPEND=""
 
 src_prepare() {
+	if [[ ${PV} == *9999* ]]; then
+		$(PYTHON -2) build.py prepare || die
+	fi
+
 	# Sub-slot sanity check
 	local sub_slot=${SLOT#*/}
 	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
@@ -56,10 +60,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-4.9.3-darwin.patch
 	sed -i -e 's/-O2//g' specs/* || die
 
-	if [[ ${PV} == *9999* ]]; then
-		$(PYTHON -2) build.py prepare || die
-	fi
-
 	python_src_prepare
 }

next             reply	other threads:[~2012-10-14 20:17 UTC|newest]

Thread overview: 88+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-14 20:17 Davide Pesavento [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-07-29 16:41 [gentoo-commits] proj/qt:master commit in: dev-python/sip/ Davide Pesavento
2015-06-11  1:35 Davide Pesavento
2014-12-26 22:31 Davide Pesavento
2014-10-19 23:40 Davide Pesavento
2014-09-10  1:53 Davide Pesavento
2013-11-06 17:31 Markos Chandras
2013-08-25  4:01 Markos Chandras
2013-08-19  4:00 Markos Chandras
2013-08-18  4:00 Markos Chandras
2013-08-14  4:00 Markos Chandras
2013-08-08 10:53 Michael Palimaka
2013-08-08  4:00 Markos Chandras
2013-08-05  4:00 Markos Chandras
2013-08-01  4:00 Markos Chandras
2013-07-31  4:00 Markos Chandras
2013-07-27  4:01 Markos Chandras
2013-07-25  4:01 Markos Chandras
2013-07-24  4:01 Markos Chandras
2013-07-22  4:00 Markos Chandras
2013-07-14  4:03 Markos Chandras
2013-07-12  4:03 Markos Chandras
2013-07-11  4:03 Markos Chandras
2013-07-08  4:03 Markos Chandras
2013-07-02  4:02 Markos Chandras
2013-07-01  4:03 Markos Chandras
2013-06-24  8:10 Davide Pesavento
2013-06-24  7:58 Davide Pesavento
2013-06-13  4:02 Markos Chandras
2013-06-12  4:01 Markos Chandras
2013-06-11 11:40 Michael Palimaka
2013-06-11  4:01 Markos Chandras
2013-06-09  4:01 Markos Chandras
2013-06-08  4:01 Markos Chandras
2013-06-03  4:01 Markos Chandras
2013-06-02  4:01 Markos Chandras
2013-04-18  4:01 Markos Chandras
2013-04-07 11:01 Davide Pesavento
2013-03-07  5:00 Markos Chandras
2013-02-27  5:01 Markos Chandras
2013-02-25  5:01 Markos Chandras
2013-02-21  5:00 Markos Chandras
2013-02-15  5:00 Markos Chandras
2013-02-04 16:12 Michael Palimaka
2013-01-22 20:26 Davide Pesavento
2013-01-22 14:35 Michael Palimaka
2012-11-15  5:00 Markos Chandras
2012-11-05  4:46 Davide Pesavento
2012-10-27  4:05 Markos Chandras
2012-10-24  4:04 Markos Chandras
2012-10-23  4:04 Markos Chandras
2012-10-22  4:04 Markos Chandras
2012-10-21  4:04 Markos Chandras
2012-10-20  4:04 Markos Chandras
2012-10-19  4:04 Markos Chandras
2012-10-18  4:04 Markos Chandras
2012-10-17  4:04 Markos Chandras
2012-10-16 12:34 Davide Pesavento
2012-10-16  4:04 Markos Chandras
2012-10-15  4:04 Markos Chandras
2012-10-14 21:30 Davide Pesavento
2012-10-14 21:30 Davide Pesavento
2012-10-14 19:57 Davide Pesavento
2012-10-14 19:57 Davide Pesavento
2012-10-13  4:04 Markos Chandras
2012-10-12 17:40 Davide Pesavento
2012-10-10  4:03 Markos Chandras
2012-10-02  4:03 Markos Chandras
2012-09-22  4:02 Markos Chandras
2012-09-21  4:02 Markos Chandras
2012-09-19  4:02 Markos Chandras
2012-09-14  4:02 Markos Chandras
2012-09-02  4:01 Markos Chandras
2012-09-01  4:01 Markos Chandras
2012-08-31  4:02 Markos Chandras
2012-08-28  4:01 Markos Chandras
2012-08-27  4:02 Markos Chandras
2012-08-26  4:01 Markos Chandras
2012-08-25  4:01 Markos Chandras
2012-07-23  5:56 Markos Chandras
2012-07-10 17:23 Markos Chandras
2012-07-10  5:57 Markos Chandras
2012-07-06  5:57 Markos Chandras
2012-05-26  9:21 Markos Chandras
2012-05-05  8:49 Markos Chandras
2012-04-10 22:15 Markos Chandras
2012-02-23 21:34 Davide Pesavento
2012-02-23 20:47 Davide Pesavento

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:c69aa72 dfblob:6e6f88e dfblob:3a9255b dfblob:9394489 )
 OR (
bs:"[gentoo-commits] proj/qt:master commit in: dev-python/sip/" )
	(help)

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=1350245849.278fc9e62f7c7823366ad20c7da09a369be84ad2.pesa@gentoo \
    --to=pesa@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