Remove old.

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

3 files changed, 13 insertions, 246 deletions

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index 126abff979fb..a4f4025a34ae 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/calligra
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.92 2013/07/13 07:47:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.93 2013/07/13 16:26:28 johu Exp $
+
+  13 Jul 2013; Johannes Huber <johu@gentoo.org> -calligra-2.6.3.ebuild:
+  Remove old.
 
   13 Jul 2013; Agostino Sarubbo <ago@gentoo.org> calligra-2.6.4.ebuild:
   Stable for x86, wrt bug #476384
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index fea436172755..4372cad3dffd 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,27 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST calligra-2.6.3.tar.bz2 126545368 SHA256 72479e23098f221bc6b5dff92fc62906897061f1009223a632e513fa3b60bfef SHA512 55da2f4552ee68bbf6494fb6ec9abc0958cff762719b1ba5a172793a5cff5283ec63a965f26fe0347ccb1ea71cc4ceb4d70edd72b058d7bfd316421595b48cb5 WHIRLPOOL 5281272864a7c30f518bb91e0a53ce24780e3e91efe9aa5d7c5ee83dc0b577816e40c27d67968987ab805eb60e6cbcef9c3c765d2026969f37083dba6caac59c
 DIST calligra-2.6.4.tar.bz2 126965216 SHA256 228376399fd9aef0e4c3d647070540aafcaa2647610ea341cc0093502be8ec69 SHA512 edcee53532f4ad1b74360ca9d8978b5ea3fed3aa88934b4cd68fcf01a3d43f3651152d1bea9300363be51031f02793562c6d49e4ab87b4fd619ffd49c5bd6b95 WHIRLPOOL bcf49880007a58f1c0199ac21d853e0112cd9287de4aa9303c8776efdbe9e58c2b541d68bb5af55380becae34d75538ba21f1fe0c8d87b2169c4e46f03cf6104
-EBUILD calligra-2.6.3.ebuild 6600 SHA256 a3b239e19364abfee7e4b543122d19defd33571d09188c6572382e74d923cc7b SHA512 b820713f949888375762996d514a5e2931f8efaf4cd686a943ebcebd4c1ef34aa878399442fbbda8d06b524b8e86e40928c3e7bd96a2afce0d436d7b0268971e WHIRLPOOL fe53c6ae6a4a09b111657b27faac54793c16c66e2581905048dc2b75606376d0d924ad7f1fac26ce33a6ada8f2830f2632a8e72ec9908f3c48306507e6f77d7a
 EBUILD calligra-2.6.4.ebuild 6600 SHA256 1fe0d0ff87ea7388988ab140ed36a9753d3b4fdb1235b84f57bfcc8a2f7fa3f5 SHA512 a66ae9821b1dd5c0cddf09ee6daf3ea96e439a13c7ef275918d678821ed18e48f2de1b4fddc4d6a2686d8e871172948128226a9fb2a840c531b9759ec06601f6 WHIRLPOOL 4c95f82b1db63cf8cdd12b47a5d07c2020a83e7d1b166031cf37522e3966397dd02e3116678e77caf504278245280410a42e20307a1fee8399df764ff006755f
 EBUILD calligra-9999.ebuild 6602 SHA256 14d795dd54e0b6ab7a1f1d852fc93356773040a650eae05f073af087f217ce8d SHA512 1943e2c0e88fe132392fa8f1cf172bebf1020d184cf0b7167f233f069a484be1d5785b7804679830871564ea52ae4883d27b98b88d6d48fe9d4f3a3150153c6e WHIRLPOOL 91d9a33a728caba98dd63683e93231edb0e3fc76edc789860990e40122aab0a2edb4b4b8a4938c5bf7a11d266cb32cd67133930bed4ba37bfbe046e69ca27b67
-MISC ChangeLog 15974 SHA256 3796a7d2df41a31e1a5dce6df1ad33e383d48fceb2f461292ff69b37df65fdee SHA512 b6264175086a9eb6924a58b840f6701a3d1047aa7a7da701f09ce5f0628c51cd3f1d5aa909e237cb52b113d33ca0c3008af79b5ef85a77c36871181ea97c5203 WHIRLPOOL bd071e35dc9eb93bb9e810297e2403b1fe9350f6896892f01dcb515ee48262a174f4cdc81798a35f87dec072da03fcebc053162ebfa37413d7daed8f247b298e
+MISC ChangeLog 16062 SHA256 4047ac23ce2b7b0c05a1025a5f4205dd82474c99dfdb545229c7a4c538683419 SHA512 3fd7b3de9f2b579ed5b3b1bf702332ad25092534a06d86796165bad231c7f0218be8f867e875448a3d5f690af3404ebce7bc07f318fa984935029591c8d2566f WHIRLPOOL 32d008d12a0a48da26532ce259e0333b2ad90145f89c14b0ab4ce1b566189f38e0b857ff22c351b47c5ec764da9f9c857a7499586f93d45f8db386dc2fabbd60
 MISC metadata.xml 1466 SHA256 98b54f594a8ccb798746be3f384be9857d99083e7573eab6f1c653874cf3e894 SHA512 06352ab873f12a6e0b3d44b4cb491b7ba2a1e12b671a1dc77e88efdead7c54f51f6adbe0faaa466487be50307320e03b260c50e848605fdd4e83fa174ed2e775 WHIRLPOOL 978e11c29c82bff2b8e281c386eefd8d044eb9b5fc8e7ba33a296507b62ed0bd15135c324e343207323f8d58b5a2b7a7a933aee75af52ab9af45c16f15c164ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR4QYpAAoJELp701BxlEWf0N8P/0dvqSe7clel3nHuyQMwyD33
