Add next stable version and beta for 2.5; remove unused patch; better SRC_URI logic in 9999

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

7 files changed, 474 insertions, 200 deletions

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index f530ffe2bf2e..3953b41ae713 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,15 @@
 # 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.43 2012/05/27 16:44:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.44 2012/05/27 17:06:42 dilfridge Exp $
+
+*calligra-2.4.90 (27 May 2012)
+*calligra-2.4.2 (27 May 2012)
+
+  27 May 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/calligra-2.4.0-rdf.patch, +calligra-2.4.2.ebuild,
+  +calligra-2.4.90.ebuild, calligra-2.4.9999.ebuild, calligra-9999.ebuild:
+  Add next stable version and beta for 2.5; remove unused patch; better SRC_URI
+  logic in 9999
 
   27 May 2012; Agostino Sarubbo <ago@gentoo.org> calligra-2.4.1.ebuild:
   Stable for x86, wrt to bug #415749
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 97e0ea7df534..a4864d006fce 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,21 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX calligra-2.4.0-rdf.patch 7537 RMD160 4320fe29ab85791232665a7f2d717dab1b8505b3 SHA1 048f59b24ef7662363423b3d71483c979bd3e050 SHA256 0a2d29cc549d032b70c8d006d5db56d857b4db1946795f94dcfe52f52e5d49c9
 DIST calligra-2.4.1.tar.bz2 119301573 RMD160 5cb241ab46c6e064a05e39436da81f2a2a8df71f SHA1 f5be221d50088ac4537931811272392846cd7363 SHA256 59a5421484ec71bfc3db6351d44a88b22dd164a5ff8cd225b67ac2eb835774a3
+DIST calligra-2.4.2.tar.bz2 119318136 RMD160 e884a4e68ea65d24166f3992488413283894c3d8 SHA1 d44a6b321b0b90122b86e074785546f4a2b0d066 SHA256 0f6b87a013601008f1198791bf743143c60b3aba26e2729c085aa98372459193
+DIST calligra-2.4.90.tar.bz2 119019409 RMD160 9ebfe42df70b6a0800300a039816aeed28592f5b SHA1 b9032d10cc0a2acf68c4629e592d72ed949ad7c0 SHA256 9160c6911be849ca5da36eb3c8a09b210e083e1ca05a842a0fb1978c05adebce
 EBUILD calligra-2.4.1.ebuild 5966 RMD160 08832845c6da4d7a229a26ad89f266cf22215d1d SHA1 66532a1861677fada5d5bf9e79b924b7f012a2ed SHA256 616000603b58024efac73019eea28ebc4dc987197d97081706b952f9fe795dc7
-EBUILD calligra-2.4.9999.ebuild 6026 RMD160 e45a529f9ddd970b348ec9b1cffd1d2b35906438 SHA1 6121c85477c26265e22c0e528c008013c46b1000 SHA256 61b8acf40a6a0c63dfcc9600bc4bb09d02f3bed4119526b17ddd9f54e543027b
-EBUILD calligra-9999.ebuild 5849 RMD160 d0cb79e5ac354186c8402b582f734e7b798a41be SHA1 6071fc8a10c68303da69a9f83d8a42f42672819d SHA256 442f6a0222871fc469418bb8f8259eb02c0b8b5b906fe24807f96259128ac17c
-MISC ChangeLog 7567 RMD160 6561f7d50755d2add259b4dbd5d92c04cf915bff SHA1 a2c068ed9930fde2e7a147ecd9e526b0f894455f SHA256 a9197ed95c2f916e9c07e9804a763745440980aeb4ae291d1ba1e46eff52315b
+EBUILD calligra-2.4.2.ebuild 5974 RMD160 a15a47a6674af7f96c6704aa2d33ad63f4935c48 SHA1 72da387eb112545b61fa963410b35b2aa2dd0da6 SHA256 12a8b5db37768ef0ee175026ab6614d759e3e9555f43811615c7472e1bfee554
+EBUILD calligra-2.4.90.ebuild 6202 RMD160 5ce338a311da200ac9bad342a0548309a807282c SHA1 63c9a5948c278dcb5091fcc55f337d2fbabffdfd SHA256 93cf27596ac0df952819d783c6e990bff99fc5500adee64baa7325171444cb1e
+EBUILD calligra-2.4.9999.ebuild 5977 RMD160 272be303a5360b830e13ec15799b647947804c66 SHA1 347b3911620203ceba93b7ac83c2abb3438217da SHA256 61e2fdf53e0e58a20399cf81b0afc131b93f999bededf351464a0216901a4a7f
+EBUILD calligra-9999.ebuild 6201 RMD160 1c64ec9298fb83a9c0a1c9fcb1ca3699e60ded9b SHA1 3fa6d706164c7f1bef6e422f729442bb83dd44e3 SHA256 90298058885f823f7056f8da48e127d3fde6a23763e7d1cda04e60802c061268
+MISC ChangeLog 7923 RMD160 77d8a588e1fb2dffc7ea8eac7e711e708254a06b SHA1 cb15e6141b71d5e2fe0dcb4ad37b31c03038cdfa SHA256 f3dd4e249e6d13daa37696848e222abf02cc6cb3984354511c51e2edb54ebd1a
 MISC metadata.xml 1491 RMD160 f8ff74f843ae8df2be457f5376f8d1ad08604c09 SHA1 56f2b25dfd6524b43aed66a177a515e80f04cde2 SHA256 9e6668563b25b690da423ea91dbac27e6289ee117cb6cb026c2657c476555c69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPwlnaAAoJEOTDgjZ80txd1/IH/220l5we5E5bm7X00v0ud4xP
