Drop old.

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

4 files changed, 5 insertions, 252 deletions

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index d62b8953856f..e9854b2080db 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/calligra
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.27 2012/03/25 08:48:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.28 2012/04/06 10:29:32 scarabeus Exp $
+
+  06 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> -calligra-2.3.87.ebuild,
+  -files/calligra-2.3.87-koabstr.patch, -files/calligra-2.3.87-marble.patch:
+  Drop old.
 
   25 Mar 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   calligra-2.3.92.ebuild, calligra-9999.ebuild:
diff --git a/app-office/calligra/calligra-2.3.87.ebuild b/app-office/calligra/calligra-2.3.87.ebuild
deleted file mode 100644
index 5d0ecfe33e02..000000000000
--- a/app-office/calligra/calligra-2.3.87.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.87.ebuild,v 1.5 2012/03/20 08:31:42 dilfridge Exp $
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=4
-
-KDE_SCM=git
-KDE_MINIMAL=4.6.4
-OPENGL_REQUIRED=optional
-
-KDE_HANDBOOK=optional
-
-KDE_LINGUAS_LIVE_OVERRIDE=true
-inherit kde4-base
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra-suite.org/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
-+pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
-+wmf word-perfect xbase +xml +xslt"
-
-# please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="kexi words flow plan stage tables krita karbon braindump"
-for cal_ft in ${CAL_FTS}; do
-	IUSE+=" calligra_features_${cal_ft}"
-done
-unset cal_ft
-
-REQUIRED_USE="
-	calligra_features_kexi? ( calligra_features_tables )
-	calligra_features_words? ( calligra_features_tables )
-	calligra_features_krita? ( eigen exif lcms )
-	calligra_features_plan? ( kdepim semantic-desktop )
-	calligra_features_tables? ( eigen )
-	test? ( calligra_features_karbon )
-"
-
-RDEPEND="
-	!app-office/karbon
-	!app-office/kexi
-	!app-office/koffice-data
-	!app-office/koffice-l10n
-	!app-office/koffice-libs
-	!app-office/koffice-meta
-	!app-office/kplato
-	!app-office/kpresenter
-	!app-office/krita
-	!app-office/kspread
-	!app-office/kword
-	dev-lang/perl
-	dev-libs/boost
-	dev-libs/libxml2
-	$(add_kdebase_dep knewstuff)
-	media-libs/libpng
-	sys-libs/zlib
-	attica? ( dev-libs/libattica )
-	crypt? ( app-crypt/qca:2 )
-	eigen? ( dev-cpp/eigen:2 )
-	exif? ( media-gfx/exiv2 )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	freetds? ( dev-db/freetds )
-	gif? ( media-libs/giflib )
-	glew? ( media-libs/glew )
-	glib? ( dev-libs/glib:2 )
-	gsf? ( gnome-extra/libgsf )
-	gsl? ( sci-libs/gsl )
-	iconv? ( virtual/libiconv )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs) )
-	lcms? ( media-libs/lcms:2 )
-	marble? ( $(add_kdebase_dep marble) )
-	mysql? ( virtual/mysql )
-	okular? ( $(add_kdebase_dep okular) )
-	openctl? ( >=media-libs/opengtl-0.9.15 )
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler
-		media-gfx/pstoedit
-	)
-	postgres? (
-		dev-db/postgresql-base
-		=dev-libs/libpqxx-3*
-	)
-	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
-	ssl? ( dev-libs/openssl )
-	sybase? ( dev-db/freetds )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype:2 )
-	word-perfect? (
-		app-text/libwpd
-		app-text/libwps
-		app-text/libwpg
-	)
-	xbase? ( dev-db/xbase )
-	xslt? ( dev-libs/libxslt )
-	calligra_features_kexi? (
-		>=dev-db/sqlite-3.7.9:3[extensions]
-		dev-libs/icu
-	)
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT=test
-# bug 394273
-
-PATCHES=(
-	"${FILESDIR}/${P}-marble.patch"
-	"${FILESDIR}/${P}-koabstr.patch"
-)
-
-src_configure() {
-	local cal_ft
-
-	# first write out things we want to hard-enable
-	local mycmakeargs=(
-		"-DWITH_Boost=ON"
-		"-DWITH_LibXml2=ON"
-		"-DWITH_PNG=ON"
-		"-DWITH_ZLIB=ON"
-		"-DGHNS=ON"
-		"-DWITH_X11=ON"
-		"-DWITH_Qt4=ON"
-		"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
-		"-DWITH_LCMS=OFF" # we use lcms:2
-		"-DCREATIVEONLY=OFF"
-		"-DWITH_TINY=OFF"
-		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
-		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
-		"-DWITH_Spnav=OFF"           # NOT PACKAGED: http://spacenav.sourceforge.net/
-	)
-
-	# regular options
-	mycmakeargs+=(
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with fontconfig Fontconfig)
-		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with gif GIF2)
-		$(cmake-utils_use_with glew GLEW)
-		$(cmake-utils_use_with glib GLIB2)
-		$(cmake-utils_use_with glib GObject)
-		$(cmake-utils_use_with gsf LIBGSF)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with iconv Iconv)
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with jpeg2k OpenJPEG)
-		$(cmake-utils_use_with kdcraw Kdcraw)
-		$(cmake-utils_use_with kdepim KdepimLibs)
-		$(cmake-utils_use_with lcms LCMS2)
-		$(cmake-utils_use_with marble Marble)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with openctl OpenCTL)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use semantic-desktop NEPOMUK)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with sybase FreeTDS)
-		$(cmake-utils_use_with tiff TIFF)
-		$(cmake-utils_use_with threads Threads)
-		$(cmake-utils_use_with truetype Freetype)
-		$(cmake-utils_use_with word-perfect WPD)
-		$(cmake-utils_use_with word-perfect WPG)
-		$(cmake-utils_use_with xbase XBase)
-		$(cmake-utils_use_with xslt LibXslt)
-		$(cmake-utils_use_build wmf libkowmf)
-		$(cmake-utils_use_build mso libmsooxml)
-	)
-
-	# applications
-	for cal_ft in ${CAL_FTS}; do
-		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
-	done
-	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
-	# filters
-
-	kde4-base_src_configure
-}
diff --git a/app-office/calligra/files/calligra-2.3.87-koabstr.patch b/app-office/calligra/files/calligra-2.3.87-koabstr.patch
deleted file mode 100644
index 83e4da932f0e..000000000000
--- a/app-office/calligra/files/calligra-2.3.87-koabstr.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b4c55f40811cdb7ae990eeeca26757ad85ba42c8 Mon Sep 17 00:00:00 2001
-From: Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
-Date: Fri, 24 Feb 2012 22:24:14 +0100
-Subject: [PATCH] Only build koabstraction if words, tables and stage are really built (not just can be built)
-
----
- CMakeLists.txt |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8701780..5d8434e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -600,9 +600,9 @@ if(SHOULD_BUILD_ACTIVE)
- endif(SHOULD_BUILD_ACTIVE)
- 
- 
--if(NOT SHOULD_BUILD_TABLES OR NOT SHOULD_BUILD_WORDS OR NOT SHOULD_BUILD_STAGE)
-+if(NOT SHOULD_BUILD_TABLES OR NOT BUILD_tables OR NOT SHOULD_BUILD_WORDS OR NOT BUILD_words OR NOT SHOULD_BUILD_STAGE OR NOT BUILD_stage)
-     set(SHOULD_BUILD_KOABSTRACTION FALSE)
--endif(NOT SHOULD_BUILD_TABLES OR NOT SHOULD_BUILD_WORDS OR NOT SHOULD_BUILD_STAGE)
-+endif(NOT SHOULD_BUILD_TABLES OR NOT BUILD_tables OR NOT SHOULD_BUILD_WORDS OR NOT BUILD_words OR NOT SHOULD_BUILD_STAGE OR NOT BUILD_stage)
- 
- if(SHOULD_BUILD_KOABSTRACTION)
-     # koabstraction depends on kotext & flake
--- 
-1.7.3.4
-
diff --git a/app-office/calligra/files/calligra-2.3.87-marble.patch b/app-office/calligra/files/calligra-2.3.87-marble.patch
deleted file mode 100644
index 6f90f37edad6..000000000000
--- a/app-office/calligra/files/calligra-2.3.87-marble.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ruN calligra-2.3.87.orig/CMakeLists.txt calligra-2.3.87/CMakeLists.txt
---- calligra-2.3.87.orig/CMakeLists.txt	2012-01-28 15:26:27.000000000 +0100
-+++ calligra-2.3.87/CMakeLists.txt	2012-02-07 23:53:45.000000000 +0100
-@@ -264,12 +264,9 @@
-     ##
-     find_file(MARBLECONTROLBOX_H MarbleControlBox.h ${MARBLE_INCLUDE_DIR})
-     if( MARBLECONTROLBOX_H )
--        INCLUDE(CheckCXXSourceCompiles)
--        set(CMAKE_REQUIRED_LIBRARIES_SWAP ${CMAKE_REQUIRED_LIBRARIES})
--        set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${MARBLE_LIBRARIES})
--        CHECK_CXX_SOURCE_COMPILES ( "#include <${MARBLECONTROLBOX_H}>\nint main(){Marble::MarbleControlBox*p; p->setMarbleWidget(0); return 0;}" SETMARBLEWIDGET)
--        # subsequent tests will fail if this is not set back.
--        set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SWAP})
-+        execute_process(COMMAND grep -m 1 -e "setMarbleWidget" ${MARBLECONTROLBOX_H}
-+                        OUTPUT_VARIABLE SETMARBLEWIDGET
-+        )
-         if( SETMARBLEWIDGET )
-             add_definitions(-DHAVE_SETMARBLEWIDGET)
-         endif( SETMARBLEWIDGET)