made dep on a monolithic kde-base package accept the equivalent -meta package from...
authorDan Armak <danarmak@gentoo.org>
Sat, 15 Jan 2005 00:01:22 +0000 (00:01 +0000)
committerDan Armak <danarmak@gentoo.org>
Sat, 15 Jan 2005 00:01:22 +0000 (00:01 +0000)
17 files changed:
media-sound/amarok/ChangeLog
media-sound/amarok/amarok-1.0.2.ebuild
media-sound/amarok/amarok-1.1.1.ebuild
media-sound/amarok/amarok-1.2_beta2.ebuild
media-sound/amarok/amarok-1.2_beta3.ebuild
media-sound/musicman/ChangeLog
media-sound/musicman/musicman-0.11-r1.ebuild
media-sound/noteedit/ChangeLog
media-sound/noteedit/noteedit-2.6.2.ebuild
media-sound/rosegarden/ChangeLog
media-sound/rosegarden/rosegarden-4.0.9.8.ebuild
media-sound/rosegarden/rosegarden-4.0.9.91.ebuild
media-sound/rosegarden/rosegarden-4.0.9.91_rc2.ebuild
media-sound/yammi/ChangeLog
media-sound/yammi/yammi-0.8.2.ebuild
media-sound/yammi/yammi-1.0-r1.ebuild
media-sound/yammi/yammi-1.0.ebuild

index 845efa39aa2acbe275588d4db4d17434ac06b5e6..3c6e693a9215401aec668bb0490012f8184bf303 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.42 2005/01/12 12:10:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.43 2005/01/14 23:53:32 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> amarok-1.0.2.ebuild,
+  amarok-1.1.1.ebuild, amarok-1.2_beta2.ebuild, amarok-1.2_beta3.ebuild:
+  Changed deps on kdebase, kdemultimedia to accept kdebase-meta and
+  kdemultimedia-meta, the split 'meta' packages. This dep will be narrowed
+  down in the future to the precise split packages required.
 
 *amarok-1.2_beta3 (11 Jan 2005)
 
index f09e828200dc82c4ac590b8b8f2029e306ee956e..35705e7fefdaaa2ff326b92a4adac355d13e7641 100644 (file)
@@ -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/media-sound/amarok/amarok-1.0.2.ebuild,v 1.3 2005/01/04 12:43:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.0.2.ebuild,v 1.4 2005/01/14 23:53:32 danarmak Exp $
 
 inherit kde eutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="x86 ~ppc amd64"
 IUSE="cjk gstreamer xmms arts opengl xine"
 
-DEPEND=">=kde-base/kdemultimedia-3.2
+DEPEND="|| ( kde-base/kdemultimedia-meta >=kde-base/kdemultimedia-3.2 )
        arts? ( >=kde-base/arts-1.2 )
        gstreamer? ( >=media-libs/gst-plugins-0.8.1 )
        opengl? ( virtual/opengl )
index 5c6c42df9f5a4ec496787371771cdcaef7dd319e..a998a802a2b75e27b1a668b0f07eb85fe24affe1 100644 (file)
@@ -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/media-sound/amarok/amarok-1.1.1.ebuild,v 1.13 2005/01/04 12:43:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.1.1.ebuild,v 1.14 2005/01/14 23:53:32 danarmak Exp $
 
 IUSE="noamazon cjk xmms opengl xine arts gstreamer"
 
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc -sparc ~x86"
 
 DEPEND="=media-libs/libvisual-0.1.6
-       >=kde-base/kdemultimedia-3.2
+       || ( kde-base/kdemultimedia-meta >=kde-base/kdemultimedia-3.2 )
        arts? ( >=kde-base/arts-1.2 )
        opengl? ( virtual/opengl )
        xmms? ( >=media-sound/xmms-1.2 )
index 52131c9d0dbd0eff7a910a39a4266b0f4a9dbbf9..586a46479a4cd3b246a4b6da96200e55acbb5d98 100644 (file)
@@ -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/media-sound/amarok/amarok-1.2_beta2.ebuild,v 1.3 2005/01/04 12:43:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2_beta2.ebuild,v 1.4 2005/01/14 23:53:32 danarmak Exp $
 
 IUSE="noamazon cjk xmms opengl xine arts gstreamer mysql"
 
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~ppc -sparc ~x86"
 
 #      Not yet released:
 #      ">=media-libs/libvisual-0.2.0
-DEPEND=">=kde-base/kdemultimedia-3.2
+DEPEND="|| ( kde-base/kdemultimedia-meta >=kde-base/kdemultimedia-3.2 )
        arts? ( >=kde-base/arts-1.2 )
        opengl? ( virtual/opengl )
        xmms? ( >=media-sound/xmms-1.2 )
index aa147a1569d90e3ff62607ddf7cfe3a8fb07f2dc..3361c47548d102f65ee1002daa8f6cb9d8cdfc8a 100644 (file)
@@ -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/media-sound/amarok/amarok-1.2_beta3.ebuild,v 1.2 2005/01/13 18:02:41 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2_beta3.ebuild,v 1.3 2005/01/14 23:53:32 danarmak Exp $
 
 inherit kde eutils
 
