Depend on 1.1.2 version of flac, as the 1.1.3 version changes API.

(Portage version: 2.1.2_pre3-r6)

6 files changed, 17 insertions, 11 deletions

diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index efd56bc256e7..ea942c900a9e 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.221 2006/10/03 14:24:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.222 2006/10/21 11:42:56 flameeyes Exp $
+
+  21 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  kdemultimedia-3.5.2-r2.ebuild, kdemultimedia-3.5.3.ebuild,
+  kdemultimedia-3.5.3-r1.ebuild, kdemultimedia-3.5.4.ebuild,
+  kdemultimedia-3.5.5.ebuild:
+  Depend on 1.1.2 version of flac, as the 1.1.3 version changes API.
 
 *kdemultimedia-3.5.5 (03 Oct 2006)
 
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5.2-r2.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5.2-r2.ebuild
index ad7f02ac8ea9..5cd16a75dd2b 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.5.2-r2.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.5.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.2-r2.ebuild,v 1.16 2006/09/10 00:12:38 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.2-r2.ebuild,v 1.17 2006/10/21 11:42:56 flameeyes Exp $
 
 inherit kde-dist flag-o-matic
 
@@ -24,7 +24,7 @@ DEPEND="~kde-base/kdebase-${PV}
 				 =media-libs/gst-plugins-0.8* )
 	encode? ( mp3? ( media-sound/lame )
 			  vorbis? ( media-sound/vorbis-tools )
-			  flac? ( media-libs/flac ) )
+			  flac? ( ~media-libs/flac-1.1.2 ) )
 	!arts? ( !gstreamer? ( media-libs/akode ) )"
 
 RDEPEND="${DEPEND}
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5.3-r1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5.3-r1.ebuild
index 52165ac272e2..1ede1358f1b9 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.5.3-r1.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.3-r1.ebuild,v 1.2 2006/07/25 10:41:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.3-r1.ebuild,v 1.3 2006/10/21 11:42:56 flameeyes Exp $
 
 inherit kde-dist flag-o-matic
 
@@ -24,7 +24,7 @@ DEPEND="~kde-base/kdebase-${PV}
 				 =media-libs/gst-plugins-0.8* )
 	encode? ( mp3? ( media-sound/lame )
 			  vorbis? ( media-sound/vorbis-tools )
-			  flac? ( media-libs/flac ) )
+			  flac? ( ~media-libs/flac-1.1.2 ) )
 	!arts? ( !gstreamer? ( media-libs/akode ) )"
 
 RDEPEND="${DEPEND}
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5.3.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5.3.ebuild
index d42c94755729..f17a839d3cfa 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.5.3.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.3.ebuild,v 1.2 2006/07/25 10:41:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.3.ebuild,v 1.3 2006/10/21 11:42:56 flameeyes Exp $
 
 inherit kde-dist flag-o-matic
 
@@ -21,7 +21,7 @@ DEPEND="~kde-base/kdebase-${PV}
 				 =media-libs/gst-plugins-0.8* )
 	encode? ( mp3? ( media-sound/lame )
 			  vorbis? ( media-sound/vorbis-tools )
-			  flac? ( media-libs/flac ) )
+			  flac? ( ~media-libs/flac-1.1.2 ) )
 	!arts? ( !gstreamer? ( media-libs/akode ) )"
 
 RDEPEND="${DEPEND}
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5.4.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5.4.ebuild
index 2d6c321c8f04..fedb87194e5e 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.5.4.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.4.ebuild,v 1.1 2006/07/26 08:32:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.4.ebuild,v 1.2 2006/10/21 11:42:56 flameeyes Exp $
 
 inherit kde-dist flag-o-matic
 
@@ -21,7 +21,7 @@ DEPEND="~kde-base/kdebase-${PV}
 				 =media-libs/gst-plugins-0.8* )
 	encode? ( mp3? ( media-sound/lame )
 			  vorbis? ( media-sound/vorbis-tools )
-			  flac? ( media-libs/flac ) )
+			  flac? ( ~media-libs/flac-1.1.2 ) )
 	!arts? ( !gstreamer? ( media-libs/akode ) )"
 
 RDEPEND="${DEPEND}
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5.5.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5.5.ebuild
index 31862465d09c..9d4b52bc626a 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.5.5.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.5.ebuild,v 1.1 2006/10/03 14:24:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.5.ebuild,v 1.2 2006/10/21 11:42:56 flameeyes Exp $
 
 inherit kde-dist flag-o-matic
 
@@ -21,7 +21,7 @@ DEPEND="~kde-base/kdebase-${PV}
 				 =media-libs/gst-plugins-0.8* )
 	encode? ( mp3? ( media-sound/lame )
 			  vorbis? ( media-sound/vorbis-tools )
-			  flac? ( media-libs/flac ) )
+			  flac? ( ~media-libs/flac-1.1.2 ) )
 	!arts? ( !gstreamer? ( media-libs/akode ) )"
 
 RDEPEND="${DEPEND}