Allow mixing of split & monolithic ebuilds, where possible, thanks to Arfrever Frehte...

Package-Manager: portage-2.1.4.4

diff --git a/kde-base/kaddressbook-plugins/ChangeLog b/kde-base/kaddressbook-plugins/ChangeLog
index 06b478d84dc4b2fb5bb977cdb75cc58db74f61e8..83734d0a82d8d691b9688e66843960b43b0e5523 100644 (file)
--- a/kde-base/kaddressbook-plugins/ChangeLog
+++ b/kde-base/kaddressbook-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kaddressbook-plugins
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook-plugins/ChangeLog,v 1.78 2008/03/04 06:53:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook-plugins/ChangeLog,v 1.79 2008/03/07 20:30:44 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  kaddressbook-plugins-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org>
   kaddressbook-plugins-3.5.8.ebuild, kaddressbook-plugins-3.5.9.ebuild:

diff --git a/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.9.ebuild b/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.9.ebuild
index 029681d13ffb4b91d038e7942b81c7addad4bde0..04aa235da94a90dc5bec6d71c09333fb20b67d4f 100644 (file)
--- a/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.9.ebuild
+++ b/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.9.ebuild,v 1.2 2008/03/04 06:53:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.9.ebuild,v 1.3 2008/03/07 20:30:43 ingmar Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA=kaddressbook-plugins/
@@ -10,6 +10,6 @@ inherit kde-meta
 DESCRIPTION="Plugins for KAB"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
-DEPEND=">=kde-base/kaddressbook-${PV}:${SLOT}"
+DEPEND="|| ( >=kde-base/kaddressbook-${PV}:${SLOT} >=kde-base/kdepim-${PV}:${SLOT} )"
 
 RDEPEND="${DEPEND}"

diff --git a/kde-base/kate-plugins/ChangeLog b/kde-base/kate-plugins/ChangeLog
index 03b43c20f128ebbfc483810eb3cea2bac9f02ffb..67d8f5c1837e91981838517c9a9868ad7a79132f 100644 (file)
--- a/kde-base/kate-plugins/ChangeLog
+++ b/kde-base/kate-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kate-plugins
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kate-plugins/ChangeLog,v 1.81 2008/03/04 06:53:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate-plugins/ChangeLog,v 1.82 2008/03/07 20:31:27 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  kate-plugins-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org> kate-plugins-3.5.8.ebuild,
   kate-plugins-3.5.9.ebuild:

diff --git a/kde-base/kate-plugins/kate-plugins-3.5.9.ebuild b/kde-base/kate-plugins/kate-plugins-3.5.9.ebuild
index f8d94c979e728eeedd33ca7db21e626818d7d8c1..b5361b7a0da6ea802e5c064e836d02a4eef42b10 100644 (file)
--- a/kde-base/kate-plugins/kate-plugins-3.5.9.ebuild
+++ b/kde-base/kate-plugins/kate-plugins-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kate-plugins/kate-plugins-3.5.9.ebuild,v 1.2 2008/03/04 06:53:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate-plugins/kate-plugins-3.5.9.ebuild,v 1.3 2008/03/07 20:31:27 ingmar Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kate"
@@ -11,5 +11,5 @@ DESCRIPTION="kate plugins and docs"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND=">=kde-base/kate-${PV}:${SLOT}"
+DEPEND="|| ( >=kde-base/kate-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 RDEPEND="${DEPEND}"

diff --git a/kde-base/kbstateapplet/ChangeLog b/kde-base/kbstateapplet/ChangeLog
index 0a34b44b45c6c4490772dc7d629e899cccca1fd2..df47756ca2479eb04cd6ee8777df9ec90c11b9f9 100644 (file)
--- a/kde-base/kbstateapplet/ChangeLog
+++ b/kde-base/kbstateapplet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kbstateapplet
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbstateapplet/ChangeLog,v 1.79 2008/03/04 03:59:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbstateapplet/ChangeLog,v 1.80 2008/03/07 20:32:07 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  kbstateapplet-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org> kbstateapplet-3.5.8.ebuild,
   kbstateapplet-3.5.9.ebuild:

diff --git a/kde-base/kbstateapplet/kbstateapplet-3.5.9.ebuild b/kde-base/kbstateapplet/kbstateapplet-3.5.9.ebuild
index 35699d558790c33dfa4c6218682be7c7bf507a46..0d948e266fc75ace38920cf0a63c3fdefb6bbaec 100644 (file)
--- a/kde-base/kbstateapplet/kbstateapplet-3.5.9.ebuild
+++ b/kde-base/kbstateapplet/kbstateapplet-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbstateapplet/kbstateapplet-3.5.9.ebuild,v 1.2 2008/03/04 03:59:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbstateapplet/kbstateapplet-3.5.9.ebuild,v 1.3 2008/03/07 20:32:07 ingmar Exp $
 KMNAME=kdeaccessibility
 EAPI="1"
 inherit kde-meta
