corrected dependencies: #77563 and #77555, revoked #75252, stable on x86

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index e99129e3662b4e37bf5332a3d0447b5558efbd04..667d1d1a8b309686093f9c26e5a50cc6b86febe4 100644 (file)
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.85 2005/01/07 23:11:45 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.86 2005/01/11 21:58:44 carlo Exp $
+
+  11 Jan 2005; Carsten Lohrke <carlo@gentoo.org> k3b-0.11.18.ebuild:
+  corrected dependencies: #77563 and #77555, revoked #75252, stable on x86
 
   08 Jan 2005; Lars Weiler <pylon@gentoo.org> k3b-0.11.17.ebuild,
   k3b-0.11.18.ebuild:

diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 32fba69ec525fb487ce16d656cc15b1403d1ab0b..884a516c8f5815f53eedc9a80d2555952959c4da 100644 (file)
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,7 +1,7 @@
-MD5 71eda2aeec0816a51babe73ea7414757 ChangeLog 12086
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 d18436792cb5be127c01d61d4d42f578 k3b-0.11.18.ebuild 3422
 MD5 2a730959e6cc100464d2cd8035dcbb6f k3b-0.11.17.ebuild 3394
+MD5 2b9dfab12f93a3e3fdb5c2f41f083cea k3b-0.11.18.ebuild 3240
+MD5 a68d90a7640d51ca215d9f55e13c7d7c ChangeLog 12231
+MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
 MD5 513df86e2c91f7c1209b63cea7d41b84 files/k3b-0.11.17-noarts.patch 893
 MD5 07a27bd19c22330f89e89f0e3d663a3a files/digest-k3b-0.11.17 132
 MD5 d6b7a5cc59198e0b99b320d118983fd6 files/digest-k3b-0.11.18 132

diff --git a/app-cdr/k3b/k3b-0.11.18.ebuild b/app-cdr/k3b/k3b-0.11.18.ebuild
index 10c1cfa8d8a5e0caaf9677192cbf80cd4ba2d5a6..1640a6972039de90a2eaa4ea33676ea455ee6c1e 100644 (file)
--- a/app-cdr/k3b/k3b-0.11.18.ebuild
+++ b/app-cdr/k3b/k3b-0.11.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.18.ebuild,v 1.3 2005/01/07 23:11:45 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.18.ebuild,v 1.4 2005/01/11 21:58:44 carlo Exp $
 
 inherit kde eutils
 
@@ -9,30 +9,25 @@ HOMEPAGE="http://www.k3b.org/"
 SRC_URI="mirror://sourceforge/k3b/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
 IUSE="arts dvdr kde oggvorbis mad flac encode"
 
 DEPEND="kde? ( >=kde-base/kdebase-3.1 )
        >=media-sound/cdparanoia-3.9.8
        >=media-libs/id3lib-3.8.0_pre2
        flac? ( media-libs/flac )
-       mad? ( >=media-sound/madplay-0.14.2b )
-       oggvorbis? ( media-libs/libvorbis )
-       arts? ( kde-base/arts )"
-RDEPEND="kde? ( >=kde-base/kdebase-3.1 )
-       >=media-sound/cdparanoia-3.9.8
-       >=media-libs/id3lib-3.8.0_pre2
-       flac? ( media-libs/flac )
-       mad? ( >=media-sound/madplay-0.14.2b )
+       mad? ( media-libs/libmad )
        oggvorbis? ( media-libs/libvorbis )
        arts? ( kde-base/arts )
+       media-libs/libsamplerate"
+RDEPEND="${DEPEND}
        virtual/cdrtools
        >=app-cdr/cdrdao-1.1.7-r3
        media-sound/normalize
        dvdr? ( app-cdr/dvd+rw-tools )
        encode? ( media-sound/lame
                  media-sound/sox
-                 media-video/transcode
+                 !amd64? ( <media-video/transcode-0.6.12 )
                  media-video/vcdimager )"
 need-kde 3.1