summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSantiago M. Mola <coldwind@gentoo.org>2008-09-26 12:26:29 +0000
committerSantiago M. Mola <coldwind@gentoo.org>2008-09-26 12:26:29 +0000
commit0aab0f81e5be69c23434f37847f41015d34d0dac (patch)
tree00b465283da32e40dd8bfdcf22c97fc7f4ee731d /net-voip/telepathy-butterfly
parentMarked ~hppa (bug #237411). (diff)
downloadhistorical-0aab0f81e5be69c23434f37847f41015d34d0dac.tar.gz
historical-0aab0f81e5be69c23434f37847f41015d34d0dac.tar.bz2
historical-0aab0f81e5be69c23434f37847f41015d34d0dac.zip
Fix build when MAKEOPTS contains options different than -j, fixes #233943.
Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.26-gentoo-r1 x86_64
Diffstat (limited to 'net-voip/telepathy-butterfly')
-rw-r--r--net-voip/telepathy-butterfly/ChangeLog6
-rw-r--r--net-voip/telepathy-butterfly/Manifest4
-rw-r--r--net-voip/telepathy-butterfly/telepathy-butterfly-0.3.2.ebuild5
3 files changed, 10 insertions, 5 deletions
diff --git a/net-voip/telepathy-butterfly/ChangeLog b/net-voip/telepathy-butterfly/ChangeLog
index 98faa445f488..9badf2bbdca1 100644
--- a/net-voip/telepathy-butterfly/ChangeLog
+++ b/net-voip/telepathy-butterfly/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-voip/telepathy-butterfly
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/ChangeLog,v 1.9 2008/08/20 22:34:07 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/ChangeLog,v 1.10 2008/09/26 12:26:29 coldwind Exp $
+
+ 26 Sep 2008; Santiago M. Mola <coldwind@gentoo.org>
+ telepathy-butterfly-0.3.2.ebuild:
+ Fix build when MAKEOPTS contains options different than -j, fixes #233943.
*telepathy-butterfly-0.3.2 (20 Aug 2008)
diff --git a/net-voip/telepathy-butterfly/Manifest b/net-voip/telepathy-butterfly/Manifest
index 6c81fdff8451..5509ae3d7b10 100644
--- a/net-voip/telepathy-butterfly/Manifest
+++ b/net-voip/telepathy-butterfly/Manifest
@@ -1,6 +1,6 @@
DIST telepathy-butterfly-0.3.1.tar.gz 122795 RMD160 b8c22183e549cec256b8b24327b3ec970d0dd97f SHA1 0238cdcdbf6931f4e70150af45f29f25ca2328a2 SHA256 d8185e611983a77aaa8debccce00149af66694be4e08cea2040253ef3924603b
DIST telepathy-butterfly-0.3.2.tar.gz 121806 RMD160 9cece6ff464c0fbde87e8fef0aae7704334cd77a SHA1 e2718a28d06c8b4e307dffd4c33d8d5ff2c190ce SHA256 b1f70a6e980479572359acd9deac7833e5c8f1a2e60b5a22dacc92b13bd1f819
EBUILD telepathy-butterfly-0.3.1.ebuild 1071 RMD160 5d8245660a0c69c1b96931f9a5c07e47f6113e12 SHA1 2aff493f5761d76cdeaf8855739514d753328b94 SHA256 a990deff58401f7a5d3920fe824b9d14b48d78713d70abc15c5bec11b01ece71
-EBUILD telepathy-butterfly-0.3.2.ebuild 1070 RMD160 386af57075904b6774f72999251fd32a88b156a6 SHA1 90e6ec9146d242c858135248ea7263060e060009 SHA256 221f6ea2878785535e02b174f75d50a644b438e123a0d06be2ed6f6dceaa0a39
-MISC ChangeLog 1409 RMD160 c7c6bf793c887ade13e148a6d949c93dce286dda SHA1 c47e06e53f597604126de749b6e307c362fdec2a SHA256 ab6cc7e3f356ebda2f522b53d2f844071b115f2cefa45a39ab65a641481f6298
+EBUILD telepathy-butterfly-0.3.2.ebuild 1149 RMD160 7b56afddc266d870cb79598186d5ace4a9c5f60a SHA1 6356efc164523f5ee016997eb749085b2fbfe0fb SHA256 3e82e9b58839d062876c5371bb5afba55eebb6d99bdec3d37b5f7a0e44be458c
+MISC ChangeLog 1580 RMD160 66290f6a6bad31d393c81a6028339fa6aab39266 SHA1 0c91382da4041d67fc48732748bdb953cae98d0d SHA256 d0161b6dc97b6fead603d479483f183607a7b35a0050e4d7a988792abdf8e3e8
MISC metadata.xml 345 RMD160 56901eb09660c9f9bc547d217cab9be94c885923 SHA1 003c05a26ec4ef5650ea07ab79ac49187bc0bf1b SHA256 9654fd71abe521c86064fb21595ff2c595148cf207caad8f9f9e4e1c9e45c542
diff --git a/net-voip/telepathy-butterfly/telepathy-butterfly-0.3.2.ebuild b/net-voip/telepathy-butterfly/telepathy-butterfly-0.3.2.ebuild
index 02311ced60ee..c35fe68ccb1f 100644
--- a/net-voip/telepathy-butterfly/telepathy-butterfly-0.3.2.ebuild
+++ b/net-voip/telepathy-butterfly/telepathy-butterfly-0.3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/telepathy-butterfly-0.3.2.ebuild,v 1.1 2008/08/20 22:34:07 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/telepathy-butterfly-0.3.2.ebuild,v 1.2 2008/09/26 12:26:29 coldwind Exp $
NEED_PYTHON="2.4"
@@ -21,9 +21,10 @@ RDEPEND="dev-python/telepathy-python
DOCS="AUTHORS NEWS"
src_compile() {
+ local myjobs=$(echo "$MAKEOPTS" | sed -n -e 's,.*\(-j[[:digit:]]\+\).*,\1,p')
./waf --prefix=/usr \
configure || die "./waf configure failed"
- ./waf ${MAKEOPTS} build || die "./waf configure failed"
+ ./waf ${myjobs} build || die "./waf configure failed"
}
src_install() {