@@ -8,6 +8,6 @@ inherit kde-meta
 DESCRIPTION="KDE panel applet that displays the keyboard status"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
-DEPEND=">=kde-base/kcontrol-${PV}:${SLOT}"
+DEPEND="|| ( >=kde-base/kcontrol-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 
 RDEPEND="${DEPEND}"

diff --git a/kde-base/kbugbuster/ChangeLog b/kde-base/kbugbuster/ChangeLog
index 406bff1a38fceb7ed1fabf9e79bb7450171cb0f7..5a246c9797ab76bfafde48e352d12a1b57863118 100644 (file)
--- a/kde-base/kbugbuster/ChangeLog
+++ b/kde-base/kbugbuster/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kbugbuster
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbugbuster/ChangeLog,v 1.73 2008/03/04 01:23:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbugbuster/ChangeLog,v 1.74 2008/03/07 20:32:53 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> kbugbuster-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org> kbugbuster-3.5.8.ebuild,
   kbugbuster-3.5.9.ebuild, kbugbuster-4.0.1.ebuild:

diff --git a/kde-base/kbugbuster/kbugbuster-3.5.9.ebuild b/kde-base/kbugbuster/kbugbuster-3.5.9.ebuild
index 1944135092b8ae5ccb8f6d9d32aae970f3474338..40e4e81dfd23cf41b393f4e49722897cbf01c666 100644 (file)
--- a/kde-base/kbugbuster/kbugbuster-3.5.9.ebuild
+++ b/kde-base/kbugbuster/kbugbuster-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbugbuster/kbugbuster-3.5.9.ebuild,v 1.2 2008/03/04 01:23:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbugbuster/kbugbuster-3.5.9.ebuild,v 1.3 2008/03/07 20:32:53 ingmar Exp $
 
 KMNAME=kdesdk
 EAPI="1"
@@ -10,6 +10,6 @@ DESCRIPTION="KBugBuster - A tool for checking and reporting KDE apps' bugs"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="kcal kdehiddenvisibility"
 
-DEPEND="kcal? ( >=kde-base/libkcal-${PV}:${SLOT} )"
+DEPEND="kcal? ( || ( >=kde-base/libkcal-${PV}:${SLOT} >=kde-base/kdepim-${PV}:${SLOT} ) )"
 
 #TODO tell configure about the optional kcal support, or something

diff --git a/kde-base/kdeartwork-kscreensaver/ChangeLog b/kde-base/kdeartwork-kscreensaver/ChangeLog
index e083f5e4ebeea0b5e522d7b9b4129100ccc1ff11..61529bd2a2ac1069d0aa46aaccf3c14bc0a8f2df 100644 (file)
--- a/kde-base/kdeartwork-kscreensaver/ChangeLog
+++ b/kde-base/kdeartwork-kscreensaver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeartwork-kscreensaver
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.88 2008/03/04 04:21:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.89 2008/03/07 20:33:41 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  kdeartwork-kscreensaver-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org>
   kdeartwork-kscreensaver-3.5.8.ebuild,

diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.9.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.9.ebuild
index 28863733a5a1d62f4031e6a2f5492c4495ea2952..94b795fca16e6a1afad5067f212fdc401d93e09e 100644 (file)
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.9.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.9.ebuild,v 1.2 2008/03/04 04:21:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.9.ebuild,v 1.3 2008/03/07 20:33:41 ingmar Exp $
 
 KMMODULE=kscreensaver
 KMNAME=kdeartwork
@@ -10,7 +10,7 @@ inherit kde-meta
 DESCRIPTION="Extra screensavers for kde"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="opengl xscreensaver"
-DEPEND=">=kde-base/kscreensaver-${PV}:${SLOT}
+DEPEND="|| ( >=kde-base/kscreensaver-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
        media-libs/libart_lgpl
        opengl? ( virtual/opengl )
        xscreensaver? ( x11-misc/xscreensaver )"

diff --git a/kde-base/kdeartwork-kwin-styles/ChangeLog b/kde-base/kdeartwork-kwin-styles/ChangeLog
index df0f9ee32329ab20643bfa198a6273ad99c69000..74aa05519f4644d2f0acd5d29b7f9993b58516b3 100644 (file)
--- a/kde-base/kdeartwork-kwin-styles/ChangeLog
+++ b/kde-base/kdeartwork-kwin-styles/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeartwork-kwin-styles
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kwin-styles/ChangeLog,v 1.79 2008/03/04 04:22:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kwin-styles/ChangeLog,v 1.80 2008/03/07 20:34:16 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  kdeartwork-kwin-styles-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org>
   kdeartwork-kwin-styles-3.5.8.ebuild, kdeartwork-kwin-styles-3.5.9.ebuild:

