koffice cleanup

(Portage version: 2.1.9.41/cvs/Linux x86_64, RepoMan options: --force)

22 files changed, 54 insertions, 570 deletions

diff --git a/app-office/karbon/ChangeLog b/app-office/karbon/ChangeLog
index 3198a2327a56..945b91b7a938 100644
--- a/app-office/karbon/ChangeLog
+++ b/app-office/karbon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/karbon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/ChangeLog,v 1.119 2011/02/24 12:00:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/ChangeLog,v 1.120 2011/02/27 21:57:00 dilfridge Exp $
+
+  27 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -karbon-2.3.1.ebuild:
+  Cleanup
 
 *karbon-2.3.3 (24 Feb 2011)
 
diff --git a/app-office/karbon/karbon-2.3.1.ebuild b/app-office/karbon/karbon-2.3.1.ebuild
deleted file mode 100644
index 854fd6662780..000000000000
--- a/app-office/karbon/karbon-2.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/karbon-2.3.1.ebuild,v 1.1 2011/01/20 00:09:10 dilfridge Exp $
-
-EAPI=3
-KMNAME="koffice"
-KMMODULE="${PN}"
-
-inherit kde4-meta
-
-DESCRIPTION="KOffice vector drawing application."
-
-KEYWORDS="~amd64 ~x86"
-IUSE="+pstoedit wpg"
-
-DEPEND="
-	media-libs/libart_lgpl
-	pstoedit? ( media-gfx/pstoedit )
-	wpg? ( media-libs/libwpg )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRA="filters/${KMMODULE}"
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	libs/
-	plugins/
-	filters/
-"
-KMLOADLIBS="koffice-libs"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with wpg)
-		$(cmake-utils_use_with pstoedit)
-	)
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
diff --git a/app-office/kexi/ChangeLog b/app-office/kexi/ChangeLog
index 4bee04aca12d..e83b5a3e9407 100644
--- a/app-office/kexi/ChangeLog
+++ b/app-office/kexi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/kexi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/ChangeLog,v 1.107 2011/02/24 12:00:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/ChangeLog,v 1.108 2011/02/27 21:57:00 dilfridge Exp $
+
+  27 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kexi-2.3.1.ebuild:
+  Cleanup
 
 *kexi-2.3.3 (24 Feb 2011)
 
