QA: kde-base -> kde, need-kde after DEPEND

5 files changed, 21 insertions, 29 deletions

diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index 9ab157ce912f..aa21bb9c5d56 100644
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/koffice
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.49 2004/06/24 22:42:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.50 2004/06/29 11:42:09 carlo Exp $
+
+  29 Jun 2004; Carsten Lohrke <carlo@gentoo.org> koffice-1.2.1-r1.ebuild,
+  koffice-1.3.1-r1.ebuild, koffice-1.3.1.ebuild, koffice-1.3.ebuild:
+  QA: kde-base -> kde, need-kde after DEPEND
 
 *koffice-1.3.1-r1 (09 Jun 2004)
 
diff --git a/app-office/koffice/koffice-1.2.1-r1.ebuild b/app-office/koffice/koffice-1.2.1-r1.ebuild
index 670254a56418..0529fb40bd26 100644
--- a/app-office/koffice/koffice-1.2.1-r1.ebuild
+++ b/app-office/koffice/koffice-1.2.1-r1.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.2.1-r1.ebuild,v 1.14 2004/06/24 22:42:00 agriffis Exp $
-inherit kde-base flag-o-matic
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.2.1-r1.ebuild,v 1.15 2004/06/29 11:42:09 carlo Exp $
+inherit kde flag-o-matic
 
 filter-flags "-fomit-frame-pointer"
 
-need-kde 3
-
 DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
 HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
@@ -17,10 +15,10 @@ KEYWORDS="x86 ppc sparc alpha"
 IUSE=""
 SLOT="0"
 
-DEPEND="$DEPEND
-	>=dev-lang/python-2.2.1
+DEPEND=">=dev-lang/python-2.2.1
 	>=media-libs/libart_lgpl-2.3.9
 	>=media-gfx/imagemagick-5.4.5"
+need-kde 3
 
 PATCHES="$FILESDIR/${P}-kword-crashes.diff"
 
diff --git a/app-office/koffice/koffice-1.3.1-r1.ebuild b/app-office/koffice/koffice-1.3.1-r1.ebuild
index 8c989b9fdc1c..8cf16048e1f9 100644
--- a/app-office/koffice/koffice-1.3.1-r1.ebuild
+++ b/app-office/koffice/koffice-1.3.1-r1.ebuild
@@ -1,31 +1,28 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.1-r1.ebuild,v 1.3 2004/06/24 22:42:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.1-r1.ebuild,v 1.4 2004/06/29 11:42:09 carlo Exp $
+
 inherit kde eutils
 
 # TODO : mysql support
 # other refs from configure: jasper, qt-docs, doxygen, libxml2, libxslt, freetype, fontconfig, qt being built with sql support (???)
 
-need-kde 3
-
 DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
 HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
 SRC_URI="mirror://kde/stable/${P}/src/${P}.tar.bz2"
 
+LICENSE="GPL-2 LGPL-2"
 KEYWORDS="~x86 amd64 ~ppc ~sparc ~alpha"
-RESTRICT="nomirror"
 
 IUSE=""
 SLOT="0"
 
-DEPEND="$DEPEND
-	>=kde-base/kdelibs-3.1
-	>=dev-lang/python-2.2.1
+DEPEND=">=dev-lang/python-2.2.1
 	>=media-libs/libart_lgpl-2.3.9
 	>=media-gfx/imagemagick-5.4.5
 	>=app-text/wv2-0.1.8
 	dev-util/pkgconfig"
+need-kde 3.1
 
 src_unpack() {
 	kde_src_unpack
diff --git a/app-office/koffice/koffice-1.3.1.ebuild b/app-office/koffice/koffice-1.3.1.ebuild
index a9b7a2cf2991..6612feedee3c 100644
--- a/app-office/koffice/koffice-1.3.1.ebuild
+++ b/app-office/koffice/koffice-1.3.1.ebuild
@@ -1,31 +1,27 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.1.ebuild,v 1.4 2004/06/24 22:42:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.1.ebuild,v 1.5 2004/06/29 11:42:09 carlo Exp $
 inherit kde
 
 # TODO : mysql support
 # other refs from configure: jasper, qt-docs, doxygen, libxml2, libxslt, freetype, fontconfig, qt being built with sql support (???)
 
-need-kde 3
-
 DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
 HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 SRC_URI="mirror://kde/stable/${P}/src/${P}.tar.bz2"
 
 KEYWORDS="~x86 ~amd64 ppc ~sparc ~alpha"
-RESTRICT="nomirror"
 
 IUSE=""
 SLOT="0"
 
-DEPEND="$DEPEND
-	>=kde-base/kdelibs-3.1
-	>=dev-lang/python-2.2.1
+DEPEND=">=dev-lang/python-2.2.1
 	>=media-libs/libart_lgpl-2.3.9
 	>=media-gfx/imagemagick-5.4.5
 	>=app-text/wv2-0.1.8
 	dev-util/pkgconfig"
+need-kde 3.1
 
 src_compile() {
 	export LIBPYTHON="`python-config --libs`"
diff --git a/app-office/koffice/koffice-1.3.ebuild b/app-office/koffice/koffice-1.3.ebuild
index afc8a3a62c0e..f86064f26913 100644
--- a/app-office/koffice/koffice-1.3.ebuild
+++ b/app-office/koffice/koffice-1.3.ebuild
@@ -1,31 +1,28 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.ebuild,v 1.10 2004/06/24 22:42:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.ebuild,v 1.11 2004/06/29 11:42:09 carlo Exp $
+
 inherit kde
 
 # TODO : mysql support
 # other refs from configure: jasper, qt-docs, doxygen, libxml2, libxslt, freetype, fontconfig, qt being built with sql support (???)
 
-need-kde 3
-
 DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
 HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 SRC_URI="mirror://kde/stable/${P}/src/${P}.tar.bz2"
 
 KEYWORDS="x86 amd64 ppc sparc"
-RESTRICT="nomirror"
 
 IUSE=""
 SLOT="0"
 
-DEPEND="$DEPEND
-	>=kde-base/kdelibs-3.1
-	>=dev-lang/python-2.2.1
+DEPEND=">=dev-lang/python-2.2.1
 	>=media-libs/libart_lgpl-2.3.9
 	>=media-gfx/imagemagick-5.4.5
 	>=app-text/wv2-0.1.8
 	dev-util/pkgconfig"
+need-kde 3.1
 
 src_compile() {
 	export LIBPYTHON="`python-config --libs`"