-UyjOfVP9o9h95lB0LCGxRCRM4SLsO53UOHDNve24BCBXTEeteprzOsLCSF5j/5rt
-zSe3Voe416n03KRkHJFHn2WzGdmHUgCqHPaTtaBNu9nCPHhQ5c1zyRb+8zn71NRm
-/hFsl5Bl7J9ZI8syViJqCZjez2Pz+s5wDyTiCx2EscDrmv021fY0XVvhSQWRXTl7
-l2lonCym922AlDTP22b63XK/6l/lz2bQdFJOhiuToyVeGeqBiBpJx457JVl7oyvc
-D18BhDKp5EkPuPk/YFHm1++9rXhFkHVgjMf8baU52nhlaIfk2AhujGqm+virud3L
-JW4uxdBJkQpiLQGJhHYynbvz7GxLUy4fbwcpkgZfWZoDI5R3JsX1cVisfDFAkpXF
-T4trrvk29vVJ1r4MQK2D96E21w0nY9UU0hYNHrnyG8OaeTyV6JyInxxsPljnCiXZ
-NB+THon78FlrmOdbt4EcnMTgNXyUmUnpW1aoAetY7+hOLmjyAYyjUTMUdDCzJozu
-IoWYGEbnMV55WIST/mhlmr2Lbjx6MXwwauC4z2hAwa3gsmmiEaST2p40UvX/Pirp
-tKnAuyn/4Vqj2IblQfcRiI8igal8AETUUrzjQrtldwYk/FQO6c7UyyTaIDaF4iK6
-KNXPZOsVANJbHfr+jyKe
-=k/MB
+iQEcBAEBCAAGBQJR4X/cAAoJEO+t9ga+3I3aRFIH/iQDOHbNDG/WxwoC8QyBuQpZ
+Za/Z1aWKNPFRPO9eaztHWk29DIbm8hmbZqSY0agDoDV1Rwl+5ht1+h3X1r6xrZNh
+JQ4+yKAhUkPtBOjH5ohjnyhYcQ/y8TRQX6Cdkp+31JWPlRgRRH5bmyho8em3NqfI
+HOREZwLdHk176AWYXvJUx9bo77FskowW84vZnefCnd9jb7W5AynJzGFpneOioooy
+iJKiNIRt8a1E0Jq+J4ppGrJ25KSEnUEEWbdcZkRWW0krkwX7UVx0tnVFpazExLfU
++SX2aLRTsoG/oiq9QQG7O1uuXcm2qoExEZCAUlwmm0hxCBzdGydR2v4g2NHm5Jw=
+=XBKF
 -----END PGP SIGNATURE-----
diff --git a/app-office/calligra/calligra-2.6.3.ebuild b/app-office/calligra/calligra-2.6.3.ebuild
deleted file mode 100644
index 25e37c3a7435..000000000000
--- a/app-office/calligra/calligra-2.6.3.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.6.3.ebuild,v 1.7 2013/06/13 12:08:18 xmw Exp $
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=5
-
-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"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="amd64 ~arm 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 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="author 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_author? ( calligra_features_words )
-	calligra_features_kexi? ( calligra_features_sheets )
-	calligra_features_words? ( calligra_features_sheets )
-	calligra_features_krita? ( eigen exif lcms )
-	calligra_features_plan? ( kdepim )
-	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
-	$(add_kdebase_dep kdelibs 'semantic-desktop(+)')
-	dev-lang/perl
-	dev-libs/boost
-	dev-libs/libxml2
-	dev-libs/soprano
-	$(add_kdebase_dep knewstuff)
-	media-libs/libpng
-	sys-libs/zlib
-	>=dev-qt/qtgui-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:0 )
-	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) )
-	opengl? ( virtual/glu )
-	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
-	)
-	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 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 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
-}