diff --git a/app-office/kexi/kexi-2.3.1.ebuild b/app-office/kexi/kexi-2.3.1.ebuild
deleted file mode 100644
index 2a43c3a7d591..000000000000
--- a/app-office/kexi/kexi-2.3.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/kexi-2.3.1.ebuild,v 1.2 2011/02/16 21:53:19 dilfridge Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-inherit kde4-meta
-
-DESCRIPTION="KOffice integrated environment for database management"
-KEYWORDS="~amd64 ~x86"
-IUSE="freetds mysql postgres reports xbase"
-
-DEPEND="
-	sys-libs/readline
-	app-arch/bzip2
-	~app-office/kspread-${PV}:${SLOT}
-	freetds? ( dev-db/freetds )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-libs/libpqxx )
-	reports? ( ~app-office/koffice-libs-${PV}:${SLOT}[reports] )
-	xbase? ( dev-db/xbase )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}"-2.3.0-link.patch )
-
-KMLOADLIBS="koffice-libs"
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	libs/
-	kspread/
-"
-
-src_configure() {
-	 mycmakeargs=(
-		-DWITH_WEBFORMS=Off
-		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_with postgres Pqxx)
-		$(cmake-utils_use_with xbase XBase)
-		-DBUILD_kexi=ON
-		$(cmake-utils_use_build reports koreport)
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
diff --git a/app-office/koffice-data/ChangeLog b/app-office/koffice-data/ChangeLog
index 7f1e5134e5a9..3e42f1d0c7c5 100644
--- a/app-office/koffice-data/ChangeLog
+++ b/app-office/koffice-data/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/koffice-data
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/ChangeLog,v 1.113 2011/02/24 12:00:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/ChangeLog,v 1.114 2011/02/27 21:57:00 dilfridge Exp $
+
+  27 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -koffice-data-2.3.1.ebuild:
+  Cleanup
 
 *koffice-data-2.3.3 (24 Feb 2011)
 
diff --git a/app-office/koffice-data/koffice-data-2.3.1.ebuild b/app-office/koffice-data/koffice-data-2.3.1.ebuild
deleted file mode 100644
index 9aa258e01a45..000000000000
--- a/app-office/koffice-data/koffice-data-2.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/koffice-data-2.3.1.ebuild,v 1.1 2011/01/20 00:09:10 dilfridge Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMNOMODULE="true"
-inherit kde4-meta
-
-DESCRIPTION="Shared KOffice data files"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/lcms:0"
-RDEPEND="${DEPEND}"
-
-KMEXTRA="pics/
-	servicetypes/
-	templates/"
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	doc/CMakeLists.txt
-	doc/koffice.desktop"
diff --git a/app-office/koffice-l10n/ChangeLog b/app-office/koffice-l10n/ChangeLog
index 37992ec13943..081f14515347 100644
--- a/app-office/koffice-l10n/ChangeLog
+++ b/app-office/koffice-l10n/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/koffice-l10n
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-l10n/ChangeLog,v 1.26 2011/02/24 12:00:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-l10n/ChangeLog,v 1.27 2011/02/27 21:57:00 dilfridge Exp $
+
+  27 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -koffice-l10n-2.3.1.ebuild:
+  Cleanup
 
 *koffice-l10n-2.3.3 (24 Feb 2011)
 
diff --git a/app-office/koffice-l10n/koffice-l10n-2.3.1.ebuild b/app-office/koffice-l10n/koffice-l10n-2.3.1.ebuild
deleted file mode 100644
index 868f0a286fe9..000000000000
--- a/app-office/koffice-l10n/koffice-l10n-2.3.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-l10n/koffice-l10n-2.3.1.ebuild,v 1.1 2011/01/20 00:09:10 dilfridge Exp $
-
-EAPI=3
-
-inherit kde4-base
-
-DESCRIPTION="KOffice localization package"
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2"
-
-DEPEND="sys-devel/gettext"
-RDEPEND=""
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc"
-
-MY_LANGS="ca ca@valencia da de el en_GB es et fr gl hu it ja kk nb nds nl pl pt pt_BR
-	ru sv tr uk wa zh_CN zh_TW"
-URI_BASE="mirror://kde/stable/koffice-${PV}/${PN}/"
-SRC_URI=""
-SLOT="2"
-
-for MY_LANG in ${MY_LANGS} ; do
-	IUSE="${IUSE} linguas_${MY_LANG}"
-	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.bz2 )"
-done
-
-S="${WORKDIR}"
-
-src_unpack() {
-	local lng dir
-	if [[ -z ${A} ]]; then
-		elog
-		elog "You either have the LINGUAS variable unset, or it only"
-		elog "contains languages not supported by ${P}."
-		elog "You won't have any additional language support."
-		elog
-		elog "${P} supports these language codes:"
-		elog "${MY_LANGS}"
-		elog
-	fi
-
-	[[ -n ${A} ]] && unpack ${A}
-	cd "${S}"
-
-	# add all linguas to cmake
-	if [[ -n ${A} ]]; then
-		for lng in ${MY_LANGS}; do
-			dir="${PN}-${lng}-${PV}"
-			if [[ -d "${dir}" ]] ; then
-				echo "add_subdirectory( ${dir} )" >> "${S}"/CMakeLists.txt
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	local mycmakeargs
-
-	mycmakeargs="${mycmakeargs} -DBUILD_MESSAGES=ON -DBUILD_DATA=ON
-		$(cmake-utils_use_build doc)"
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_configure
-}
-
-src_compile() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_compile
-}
-
-src_test() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_test
-}
-
-src_install() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_install
-}
diff --git a/app-office/koffice-libs/ChangeLog b/app-office/koffice-libs/ChangeLog
index ef236ec4e6d9..942cbceea153 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/ChangeLog,v 1.122 2011/02/24 12:00:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/ChangeLog,v 1.123 2011/02/27 21:56:59 dilfridge Exp $
+
+  27 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -koffice-libs-2.3.1.ebuild:
+  Cleanup
 
 *koffice-libs-2.3.3 (24 Feb 2011)
 
