Move live ebuild to main tree; it makes no sense to keep it alone in the kde overlay

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

3 files changed, 214 insertions, 15 deletions

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index 64624708f524..3afb4c15ae0e 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/calligra
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.7 2011/08/26 20:46:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.8 2011/08/26 20:53:46 dilfridge Exp $
+
+*calligra-9999 (26 Aug 2011)
+
+  26 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> +calligra-9999.ebuild:
+  Move live ebuild to main tree; it makes no sense to keep it alone in the kde
+  overlay
 
   26 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   calligra-2.3.74.ebuild:
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 9bc53b20af95..081d0d654d4d 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -5,22 +5,23 @@ AUX calligra-2.3.74-jpeglcms-2.patch 1014 RMD160 cd9532d322789aa655448fb89ffed58
 AUX calligra-2.3.74-jpeglcms.patch 723 RMD160 07b5d22e1e2e27dd658c7ec8e10e093e11108f17 SHA1 11cae52b535f8d665ae48d8fa32aa35f7e745ecc SHA256 5cfcb207b7d963fd3c593b5c43bff5774238c69da7a95df20aadd017fa7b6cc1
 DIST calligra-2.3.74.tar.bz2 105902759 RMD160 95154039344ac07ec75323821afff8d2e60159ed SHA1 b1ac9f3036f5d52aacd7a9caaa168f7ef5eae8dc SHA256 686a8f5f7eac49c40c53cbdb8cfbb102e765790dd0cfe2d1843975c55921e447
 EBUILD calligra-2.3.74.ebuild 5626 RMD160 e2d99aea615eab8c0baa2a019d15c4c663703c99 SHA1 878736ee9745290fdcf87634461bee10a0cdc48f SHA256 6b21cf35ae71a67adf795c598006af10ace2305f510414ba50e7d675808543a8
-MISC ChangeLog 1334 RMD160 caf39f42ece2b8374270823d72ac12cdcdc9e9a5 SHA1 8bfe776af2045c187bcb29b8aa8f029a6ada84bb SHA256 a7789fe4436ec66c93efad863e12e3a2ca559e10e1b6fe8492b021c98f3be3c6
+EBUILD calligra-9999.ebuild 5624 RMD160 e2d7697ce8f356dc204303f7f7e67296d1e728f4 SHA1 0676ad1c30b9bd7aa5dca7b64c170421f374e01d SHA256 613753b56ca5350272a374620bf67de410c3060f9f8b1f79ec53071e836d0fc7
+MISC ChangeLog 1534 RMD160 ac7331168522ca15249a9806336f6836c3ecf7ee SHA1 aebf062dab349579b5b07dd6a7d34bf80290b6d3 SHA256 73fb7e3293e2df6c5c8040ea1313ec4ed034c0ba5b0c4b88bc7d76e283fe1014
 MISC metadata.xml 1413 RMD160 9e5d04607a8a3f6af1d9a4daa3a224d8baa6b772 SHA1 6db8d64d20d9af877e625e630e3a437651bee3a3 SHA256 5a28be7ce31d48f02f258becf5ebded580b0cf387bf353eb24ce2fccc5746659
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOWAZSAAoJENwGBM22xffea+8P/33xYWf6ixwdLU3yt27nT7Mi
-dxwHLvl0CttkNjVrZI5dEMf9Rzp4vIu9CHeZduucDf5B+39h/Qo+T7S9u6eoVAoK
-5a+VyKnpt0UqA2/xYj7lOA2l9Mkhg+qi4GqXg9JWBw80c0FtSHJPEDcPMllEyA9D
-pBSbFAG3cDdFloNJB6kFzwa4LfwhknJ02JwdjdqZ+z1SDObhz/0q7E2WwEB0ohAI
-0DE4TpQ7Zs5msKshWHQzeMetI1lxVY838o5g9sTRk4MgWpPm0oRG26mEAdf/so7l
-UbYnXJ10ab7iwAxDhKGE5oztte/El8sNVsHoDl4rsxu4cn3FWA3fXq2BViqCJlfF
-VH0L8kLZdpsQOvFgIT/eR77ir9hW8sl3W9+iE4yvrZjLIiCG7QYt7NH6CTlUTFPb
-n6iE69kM1ppJjyYxNoB4oNlpGSLqaxsrY4OdomIk2Jp4ZGIisd/n1G76Uv5324KU
-vpDQrTyPIIAPzzIe+ts5LEVdT3n1ckMNe8RQXlGr3UCryIP4QmIxtwZ55aRMkFx1
-X96gpIjstMP+HQQ5XBrUu28cYs0LlxH65Oo1hqBcmWYS25KyM/MfdRTLMzg1XNlz
-1Bu0FePeKMeMM2shlQKxjAJ0IVL3WFJvBzB9bm9c1YkqGEfdg5gxvU+TpP7MtjqO
-rTg6uOGCOXAfGbaZadXB
-=IGhN
+iQIcBAEBCgAGBQJOWAfuAAoJENwGBM22xffeEKcP/RTYD2CeEndks8jC3sDc5Mge
+/vnKnwL8BypyMG2aox74gXDPlKzt1QCdRwCaVAXT67y7+vGE1MtMgU4bLZRKQmVD
+MwxuJpzO3brbmOBy3ostyG7hpoWWK0v7HTkMJPh61UjkAQp1L6aL5H+Py+4jZq+X
+MIuKeV8NbO7br41fJfwzBi6woHYCRPC7IkFKcv8X8Oh7gVfKNfVOiPn6O/knPfng
+NCTnoeLJNPt93QGRg75H4HCTkVG6TY8RY6IYmaD8xxGaqArmQggZHKhUk3QUXw5w
+RBATo1PqZJ+2Aaa87X2J1XTie0X/MfyHs0hs918dmvLBqplhhuZy7y9ZkXHUbCgw
+VsknS+ZslN7CkTN1hn4Cz22efn4ts27j27EnbJtqAu10DD9Q19wp3Vbqf3mIorNh
+aqUkXzdmDX4CgeDJQNcSOrcvALWKlgiOmqerV8LctmYO10Gf1zjEbQdDd7HKStZv
+WNHPvI0d2IxLgJYHy5TJx+sVpnQlNojbAfYfYOTzuYTpa6InChctPMOAxhvr6NvM
+yCkNk3R14TjLP5rZrzCq/frhFwry51Q3b2s25uGFdYggL/prA/1UEFe45/3lv7Te
+66+JQ1/TvTouCqEv4uuas7vy7sO/VrtIP/tUy9kfECL+1qFPxqAV8DUUJXLQP8GT
+4rmOeL3fzWc5wK2Aoqm/
+=oRgz
 -----END PGP SIGNATURE-----
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
new file mode 100644
index 000000000000..5a80563596df
--- /dev/null
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -0,0 +1,192 @@
+# 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-9999.ebuild,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
+
+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="+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_krita? ( eigen exif lcms )
+	calligra_features_plan? ( kdepim )
+	calligra_features_tables? ( eigen )
+	test? ( calligra_features_karbon )
+"
+
+RDEPEND="
+	!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
+	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 )
+	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.3 )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.74-jpeglcms.patch"
+	"${FILESDIR}/${PN}-2.3.74-jpeglcms-2.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"
+	)
+
+	# default disablers
+	mycmakeargs+=(
+		"-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
+		"-DWITH_LCMS=OFF" # we use lcms:2
+		"-DWITH_XBase=OFF" # i am not the one to support this
+		"-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 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_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
+}