-497haG1UzOe/qIVN96g4xQM9+6BRDHkJO8PQDbKNLAHyO1l/qpr1V8eoV568uGPJ
-ruwKbzvW2gHV2P1c6iRtMPuklliQ+2SmlLNQoCA59lNQEs9J8gg7lGig/wchBSkB
-4M5Oo9ZJYVp0PAAN9cXH60mDeJQAXdR3b5Yp4cUcbLUHSTdiacW6+qM3glbFs4Ae
-F5vF4ngSEb9OAqxCZbrw/9Ox34JjWLaQE+GHDFWWsH3OSrWue+/oz24XFpFKjfue
-ZGEUtCucpa1HxyGNZ40/3nTtEren+cDtIA05R5f2OYgNsSrDFEXrJQqBlKuUO7g=
-=9mIL
+iQIcBAEBCgAGBQJPwl9oAAoJENwGBM22xffes/cP/RbaOJDbMDtqv1XkvpKb6stc
+ne9dLDibYsuvaTPtsLSc6jPbppk8fj1yTP07cl1WN3V61a3UmoukhK04nBeBAiRR
+n1XLePcGF41uHUC12AZRdyeeZNav4lmNpilE8rjWzw897CKvnc+5qpy+4EXfideK
+xub7xWi8cXpnDqXWt1I8SFgwxdxMqygU4P51H0oIeABaNydptamJ0tz3nT6Z5+gq
+3SoGANchu3lYPWbCDgj3aaa4XEfrK8XbwWdVbN8gjDMTyBrK50SpIW4hUA04ClsL
+6zVAnD3HqjP1Y9b3fnQPHcgFJGkFMfo4SF254FCPgF4x+oSiRZAcak34yDDL7IOT
+gxI7jkjuuzXZgc/dvqaC+7wBWZPp76vQ0jKMFKBotMho68Ug3eLwBGYjV1sG+b1o
+KRA5+aGpWCav8hBwBb7BTU4j3CPzNS7eDDPYMZNyWOfIZGBDGNrUdwcOepDPD6Bz
+Nefw89IXmXKHIFwGt1/X2jRefeGL0qMgIhl++rjtGpoABqk+Cyby+iMvr2cnC4IU
+GNZpH9S6IeOyntxL0oiTLrrABuEvF3xWbf4OHCe4UX57P1TlDvO2hMXcyh2pvjeR
+Lor+XjOy9xZV7PygADNoSa+khxM7eCvykGqAgpieADVoxl+x9b0uyRVYl/l8I2jh
+r9hKxkRB/RLPe6YmedWz
+=arj2
 -----END PGP SIGNATURE-----