@@ -21,8 +21,8 @@ KEYWORDS="~amd64 ~ppc -sparc ~x86"
 
 #      Not yet released:
 #      ">=media-libs/libvisual-0.2.0
-DEPEND="kde? ( >=kde-base/kdebase-3.2 )
-       arts? ( >=kde-base/kdemultimedia-3.2
+DEPEND="kde? ( || ( kde-base/kdemultimedia-meta >=kde-base/kdebase-3.2 ) )
+       arts? ( || ( kde-base/kdemultimedia-meta >=kde-base/kdemultimedia-3.2 )
                >=kde-base/arts-1.2 )
        opengl? ( virtual/opengl )
        xmms? ( >=media-sound/xmms-1.2 )
index 32556c4759491505fe90e1e613cb3718c022575f..4f63d43ebcd6a1d0b814f5240fafd273035953f8 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/musicman
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musicman/ChangeLog,v 1.7 2004/12/19 06:12:16 eradicator Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musicman/ChangeLog,v 1.8 2005/01/14 23:55:59 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> musicman-0.11-r1.ebuild:
+  Changed dep on kdebase to accept kdebase-meta, the split 'meta' package.
+  This dep will be narrowed down in the future to the precise split packages
+  required.
 
   18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   musicman-0.11-r1.ebuild:
index 7f8a836dcf8c015cb985c301badb26e86ef0f44a..b2aae0082e7bda3e37d55727831d1e052a7f8e29 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musicman/musicman-0.11-r1.ebuild,v 1.6 2004/12/19 06:12:16 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musicman/musicman-0.11-r1.ebuild,v 1.7 2005/01/14 23:55:59 danarmak Exp $
 
 IUSE=""
 
@@ -16,7 +16,7 @@ LICENSE="GPL-1"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
 
-DEPEND=">=kde-base/kdebase-3.2.1
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.2.1 )
        kde-base/arts
        >=media-libs/jpeg-6b-r3
        virtual/fam
index 65a60959f2828212bd31eb59f0c6011e64371706..13365eb7e43688884071d8fe73267d24caf54982 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/noteedit
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/noteedit/ChangeLog,v 1.12 2004/10/15 09:16:55 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/noteedit/ChangeLog,v 1.13 2005/01/14 23:57:13 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> noteedit-2.6.2.ebuild:
+  Changed dep on kdemultimedia to accept kdemultimedia-meta, the split 'meta'
+  packages. This dep will be narrowed down in the future to the precise split
+  packages required.
 
   15 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
   -noteedit-2.5.3.ebuild, noteedit-2.6.2.ebuild:
index d19989e1ebd713540dcb69f8b57dfefb95d51757..38c3b409b2ecfecee431683162a4147db56a00b3 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/noteedit/noteedit-2.6.2.ebuild,v 1.6 2004/10/15 09:16:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/noteedit/noteedit-2.6.2.ebuild,v 1.7 2005/01/14 23:57:13 danarmak Exp $
 
 IUSE=""
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc sparc amd64"
 
-DEPEND="kde-base/kdemultimedia
+DEPEND="|| ( kde-base/kdemultimedia-meta kde-base/kdemultimedia )
        kde-base/arts
        media-libs/tse3"
 
index 1e5c4018245d42e329cb7ca30d2ae8ac02e694f4..1bc04949e7bbdcd1c95b0f560bb792fba781d086 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/rosegarden
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.23 2005/01/11 14:14:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.24 2005/01/14 23:59:24 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> rosegarden-4.0.9.8.ebuild,
+  rosegarden-4.0.9.91.ebuild, rosegarden-4.0.9.91_rc2.ebuild:
+  Changed dep on kdebase to accept kdebase-meta, the split 'meta' package.
+  This dep will be narrowed down in the future to the precise split packages
+  required.
 
 *rosegarden-4.0.9.91 (11 Jan 2005)
 
index 5519d73ed8921f2c11d5e1efe5ec14c8a7900a21..bad5c3a9c815dabb289b92afec394e9e5042c440 100644 (file)
@@ -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/media-sound/rosegarden/rosegarden-4.0.9.8.ebuild,v 1.6 2005/01/11 14:14:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-4.0.9.8.ebuild,v 1.7 2005/01/14 23:59:24 danarmak Exp $
 
 MY_PV="${PV/./-}"
 MY_P="${PN}-${MY_PV}"
@@ -17,7 +17,7 @@ KEYWORDS="x86 ~ppc amd64"
 IUSE="jack"
 
 DEPEND=">=kde-base/kdelibs-3.0
-       kde-base/kdemultimedia
+       || ( kde-base/kdemultimedia-meta kde-base/kdemultimedia )
        >=x11-libs/qt-3
        virtual/alsa
        jack? ( media-sound/jack-audio-connection-kit )
index dcc3e97d8a2546a5854d8a7d1e1355123e4a220b..da85d1bc272e7df0b7b6f173c1c320bc5044b0d5 100644 (file)
@@ -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/media-sound/rosegarden/rosegarden-4.0.9.91.ebuild,v 1.1 2005/01/11 14:14:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-4.0.9.91.ebuild,v 1.2 2005/01/14 23:59:24 danarmak Exp $
 
 IUSE="alsa arts jack"
 
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 DEPEND=">=kde-base/kdelibs-3.0
-       kde-base/kdemultimedia
+       || ( kde-base/kdemultimedia-meta kde-base/kdemultimedia )
        >=x11-libs/qt-3
        !arts? ( media-libs/alsa-lib )
        alsa? ( media-libs/alsa-lib )
index dfe4cceeb6c68bfcbf4d34638794cd4bd583f025..f8c8d65e121b8a9b81cca59832a80f466223c28d 100644 (file)
@@ -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/media-sound/rosegarden/rosegarden-4.0.9.91_rc2.ebuild,v 1.4 2005/01/11 14:14:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-4.0.9.91_rc2.ebuild,v 1.5 2005/01/14 23:59:24 danarmak Exp $
 
 IUSE="alsa arts jack"
 
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 DEPEND=">=kde-base/kdelibs-3.0
-       kde-base/kdemultimedia
+       || ( kde-base/kdemultimedia-meta kde-base/kdemultimedia )
        >=x11-libs/qt-3
        !arts? ( media-libs/alsa-lib )
        alsa? ( media-libs/alsa-lib )
index 4f59b88e59a2e6c917c1c2d8a05ae600fc976390..2db6285f3861d118a763b1832d8fcd47385b3fec 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/yammi
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.19 2004/09/03 21:08:30 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.20 2005/01/15 00:01:22 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> yammi-0.8.2.ebuild,
+  yammi-1.0-r1.ebuild, yammi-1.0.ebuild:
+  Changed dep on a kde-base monolithic package to accept the equivalent split
+  or -meta package. KDE 3.4 has 'split' packages as well as monolithic, and
+  either alternative may provide the same files. This dep may have to be
+  narrowed down in the future to the precise split packages required.
 
   03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> yammi-1.0-r1.ebuild:
   Stable amd64, sparc, x86.
index 1de3de83ea4b4ccb4f6328bf5ed9fb2998c7d0e3..4ba32785998395f0d619c484c5a51f4b7f26d502 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-0.8.2.ebuild,v 1.15 2004/06/25 00:30:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-0.8.2.ebuild,v 1.16 2005/01/15 00:01:22 danarmak Exp $
 
 inherit flag-o-matic eutils
 
@@ -23,7 +23,7 @@ DEPEND=">=x11-libs/qt-3.1.0-r1
        cdr? ( >=app-cdr/cdlabelgen-2.4.0 >=app-cdr/mp3burn-0.1 )
        xmms? ( >=media-sound/xmms-1.2.7-r18 )
        oggvorbis? ( >=media-libs/libvorbis-1.0-r1 >=media-sound/vorbis-tools-1.0-r1 )
-       kde? ( >=kde-base/kdebase-3.0.4 )"
+       kde? ( || ( kde-base/kdebase-meta >=kde-base/kdebase-3.0.4 ) )"
 
 src_unpack() {
        unpack ${P}fixed.tar.gz
index 51e9ea908a9151aafeb3ec43255b2e6321da4375..94e5b811c3c9dbb877fb0c8437e949b84eaf5291 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.0-r1.ebuild,v 1.3 2004/09/03 21:08:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.0-r1.ebuild,v 1.4 2005/01/15 00:01:22 danarmak Exp $
 
 inherit flag-o-matic eutils
 
@@ -22,7 +22,7 @@ DEPEND=">=x11-libs/qt-3.1.0-r1
        cdr? ( >=app-cdr/cdlabelgen-2.4.0 >=app-cdr/mp3burn-0.1 )
        xmms? ( >=media-sound/xmms-1.2.7-r18 )
        oggvorbis? ( >=media-libs/libvorbis-1.0-r1 >=media-sound/vorbis-tools-1.0-r1 )
-       kde? ( >=kde-base/kdebase-3.0.4 )"
+       kde? ( || ( kde-base/kdebase-meta >=kde-base/kdebase-3.0.4 ) )"
 
 src_unpack() {
        unpack ${A}
index a8e9a7f0872824394e2ec6ac74a3608c1843b155..eb3643786ab97549b31358627e9eaf8d497510b8 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.0.ebuild,v 1.9 2004/07/07 11:19:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.0.ebuild,v 1.10 2005/01/15 00:01:22 danarmak Exp $
 
 inherit flag-o-matic eutils
 
@@ -22,7 +22,7 @@ DEPEND=">=x11-libs/qt-3.1.0-r1
        cdr? ( >=app-cdr/cdlabelgen-2.4.0 >=app-cdr/mp3burn-0.1 )
        xmms? ( >=media-sound/xmms-1.2.7-r18 )
        oggvorbis? ( >=media-libs/libvorbis-1.0-r1 >=media-sound/vorbis-tools-1.0-r1 )
-       kde? ( >=kde-base/kdebase-3.0.4 )"
+       kde? ( || ( kde-base/kdebase-meta >=kde-base/kdebase-3.0.4 ) )"
 
 src_unpack() {
        unpack ${A}