3 files changed, 5 insertions, 94 deletions
diff --git a/app-office/koffice-libs/ChangeLog b/app-office/koffice-libs/ChangeLog
index 3249749f5058..5289758d92b0 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.127 2011/05/09 23:12:48 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/ChangeLog,v 1.128 2011/06/01 21:46:40 dilfridge Exp $
+
+  01 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -koffice-libs-2.2.2.ebuild, -files/koffice-libs-2.2.2-kspreadcommon.patch:
+  Remove old
 
   09 May 2011; Markos Chandras <hwoarang@gentoo.org> koffice-libs-2.3.3.ebuild:
   Stable on amd64 wrt bug #354033
diff --git a/app-office/koffice-libs/files/koffice-libs-2.2.2-kspreadcommon.patch b/app-office/koffice-libs/files/koffice-libs-2.2.2-kspreadcommon.patch
deleted file mode 100644
index 828ffa6ecaac..000000000000
--- a/app-office/koffice-libs/files/koffice-libs-2.2.2-kspreadcommon.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r -u koffice-libs-2.2.0.orig/libs/koreport/CMakeLists.txt koffice-libs-2.2.0/libs/koreport/CMakeLists.txt
---- koffice-libs-2.2.0.orig/libs/koreport/CMakeLists.txt	2010-05-23 08:21:05.000000000 +0200
-+++ koffice-libs-2.2.0/libs/koreport/CMakeLists.txt	2010-06-02 22:56:18.104790383 +0200
-@@ -100,7 +100,7 @@
- target_link_libraries(koreport ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY}
-   ${KOPROPERTY_LIBS} kdchart ${KDE4_KROSSCORE_LIBS} komain ${QT_QT3SUPPORT_LIBRARY})
- if (SHOULD_BUILD_KSPREAD)
--    target_link_libraries(koreport kspreadcommon)
-+    target_link_libraries(koreport)
- endif (SHOULD_BUILD_KSPREAD)
- 
- set_target_properties(koreport PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} )
diff --git a/app-office/koffice-libs/koffice-libs-2.2.2.ebuild b/app-office/koffice-libs/koffice-libs-2.2.2.ebuild
deleted file mode 100644
index 58fa612c35fa..000000000000
--- a/app-office/koffice-libs/koffice-libs-2.2.2.ebuild
+++ /dev/null
@@ -1,81 +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.2.2.ebuild,v 1.7 2011/03/13 08:29:22 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"
-
-# the contents of kchart have been moved into koffice-libs in 2.2.0
-
-RDEPEND="<kde-base/kdelibs-4.6
-	>=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 )"
-
-PATCHES=( "${FILESDIR}/${P}-kspreadcommon.patch" )
-
-KMEXTRA="
-	doc/koffice/
-	doc/thesaurus/
-	filters/generic_wrapper/
-	filters/libkowmf/
-	filters/libmsooxml/
-	filters/xsltfilter/
-	filters/kchart/
-	filters/kformula/
-	interfaces/
-	kounavail/
-	plugins/
-	tools/
-	kchart/
-	kformula/
-"
-#	doc/api/"
-KMEXTRACTONLY="
-	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 "${ED}/usr/include/config-opengl.h"
-}