diff --git a/app-office/calligra/calligra-2.4.2.ebuild b/app-office/calligra/calligra-2.4.2.ebuild
new file mode 100644
index 000000000000..164a096926d3
--- /dev/null
+++ b/app-office/calligra/calligra-2.4.2.ebuild
@@ -0,0 +1,204 @@
+# 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.4.2.ebuild,v 1.1 2012/05/27 17:06: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
+
+EGIT_BRANCH="calligra/2.4"
+
+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
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra.org/"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://kde/stable/${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
+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
+	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
+	)
+	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
+
+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"
+		"-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
+		"-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 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/calligra-2.4.90.ebuild b/app-office/calligra/calligra-2.4.90.ebuild
new file mode 100644
index 000000000000..b757e2c8ea43
--- /dev/null
+++ b/app-office/calligra/calligra-2.4.90.ebuild
@@ -0,0 +1,218 @@
+# 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.4.90.ebuild,v 1.1 2012/05/27 17:06: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
+QT_MINIMAL=4.8.1
+OPENGL_REQUIRED=optional
+
+KDE_HANDBOOK=optional
+
+KDE_LINGUAS_LIVE_OVERRIDE=true
+inherit kde4-base
+
+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 +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
++pdf postgres +semantic-desktop +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
+	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
+	)
+	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
+
+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"
+		"-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
+		"-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 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/calligra-2.4.9999.ebuild b/app-office/calligra/calligra-2.4.9999.ebuild
index 6753f66aeec8..e8c8306ee34c 100644
--- a/app-office/calligra/calligra-2.4.9999.ebuild
+++ b/app-office/calligra/calligra-2.4.9999.ebuild
@@ -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-2.4.9999.ebuild,v 1.8 2012/05/02 21:59:18 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.9999.ebuild,v 1.9 2012/05/27 17:06:42 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -117,8 +117,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-2.4.0-rdf.patch" )
-
 RESTRICT=test
 # bug 394273
 
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 5b3aefa73230..573f98a095bd 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -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.18 2012/05/02 21:59:18 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.19 2012/05/27 17:06:42 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -20,11 +20,27 @@ inherit kde4-base
 
 DESCRIPTION="KDE Office Suite"
 HOMEPAGE="http://www.calligra.org/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://kde/stable/${P}/${P}.tar.bz2"
+
+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 +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
 +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