diff --git a/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.9.ebuild b/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.9.ebuild
index c9a2d3e48c89063aaa7add6c715b55a0558dbf25..40b8acc5891acd5ac011eb082b5da07fb531cd1c 100644 (file)
--- a/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.9.ebuild
+++ b/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.9.ebuild,v 1.2 2008/03/04 04:22:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.9.ebuild,v 1.3 2008/03/07 20:34:16 ingmar Exp $
 
 ARTS_REQUIRED="never"
 
@@ -13,4 +13,4 @@ DESCRIPTION="Window styles for kde"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND=">=kde-base/kwin-${PV}:${SLOT}"
+DEPEND="|| ( >=kde-base/kwin-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"

diff --git a/kde-base/kdeartwork-kworldclock/ChangeLog b/kde-base/kdeartwork-kworldclock/ChangeLog
index 25635723c14c21c0de35665ed15e0a4e429c7b47..8833ba43acb2fff787bd177a70abfa4eaff96ee6 100644 (file)
--- a/kde-base/kdeartwork-kworldclock/ChangeLog
+++ b/kde-base/kdeartwork-kworldclock/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeartwork-kworldclock
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kworldclock/ChangeLog,v 1.81 2008/03/04 04:23:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kworldclock/ChangeLog,v 1.82 2008/03/07 20:34:53 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  kdeartwork-kworldclock-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org>
   kdeartwork-kworldclock-3.5.8.ebuild, kdeartwork-kworldclock-3.5.9.ebuild,

diff --git a/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.9.ebuild b/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.9.ebuild
index 8e953508fc05b8090ec717faa9856371368db628..f20bb90da5392334fa9cc5ae08b1f4da1778e9cc 100644 (file)
--- a/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.9.ebuild
+++ b/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.9.ebuild,v 1.2 2008/03/04 04:23:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.9.ebuild,v 1.3 2008/03/07 20:34:53 ingmar Exp $
 
 ARTS_REQUIRED="never"
 
@@ -13,4 +13,4 @@ DESCRIPTION="kworldclock from kdeartwork"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=kde-base/kworldclock-${PV}:${SLOT}"
+RDEPEND="|| ( >=kde-base/kworldclock-${PV}:${SLOT} >=kde-base/kdetoys-${PV}:${SLOT} )"

diff --git a/kde-base/kdejava/ChangeLog b/kde-base/kdejava/ChangeLog
index a9b322a03f9d649a84efebc46ddbec175e37a48b..bfa6e81af68238958234adcaec9363fc29554690 100644 (file)
--- a/kde-base/kdejava/ChangeLog
+++ b/kde-base/kdejava/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdejava
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/ChangeLog,v 1.70 2008/02/23 20:09:59 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/ChangeLog,v 1.71 2008/03/07 20:35:37 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> kdejava-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
   23 Feb 2008; Vlastimil Babka <caster@gentoo.org> kdejava-3.5.9.ebuild:
   Apply the patch for bug #208631 also in 3.5.9.

diff --git a/kde-base/kdejava/kdejava-3.5.9.ebuild b/kde-base/kdejava/kdejava-3.5.9.ebuild
index fe959bc53df95a3d3da8be81436848f136b75600..78ac132dad12d93e4380c7d845926d9c607d033a 100644 (file)
--- a/kde-base/kdejava/kdejava-3.5.9.ebuild
+++ b/kde-base/kdejava/kdejava-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.5.9.ebuild,v 1.2 2008/02/23 20:09:59 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.5.9.ebuild,v 1.3 2008/03/07 20:35:37 ingmar Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY=qtjava
@@ -12,8 +12,7 @@ inherit java-pkg-2 kde-meta
 DESCRIPTION="KDE java bindings"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
-COMMONDEPEND=">=kde-base/kwin-${PV}:${SLOT}
-       >=kde-base/kcontrol-${PV}:${SLOT}
+COMMONDEPEND="|| ( ( >=kde-base/kwin-${PV}:${SLOT} >=kde-base/kcontrol-${PV}:${SLOT} ) >=kde-base/kdebase-${PV}:${SLOT} )
        >=kde-base/qtjava-${PV}:${SLOT}"
 DEPEND=">=virtual/jdk-1.4 $COMMONDEPEND"
 RDEPEND=">=virtual/jre-1.4 $COMMONDEPEND"

diff --git a/kde-base/kdeprint/ChangeLog b/kde-base/kdeprint/ChangeLog
index 20c9bcdff4b675d0e9703a955300fd3e38485ac9..07637ebf99d2d16e514cf97348d50d817ec2c8ba 100644 (file)
--- a/kde-base/kdeprint/ChangeLog
+++ b/kde-base/kdeprint/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeprint
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeprint/ChangeLog,v 1.87 2008/03/04 03:16:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeprint/ChangeLog,v 1.88 2008/03/07 20:36:16 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> kdeprint-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org> kdeprint-3.5.8.ebuild,
   kdeprint-3.5.9.ebuild:

