[koffice] Cleanups

8 files changed, 23 insertions, 85 deletions

diff --git a/Documentation/package.unmask/koffice-2.3.0 b/Documentation/package.unmask/koffice-2.3.0
deleted file mode 100644
index 36c1b5664dc..00000000000
--- a/Documentation/package.unmask/koffice-2.3.0
+++ /dev/null
@@ -1,7 +0,0 @@
-app-office/koffice-libs-2.3.0
-app-office/koffice-data-2.3.0
-app-office/kword-2.3.0
-app-office/krita-2.3.0
-app-office/karbon-2.3.0
-app-office/kchart-2.3.0
-app-office/kspread-2.3.0
diff --git a/app-office/kchart/Manifest b/app-office/kchart/Manifest
deleted file mode 100644
index b66d9c048bd..00000000000
--- a/app-office/kchart/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-EBUILD kchart-2.3.0.ebuild 498 RMD160 c9e9a569fcfbb043cf98233a09344ee9fa258123 SHA1 81937c2fbb9557f3c2c95056c60b8f36847a557f SHA256 891a062eed5b382f3ad847e98082bfd703823b94dd621849ba6683f1f9431d35
-EBUILD kchart-9999.ebuild 639 RMD160 678329062fe7fc3b1a745e68e9c37b9c01f4ee90 SHA1 a676fb129d0de2d7c7a08fe77c99c6acf70770cd SHA256 f61f1566e682ba608b931f25990db21305132fdd74e3929443bb0c7fdb9c2114
-MISC metadata.xml 274 RMD160 36613e453c44bddc105b680b428646468b763cf4 SHA1 5deb517eb48fbfbea683de59a817db233c00dd4f SHA256 e50185f7c5b54b6190f71b75a1903d7ad01a3fb441a06d739c8fbd51bf4b6b1b
diff --git a/app-office/kchart/kchart-2.3.0.ebuild b/app-office/kchart/kchart-2.3.0.ebuild
deleted file mode 100644
index b7e1cbbe354..00000000000
--- a/app-office/kchart/kchart-2.3.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kchart/kchart-2.2.2.ebuild,v 1.4 2010/11/04 13:42:44 hwoarang Exp $
-
-EAPI=2
-
-DESCRIPTION="KOffice chart application. Temporary dummy ebuild for compatibility."
-
-SRC_URI=""
-HOMEPAGE="http://www.kde.org/"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="2"
-LICENSE="GPL-2"
-
-IUSE="reports"
-
-DEPEND="~app-office/koffice-libs-${PV}:${SLOT}[reports=]"
-RDEPEND=${DEPEND}
diff --git a/app-office/kchart/kchart-9999.ebuild b/app-office/kchart/kchart-9999.ebuild
deleted file mode 100644
index ff341d1bd5d..00000000000
--- a/app-office/kchart/kchart-9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-#
-# Please note that koffice is currently bumped "forward" and that this live
-# ebuild is more or less unmaintained.
-#
-
-EAPI="2"
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-inherit kde4-meta
-
-DESCRIPTION="KOffice chart application."
-
-KEYWORDS=""
-IUSE="reports"
-
-KMEXTRACTONLY="
-	libs/
-	interfaces/
-	filters/
-	plugins/
-"
-KMEXTRA="
-	filters/${KMMODULE}/
-	libs/koreport/
-"
-
-KMLOADLIBS="koffice-libs"
-
-src_configure() {
-	 mycmakeargs=(
-		-DBUILD_kchart=ON
-		$(cmake-utils_use_build reports koreport)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/app-office/kchart/metadata.xml b/app-office/kchart/metadata.xml
deleted file mode 100644
index e6c8f87eb7f..00000000000
--- a/app-office/kchart/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<use>
-	<flag name="reports">Enable the reports koffice module in kchart,
-		also used by kplato and kexi</flag>
-</use>
-</pkgmetadata>
diff --git a/app-office/koffice-libs/Manifest b/app-office/koffice-libs/Manifest
index 2fd333b6e19..0394c1a4c8a 100644
--- a/app-office/koffice-libs/Manifest
+++ b/app-office/koffice-libs/Manifest
@@ -2,6 +2,6 @@ AUX koffice-libs-2.2.0-kspreadcommon.patch 744 RMD160 02173829041b40acef6aaa8333
 AUX koffice-libs-2.2.1-kspreadcommon.patch 744 RMD160 02173829041b40acef6aaa83338920ae492af120 SHA1 96abc53524fb2a9955326499ac084d2291a65762 SHA256 8577e3c9b5a00bc14379e92fdb556ac911ace2d2caa975f8ca88ab18cc956ef3
 AUX koffice-libs-2.2.2-kspreadcommon.patch 744 RMD160 02173829041b40acef6aaa83338920ae492af120 SHA1 96abc53524fb2a9955326499ac084d2291a65762 SHA256 8577e3c9b5a00bc14379e92fdb556ac911ace2d2caa975f8ca88ab18cc956ef3
 DIST koffice-2.3.0.tar.bz2 75689297 RMD160 c4fb1ad0895a527f9c2abb96be64f45bf6a23a3c SHA1 4eda6ba3f56e9697cde37421b27de1f8da531ba1 SHA256 a8e9a3ed882536cc4ca59388cc82268478339d328b62daaaec1a7bc970b73e1c
-EBUILD koffice-libs-2.3.0.ebuild 1727 RMD160 f1ce5d99238bb1c0d9f1ebb50cbacc387fc2fbcd SHA1 185386b6ac85a690024e274b75f5c575178cbed8 SHA256 819fdd945c878880c687f60d77e729e5c0917dae62f3bcb9d7294dedb624d7ac
+EBUILD koffice-libs-2.3.0.ebuild 1637 RMD160 223abfbc87471687e7ba89f47baa7be7e0c7ab93 SHA1 92bd7cd158e3469c098027d591faef56b408d04a SHA256 cdb364b276c758c6a8c1db7d0715168ed3f87644cbc0e0eb3ca0e286e5c9cd72
 EBUILD koffice-libs-9999.ebuild 1380 RMD160 15259f1e50cc6313ccc6af727f6554d1859f4595 SHA1 e17830a8bf8e092ddcd64dd175a95dbbb1d0a83a SHA256 541a527bc5ea18b9fb27794094d318d5e43fbad6a445b7c9512dbbd959637910
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/app-office/koffice-libs/koffice-libs-2.3.0.ebuild b/app-office/koffice-libs/koffice-libs-2.3.0.ebuild
index 1332e4039a6..d34b8c7017c 100644
--- a/app-office/koffice-libs/koffice-libs-2.3.0.ebuild
+++ b/app-office/koffice-libs/koffice-libs-2.3.0.ebuild
@@ -14,8 +14,6 @@ DESCRIPTION="Shared KOffice libraries."
 KEYWORDS="~amd64 ~x86"
 IUSE="crypt openexr reports"
 
-# the contents of kchart have been _temporarily_ moved into koffice-libs in 2.2.0
-
 RDEPEND="
 	>=app-office/koffice-data-${PV}:${SLOT}
 	dev-libs/libxml2
@@ -25,7 +23,7 @@ RDEPEND="
 	crypt? ( app-crypt/qca:2 )
 	openexr? ( media-libs/openexr )
 	opengl? ( media-libs/mesa )
-	!<app-office/kchart-2.2.0
+	!app-office/kchart
 "
 DEPEND="${RDEPEND}"
 #	doc? ( app-doc/doxygen )"
@@ -40,11 +38,11 @@ KMEXTRA="
 	filters/kchart/
 	filters/kformula/
 	interfaces/
+	kchart/
+	kformula/
 	kounavail/
 	plugins/
 	tools/
-	kchart/
-	kformula/
 "
 
 KMEXTRACTONLY="
diff --git a/profiles/package.mask b/profiles/package.mask
index a40d202eb87..5befbd5a030 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -327,4 +327,23 @@ kde-base/ktimetracker:4.5
 =net-im/kmess-9999
 
 
+# Mask RC's of koffice-2.3 - this is work in progress 
+# Some of the applications do not build yet and I have not
+# even started checking if they are "complete"
+# dilfridge, 3/12/2010
+#
+>=app-office/koffice-meta-2.2.91
+>=app-office/kexi-2.2.91
+>=app-office/koffice-l10n-2.2.91
+>=app-office/kplato-2.2.91
+>=app-office/kchart-2.2.91
+>=app-office/kword-2.2.91
+>=app-office/krita-2.2.91
+>=app-office/kspread-2.2.91
+>=app-office/koffice-data-2.2.91
+>=app-office/kpresenter-2.2.91
+>=app-office/koffice-libs-2.2.91
+>=app-office/karbon-2.2.91
+
+
 media-libs/opengtl