* [gentoo-commits] gentoo-x86 commit in app-office/calligra: calligra-2.5.49.9999.ebuild ChangeLog calligra-9999.ebuild calligra-2.4.49.9999.ebuild
@ 2012-08-30 11:30 Andreas HAttel (dilfridge)
0 siblings, 0 replies; only message in thread
From: Andreas HAttel (dilfridge) @ 2012-08-30 11:30 UTC (permalink / raw
To: gentoo-commits
dilfridge 12/08/30 11:30:45
Modified: ChangeLog calligra-9999.ebuild
Added: calligra-2.5.49.9999.ebuild
Removed: calligra-2.4.49.9999.ebuild
Log:
Clean up and sync live ebuilds
(Portage version: 2.2.0_alpha123/cvs/Linux x86_64)
Revision Changes Path
1.67 app-office/calligra/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/ChangeLog?rev=1.67&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/ChangeLog?rev=1.67&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/ChangeLog?r1=1.66&r2=1.67
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ChangeLog 30 Aug 2012 11:20:05 -0000 1.66
+++ ChangeLog 30 Aug 2012 11:30:45 -0000 1.67
@@ -1,6 +1,13 @@
# 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.66 2012/08/30 11:20:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.67 2012/08/30 11:30:45 dilfridge Exp $
+
+*calligra-2.5.49.9999 (30 Aug 2012)
+
+ 30 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+ -calligra-2.4.49.9999.ebuild, +calligra-2.5.49.9999.ebuild,
+ calligra-9999.ebuild:
+ Clean up and sync live ebuilds
*calligra-2.5.1 (30 Aug 2012)
1.29 app-office/calligra/calligra-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-9999.ebuild?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-9999.ebuild?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-9999.ebuild?r1=1.28&r2=1.29
Index: calligra-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- calligra-9999.ebuild 21 Aug 2012 19:06:56 -0000 1.28
+++ calligra-9999.ebuild 30 Aug 2012 11:30:45 -0000 1.29
@@ -1,6 +1,6 @@
# 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-9999.ebuild,v 1.28 2012/08/21 19:06:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.29 2012/08/30 11:30:45 dilfridge Exp $
# note: files that need to be checked for dependencies etc:
# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -153,7 +153,7 @@
"-DWITH_Qt4=ON"
"-DBUILD_libmsooxml=ON" # only internal code, no deps
"-DWITH_Iconv=ON" # available on all supported arches and many more
- "-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
+ "-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
)
# default disablers
@@ -189,6 +189,7 @@
$(cmake-utils_use_with lcms LCMS2)
$(cmake-utils_use_with marble Marble)
$(cmake-utils_use_with mysql MySQL)
+ $(cmake-utils_use_build mysql)
$(cmake-utils_use_with okular Okular)
$(cmake-utils_use_with opengtl OpenCTL)
$(cmake-utils_use_with openexr OpenEXR)
@@ -196,17 +197,20 @@
$(cmake-utils_use_with pdf Poppler)
$(cmake-utils_use_with pdf Pstoedit)
$(cmake-utils_use_with postgres PostgreSQL)
+ $(cmake-utils_use_build postgres pqxx)
$(cmake-utils_use_with semantic-desktop Soprano)
$(cmake-utils_use semantic-desktop NEPOMUK)
$(cmake-utils_use_with spacenav Spnav)
$(cmake-utils_use_with ssl OpenSSL)
$(cmake-utils_use_with sybase FreeTDS)
+ $(cmake-utils_use_build sybase sybase)
$(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_build xbase xbase)
$(cmake-utils_use_with xslt LibXslt)
)
1.1 app-office/calligra/calligra-2.5.49.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.5.49.9999.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.5.49.9999.ebuild?rev=1.1&content-type=text/plain
Index: calligra-2.5.49.9999.ebuild
===================================================================
# 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.5.49.9999.ebuild,v 1.1 2012/08/30 11:30:45 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
EGIT_BRANCH="calligra/2.5"
KDE_SCM=git
KDE_MINIMAL=4.6.4
QT_MINIMAL=4.8.1
OPENGL_REQUIRED=optional
KDE_HANDBOOK=optional
KDE_LINGUAS_LIVE_OVERRIDE=true
inherit kde4-base versionator
DESCRIPTION="KDE Office Suite"
HOMEPAGE="http://www.calligra.org/"
case ${PV} in
2.[456789].[789]?)
# beta or rc releases
SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2" ;;
2.[456789].?)
# stable releases
SRC_URI="mirror://kde/stable/${P}/${P}.tar.bz2" ;;
2.[456789].9999)
# stable branch live ebuild
SRC_URI="" ;;
9999)
# master branch live ebuild
SRC_URI="" ;;
esac
LICENSE="GPL-2"
SLOT="4"
[[ ${PV} == *9999 ]] || KEYWORDS="~amd64 ~x86"
IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
gsl +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +okular opengtl openexr
+pdf postgres +semantic-desktop spacenav +ssl sybase test tiff +threads +truetype
word-perfect xbase +xml +xslt"
# please do not sort here, order is same as in CMakeLists.txt
CAL_FTS="kexi words flow plan stage sheets 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_sheets )
calligra_features_words? ( calligra_features_sheets )
calligra_features_krita? ( eigen exif lcms )
calligra_features_plan? ( kdepim semantic-desktop )
calligra_features_sheets? ( 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
>=x11-libs/qt-gui-4.8.1-r1:4
virtual/libiconv
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 )
jpeg? ( virtual/jpeg )
jpeg2k? ( media-libs/openjpeg )
kdcraw? ( $(add_kdebase_dep libkdcraw) )
kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
lcms? ( media-libs/lcms:2 )
marble? ( $(add_kdebase_dep marble) )
mysql? ( virtual/mysql )
okular? ( $(add_kdebase_dep okular) )
opengtl? ( >=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
)
semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
spacenav? ( dev-libs/libspnav )
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}"
[[ ${PV} == 9999 ]] && LANGVERSION="2.4" || LANGVERSION="$(get_version_component_range 1-2)"
PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
RESTRICT=test
# bug 394273
src_configure() {
local cal_ft
# first write out things we want to hard-enable
local mycmakeargs=(
"-DIHAVEPATCHEDQT=ON"
"-DWITH_Boost=ON"
"-DWITH_LibXml2=ON"
"-DWITH_PNG=ON"
"-DWITH_ZLIB=ON"
"-DGHNS=ON"
"-DWITH_X11=ON"
"-DWITH_Qt4=ON"
"-DBUILD_libmsooxml=ON" # only internal code, no deps
"-DWITH_Iconv=ON" # available on all supported arches and many more
"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
)
# default disablers
mycmakeargs+=(
"-DBUILD_mobile=OFF" # we dont support mobile gui, maybe arm could
"-DBUILD_active=OFF" # we dont support active 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
)
# 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 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_build mysql)
$(cmake-utils_use_with okular Okular)
$(cmake-utils_use_with opengtl 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_build postgres pqxx)
$(cmake-utils_use_with semantic-desktop Soprano)
$(cmake-utils_use semantic-desktop NEPOMUK)
$(cmake-utils_use_with spacenav Spnav)
$(cmake-utils_use_with ssl OpenSSL)
$(cmake-utils_use_with sybase FreeTDS)
$(cmake-utils_use_build sybase sybase)
$(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_build xbase xbase)
$(cmake-utils_use_with xslt LibXslt)
)
# 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
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-08-30 11:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-30 11:30 [gentoo-commits] gentoo-x86 commit in app-office/calligra: calligra-2.5.49.9999.ebuild ChangeLog calligra-9999.ebuild calligra-2.4.49.9999.ebuild Andreas HAttel (dilfridge)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox