From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 65E441387FD for ; Sun, 6 Apr 2014 11:42:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0471E0A02; Sun, 6 Apr 2014 11:42:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 33ECAE0A02 for ; Sun, 6 Apr 2014 11:42:18 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 400C933FDC7 for ; Sun, 6 Apr 2014 11:42:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 768C01818D for ; Sun, 6 Apr 2014 11:42:15 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1396783008.38058ab8d6ece54df529fc71dc6ff2e2ee33c279.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: app-office/calligra/ X-VCS-Repository: proj/kde X-VCS-Files: app-office/calligra/calligra-2.8.0.ebuild app-office/calligra/calligra-2.8.1.ebuild app-office/calligra/calligra-9999.ebuild app-office/calligra/metadata.xml X-VCS-Directories: app-office/calligra/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 38058ab8d6ece54df529fc71dc6ff2e2ee33c279 X-VCS-Branch: master Date: Sun, 6 Apr 2014 11:42:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9b96472c-3681-450b-93a9-b52325fa484d X-Archives-Hash: 63b08244fe3c6371ef637eb81876ccec commit: 38058ab8d6ece54df529fc71dc6ff2e2ee33c279 Author: Johannes Huber gentoo org> AuthorDate: Sun Apr 6 11:16:48 2014 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sun Apr 6 11:16:48 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=38058ab8 [app-office/calligra] Version bump, remove old, bug #503544 Package-Manager: portage-2.2.10 --- ...calligra-2.8.0.ebuild => calligra-2.8.1.ebuild} | 28 +++++++++++++--------- app-office/calligra/calligra-9999.ebuild | 28 +++++++++++++--------- app-office/calligra/metadata.xml | 2 +- 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/app-office/calligra/calligra-2.8.0.ebuild b/app-office/calligra/calligra-2.8.1.ebuild similarity index 92% rename from app-office/calligra/calligra-2.8.0.ebuild rename to app-office/calligra/calligra-2.8.1.ebuild index c6f36c9..84d3cbf 100644 --- a/app-office/calligra/calligra-2.8.0.ebuild +++ b/app-office/calligra/calligra-2.8.1.ebuild @@ -40,9 +40,9 @@ SLOT="4" KEYWORDS="~amd64 ~arm ~x86" IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf -gsl +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular opengtl openexr -+pdf postgres semantic-desktop spacenav +ssl sybase test tiff +threads -+truetype vc word-perfect xbase +xml +xslt" +gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular +opengtl openexr +pdf postgres semantic-desktop spacenav +ssl sybase test tiff ++threads +truetype vc xbase +xml +xslt" # please do not sort here, order is same as in CMakeLists.txt CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump" @@ -96,6 +96,14 @@ RDEPEND=" glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) + import-filter? ( + app-text/libetonyek + app-text/libodfgen + app-text/libwpd + app-text/libwpg + app-text/libwps + media-libs/libvisio + ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) kdcraw? ( $(add_kdebase_dep libkdcraw) ) @@ -125,11 +133,6 @@ RDEPEND=" tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) vc? ( dev-libs/vc ) - word-perfect? ( - app-text/libwpd - app-text/libwps - app-text/libwpg - ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( @@ -199,6 +202,12 @@ src_configure() { $(cmake-utils_use_with glib GObject) $(cmake-utils_use_with gsf LIBGSF) $(cmake-utils_use_with gsl GSL) + $(cmake-utils_use_with import-filter LibEtonyek) + $(cmake-utils_use_with import-filter LibOdfGen) + $(cmake-utils_use_with import-filter LibVisio) + $(cmake-utils_use_with import-filter LibWpd) + $(cmake-utils_use_with import-filter LibWpg) + $(cmake-utils_use_with import-filter LibWps) $(cmake-utils_use_with jpeg JPEG) $(cmake-utils_use_with jpeg2k OpenJPEG) $(cmake-utils_use_with kdcraw Kdcraw) @@ -216,7 +225,6 @@ src_configure() { $(cmake-utils_use_with pdf Pstoedit) $(cmake-utils_use_with postgres PostgreSQL) $(cmake-utils_use_build postgres pqxx) - $(cmake-utils_use semantic-desktop NEPOMUK) $(cmake-utils_use_with semantic-desktop Soprano) $(cmake-utils_use_with spacenav Spnav) $(cmake-utils_use_with ssl OpenSSL) @@ -226,8 +234,6 @@ src_configure() { $(cmake-utils_use_with threads Threads) $(cmake-utils_use_with truetype Freetype) $(cmake-utils_use_with vc Vc) - $(cmake-utils_use_with word-perfect WPD) - $(cmake-utils_use_with word-perfect WPG) $(cmake-utils_use_with xbase XBase) $(cmake-utils_use_build xbase xbase) $(cmake-utils_use_with xslt LibXslt) diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild index c6f36c9..84d3cbf 100644 --- a/app-office/calligra/calligra-9999.ebuild +++ b/app-office/calligra/calligra-9999.ebuild @@ -40,9 +40,9 @@ SLOT="4" KEYWORDS="~amd64 ~arm ~x86" IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf -gsl +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular opengtl openexr -+pdf postgres semantic-desktop spacenav +ssl sybase test tiff +threads -+truetype vc word-perfect xbase +xml +xslt" +gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular +opengtl openexr +pdf postgres semantic-desktop spacenav +ssl sybase test tiff ++threads +truetype vc xbase +xml +xslt" # please do not sort here, order is same as in CMakeLists.txt CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump" @@ -96,6 +96,14 @@ RDEPEND=" glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) + import-filter? ( + app-text/libetonyek + app-text/libodfgen + app-text/libwpd + app-text/libwpg + app-text/libwps + media-libs/libvisio + ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) kdcraw? ( $(add_kdebase_dep libkdcraw) ) @@ -125,11 +133,6 @@ RDEPEND=" tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) vc? ( dev-libs/vc ) - word-perfect? ( - app-text/libwpd - app-text/libwps - app-text/libwpg - ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( @@ -199,6 +202,12 @@ src_configure() { $(cmake-utils_use_with glib GObject) $(cmake-utils_use_with gsf LIBGSF) $(cmake-utils_use_with gsl GSL) + $(cmake-utils_use_with import-filter LibEtonyek) + $(cmake-utils_use_with import-filter LibOdfGen) + $(cmake-utils_use_with import-filter LibVisio) + $(cmake-utils_use_with import-filter LibWpd) + $(cmake-utils_use_with import-filter LibWpg) + $(cmake-utils_use_with import-filter LibWps) $(cmake-utils_use_with jpeg JPEG) $(cmake-utils_use_with jpeg2k OpenJPEG) $(cmake-utils_use_with kdcraw Kdcraw) @@ -216,7 +225,6 @@ src_configure() { $(cmake-utils_use_with pdf Pstoedit) $(cmake-utils_use_with postgres PostgreSQL) $(cmake-utils_use_build postgres pqxx) - $(cmake-utils_use semantic-desktop NEPOMUK) $(cmake-utils_use_with semantic-desktop Soprano) $(cmake-utils_use_with spacenav Spnav) $(cmake-utils_use_with ssl OpenSSL) @@ -226,8 +234,6 @@ src_configure() { $(cmake-utils_use_with threads Threads) $(cmake-utils_use_with truetype Freetype) $(cmake-utils_use_with vc Vc) - $(cmake-utils_use_with word-perfect WPD) - $(cmake-utils_use_with word-perfect WPG) $(cmake-utils_use_with xbase XBase) $(cmake-utils_use_build xbase xbase) $(cmake-utils_use_with xslt LibXslt) diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml index 136e326..6ad4b18 100644 --- a/app-office/calligra/metadata.xml +++ b/app-office/calligra/metadata.xml @@ -9,6 +9,7 @@ Enable media-libs/glew opengl extension library support Enable support for C library routines from dev-libs/glib Enable support for ODT structures extraction via gnome-extra/libgsf + Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote Enable support for KDE image manipulating interface via kde-base/libkdcraw Enable support for KDEPIM resources integration Enable displaying of maps using Marble @@ -16,7 +17,6 @@ Enable support for transformation algorithms via media-libs/opengtl Enable support for the 3Dconnexion spacenav input device via dev-libs/libspnav Enable support for dev-libs/vc, could be a significant speed boost on krita - Enable support for various WordPerfect file formats Enable support for xbase compatible database formats Enable xslt and exslt support format support