diff --git a/app-office/koffice-libs/koffice-libs-2.3.1.ebuild b/app-office/koffice-libs/koffice-libs-2.3.1.ebuild
deleted file mode 100644
index 8790c357f263..000000000000
--- a/app-office/koffice-libs/koffice-libs-2.3.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-2.3.1.ebuild,v 1.1 2011/01/20 00:09:10 dilfridge Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="libs"
-OPENGL_REQUIRED="optional"
-CPPUNIT_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="Shared KOffice libraries."
-KEYWORDS="~amd64 ~x86"
-IUSE="crypt openexr reports"
-
-RDEPEND="
-	>=app-office/koffice-data-${PV}:${SLOT}
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=kde-base/kdepimlibs-${KDE_MINIMAL}
-	media-libs/lcms:0
-	crypt? ( app-crypt/qca:2 )
-	openexr? ( media-libs/openexr )
-	opengl? ( media-libs/mesa )
-	!app-office/kchart
-"
-DEPEND="${RDEPEND}"
-#	doc? ( app-doc/doxygen )"
-
-KMEXTRA="
-	doc/koffice/
-	doc/thesaurus/
-	filters/generic_wrapper/
-	filters/libkowmf/
-	filters/libmsooxml/
-	filters/xsltfilter/
-	filters/kchart/
-	filters/kformula/
-	interfaces/
-	kchart/
-	kformula/
-	kounavail/
-	plugins/
-	tools/
-"
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	doc/koffice.desktop
-	filters/
-"
-
-KMSAVELIBS="true"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with openexr OpenEXR)
-		-DBUILD_kchart=ON
-		-DBUILD_kformula=ON
-		$(cmake-utils_use_build reports koreport)
-	)
-	use crypt && \
-		mycmakeargs+=(-DQCA2_LIBRARIES=/usr/$(get_libdir)/qca2/libqca.so.2)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	newdoc kounavail/README README.kounavail || die
-
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
diff --git a/app-office/koffice-meta/ChangeLog b/app-office/koffice-meta/ChangeLog
index a9764f6d60a7..803e22a99a6d 100644
--- a/app-office/koffice-meta/ChangeLog
+++ b/app-office/koffice-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/koffice-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/ChangeLog,v 1.111 2011/02/24 12:00:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/ChangeLog,v 1.112 2011/02/27 21:57:00 dilfridge Exp $
+
+  27 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -koffice-meta-2.3.1.ebuild:
+  Cleanup
 
 *koffice-meta-2.3.3 (24 Feb 2011)
 
