summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Raghavan <ford_prefect@gentoo.org>2013-05-01 03:23:59 +0000
committerArun Raghavan <ford_prefect@gentoo.org>2013-05-01 03:23:59 +0000
commit61fba69c3b9beba98e4f62f979468572c710fc4b (patch)
tree07fd554615cb1526523e60ccba14fd31c7eef0cd /media-sound
parentFix gtk+-1.2.10-r12's build failure with automake-1.13 (bug #467520, thanks t... (diff)
downloadgentoo-2-61fba69c3b9beba98e4f62f979468572c710fc4b.tar.gz
gentoo-2-61fba69c3b9beba98e4f62f979468572c710fc4b.tar.bz2
gentoo-2-61fba69c3b9beba98e4f62f979468572c710fc4b.zip
Restrict json-c version in older ebuilds since they are incompatible with current unstable json-c 0.11.
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 29C3E2EC)
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/pulseaudio/ChangeLog7
-rw-r--r--media-sound/pulseaudio/pulseaudio-2.1-r1.ebuild4
-rw-r--r--media-sound/pulseaudio/pulseaudio-3.0.ebuild4
3 files changed, 10 insertions, 5 deletions
diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index af150946b923..105cb44ed2ea 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-sound/pulseaudio
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.302 2013/05/01 03:18:47 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.303 2013/05/01 03:23:59 ford_prefect Exp $
+
+ 01 May 2013; Arun Raghavan <ford_prefect@gentoo.org>
+ pulseaudio-2.1-r1.ebuild, pulseaudio-3.0.ebuild:
+ Restrict json-c version in older ebuilds since they are incompatible with
+ current unstable json-c 0.11.
01 May 2013; Arun Raghavan <ford_prefect@gentoo.org>
-pulseaudio-1.1-r1.ebuild:
diff --git a/media-sound/pulseaudio/pulseaudio-2.1-r1.ebuild b/media-sound/pulseaudio/pulseaudio-2.1-r1.ebuild
index 2ea30bb92145..fa1920b92f09 100644
--- a/media-sound/pulseaudio/pulseaudio-2.1-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-2.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-2.1-r1.ebuild,v 1.14 2013/04/10 20:43:51 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-2.1-r1.ebuild,v 1.15 2013/05/01 03:23:59 ford_prefect Exp $
EAPI=5
@@ -58,7 +58,7 @@ RDEPEND=">=media-libs/libsndfile-1.0.20
webrtc-aec? ( media-libs/webrtc-audio-processing )
xen? ( app-emulation/xen )
systemd? ( >=sys-apps/systemd-39 )
- dev-libs/json-c
+ <dev-libs/json-c-0.11
>=sys-devel/libtool-2.2.4" # it's a valid RDEPEND, libltdl.so is used
DEPEND="${RDEPEND}
diff --git a/media-sound/pulseaudio/pulseaudio-3.0.ebuild b/media-sound/pulseaudio/pulseaudio-3.0.ebuild
index fce638865b4f..0bd24b64b648 100644
--- a/media-sound/pulseaudio/pulseaudio-3.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-3.0.ebuild,v 1.5 2013/04/10 20:43:51 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-3.0.ebuild,v 1.6 2013/05/01 03:23:59 ford_prefect Exp $
EAPI="5"
@@ -58,7 +58,7 @@ RDEPEND=">=media-libs/libsndfile-1.0.20
webrtc-aec? ( media-libs/webrtc-audio-processing )
xen? ( app-emulation/xen )
systemd? ( >=sys-apps/systemd-39 )
- dev-libs/json-c
+ <dev-libs/json-c-0.11
>=sys-devel/libtool-2.2.4" # it's a valid RDEPEND, libltdl.so is used
DEPEND="${RDEPEND}