summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Lohrke <carlo@gentoo.org>2006-03-30 18:38:37 +0000
committerCarsten Lohrke <carlo@gentoo.org>2006-03-30 18:38:37 +0000
commit48f041bfc74321e2eb0c97e9fe6c618c87328e3b (patch)
tree05b0e5742f3fe823904c212cea1d1b8e0f04f222 /app-office
parentAdd ~x86-fbsd keyword and drop virtual/libc dependency. (diff)
downloadhistorical-48f041bfc74321e2eb0c97e9fe6c618c87328e3b.tar.gz
historical-48f041bfc74321e2eb0c97e9fe6c618c87328e3b.tar.bz2
historical-48f041bfc74321e2eb0c97e9fe6c618c87328e3b.zip
Correct dependency for monolithic KDE.
Package-Manager: portage-2.0.54
Diffstat (limited to 'app-office')
-rw-r--r--app-office/koffice-libs/ChangeLog6
-rw-r--r--app-office/koffice-libs/koffice-libs-1.5_rc1.ebuild4
-rw-r--r--app-office/koffice/ChangeLog5
-rw-r--r--app-office/koffice/koffice-1.5_rc1.ebuild4
4 files changed, 13 insertions, 6 deletions
diff --git a/app-office/koffice-libs/ChangeLog b/app-office/koffice-libs/ChangeLog
index 7adc99c06a89..1875b09fa105 100644
--- a/app-office/koffice-libs/ChangeLog
+++ b/app-office/koffice-libs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/koffice-libs
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/ChangeLog,v 1.36 2006/03/30 18:01:21 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/ChangeLog,v 1.37 2006/03/30 18:38:37 carlo Exp $
+
+ 30 Mar 2006; Carsten Lohrke <carlo@gentoo.org>
+ koffice-libs-1.5_rc1.ebuild:
+ Correct dependency for monolithic KDE.
30 Mar 2006; Carsten Lohrke <carlo@gentoo.org>
koffice-libs-1.5_rc1.ebuild:
diff --git a/app-office/koffice-libs/koffice-libs-1.5_rc1.ebuild b/app-office/koffice-libs/koffice-libs-1.5_rc1.ebuild
index 9ede55486e88..6d24046968bb 100644
--- a/app-office/koffice-libs/koffice-libs-1.5_rc1.ebuild
+++ b/app-office/koffice-libs/koffice-libs-1.5_rc1.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/app-office/koffice-libs/koffice-libs-1.5_rc1.ebuild,v 1.3 2006/03/30 18:01:21 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-1.5_rc1.ebuild,v 1.4 2006/03/30 18:38:37 carlo Exp $
MAXKOFFICEVER=${PV}
KMNAME=koffice
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
dev-util/pkgconfig"
RDEPEND="${RDEPEND}
- kde-base/kdeprint"
+ || ( kde-base/kdeprint kde-base/kdebase )"
KMEXTRA="interfaces/
plugins/
diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index 84fa58c73927..f5643e626f72 100644
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-office/koffice
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.159 2006/03/30 17:56:30 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.160 2006/03/30 18:36:40 carlo Exp $
+
+ 30 Mar 2006; Carsten Lohrke <carlo@gentoo.org> koffice-1.5_rc1.ebuild:
+ Correct dependency for monolithic KDE.
30 Mar 2006; Carsten Lohrke <carlo@gentoo.org> koffice-1.5_rc1.ebuild:
Obviously, KOffice users want to print.
diff --git a/app-office/koffice/koffice-1.5_rc1.ebuild b/app-office/koffice/koffice-1.5_rc1.ebuild
index 6c09229720da..3940c8c5e51f 100644
--- a/app-office/koffice/koffice-1.5_rc1.ebuild
+++ b/app-office/koffice/koffice-1.5_rc1.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/app-office/koffice/koffice-1.5_rc1.ebuild,v 1.2 2006/03/30 17:56:30 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.5_rc1.ebuild,v 1.3 2006/03/30 18:36:40 carlo Exp $
inherit kde
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
dev-util/pkgconfig"
RDEPEND="${RDEPEND}
- kde-base/kdeprint"
+ || ( kde-base/kdeprint kde-base/kdebase )"
# add blockers on split packages derived from this one
for x in $(get-child-packages ${CATEGORY}/${PN}); do