diff --git a/app-office/koffice-meta/koffice-meta-2.3.1.ebuild b/app-office/koffice-meta/koffice-meta-2.3.1.ebuild
deleted file mode 100644
index dcf7f3d1fbb0..000000000000
--- a/app-office/koffice-meta/koffice-meta-2.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/koffice-meta-2.3.1.ebuild,v 1.1 2011/01/20 00:09:10 dilfridge Exp $
-
-EAPI=3
-
-DESCRIPTION="KOffice - merge this to pull in all KOffice-derived packages"
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2"
-
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls reports"
-
-RDEPEND="
-	>=app-office/karbon-${PV}:${SLOT}
-	>=app-office/kexi-${PV}:${SLOT}
-	>=app-office/koffice-data-${PV}:${SLOT}
-	>=app-office/koffice-libs-${PV}:${SLOT}[reports?]
-	>=app-office/kpresenter-${PV}:${SLOT}
-	>=app-office/krita-${PV}:${SLOT}
-	>=app-office/kspread-${PV}:${SLOT}
-	>=app-office/kword-${PV}:${SLOT}
-	nls? ( >=app-office/koffice-l10n-${PV}:${SLOT} )
-	reports? ( >=app-office/kplato-${PV}:${SLOT} )
-	!app-office/kchart
-"
diff --git a/app-office/kplato/ChangeLog b/app-office/kplato/ChangeLog
index 54e98af9351f..b0d3a4e442ed 100644
--- a/app-office/kplato/ChangeLog
+++ b/app-office/kplato/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/kplato
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kplato/ChangeLog,v 1.90 2011/02/27 21:50:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kplato/ChangeLog,v 1.91 2011/02/27 21:57:00 dilfridge Exp $
+
+  27 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kplato-2.3.1.ebuild:
+  Cleanup
 
   27 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   kplato-2.3.3.ebuild:
diff --git a/app-office/kplato/kplato-2.3.1.ebuild b/app-office/kplato/kplato-2.3.1.ebuild
deleted file mode 100644
index bf00fe436164..000000000000
--- a/app-office/kplato/kplato-2.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kplato/kplato-2.3.1.ebuild,v 1.1 2011/01/20 00:09:10 dilfridge Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-inherit kde4-meta
-
-DESCRIPTION="KOffice project management application"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="~app-office/koffice-libs-${PV}:${SLOT}[reports]"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	libs/
-	plugins/chartshape/kdchart
-"
-KMEXTRA="
-	filters/${KMMODULE}/
-	kdgantt/
-"
-KMLOADLIBS="koffice-libs"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with python PythonLibs)
-		-DBUILD_kplato=ON
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
diff --git a/app-office/kpresenter/ChangeLog b/app-office/kpresenter/ChangeLog
index 7b251ab2389d..e4aafd1fbb37 100644
--- a/app-office/kpresenter/ChangeLog
+++ b/app-office/kpresenter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/kpresenter
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/ChangeLog,v 1.110 2011/02/24 12:00:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/ChangeLog,v 1.111 2011/02/27 21:57:00 dilfridge Exp $
+
+  27 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kpresenter-2.3.1.ebuild:
+  Cleanup
 
 *kpresenter-2.3.3 (24 Feb 2011)
 
diff --git a/app-office/kpresenter/kpresenter-2.3.1.ebuild b/app-office/kpresenter/kpresenter-2.3.1.ebuild
deleted file mode 100644
index d62443f518fc..000000000000
--- a/app-office/kpresenter/kpresenter-2.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/kpresenter-2.3.1.ebuild,v 1.1 2011/01/20 00:09:09 dilfridge Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-inherit kde4-meta
-
-DESCRIPTION="KOffice presentation program"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/boost-1.35.0"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	filters/libmsooxml/
-	filters/kspread/xlsx/
-	libs/
-"
-KMEXTRA="
-	filters/${KMMODULE}/
-	filters/libmso/
-"
-
-KMLOADLIBS="koffice-libs"
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
diff --git a/app-office/krita/ChangeLog b/app-office/krita/ChangeLog
index 388876c9c4a1..3c3c7ef00226 100644
--- a/app-office/krita/ChangeLog
+++ b/app-office/krita/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/krita
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.130 2011/02/24 12:00:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.131 2011/02/27 21:57:00 dilfridge Exp $
+
+  27 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -krita-2.3.1.ebuild:
+  Cleanup
 
 *krita-2.3.3 (24 Feb 2011)
 