@@ -136,8 +152,9 @@ src_configure() {
 
 	# default disablers
 	mycmakeargs+=(
-		"-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
-		"-DWITH_LCMS=OFF" # we use lcms:2
+		"-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/
diff --git a/app-office/calligra/files/calligra-2.4.0-rdf.patch b/app-office/calligra/files/calligra-2.4.0-rdf.patch
deleted file mode 100644
index eb5566007902..000000000000
--- a/app-office/calligra/files/calligra-2.4.0-rdf.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From c34af29f458a35b6cf0fbec8574425516be62859 Mon Sep 17 00:00:00 2001
-From: Boudewijn Rempt <boud@valdyas.org>
-Date: Sun, 8 Apr 2012 12:21:50 +0200
-Subject: [PATCH] Hide rdf in more places
-
-We shouldn't use KoDocumentRdf unless hedged with SHOULD_BUILD_RDF
-
-Ok to backport?
----
- libs/main/KoDocument.cpp           |    2 +-
- libs/main/KoDocument.h             |    2 +-
- libs/main/KoDocumentInfoDlg.cpp    |    8 +++++---
- libs/main/KoDocumentInfoDlg.h      |    4 ++--
- words/part/KWOdfLoader.cpp         |    3 ++-
- words/part/KWView.cpp              |    6 +++---
- words/part/dockers/KWRdfDocker.cpp |    6 +++---
- 7 files changed, 17 insertions(+), 14 deletions(-)
-
-diff --git a/libs/main/KoDocument.cpp b/libs/main/KoDocument.cpp
-index 2fedde7..775c2c6 100644
---- a/libs/main/KoDocument.cpp
-+++ b/libs/main/KoDocument.cpp
-@@ -812,7 +812,7 @@ KoDocumentInfo *KoDocument::documentInfo() const
-     return d->docInfo;
- }
- 
--KoDocumentRdf *KoDocument::documentRdf() const
-+KoDocumentRdfBase *KoDocument::documentRdf() const
- {
- #ifdef SHOULD_BUILD_RDF
-     if (d->docRdf && d->docRdf->model()) {
-diff --git a/libs/main/KoDocument.h b/libs/main/KoDocument.h
-index d69e15c..7cc8cd5 100644
---- a/libs/main/KoDocument.h
-+++ b/libs/main/KoDocument.h
-@@ -595,7 +595,7 @@ public:
-      * the RDF system and needs full access to the KoDocumentRdf object.
-      * @see KoDocumentRdf
-      */
--    KoDocumentRdf *documentRdf() const;
-+    KoDocumentRdfBase *documentRdf() const;
- 
-     /**
-      * Replace the current rdf document with the given rdf document. The existing RDF document
-diff --git a/libs/main/KoDocumentInfoDlg.cpp b/libs/main/KoDocumentInfoDlg.cpp
-index 23ae08e..1781e34 100644
---- a/libs/main/KoDocumentInfoDlg.cpp
-+++ b/libs/main/KoDocumentInfoDlg.cpp
-@@ -26,8 +26,10 @@
- #include "KoDocumentInfo.h"
- #include "KoDocument.h"
- #include "KoMainWindow.h"
-+
- #include "rdf/KoDocumentRdfEditWidgetBase.h"
- #ifdef SHOULD_BUILD_RDF
-+#include "rdf/KoDocumentRdf.h"
- #include "rdf/KoDocumentRdfEditWidget.h"
- #endif
- 
-@@ -68,7 +70,7 @@ public:
-     QList<KPageWidgetItem*> m_pages;
-     Ui::KoDocumentInfoAboutWidget* m_aboutUi;
-     Ui::KoDocumentInfoAuthorWidget* m_authorUi;
--    KoDocumentRdf* m_rdf;
-+    KoDocumentRdfBase* m_rdf;
- #ifdef SHOULD_BUILD_RDF
-     KoDocumentRdfEditWidget* m_rdfEditWidget;
- #else
-@@ -80,7 +82,7 @@ public:
- };
- 
- 
--KoDocumentInfoDlg::KoDocumentInfoDlg(QWidget* parent, KoDocumentInfo* docInfo, KoDocumentRdf* docRdf)
-+KoDocumentInfoDlg::KoDocumentInfoDlg(QWidget* parent, KoDocumentInfo* docInfo, KoDocumentRdfBase* docRdf)
-         : KPageDialog(parent)
-         , d(new KoDocumentInfoDlgPrivate)
- {
-@@ -136,7 +138,7 @@ KoDocumentInfoDlg::KoDocumentInfoDlg(QWidget* parent, KoDocumentInfo* docInfo, K
-         d->m_rdfEditWidget = 0;
- 
- #ifdef SHOULD_BUILD_RDF
--        d->m_rdfEditWidget = new KoDocumentRdfEditWidget(this, d->m_rdf);
-+        d->m_rdfEditWidget = new KoDocumentRdfEditWidget(this, (KoDocumentRdf*)d->m_rdf);
-         page = new KPageWidgetItem(d->m_rdfEditWidget->widget(), i18n("Rdf"));
-         page->setHeader(i18n("Rdf"));
-         page->setIcon(KIcon("text-rdf"));
-diff --git a/libs/main/KoDocumentInfoDlg.h b/libs/main/KoDocumentInfoDlg.h
-index 9d3e6eb..733f126 100644
---- a/libs/main/KoDocumentInfoDlg.h
-+++ b/libs/main/KoDocumentInfoDlg.h
-@@ -24,7 +24,7 @@
- #include <kpagedialog.h>
- 
- class KoDocumentInfo;
--class KoDocumentRdf;
-+class KoDocumentRdfBase;
- class KPageWidgetItem;
- 
- /**
-@@ -55,7 +55,7 @@ public:
-      * @param parent a pointer to the parent widget
-      * @param docInfo a pointer to the shown KoDocumentInfo
-      */
--    KoDocumentInfoDlg(QWidget *parent, KoDocumentInfo* docInfo, KoDocumentRdf* docRdf = 0);
-+    KoDocumentInfoDlg(QWidget *parent, KoDocumentInfo* docInfo, KoDocumentRdfBase* docRdf = 0);
- 
-     /** The destructor */
-     virtual ~KoDocumentInfoDlg();
-diff --git a/words/part/KWOdfLoader.cpp b/words/part/KWOdfLoader.cpp
-index 9900102..238c7fe 100644
---- a/words/part/KWOdfLoader.cpp
-+++ b/words/part/KWOdfLoader.cpp
-@@ -46,8 +46,9 @@
- #include <KoProgressUpdater.h>
- #include <KoVariableManager.h>
- #include <KoInlineTextObjectManager.h>
-+#ifdef SHOULD_BUILD_RDF
- #include <KoDocumentRdf.h>
--
-+#endif
- // KDE + Qt includes
- #include <QTextCursor>
- #include <KDebug>
-diff --git a/words/part/KWView.cpp b/words/part/KWView.cpp
-index 0ac5285..53f7da5 100644
---- a/words/part/KWView.cpp
-+++ b/words/part/KWView.cpp
-@@ -163,7 +163,7 @@ KWView::KWView(const QString &viewMode, KWDocument *document, QWidget *parent)
-     connect(m_zoomController, SIGNAL(zoomChanged(KoZoomMode::Mode, qreal)), this, SLOT(zoomChanged(KoZoomMode::Mode, qreal)));
- 
- #ifdef SHOULD_BUILD_RDF
--    if (KoDocumentRdf *rdf = m_document->documentRdf()) {
-+    if (KoDocumentRdf *rdf = dynamic_cast<KoDocumentRdf*>(m_document->documentRdf())) {
-         connect(rdf, SIGNAL(semanticObjectViewSiteUpdated(KoRdfSemanticItem*, const QString&)),
-                 this, SLOT(semanticObjectViewSiteUpdated(KoRdfSemanticItem*, const QString&)));
-     }
-@@ -303,7 +303,7 @@ void KWView::setupActions()
-     action->setWhatsThis(i18n("Stylesheets are used to format contact, event, and location information which is stored in Rdf"));
-     connect(action, SIGNAL(triggered()), this, SLOT(editSemanticStylesheets()));
- 
--    if (KoDocumentRdf* rdf = m_document->documentRdf()) {
-+    if (KoDocumentRdf* rdf = dynamic_cast<KoDocumentRdf*>(m_document->documentRdf())) {
-         KAction* createRef = rdf->createInsertSemanticObjectReferenceAction(canvasBase());
-         actionCollection()->addAction("insert_semanticobject_ref", createRef);
-         KActionMenu *subMenu = new KActionMenu(i18n("Create"), this);
-@@ -708,7 +708,7 @@ void KWView::pageSettingsDialogFinished()
- void KWView::editSemanticStylesheets()
- {
- #ifdef SHOULD_BUILD_RDF
--    if (KoDocumentRdf *rdf = m_document->documentRdf()) {
-+    if (KoDocumentRdf *rdf = dynamic_cast<KoDocumentRdf*>(m_document->documentRdf())) {
-         KoSemanticStylesheetsEditor *dia = new KoSemanticStylesheetsEditor(this, rdf);
-         dia->show();
-         // TODO this leaks memory
-diff --git a/words/part/dockers/KWRdfDocker.cpp b/words/part/dockers/KWRdfDocker.cpp
-index 0fbf85b..969977b 100644
---- a/words/part/dockers/KWRdfDocker.cpp
-+++ b/words/part/dockers/KWRdfDocker.cpp
-@@ -93,8 +93,8 @@ void KWRdfDocker::setCanvas(KoCanvasBase *canvas)
-         }
-         
-         m_document = newDoc;
--        widgetDocker.semanticView->setDocumentRdf(m_document->documentRdf());
--        connect(m_document->documentRdf(), SIGNAL(semanticObjectAdded(KoRdfSemanticItem*)),
-+        widgetDocker.semanticView->setDocumentRdf(static_cast<KoDocumentRdf*>(m_document->documentRdf()));
-+        connect(static_cast<KoDocumentRdf*>(m_document->documentRdf()), SIGNAL(semanticObjectAdded(KoRdfSemanticItem*)),
-                 this, SLOT(semanticObjectAdded(KoRdfSemanticItem*)));
-         connect(m_document->documentRdf(), SIGNAL(semanticObjectUpdated(KoRdfSemanticItem*)),
-                 this, SLOT(semanticObjectUpdated(KoRdfSemanticItem*)));
-@@ -168,7 +168,7 @@ void KWRdfDocker::updateData()
- 
-     // TODO try to get rid of 'editor' here by remembering the position in the resourceChanged()
-     KoTextEditor *editor = KoTextEditor::getTextEditorFromCanvas(m_canvas);
--    KoDocumentRdf *rdf = m_document->documentRdf();
-+    KoDocumentRdf *rdf = dynamic_cast<KoDocumentRdf*>(m_document->documentRdf());
-     if (editor && rdf)
-     {
-         //kDebug(30015) << "m_lastCursorPosition:" << m_lastCursorPosition;
--- 
-1.7.9.2
-