diff --git a/kde-base/kdeprint/kdeprint-3.5.9.ebuild b/kde-base/kdeprint/kdeprint-3.5.9.ebuild
index b25454fd01d5d898393bb85f4f24e20ecc4bc4f7..f6206d62d63f71e0e7db296d0a7d0f5d17cc6e97 100644 (file)
--- a/kde-base/kdeprint/kdeprint-3.5.9.ebuild
+++ b/kde-base/kdeprint/kdeprint-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeprint/kdeprint-3.5.9.ebuild,v 1.2 2008/03/04 03:16:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeprint/kdeprint-3.5.9.ebuild,v 1.3 2008/03/07 20:36:16 ingmar Exp $
 
 KMNAME=kdebase
 EAPI="1"
@@ -15,7 +15,7 @@ DEPEND="cups? ( net-print/cups )"
 RDEPEND="${DEPEND}
        app-text/enscript
        app-text/psutils
-       kde? ( >=kde-base/kghostview-${PV}:${SLOT} )"
+       kde? ( || ( >=kde-base/kghostview-${PV}:${SLOT} >=kde-base/kdegraphics-${PV}:${SLOT} ) )"
 
 src_compile() {
        myconf="$myconf $(use_with cups)"

diff --git a/kde-base/kicker-applets/ChangeLog b/kde-base/kicker-applets/ChangeLog
index ab0783e2b012a817cb06eb4b4fc09a8de0f843c6..1c7facfc6360f8b3e8275d5723603435f5fd55f1 100644 (file)
--- a/kde-base/kicker-applets/ChangeLog
+++ b/kde-base/kicker-applets/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kicker-applets
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker-applets/ChangeLog,v 1.85 2008/03/04 06:54:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker-applets/ChangeLog,v 1.86 2008/03/07 20:36:49 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  kicker-applets-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org> kicker-applets-3.5.8.ebuild,
   kicker-applets-3.5.9.ebuild:

diff --git a/kde-base/kicker-applets/kicker-applets-3.5.9.ebuild b/kde-base/kicker-applets/kicker-applets-3.5.9.ebuild
index e09cca991e09c0083a70624d46d044792a9706e3..526313565a5237f2c047d0095a3c4704d8cdfdc9 100644 (file)
--- a/kde-base/kicker-applets/kicker-applets-3.5.9.ebuild
+++ b/kde-base/kicker-applets/kicker-applets-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker-applets/kicker-applets-3.5.9.ebuild,v 1.2 2008/03/04 06:54:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker-applets/kicker-applets-3.5.9.ebuild,v 1.3 2008/03/07 20:36:49 ingmar Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kicker-applets doc/kicker-applets"
@@ -10,7 +10,7 @@ inherit kde-meta
 DESCRIPTION="kicker applets"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
-DEPEND=">=kde-base/kicker-${PV}:${SLOT}"
+DEPEND="|| ( >=kde-base/kicker-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 
 RDEPEND="${DEPEND}"
 

diff --git a/kde-base/kjsembed/ChangeLog b/kde-base/kjsembed/ChangeLog
index 51af1595a2bbebaa9948d656a8f59b7f1bbfa87c..ca208469e59c7979aea6157e0f447ec9c6eb9664 100644 (file)
--- a/kde-base/kjsembed/ChangeLog
+++ b/kde-base/kjsembed/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kjsembed
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjsembed/ChangeLog,v 1.82 2008/02/20 23:04:07 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjsembed/ChangeLog,v 1.83 2008/03/07 20:37:20 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> kjsembed-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
 *kjsembed-3.5.9 (20 Feb 2008)
 

diff --git a/kde-base/kjsembed/kjsembed-3.5.9.ebuild b/kde-base/kjsembed/kjsembed-3.5.9.ebuild
index 260675fb39e44419e765fb004b2185c577022327..a28fa5b2c6a19efb730c2ee57f5030507e7288e8 100644 (file)
--- a/kde-base/kjsembed/kjsembed-3.5.9.ebuild
+++ b/kde-base/kjsembed/kjsembed-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjsembed/kjsembed-3.5.9.ebuild,v 1.1 2008/02/20 23:04:07 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjsembed/kjsembed-3.5.9.ebuild,v 1.2 2008/03/07 20:37:20 ingmar Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
@@ -13,7 +13,7 @@ HOMEPAGE="http://xmelegance.org/kjsembed/"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND=">=kde-base/kwin-${PV}:${SLOT}"
+DEPEND="|| ( >=kde-base/kwin-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 RDEPEND="${DEPEND}"
 
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"

diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index f7aca637d8d825350d45f7240da52922c130fd9b..74edef1cf66cfc7d4061f4b90a91d0052481fcb0 100644 (file)
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.129 2008/03/04 06:41:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.130 2008/03/07 20:38:32 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> kmail-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org> kmail-3.5.8.ebuild,
   kmail-3.5.9.ebuild:

diff --git a/kde-base/kmail/kmail-3.5.9.ebuild b/kde-base/kmail/kmail-3.5.9.ebuild
index 77055b4bb1f7eb3bec7937f6bb81f8b68bd2873b..96186b4cec8432b7e19997f6437f3d3499822865 100644 (file)
--- a/kde-base/kmail/kmail-3.5.9.ebuild
+++ b/kde-base/kmail/kmail-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-3.5.9.ebuild,v 1.2 2008/03/04 06:41:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-3.5.9.ebuild,v 1.3 2008/03/07 20:38:32 ingmar Exp $
 
 KMNAME=kdepim
 EAPI="1"
@@ -29,8 +29,8 @@ RDEPEND="${DEPEND}
        crypt? ( app-crypt/pinentry )
        >=kde-base/kdepim-kioslaves-${PV}:${SLOT}
        >=kde-base/kmailcvt-${PV}:${SLOT}
-       >=kde-base/kdebase-kioslaves-${PV}:${SLOT}
-       >=kde-base/kcontrol-${PV}:${SLOT}" # for the "looknfeel" icon, and probably others.
+       || ( >=kde-base/kdebase-kioslaves-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
+       || ( >=kde-base/kcontrol-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )" # for the "looknfeel" icon, and probably others.
 
 KMCOPYLIB="
        libkdepim libkdepim/

diff --git a/kde-base/knewsticker-scripts/ChangeLog b/kde-base/knewsticker-scripts/ChangeLog
index 0404bc28e28eeab2a7977020090b216963cadac1..12fa75424aa2c4c07ebf793dbc66f16012da6288 100644 (file)
--- a/kde-base/knewsticker-scripts/ChangeLog
+++ b/kde-base/knewsticker-scripts/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/knewsticker-scripts
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker-scripts/ChangeLog,v 1.78 2008/03/04 06:55:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker-scripts/ChangeLog,v 1.79 2008/03/07 20:39:14 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  knewsticker-scripts-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org>
   knewsticker-scripts-3.5.8.ebuild, knewsticker-scripts-3.5.9.ebuild:

diff --git a/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.9.ebuild b/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.9.ebuild
index 16bc9c99a7bc9ab8bda270caa37bf964bd370660..8527c92e365f1890ce6b1038fce9f0cf5d9ff6f2 100644 (file)
--- a/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.9.ebuild
+++ b/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.9.ebuild,v 1.2 2008/03/04 06:55:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.9.ebuild,v 1.3 2008/03/07 20:39:14 ingmar Exp $
 KMNAME=kdeaddons
 EAPI="1"
 inherit kde-meta
@@ -9,5 +9,5 @@ DESCRIPTION="Kicker applet - RSS news ticker"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND=">=kde-base/knewsticker-${PV}:${SLOT}"
+DEPEND="|| ( >=kde-base/knewsticker-${PV}:${SLOT} >=kde-base/kdenetwork-${PV}:${SLOT} )"
 RDEPEND="${DEPEND}"

diff --git a/kde-base/konq-plugins/ChangeLog b/kde-base/konq-plugins/ChangeLog
index cd987ed8baad775db87247e86b82c4135913837e..40f1d3e5bab72218efc246b9f4d323b67bc9c2c9 100644 (file)
--- a/kde-base/konq-plugins/ChangeLog
+++ b/kde-base/konq-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/konq-plugins
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/ChangeLog,v 1.85 2008/03/04 06:59:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/ChangeLog,v 1.86 2008/03/07 20:39:53 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  konq-plugins-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org> konq-plugins-3.5.8.ebuild,
   konq-plugins-3.5.9.ebuild:

diff --git a/kde-base/konq-plugins/konq-plugins-3.5.9.ebuild b/kde-base/konq-plugins/konq-plugins-3.5.9.ebuild
index 0851e32d3d2c89d49a923656d28a22ba04da8c9e..0ffbfec03d8e94088a29400aba10265ae8839781 100644 (file)
--- a/kde-base/konq-plugins/konq-plugins-3.5.9.ebuild
+++ b/kde-base/konq-plugins/konq-plugins-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/konq-plugins-3.5.9.ebuild,v 1.2 2008/03/04 06:59:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/konq-plugins-3.5.9.ebuild,v 1.3 2008/03/07 20:39:53 ingmar Exp $
 
 KMNAME=kdeaddons
 KMNODOCS=true
@@ -10,7 +10,7 @@ inherit kde-meta
 DESCRIPTION="Various plugins for Konqueror."
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
-DEPEND=">=kde-base/konqueror-${PV}:${SLOT}
+DEPEND="|| ( >=kde-base/konqueror-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
        !kde-misc/metabar"
 RDEPEND="${DEPEND}
 >=kde-base/kdeaddons-docs-konq-plugins-${PV}:${SLOT}"

diff --git a/kde-base/konqueror-akregator/ChangeLog b/kde-base/konqueror-akregator/ChangeLog
index 93e5b95d13e35b07f7b58b176e505c95cb7d4fac..206a127e2738a9f3779fa43a3727a7cd6f8b2fbd 100644 (file)
--- a/kde-base/konqueror-akregator/ChangeLog
+++ b/kde-base/konqueror-akregator/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/konqueror-akregator
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror-akregator/ChangeLog,v 1.78 2008/03/04 06:58:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror-akregator/ChangeLog,v 1.79 2008/03/07 20:40:29 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  konqueror-akregator-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org>
   konqueror-akregator-3.5.8.ebuild, konqueror-akregator-3.5.9.ebuild:

diff --git a/kde-base/konqueror-akregator/konqueror-akregator-3.5.9.ebuild b/kde-base/konqueror-akregator/konqueror-akregator-3.5.9.ebuild
index 6010618c08ea1840409fdf9a7938f214b63d5d89..76e665bcdd085bac47a8ee494b86276e5919bfce 100644 (file)
--- a/kde-base/konqueror-akregator/konqueror-akregator-3.5.9.ebuild
+++ b/kde-base/konqueror-akregator/konqueror-akregator-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror-akregator/konqueror-akregator-3.5.9.ebuild,v 1.2 2008/03/04 06:58:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror-akregator/konqueror-akregator-3.5.9.ebuild,v 1.3 2008/03/07 20:40:29 ingmar Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="konq-plugins/akregator"
@@ -11,7 +11,7 @@ DESCRIPTION="konqueror's akregator plugin"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND=">=kde-base/konqueror-${PV}:${SLOT}"
+DEPEND="|| ( >=kde-base/konqueror-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 RDEPEND="${DEPEND}
 >=kde-base/kdeaddons-docs-konq-plugins-${PV}:${SLOT}
->=kde-base/akregator-${PV}:${SLOT}"
+|| ( >=kde-base/akregator-${PV}:${SLOT} >=kde-base/kdepim-${PV}:${SLOT} )"

diff --git a/kde-base/korn/ChangeLog b/kde-base/korn/ChangeLog
index 7f34f409bf3e75f4b5df3cd5dccccc0fab767ed9..d3f88a50a68d80c8a405c412aea37f8b27fb2a1a 100644 (file)
--- a/kde-base/korn/ChangeLog
+++ b/kde-base/korn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/korn
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korn/ChangeLog,v 1.86 2008/03/04 06:34:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korn/ChangeLog,v 1.87 2008/03/07 20:41:04 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> korn-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org> korn-3.5.8.ebuild,
   korn-3.5.9.ebuild:

diff --git a/kde-base/korn/korn-3.5.9.ebuild b/kde-base/korn/korn-3.5.9.ebuild
index fdbcc430b28ab4f0465bbb4ec1bf0a1c0ea31559..f77d1a335a85670499b85b3d5d06266c84bacdb6 100644 (file)
--- a/kde-base/korn/korn-3.5.9.ebuild
+++ b/kde-base/korn/korn-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korn/korn-3.5.9.ebuild,v 1.2 2008/03/04 06:34:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korn/korn-3.5.9.ebuild,v 1.3 2008/03/07 20:41:04 ingmar Exp $
 
 KMNAME=kdepim
 EAPI="1"
@@ -13,7 +13,7 @@ IUSE=""
 DEPEND=">=kde-base/mimelib-${PV}:${SLOT}
 >=kde-base/libkmime-${PV}:${SLOT}"
 RDEPEND="${DEPEND}
-       >=kde-base/kdebase-kioslaves-${PV}:${SLOT}
+       || ( >=kde-base/kdebase-kioslaves-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
        >=kde-base/kdepim-kioslaves-${PV}:${SLOT}"
 
 KMCOPYLIB="libmimelib mimelib

diff --git a/kde-base/kpat/ChangeLog b/kde-base/kpat/ChangeLog
index 61db786f56aedaae3846c00401bd4600ce82c299..3217f47b5e420ce4fd3f931eea1fbc98ee41bc59 100644 (file)
--- a/kde-base/kpat/ChangeLog
+++ b/kde-base/kpat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kpat
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/ChangeLog,v 1.83 2008/03/04 04:52:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/ChangeLog,v 1.84 2008/03/07 20:41:48 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> kpat-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org> kpat-3.5.8.ebuild,
   kpat-3.5.9.ebuild, kpat-4.0.1.ebuild:

diff --git a/kde-base/kpat/kpat-3.5.9.ebuild b/kde-base/kpat/kpat-3.5.9.ebuild
index cdee08fd768562816f4d2a14057c808e5e5cfd5a..250d456d75b3c31f9bf397040116b5db749bcbc1 100644 (file)
--- a/kde-base/kpat/kpat-3.5.9.ebuild
+++ b/kde-base/kpat/kpat-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-3.5.9.ebuild,v 1.2 2008/03/04 04:52:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-3.5.9.ebuild,v 1.3 2008/03/07 20:41:48 ingmar Exp $
 KMNAME=kdegames
 EAPI="1"
 inherit kde-meta
@@ -12,7 +12,7 @@ IUSE="kdehiddenvisibility"
 DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
 
 RDEPEND="${DEPEND}
-       >=kde-base/kdebase-data-${PV}:${SLOT}"
+       || ( >=kde-base/kdebase-data-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 
 KMEXTRACTONLY=libkdegames
 KMCOPYLIB="libkdegames libkdegames"

diff --git a/kde-base/kpdf/ChangeLog b/kde-base/kpdf/ChangeLog
index 623c6c0f6b1444de00fc5a2e016043151e0ce12b..6a55f0b9022a2365d260b3bd4c825b0f4d9892aa 100644 (file)
--- a/kde-base/kpdf/ChangeLog
+++ b/kde-base/kpdf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kpdf
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.155 2008/03/04 05:09:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.156 2008/03/07 20:42:33 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> kpdf-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org> kpdf-3.5.8-r1.ebuild,
   kpdf-3.5.9.ebuild:

diff --git a/kde-base/kpdf/kpdf-3.5.9.ebuild b/kde-base/kpdf/kpdf-3.5.9.ebuild
index 123ef4cdc752cc209e0a45e5a4106dbefe9316fa..c57eaa2361b44dc071606015ff36dff10a05cc1b 100644 (file)
--- a/kde-base/kpdf/kpdf-3.5.9.ebuild
+++ b/kde-base/kpdf/kpdf-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.5.9.ebuild,v 1.2 2008/03/04 05:09:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.5.9.ebuild,v 1.3 2008/03/07 20:42:33 ingmar Exp $
 
 KMNAME=kdegraphics
 EAPI="1"
@@ -16,7 +16,7 @@ DEPEND=">=media-libs/freetype-2.3
        >=app-text/poppler-0.6.1
        >=app-text/poppler-bindings-0.6.1"
 RDEPEND="${DEPEND}
-       >=kde-base/kdeprint-${PV}:${SLOT}"
+       || ( >=kde-base/kdeprint-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 
 pkg_setup() {
        kde_pkg_setup

diff --git a/kde-base/ksayit/ChangeLog b/kde-base/ksayit/ChangeLog
index fc50757b3f0be5be1135d766387d07c068855782..c8e26c49b421f0aa1ad9d536be3b4b0378e4a504 100644 (file)
--- a/kde-base/ksayit/ChangeLog
+++ b/kde-base/ksayit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ksayit
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ChangeLog,v 1.88 2008/03/04 04:06:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ChangeLog,v 1.89 2008/03/07 20:43:13 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> ksayit-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org> ksayit-3.5.8.ebuild,
   ksayit-3.5.9.ebuild:

diff --git a/kde-base/ksayit/ksayit-3.5.9.ebuild b/kde-base/ksayit/ksayit-3.5.9.ebuild
index 50043856f14b067519e618f81143f850cce44f71..3e4fb7ed0966ba746c69f28daeb807da4b82fe74 100644 (file)
--- a/kde-base/ksayit/ksayit-3.5.9.ebuild
+++ b/kde-base/ksayit/ksayit-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ksayit-3.5.9.ebuild,v 1.2 2008/03/04 04:06:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ksayit-3.5.9.ebuild,v 1.3 2008/03/07 20:43:13 ingmar Exp $
 KMNAME=kdeaccessibility
 EAPI="1"
 inherit kde-meta
@@ -11,10 +11,19 @@ IUSE=""
 
 DEPEND=">=kde-base/kttsd-${PV}:${SLOT}
        >=kde-base/arts-${PV}:${SLOT}
-       >=kde-base/kdemultimedia-arts-${PV}:${SLOT}"
+       || ( >=kde-base/kdemultimedia-arts-${PV}:${SLOT} >=kde-base/kdemultimedia-${PV}:${SLOT} )"
 
 RDEPEND="${DEPEND}"
 
+pkg_setup() {
+       kde_pkg_setup
+
+       if has_version kde-base/kdemultimedia:${SLOT} && ! built_with_use kde-base/kdemultimedia:${SLOT} arts ; then
+               eerror "You have \"arts\" USE flag enabled, but kde-base/kdemultimedia:${SLOT} was built with this flag disabled."
+               die "Reinstall kde-base/kdemultimedia:${SLOT} with USE=\"arts\""
+       fi
+}
+
 src_compile() {
        myconf="--enable-ksayit-audio-plugins"
        kde-meta_src_compile

diff --git a/kde-base/kttsd/ChangeLog b/kde-base/kttsd/ChangeLog
index 9d7da888d8f922ec02d73f126bcdc626cf9c44e0..d9f53024562ffd706620c87689f5337aaf171041 100644 (file)
--- a/kde-base/kttsd/ChangeLog
+++ b/kde-base/kttsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kttsd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/ChangeLog,v 1.87 2008/03/04 04:03:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/ChangeLog,v 1.88 2008/03/07 20:43:54 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> kttsd-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org> kttsd-3.5.8.ebuild,
   kttsd-3.5.9.ebuild, kttsd-4.0.1.ebuild:

diff --git a/kde-base/kttsd/kttsd-3.5.9.ebuild b/kde-base/kttsd/kttsd-3.5.9.ebuild
index 4686c10a424971eeebf87060b9d70812f299f7e4..134841c1d0a18b81b76a9390a16e441ef1174c34 100644 (file)
--- a/kde-base/kttsd/kttsd-3.5.9.ebuild
+++ b/kde-base/kttsd/kttsd-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-3.5.9.ebuild,v 1.2 2008/03/04 04:03:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-3.5.9.ebuild,v 1.3 2008/03/07 20:43:54 ingmar Exp $
 KMNAME=kdeaccessibility
 EAPI="1"
 inherit kde-meta
@@ -11,7 +11,7 @@ IUSE="akode alsa"
 
 DEPEND="akode? ( media-libs/akode )
        alsa? ( media-libs/alsa-lib )
-       >=kde-base/kcontrol-${PV}:${SLOT}
+       || ( >=kde-base/kcontrol-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
        !arts? ( !alsa? ( media-libs/akode ) )"
 RDEPEND="${DEPEND}
        || ( app-accessibility/festival

diff --git a/kde-base/kviewshell/ChangeLog b/kde-base/kviewshell/ChangeLog
index 9062bf61310604a682b14468b5436f0577623057..788e21415e81ff5111fa6fe4969ee5694f8e4068 100644 (file)
--- a/kde-base/kviewshell/ChangeLog
+++ b/kde-base/kviewshell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kviewshell
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kviewshell/ChangeLog,v 1.84 2008/03/04 05:08:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kviewshell/ChangeLog,v 1.85 2008/03/07 20:44:29 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> kviewshell-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org> kviewshell-3.5.8.ebuild,
   kviewshell-3.5.9.ebuild:

diff --git a/kde-base/kviewshell/kviewshell-3.5.9.ebuild b/kde-base/kviewshell/kviewshell-3.5.9.ebuild
index baed969ef81d61ae10ab89dac6ad46fbd8f54528..a19bf4189c0e839fbec1985b19503b254ae0afa4 100644 (file)
--- a/kde-base/kviewshell/kviewshell-3.5.9.ebuild
+++ b/kde-base/kviewshell/kviewshell-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kviewshell/kviewshell-3.5.9.ebuild,v 1.2 2008/03/04 05:08:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kviewshell/kviewshell-3.5.9.ebuild,v 1.3 2008/03/07 20:44:29 ingmar Exp $
 
 KMNAME=kdegraphics
 EAPI="1"
@@ -11,4 +11,4 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
-RDEPEND=">=kde-base/kdebase-kioslaves-${PV}:${SLOT}"
+RDEPEND="|| ( >=kde-base/kdebase-kioslaves-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"

diff --git a/kde-base/noatun-plugins/ChangeLog b/kde-base/noatun-plugins/ChangeLog
index 4aaf19a7eb9084ffe7b1cfc085b54ba92fba3e4f..00e541c3735847c72ecd46ef75c4620b0bda531d 100644 (file)
--- a/kde-base/noatun-plugins/ChangeLog
+++ b/kde-base/noatun-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/noatun-plugins
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/ChangeLog,v 1.83 2008/03/04 06:56:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/ChangeLog,v 1.84 2008/03/07 20:45:07 ingmar Exp $
+
+  07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  noatun-plugins-3.5.9.ebuild:
+  Allow mixing of split & monolithic ebuilds, where possible, thanks to
+  Arfrever Frehtes Taifersar Arahesis!
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org> noatun-plugins-3.5.8.ebuild,
   noatun-plugins-3.5.9.ebuild:

diff --git a/kde-base/noatun-plugins/noatun-plugins-3.5.9.ebuild b/kde-base/noatun-plugins/noatun-plugins-3.5.9.ebuild
index 1ef6a41131a689d1edeecb107283c364fef92f38..7fde49037ba4ff7c3b99eaada6912fc50fccedd7 100644 (file)
--- a/kde-base/noatun-plugins/noatun-plugins-3.5.9.ebuild
+++ b/kde-base/noatun-plugins/noatun-plugins-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/noatun-plugins-3.5.9.ebuild,v 1.2 2008/03/04 06:56:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/noatun-plugins-3.5.9.ebuild,v 1.3 2008/03/07 20:45:07 ingmar Exp $
 KMNAME=kdeaddons
 EAPI="1"
 inherit db-use kde-meta
@@ -9,7 +9,7 @@ DESCRIPTION="Various plugins for Noatun."
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="arts sdl berkdb"
 
-DEPEND=">=kde-base/noatun-${PV}:${SLOT}
+DEPEND="|| ( >=kde-base/noatun-${PV}:${SLOT} >=kde-base/kdemultimedia-${PV}:${SLOT} )
        arts? ( >=kde-base/arts-${PV}:${SLOT} )
        sdl? ( >=media-libs/libsdl-1.2 )
        berkdb? ( =sys-libs/db-4* )"