From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qx3SJ-0005uz-RA for garchives@archives.gentoo.org; Fri, 26 Aug 2011 20:56:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF7A621C215; Fri, 26 Aug 2011 20:56:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 78C3921C215 for ; Fri, 26 Aug 2011 20:56:40 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D18501B4043 for ; Fri, 26 Aug 2011 20:56:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0484480040 for ; Fri, 26 Aug 2011 20:56:39 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: Subject: [gentoo-commits] dev/dilfridge:master commit in: app-office/calligra/ X-VCS-Repository: dev/dilfridge X-VCS-Files: app-office/calligra/ChangeLog app-office/calligra/Manifest app-office/calligra/calligra-2.3.73.ebuild app-office/calligra/calligra-2.3.74.ebuild app-office/calligra/calligra-9999.ebuild X-VCS-Directories: app-office/calligra/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: f41da057ab98963aa7c36390ab154edbbed59fba Date: Fri, 26 Aug 2011 20:56:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: be1d30656abec0ff2fd2f03e7eb1bc2b commit: f41da057ab98963aa7c36390ab154edbbed59fba Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Fri Aug 26 20:56:44 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Fri Aug 26 20:56:44 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dilfridge.git;= a=3Dcommit;h=3Df41da057 Resync with main tree (Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with= key B6C5F7DE) --- app-office/calligra/ChangeLog | 4 + app-office/calligra/Manifest | 34 ++--- app-office/calligra/calligra-2.3.73.ebuild | 205 ----------------------= ------ app-office/calligra/calligra-2.3.74.ebuild | 20 ++- app-office/calligra/calligra-9999.ebuild | 117 +++++++--------- 5 files changed, 88 insertions(+), 292 deletions(-) diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLo= g index 7d6e8f3..01792b8 100644 --- a/app-office/calligra/ChangeLog +++ b/app-office/calligra/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.1 2= 011/07/22 15:10:36 dilfridge Exp $ =20 + 26 Aug 2011; Andreas K. Huettel + -calligra-2.3.73.ebuild, calligra-2.3.74.ebuild, calligra-9999.ebuild: + Resync with main tree + 19 Aug 2011; Andreas K. Huettel calligra-2.3.74.ebuild, +files/calligra-2.3.74-jpeglcms-2.patch, metadata.xml: diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index 959867e..cd781ce 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -3,27 +3,25 @@ Hash: SHA512 =20 AUX calligra-2.3.74-jpeglcms-2.patch 1014 RMD160 cd9532d322789aa655448fb= 89ffed5835d4e24ae SHA1 fd6770d6b88c360e6a5d0426d6ae0c1f19614720 SHA256 f4= 593796592cc5973685b1a9b25ca1e4f20b3ed3a64043582324eaa89b301de2 AUX calligra-2.3.74-jpeglcms.patch 723 RMD160 07b5d22e1e2e27dd658c7ec8e1= 0e093e11108f17 SHA1 11cae52b535f8d665ae48d8fa32aa35f7e745ecc SHA256 5cfcb= 207b7d963fd3c593b5c43bff5774238c69da7a95df20aadd017fa7b6cc1 -DIST calligra-2.3.73.tar.bz2 106302430 RMD160 a9d91574efe3038dfec699734a= a7980ac4d3dcac SHA1 ed69912f6570ad37e73ad24c966cab3f8018c00b SHA256 89b90= 45b47226c61877f521c0d2eb319fb4237bf0b8c86023663b7f435c1ea98 DIST calligra-2.3.74.tar.bz2 105902759 RMD160 95154039344ac07ec75323821a= fff8d2e60159ed SHA1 b1ac9f3036f5d52aacd7a9caaa168f7ef5eae8dc SHA256 686a8= f5f7eac49c40c53cbdb8cfbb102e765790dd0cfe2d1843975c55921e447 -EBUILD calligra-2.3.73.ebuild 6354 RMD160 a2dea25a05f976f9009cb8d0a1a356= 517044b4ca SHA1 7cf2e66e45dac685e8a152017ae04cc211ecfc26 SHA256 1415e2b43= 555e9ac9a7a635a14d151476e55c56e56a3a27d103cafcc7ceea8e2 -EBUILD calligra-2.3.74.ebuild 5280 RMD160 9571ca4410c9d106b718524495defc= d87b79d7da SHA1 6d578417a67a40ef3b03231ab7ad991ff0937353 SHA256 cf0452d44= 86ba69d8e19e398e5d4b67344d10e91faf96e761a72859c6129d535 -EBUILD calligra-9999.ebuild 6354 RMD160 a2dea25a05f976f9009cb8d0a1a35651= 7044b4ca SHA1 7cf2e66e45dac685e8a152017ae04cc211ecfc26 SHA256 1415e2b4355= 5e9ac9a7a635a14d151476e55c56e56a3a27d103cafcc7ceea8e2 -MISC ChangeLog 1124 RMD160 699403f7a0925505b343f71eea9846519c90085f SHA1= 0abca167175e6fa86e71b67eea692f7c72288dbe SHA256 70a23aa7dc3b7d8a865e7d31= 84ce2c43b71cfa2b811087fc14466535f61e9700 +EBUILD calligra-2.3.74.ebuild 5626 RMD160 e2d99aea615eab8c0baa2a019d15c4= c663703c99 SHA1 878736ee9745290fdcf87634461bee10a0cdc48f SHA256 6b21cf35a= e71a67adf795c598006af10ace2305f510414ba50e7d675808543a8 +EBUILD calligra-9999.ebuild 5624 RMD160 e2d7697ce8f356dc204303f7f7e67296= d1e728f4 SHA1 0676ad1c30b9bd7aa5dca7b64c170421f374e01d SHA256 613753b56ca= 5350272a374620bf67de410c3060f9f8b1f79ec53071e836d0fc7 +MISC ChangeLog 1279 RMD160 6170863f433344cbc0a23c45ee48950d65ef5b3f SHA1= 40ee0d6c9ff584d5029c8de417d48130f1ac9151 SHA256 6de6199bb7863e725a2853eb= 25a62f586650cf0a4da2302aefd754979a8078fc MISC metadata.xml 1493 RMD160 5f1e1818172372ce04d3bf9c1812fbf99136b108 S= HA1 517e3baf1c93ac56f14871bd86a2cdcaa323b3f9 SHA256 e67c6c2712484e6e0e0b6= 4d607796b264bd7539e7a24e8a3cf410151a2330685 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -iQIcBAEBCgAGBQJOTt1rAAoJENwGBM22xffeKNYQAJgIwrzw6mMypOxijF4GYUTT -j9tGxOIBQXjCDuuSe52+i3CmCvUN/oY3+MdAlRDsk4MgEXvGxg8sR/SuzXkNac1W -BK45K6GRuZcDjMb4hplCOYHUkfExLp3vjStaBy1Ji202buNAAP3aHiMj9qiON5V7 -3aiOqXAbh9hOZ1EtadkuGzwnd+H5Ceh/Vhw5TZKRENY0M7pB3sxZItDsPXzahOqY -afYmhNEzmc0tikQf+B71ftdVll/qkT5o9+Ymvhoy035uhNpYa06U1gc2BwBUBKR+ -cdiakdqUbB3Fl3Xz6LoT2pcgIwcy9BI3KfQebZQAS82yKZ4bfHK0wIC97vaQ/1fP -/U439cKl1hAMQt0rEnvB0XHTZ2XrIfFDwoU9MYOT8KF0oh0Ma5UdJ/2miKPViigN -mFzkSK1/UiBB6zR+Xhc6HPgXaVDtEf4cubUpSpI+rSMad99vJNzbihQyH+ZZ+8d5 -T9bkNafzTFDNgOGYa1pq+1NjH8L/KEEHl9S/B4RNyFX9dEkyMi1FEYHnmRxLjZKs -1mBa3dDXOolsR2hh+hvPCVlmdM/jyuVsgeBcxIlYk9eopmpWAMC04d6948yfYYTs -5bQxNFMSmR4he06NBxyw0WNa2YptmKl1pH5llLcaVT9SubcxmMPoMzxwk6mJePMc -Os/GT2zvJ/bDKFGiRw0G -=3D77Jo +iQIcBAEBCgAGBQJOWAiMAAoJENwGBM22xffeLtoP/jKLf1p+VYZ9OAGpRxPMe2ZC +qm5tPGYcGDJT85wvRrBKZgCY12H14r8EpyZ/4eJ+XBF1rSABARkm+54AcFAQFl+D +Fv3dRZZzO4tdEYHcGX9iZGyKbsGqdMRvlW6G4uBwzVpaYZrPYqrSRJx/dN26473K +wKUljIVX3dNfqa109tyFhxhmbmAs5l0OMqf4U0QGe6YddFaNHAs41Kj8MZeWg3CP +/W91vc0BzA6YDf01gDcCou7OwCZFmyFcJYqL+Hl/VUMeJS8r1AZFpLBngN9VL5oN +nLO1r5E70DvSdWeKZa69IYauLbBufPqtD+n9AMo4gOvIQ3sJadm4hOaB5N8ERA83 +q7MH8hx1dGl7g7Ox2Wa5dTNcAXW9O8nE+eFvom3n7NzLlswJbfqFOg5dqM7Ln4Bc +8ehVcDwsmr1H3hIN/0YqUa+ZEglcQR0xhJn5nTABkpjlpq2Rw4RfZ97OYET0aNIJ +D5qZbRYltzVrjhO12n2Nebrx/YqDxjrgaM310f2OqkmzZa42y+m3O6KFddOdk7TM +FQ71e+XJEfW01fgNxLYa9pYhlcaoAeT04V803a72kp18SBXKVeuK7KtGlJ1/BfdS +0QkhLiGjeBArXVkIxqbAeNugf1XKV+fXPOiW2ogzbNw4PWlLlY2xz2ON4PykXuoP +FkEUxyhaib50KyLYE800 +=3DWWjN -----END PGP SIGNATURE----- diff --git a/app-office/calligra/calligra-2.3.73.ebuild b/app-office/call= igra/calligra-2.3.73.ebuild deleted file mode 100644 index 1ea11dd..0000000 --- a/app-office/calligra/calligra-2.3.73.ebuild +++ /dev/null @@ -1,205 +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/calligra/calligra-2.3.73.e= build,v 1.2 2011/08/04 16:30:59 scarabeus Exp $ - -EAPI=3D4 - -KDE_SCM=3Dgit -KDE_MINIMAL=3D4.6 -OPENGL_REQUIRED=3Doptional -KDE_HANDBOOK=3Doptional -KDE_LINGUAS_LIVE_OVERRIDE=3Dtrue -inherit kde4-base - -DESCRIPTION=3D"KDE Office Suite" -HOMEPAGE=3D"http://www.calligra-suite.org/" -[[ ${PV} =3D=3D 9999 ]] || SRC_URI=3D"mirror://kde/unstable/${P}/${P}.ta= r.bz2" - -LICENSE=3D"GPL-2" -SLOT=3D"4" -[[ ${PV} =3D=3D 9999 ]] || KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"+boost +crypt +eigen +exif fftw +fontconfig freetds +gif glew +g= lib +gsf -gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms mysql +mso +okular openctl = openexr -+pdf +png postgres +semantic-desktop +ssl tiff +threads +truetype -+wmf word-perfect +xml +xslt" - -CAL_FTS=3D"braindump flow karbon kexi kpresenter krita tables words" -for cal_ft in ${CAL_FTS}; do - IUSE+=3D" calligra_features_${cal_ft}" -done -unset cal_ft - -RDEPEND=3D" - !app-office/koffice-libs - dev-db/sqlite:3 - dev-lang/perl - dev-libs/libxml2 - $(add_kdebase_dep knewstuff) - sys-libs/zlib - boost? ( dev-libs/boost ) - 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 ) - mysql? ( virtual/mysql ) - okular? ( $(add_kdebase_dep okular) ) - openctl? ( >=3Dmedia-libs/opengtl-0.9.15 ) - openexr? ( media-libs/openexr ) - pdf? ( - app-text/poppler - media-gfx/pstoedit - ) - png? ( media-libs/libpng ) - postgres? ( dev-db/postgresql-base ) - semantic-desktop? ( dev-libs/soprano ) - ssl? ( dev-libs/openssl ) - tiff? ( media-libs/tiff ) - truetype? ( media-libs/freetype:2 ) - word-perfect? ( - app-text/libwpd - app-text/libwps - app-text/libwpg - ) - xslt? ( dev-libs/libxslt ) -" -DEPEND=3D"${RDEPEND}" - -# By default all bulds are enabled. -# When you find out what some option does just describe it here and -# make it optional if required. -# The list is copied from ccmake output. -# -# BUILD_artistictextshape -# BUILD_braindump - note collection app ; USE_EXPAND -# BUILD_calligra - the generic "open file" office app ; default on -# BUILD_chartshape -# BUILD_colorengines -# BUILD_commentshape -# BUILD_converter -# BUILD_cstester -# BUILD_defaultTools -# BUILD_divineProportion -# BUILD_doc - handbook stuff, handled by KDE_HANDBOOK=3Doptional -# BUILD_dockers -# BUILD_flow - flowcharting app ; used to be kivio ; USE_EXPAND -# BUILD_generic_wrapper -# BUILD_karbon - vector drawing app ; handled as USE_EXPAND -# BUILD_kexi - database manager ; handled as USE_EXPAND -# BUILD_kformula << formula editor, should be part of base libs -# BUILD_koabstraction << part of base libs -# BUILD_koreport << reporting library, should be part of base libs -# BUILD_kounavail << part of base libs -# BUILD_kpresenter - presentation creator ; handled as USE_EXPAND (now s= tage ???) -# BUILD_krita - image editor ; handled as USE_EXPAND -# BUILD_kthesaurus << thesaurus framework, should be part of base libs -# BUILD_libkowmf << wmf filter ; handled as wmf useflag -# BUILD_libmsooxml << msooxml filter ; handled as mso useflag -# BUILD_mdb -# BUILD_mobile << "Maemo 5 Office UI for KOffice" ; always off -# BUILD_musicshape -# BUILD_pathshapes -# BUILD_pictureshape -# BUILD_pluginshape -# BUILD_quickprint -# BUILD_reporting -# BUILD_scan -# BUILD_slidecompare -# BUILD_staging -# BUILD_tables - table editor ; handled as USE_EXPAND -# BUILD_textediting -# BUILD_textshape -# BUILD_thumbnail -# BUILD_treeshape -# BUILD_variables -# BUILD_vectorshape -# BUILD_videoshape -# BUILD_words - text editor ; handled as USE_EXPAND - -src_configure() { - local cal_ft - - # first write out things we want to hard-enable - local mycmakeargs=3D( - "-DWITH_LibXml2=3DON" # harddep for few parts - "-DWITH_ZLIB=3DON" - "-DGHNS=3DON" - "-DWITH_X11=3DON" - "-DWITH_Qt4=3DON" - ) - - # default disablers - mycmakeargs+=3D( - "-DBUILD_mobile=3DOFF" # we dont suppor mobile gui, maybe arm could - "-DWITH_LCMS=3DOFF" # we use lcms:2 - "-DWITH_XBase=3DOFF" # i am not the one to support this - "-DCREATIVEONLY=3DOFF" - "-DWITH_TINY=3DOFF" - "-DWITH_CreateResources=3DOFF" # NOT PACKAGED: http://create.freedeskt= op.org/ - "-DWITH_DCMTK=3DOFF" # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en - "-DWITH_Spnav=3DOFF" # NOT PACKAGED: http://spacenav.sourceforge.net/ - ) - - # regular options - mycmakeargs+=3D( - $(cmake-utils_use_with boost Boost) - $(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 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 png PNG) - $(cmake-utils_use_with postgres PostgreSQL) - $(cmake-utils_use_with semantic-desktop Soprano) - $(cmake-utils_use_with ssl OpenSSL) - $(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 xslt LibXslt) - $(cmake-utils_use_build wmf libkowmf) - $(cmake-utils_use_build mso libmsooxml) - ) - - # applications - for cal_ft in ${CAL_FTS}; do - mycmakeargs+=3D( $(cmake-utils_use_build calligra_features_${cal_ft} $= {cal_ft}) ) - done - - # filters - - kde4-base_src_configure -} diff --git a/app-office/calligra/calligra-2.3.74.ebuild b/app-office/call= igra/calligra-2.3.74.ebuild index ef3b568..23ca37e 100644 --- a/app-office/calligra/calligra-2.3.74.ebuild +++ b/app-office/calligra/calligra-2.3.74.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.73.e= build,v 1.2 2011/08/04 16:30:59 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.74.e= build,v 1.5 2011/08/26 20:46:55 dilfridge Exp $ =20 # note: files that need to be checked for dependencies etc: # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt @@ -24,24 +24,35 @@ SLOT=3D"4" [[ ${PV} =3D=3D 9999 ]] || KEYWORDS=3D"~amd64 ~x86" IUSE=3D"+crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gs= f gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular o= penctl openexr -+pdf postgres +semantic-desktop +ssl sybase tiff +threads +truetype ++pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype +wmf word-perfect xbase +xml +xslt" =20 # please do not sort here, order is same as in CMakeLists.txt -CAL_FTS=3D"kexi words flow plan stage tables krita karbon braindump acti= ve" +CAL_FTS=3D"kexi words flow plan stage tables krita karbon braindump" for cal_ft in ${CAL_FTS}; do IUSE+=3D" calligra_features_${cal_ft}" done unset cal_ft =20 REQUIRED_USE=3D" - calligra_features_tables? ( eigen ) + calligra_features_kexi? ( calligra_features_tables ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim ) + calligra_features_tables? ( eigen ) + test? ( calligra_features_karbon ) " =20 RDEPEND=3D" + !app-office/karbon + !app-office/koffice-data + !app-office/koffice-l10n !app-office/koffice-libs + !app-office/koffice-meta + !app-office/krita + !app-office/kplato + !app-office/kpresenter + !app-office/kspread + !app-office/kword dev-db/sqlite:3 dev-lang/perl dev-libs/boost @@ -173,6 +184,7 @@ src_configure() { for cal_ft in ${CAL_FTS}; do mycmakeargs+=3D( $(cmake-utils_use_build calligra_features_${cal_ft} $= {cal_ft}) ) done + mycmakeargs+=3D( $(cmake-utils_use_build test cstester) ) =20 # filters =20 diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/callig= ra/calligra-9999.ebuild index 1ea11dd..5a80563 100644 --- a/app-office/calligra/calligra-9999.ebuild +++ b/app-office/calligra/calligra-9999.ebuild @@ -1,11 +1,15 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.73.e= build,v 1.2 2011/08/04 16:30:59 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebu= ild,v 1.1 2011/08/26 20:53:46 dilfridge Exp $ + +# note: files that need to be checked for dependencies etc: +# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt +# krita/CMakeLists.txt =20 EAPI=3D4 =20 KDE_SCM=3Dgit -KDE_MINIMAL=3D4.6 +KDE_MINIMAL=3D4.6.4 OPENGL_REQUIRED=3Doptional KDE_HANDBOOK=3Doptional KDE_LINGUAS_LIVE_OVERRIDE=3Dtrue @@ -18,25 +22,44 @@ HOMEPAGE=3D"http://www.calligra-suite.org/" LICENSE=3D"GPL-2" SLOT=3D"4" [[ ${PV} =3D=3D 9999 ]] || KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"+boost +crypt +eigen +exif fftw +fontconfig freetds +gif glew +g= lib +gsf -gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms mysql +mso +okular openctl = openexr -+pdf +png postgres +semantic-desktop +ssl tiff +threads +truetype -+wmf word-perfect +xml +xslt" +IUSE=3D"+crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gs= f +gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular o= penctl openexr ++pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype ++wmf word-perfect xbase +xml +xslt" =20 -CAL_FTS=3D"braindump flow karbon kexi kpresenter krita tables words" +# please do not sort here, order is same as in CMakeLists.txt +CAL_FTS=3D"kexi words flow plan stage tables krita karbon braindump" for cal_ft in ${CAL_FTS}; do IUSE+=3D" calligra_features_${cal_ft}" done unset cal_ft =20 +REQUIRED_USE=3D" + calligra_features_kexi? ( calligra_features_tables ) + calligra_features_krita? ( eigen exif lcms ) + calligra_features_plan? ( kdepim ) + calligra_features_tables? ( eigen ) + test? ( calligra_features_karbon ) +" + RDEPEND=3D" + !app-office/karbon + !app-office/koffice-data + !app-office/koffice-l10n !app-office/koffice-libs + !app-office/koffice-meta + !app-office/krita + !app-office/kplato + !app-office/kpresenter + !app-office/kspread + !app-office/kword dev-db/sqlite:3 dev-lang/perl + dev-libs/boost dev-libs/libxml2 $(add_kdebase_dep knewstuff) + media-libs/libpng sys-libs/zlib - boost? ( dev-libs/boost ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) @@ -54,6 +77,7 @@ RDEPEND=3D" 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? ( >=3Dmedia-libs/opengtl-0.9.15 ) @@ -62,10 +86,13 @@ RDEPEND=3D" app-text/poppler media-gfx/pstoedit ) - png? ( media-libs/libpng ) - postgres? ( dev-db/postgresql-base ) + postgres? ( + dev-db/postgresql-base + =3Ddev-libs/libpqxx-3* + ) semantic-desktop? ( dev-libs/soprano ) ssl? ( dev-libs/openssl ) + sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( @@ -73,67 +100,25 @@ RDEPEND=3D" app-text/libwps app-text/libwpg ) + xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) + calligra_features_kexi? ( >=3Ddev-db/sqlite-3.7.3 ) " DEPEND=3D"${RDEPEND}" =20 -# By default all bulds are enabled. -# When you find out what some option does just describe it here and -# make it optional if required. -# The list is copied from ccmake output. -# -# BUILD_artistictextshape -# BUILD_braindump - note collection app ; USE_EXPAND -# BUILD_calligra - the generic "open file" office app ; default on -# BUILD_chartshape -# BUILD_colorengines -# BUILD_commentshape -# BUILD_converter -# BUILD_cstester -# BUILD_defaultTools -# BUILD_divineProportion -# BUILD_doc - handbook stuff, handled by KDE_HANDBOOK=3Doptional -# BUILD_dockers -# BUILD_flow - flowcharting app ; used to be kivio ; USE_EXPAND -# BUILD_generic_wrapper -# BUILD_karbon - vector drawing app ; handled as USE_EXPAND -# BUILD_kexi - database manager ; handled as USE_EXPAND -# BUILD_kformula << formula editor, should be part of base libs -# BUILD_koabstraction << part of base libs -# BUILD_koreport << reporting library, should be part of base libs -# BUILD_kounavail << part of base libs -# BUILD_kpresenter - presentation creator ; handled as USE_EXPAND (now s= tage ???) -# BUILD_krita - image editor ; handled as USE_EXPAND -# BUILD_kthesaurus << thesaurus framework, should be part of base libs -# BUILD_libkowmf << wmf filter ; handled as wmf useflag -# BUILD_libmsooxml << msooxml filter ; handled as mso useflag -# BUILD_mdb -# BUILD_mobile << "Maemo 5 Office UI for KOffice" ; always off -# BUILD_musicshape -# BUILD_pathshapes -# BUILD_pictureshape -# BUILD_pluginshape -# BUILD_quickprint -# BUILD_reporting -# BUILD_scan -# BUILD_slidecompare -# BUILD_staging -# BUILD_tables - table editor ; handled as USE_EXPAND -# BUILD_textediting -# BUILD_textshape -# BUILD_thumbnail -# BUILD_treeshape -# BUILD_variables -# BUILD_vectorshape -# BUILD_videoshape -# BUILD_words - text editor ; handled as USE_EXPAND +PATCHES=3D( + "${FILESDIR}/${PN}-2.3.74-jpeglcms.patch" + "${FILESDIR}/${PN}-2.3.74-jpeglcms-2.patch" +) =20 src_configure() { local cal_ft =20 # first write out things we want to hard-enable local mycmakeargs=3D( - "-DWITH_LibXml2=3DON" # harddep for few parts + "-DWITH_Boost=3DON" + "-DWITH_LibXml2=3DON" + "-DWITH_PNG=3DON" "-DWITH_ZLIB=3DON" "-DGHNS=3DON" "-DWITH_X11=3DON" @@ -148,13 +133,12 @@ src_configure() { "-DCREATIVEONLY=3DOFF" "-DWITH_TINY=3DOFF" "-DWITH_CreateResources=3DOFF" # NOT PACKAGED: http://create.freedeskt= op.org/ - "-DWITH_DCMTK=3DOFF" # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en - "-DWITH_Spnav=3DOFF" # NOT PACKAGED: http://spacenav.sourceforge.net/ + "-DWITH_DCMTK=3DOFF" # NOT PACKAGED: http://www.dcmtk.org/dc= mtk.php.en + "-DWITH_Spnav=3DOFF" # NOT PACKAGED: http://spacenav.sourcef= orge.net/ ) =20 # regular options mycmakeargs+=3D( - $(cmake-utils_use_with boost Boost) $(cmake-utils_use_with crypt QCA2) $(cmake-utils_use_with eigen Eigen2) $(cmake-utils_use_with exif Exiv2) @@ -173,6 +157,7 @@ src_configure() { $(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) @@ -180,15 +165,16 @@ src_configure() { $(cmake-utils_use_with opengl OpenGL) $(cmake-utils_use_with pdf Poppler) $(cmake-utils_use_with pdf Pstoedit) - $(cmake-utils_use_with png PNG) $(cmake-utils_use_with postgres PostgreSQL) $(cmake-utils_use_with semantic-desktop Soprano) $(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) @@ -198,6 +184,7 @@ src_configure() { for cal_ft in ${CAL_FTS}; do mycmakeargs+=3D( $(cmake-utils_use_build calligra_features_${cal_ft} $= {cal_ft}) ) done + mycmakeargs+=3D( $(cmake-utils_use_build test cstester) ) =20 # filters =20