diff --git a/app-office/krita/krita-2.3.1.ebuild b/app-office/krita/krita-2.3.1.ebuild
deleted file mode 100644
index 71d969337ed0..000000000000
--- a/app-office/krita/krita-2.3.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-2.3.1.ebuild,v 1.2 2011/01/23 18:07:19 dilfridge Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KOffice image manipulation program."
-
-KEYWORDS="~amd64 ~x86"
-IUSE="gmm +kdcraw openexr +pdf +tiff"
-
-DEPEND="
-	>=app-office/koffice-libs-${PV}:${SLOT}[openexr=]
-	>=dev-cpp/eigen-2.0.3:2
-	>=media-libs/qimageblitz-0.0.4
-	>=media-gfx/exiv2-0.16
-	sci-libs/fftw:3.0
-	sys-devel/gcc[openmp]
-	gmm? ( sci-mathematics/gmm )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	opengl? ( media-libs/glew )
-	pdf? ( >=app-text/poppler-0.12.3-r3[qt4] )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	libs/
-"
-
-KMLOADLIBS="koffice-libs"
-
-PATCHES=( "${FILESDIR}/${P}"-linkx11.patch )
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_Eigen2=ON
-		-DWITH_Exiv2=ON
-		-DWITH_FFTW3=ON
-		-DWITH_JPEG=ON
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with gmm)
-		$(cmake-utils_use_with tiff)
-		$(cmake-utils_use_with kdcraw)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with opengl GLEW)
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
diff --git a/app-office/kspread/ChangeLog b/app-office/kspread/ChangeLog
index 62a2d098fdfe..5ca14e8ce1e9 100644
--- a/app-office/kspread/ChangeLog
+++ b/app-office/kspread/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/kspread
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/ChangeLog,v 1.126 2011/02/24 12:00:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/ChangeLog,v 1.127 2011/02/27 21:57:00 dilfridge Exp $
+
+  27 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kspread-2.3.1.ebuild:
+  Cleanup
 
 *kspread-2.3.3 (24 Feb 2011)
 
diff --git a/app-office/kspread/kspread-2.3.1.ebuild b/app-office/kspread/kspread-2.3.1.ebuild
deleted file mode 100644
index 7034c8f61727..000000000000
--- a/app-office/kspread/kspread-2.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-2.3.1.ebuild,v 1.1 2011/01/20 00:09:09 dilfridge Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-inherit kde4-meta
-
-DESCRIPTION="KOffice spreadsheet application"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="+solver"
-
-DEPEND="
-	dev-cpp/eigen:2
-	solver? ( sci-libs/gsl )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	kchart/
-	interfaces/
-	libs/
-	filters/
-	plugins/
-"
-KMEXTRA="filters/${KMMODULE}/
-	filters/libmso"
-
-KMLOADLIBS="koffice-libs"
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_Eigen2=ON
-		$(cmake-utils_use_with solver GSL)
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
diff --git a/app-office/kword/ChangeLog b/app-office/kword/ChangeLog
index 15969e8d743f..ac1dec874e37 100644
--- a/app-office/kword/ChangeLog
+++ b/app-office/kword/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/kword
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.159 2011/02/24 12:00:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.160 2011/02/27 21:57:00 dilfridge Exp $
+
+  27 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kword-2.3.1.ebuild:
+  Cleanup
 
 *kword-2.3.3 (24 Feb 2011)
 
diff --git a/app-office/kword/kword-2.3.1.ebuild b/app-office/kword/kword-2.3.1.ebuild
deleted file mode 100644
index e91929e6195b..000000000000
--- a/app-office/kword/kword-2.3.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-2.3.1.ebuild,v 1.2 2011/02/09 00:04:42 dilfridge Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-inherit kde4-meta
-
-DESCRIPTION="KOffice word processor"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="wpd"
-
-DEPEND="
-	wpd? ( app-text/libwpd )
-"
-RDEPEND="${DEPEND}
-	!app-text/wv2
-"
-
-KMEXTRA="filters/${KMMODULE}/
-	filters/libmso/
-"
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	filters/
-	kspread/
-	libs/
-	plugins/
-"
-
-KMLOADLIBS="koffice-libs"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with wpd)
-		-DWITH_DCMTK=OFF
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}