summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2009-02-07 05:17:53 +0000
committerJeremy Olexa <darkside@gentoo.org>2009-02-07 05:17:53 +0000
commitf322a018d4548fd715b930ac34a72823bc6b9fa3 (patch)
tree8ab5dc8c302b67defc7f5617455c9ec8b279df9c /net-libs/libjingle
parentmask USE=mmx on imlib2 again, it causes problems with other apps. bug 218382 (diff)
downloadhistorical-f322a018d4548fd715b930ac34a72823bc6b9fa3.tar.gz
historical-f322a018d4548fd715b930ac34a72823bc6b9fa3.tar.bz2
historical-f322a018d4548fd715b930ac34a72823bc6b9fa3.zip
(non maintainer commit) fix CFLAGS - CXXFLAGS mixup, patch by Mounir Lamouri. bug 234012
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64
Diffstat (limited to 'net-libs/libjingle')
-rw-r--r--net-libs/libjingle/ChangeLog9
-rw-r--r--net-libs/libjingle/Manifest4
-rw-r--r--net-libs/libjingle/libjingle-0.3.11-r1.ebuild (renamed from net-libs/libjingle/libjingle-0.3.11.ebuild)16
3 files changed, 21 insertions, 8 deletions
diff --git a/net-libs/libjingle/ChangeLog b/net-libs/libjingle/ChangeLog
index 826dabb162bf..27d336af4808 100644
--- a/net-libs/libjingle/ChangeLog
+++ b/net-libs/libjingle/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-libs/libjingle
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/ChangeLog,v 1.14 2009/01/07 17:01:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/ChangeLog,v 1.15 2009/02/07 05:17:53 darkside Exp $
+
+*libjingle-0.3.11-r1 (07 Feb 2009)
+
+ 07 Feb 2009; Jeremy Olexa <darkside@gentoo.org> -libjingle-0.3.11.ebuild,
+ +libjingle-0.3.11-r1.ebuild:
+ (non maintainer commit) fix CFLAGS - CXXFLAGS mixup, patch by Mounir
+ Lamouri. bug 234012
07 Jan 2009; Raúl Porcel <armin76@gentoo.org> libjingle-0.3.12.ebuild:
Add ~alpha/~ia64 wrt #245949
diff --git a/net-libs/libjingle/Manifest b/net-libs/libjingle/Manifest
index b0eae281325c..c5888fd93b6a 100644
--- a/net-libs/libjingle/Manifest
+++ b/net-libs/libjingle/Manifest
@@ -2,7 +2,7 @@ AUX libjingle-0.3.11-gcc43.patch 9565 RMD160 082360eeed9e4f4c8b5dca6eb7bea5f9825
AUX libjingle-0.3.12-asneeded.patch 1024 RMD160 ea8aa08e02f9c40fb957c0fbadb1475aae4daabd SHA1 5a720aa0f0908c98858e00deba850b8212564f8d SHA256 2e069cedf0287359b8add040e0c1dff1d01d583eaaeda39aafbde27513bfec54
DIST libjingle-0.3.11.tar.gz 613784 RMD160 61c4359f029fed2ce4fcd9da38a9ff2324b7af17 SHA1 47f6b403388d470f2bcb9e1e961711e236d01445 SHA256 d287f9f90fd0d31272d7d63edbf7103b986e2e20f82906b0ddddcfdbb914b4f4
DIST libjingle-0.3.12.tar.gz 526316 RMD160 b0b823a405e75b2c952bd638087647cee7aeef26 SHA1 7435366a5f9c228dc7fa7e47e94a7702ede0bc2e SHA256 4bbc4b4813292c20905d2f857ec7ec1055cc54611ae9cd7c85f46962f1b1a2d9
-EBUILD libjingle-0.3.11.ebuild 754 RMD160 94d954264a7bca53e0d449b43d1b4c6f4644b8cb SHA1 cf58528d43d65fcaa4dd952ea5fb977039a1c70f SHA256 df562a1cceef3b36c0999a8cc48888037ba1cc843d0ca9e9ca659d2976394af4
+EBUILD libjingle-0.3.11-r1.ebuild 997 RMD160 29ca354c17eccaea4cc4974c95ec602da5d85ad6 SHA1 001a589f1cb70a6e6eeedbcad43ab8fdbaaf3ac6 SHA256 31aa230365e84aa85dddffbea309f4d55992afa9cd604c7e76ee7f5453a542a1
EBUILD libjingle-0.3.12.ebuild 840 RMD160 dd0e8aab34a0523690f429e89bcfae579945eca2 SHA1 76d80eeb0c3a03b8fab1381baef0b605d476139d SHA256 8d14a9c794d62b4f869c7803d8b180d2d701dd6f73248d85d383311e6d9f8a75
-MISC ChangeLog 2254 RMD160 1bc5121b43aa1f38b49b1c925fba44ed45a5de21 SHA1 f9a390e207b1a7aa193bb2c5e059b0f42950e9aa SHA256 296cf616ea7110391b3394f8df02c3f33725260ce4a6cb9bffc2be7f0585e78d
+MISC ChangeLog 2492 RMD160 698fa3f25f1f4f6452ba4ec2e7612aa32b57f777 SHA1 9045d06c79683cc168c0de0ee2572c39bd76794c SHA256 565853e9606c683cb8ebac305d36b77410017420f35df9b74b0ead5b8e9e8c58
MISC metadata.xml 274 RMD160 4768001753012d66c37ffdf286af9f85acc909d2 SHA1 7d11f7d9f6871b06db910f54f1b5d68de3625698 SHA256 757abf07369008f55658d8a6b937f6677602cdfb1961aa0767a189d4bfef6d70
diff --git a/net-libs/libjingle/libjingle-0.3.11.ebuild b/net-libs/libjingle/libjingle-0.3.11-r1.ebuild
index 3a447a5a3c62..ee19e4c830d5 100644
--- a/net-libs/libjingle/libjingle-0.3.11.ebuild
+++ b/net-libs/libjingle/libjingle-0.3.11-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/libjingle-0.3.11.ebuild,v 1.2 2008/05/14 12:24:09 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/libjingle-0.3.11-r1.ebuild,v 1.1 2009/02/07 05:17:53 darkside Exp $
+
+EAPI="2"
inherit eutils
@@ -18,9 +20,13 @@ RDEPEND="dev-libs/openssl
DEPEND="${RDEPEND}
dev-util/pkgconfig"
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
+ # there is an error in configure.ac : CXXFLAGS are using CFLAGS
+ # see bug #234012
+ # patching directly configure to prevent executing autoconf
+ sed -i -e 's/CXXFLAGS="$CFLAGS/CXXFLAGS="$CXXFLAGS/' configure \
+ || die "patching configure failed"
+
epatch "${FILESDIR}"/${P}-gcc43.patch
}