Remove old wrt bug #428890.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux i686

3 files changed, 12 insertions, 218 deletions

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index df5598abeea8..14c5339f4a6c 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,9 @@
 # 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.60 2012/08/09 13:45:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.61 2012/08/09 14:15:33 johu Exp $
+
+  09 Aug 2012; Johannes Huber <johu@gentoo.org> -calligra-2.4.2.ebuild:
+  Remove old wrt bug #428890.
 
   09 Aug 2012; Agostino Sarubbo <ago@gentoo.org> calligra-2.4.3-r1.ebuild:
   stable for amd64 - #428890
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 751d272438c4..4b74eeb92fe9 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -3,26 +3,24 @@ Hash: SHA256
 
 AUX calligra-2.4.2-marble.patch 6663 SHA256 cf525eb2bc6f2e9f06b4f8376444bf22a137ca2b83889e831a1aedf69f5b5a58 SHA512 d611527ab0b144c50e97c34b50daa25175fd7f62cc2d37edd6603400a1e3998bb0f150869588549038b9f9b5a4f5110dbffae3af736283b17ddc6d1d6f8f8928 WHIRLPOOL a2175e279add5d452b1f176da9636da8fdb89132b1a8aa4817694cd77739483ba800b25316a27db89c1123075f0e5c1c2bbf28a8b2adcb8120ade214d0d3d5a0
 AUX calligra-2.4.3-security-fix-buffer-overflow.patch 1117 SHA256 2c1bbff2695c4c3daa93bf6bd8f8a0b8e93dba911daa646e1c1cdab95814864e SHA512 61bfcb66b5e5628093bbc244e0b635ced96869d066ae083e83b4cf7efa6ea3532084f10c3bf9f9cf78889ab9bea3e98673b5eb2147d6d84de1cde391547a8f1e WHIRLPOOL bd73472213f51dfdcee5e3b21fa80c24c0db443185191d180ecfd0febddcf47e58faf7b18ef1cfb67b4ab1ed1c525722ce2349301dc16f9c143c8ca2f33cda67
-DIST calligra-2.4.2.tar.bz2 119318136 SHA256 0f6b87a013601008f1198791bf743143c60b3aba26e2729c085aa98372459193 SHA512 a9a8fbeeb3269c4aa0e02479a6fe4c384bd38ae47b49a68b241a527ca36e1984e8dbc94953b809f30cfd58f51d5f0b9a1cc262d2a8ba1c45d72ed47c10e880b1 WHIRLPOOL 12a06a3cfae6db3c29766a38d6071e9f91793814286d2dbe620151c452beeef060c8ffb131347afb873115d926aa993ab50dbb4f0fbb1ec9ed6ca66dfe4a2243
 DIST calligra-2.4.3.tar.bz2 119351575 SHA256 8a7dbefdd957217ca4280c1865b319f4fa6c3b38ec8f302e6131a21be8c5946a SHA512 7c8ab608a43d2f386086d4966462521c22d648e5e6f5d11cc88093c8d40d21b3c81d77f0b01ec3781c849560138c7c3d026c017c3653400c92ad8314d1615827 WHIRLPOOL fe5259c0ff220a9020647f686de5afecb7a9c0a2929259435d7f9b7c461a0da3c338d39fbd5bb7dcd53a0f79bab6ac312d68d46c241adab7916a89d86e869974
 DIST calligra-2.4.91.tar.bz2 119280417 SHA256 720fdae969102744677b633bae81d31488f8b49d4cfba89ca848faef5764a8a9 SHA512 6f9ea68ccbd96368bb29c12f10717dcabe5bff7f7f379c9735e62d9b53c2da469a11fe569a2819410a3137acd70d91e97a1c5f7fb239dcc182fc8b3f2de009b3 WHIRLPOOL 66e4e90c025e23065e9366c8b4b983d3c318d32d7d0a61a1c5b74937b2f08982858b7ddd10bd8e46612ec6b664d6e79a246877332c91fe7670da260c7d7e37cd
 DIST calligra-2.4.92.tar.bz2 119204963 SHA256 8842f9353b13ddc9a5e5f86bee7ea57426adaea5e7ccffd8919bbae51b10d421 SHA512 75a3173f8d2a34888cc32d8e6e987e78011a33ba93fd177c3d25aa99d75e4a3cffa9cf6372f7ef45f20658ab30663d0adfcfd2d63e347c27aab2f2aab3f05420 WHIRLPOOL 623e4a1a8b19d58af205202d8bd606698e0df0188bedd301c18ed8f5f463b0882689bdc49aea61cd613789cd03e6bdd2a86a8d0b4916a0a8eba05bf9d00ba229
-EBUILD calligra-2.4.2.ebuild 6130 SHA256 0d32245886a5e6100e0f8fc85203721d3ca1c2a8e1e89f4b70f441024a5f3e49 SHA512 14fbbef46919c2b82b7df8895616b2d005b66fb0fe002b24f2b41be62b85e4e16201dc26cfc9b6aed6b87ccd2b0b1dc932f3ab61be56f645cb9b1fd5f84ef761 WHIRLPOOL bb4222c2474aeff801741bdc8dd40cde9bf1b6d1611002b8cd74d6f762cda467605b5f26f2470129297e9f67f56b3dfab35a4595c4854f65afd98e514b0fd122
 EBUILD calligra-2.4.3-r1.ebuild 6189 SHA256 452e6fbbe7e949b668e32996b6d23977039bdc0a22bee0fb201ffe86b198cbc1 SHA512 b3add68edf967b7980711254c672eef7f9d9fd2cf1ed0e1ebc8630da4f0644508f1a2cf6b1fff6f181c5bf96aa7b96f4a4e505ef3718ac3d5e8456a17d94ffc8 WHIRLPOOL 0b353d3ae1a7d6ef732d0523a49b82d484e3c729a78a8b0f557354b71514426b6bc419b71744495f0297b2f60a3bed0c79049daaa504b18fa637361c066c232a
 EBUILD calligra-2.4.49.9999.ebuild 6138 SHA256 f19e123e9c260aae56e562e0904ec09ee55ce61d090e2c056393801a9dcc7eb0 SHA512 4853ef5d61b62766c164551e4b9b599882c41513d7d6cd79300aef35a66c070a6707998ff1b3a672432974937cd7108b62d67637388fa8dd862e2c511b2f86f4 WHIRLPOOL ae51c5d53674b691836a8149fdd9fab7c5f84abd4a54d992b3ac673042b1b0ba7841ea343195d3aaa7070653e5e4f9f9e09939e2f1eb4a8412b19ba76ed86e41
 EBUILD calligra-2.4.91.ebuild 6381 SHA256 bc5fd1b11b0ecc7ac892ef791f7f4375333fb53982158a1e0bd8723dbed9352a SHA512 a29a9d79f495c8375a4b3fe04aae1087fa0bed4160ede1da4e539c3e803c2523f7cb344a4cd3b669200902df42b20dbc611680971a08236b5660a1cc0a4c6827 WHIRLPOOL 39c3155f06e1e2734917f521e79063465b0412dfa7956f53d5de9cd28afad95e5c81a33b9ffb0ea6b2c83420afe705d7f23795ac3e1a19e46a8f1abd9880c60d
 EBUILD calligra-2.4.92.ebuild 6380 SHA256 3cd54482cd34ca16d9bd3405f25ab65574acff827594178374430386dcd80065 SHA512 0851483aa1d5aed6b93b9e3c67652f1e9185893084e5a31629b00bc16f09189ecc3542912cd9c6280d54525083769865f1d265ceeaf0a9195687663a34546dd6 WHIRLPOOL 2cc6a0172545be2fc75919f96590bf29be02548a2a2241e9c802e1eef969a63df088b5c95433ee443d47d70f8b5758925b1d5ed8a83dda57584884db7574f2bf
 EBUILD calligra-9999.ebuild 6380 SHA256 5ed0fdf62e7b9b5be6dbccf19255dab4d90ac490f9a1ad6022e716bde3ef344f SHA512 536e431d62bf9548b9966bb2893b7a358d68bf5796a45e3b0fd1aa10e93cb19ee8321443e2278eb7adba615e8c2d4dce5ec91bbad4e38e55febcbbcb9597d685 WHIRLPOOL e7cd91295ac29f5a395f28d4b3b281fa2195cb4c5246faa37786ebfccb934faf15626e77ebd18060f0e0b7808ecaba976ed19ef29e8a8ff10df96e0cb785da78
-MISC ChangeLog 10631 SHA256 2a04792f6c9a4ea7a373e88699057cbf92055dba6ec39da7ce36c51a3ecf472e SHA512 625949809a251d7f7696b4a4ab8f641bc926640ff80fe6d86435fcd5ac6dd35c991325050164c2e0e2791c3ca8a393aa756a2083759f26d234ee12d6589fd5fb WHIRLPOOL b95837fd6a282785c2ed054ffa95f470f5b7106f3d3d816dcf5d19fe578fbc5df1c16d59e79a7896fe66552780b943e0dc517a6acbbf94fb54c515021b3e6a22
+MISC ChangeLog 10735 SHA256 68a6dc9ff788d1e20fb849054e0c4c0998faa17e0f6c7c8084da41cd2deab602 SHA512 b0c7bccb07dae56feae095805a498bfe7da671c75ff69caeeb9bdc290bdef3ae703c9ecb111ab37d553487afcf7a088b0daf367d4a9afc24e5605dd4218c3365 WHIRLPOOL c69bda97bfd1cd1383949e4dfba915061aaeff28615e08f4b508f73bc90e15a9670e4f0a37dbdf32262fe205c3a5ffca10db546709707d3a1d47631f40232315
 MISC metadata.xml 1600 SHA256 c33b660eff45a7075f2271b50dff8df9e7d1e6725ad814c4376bbc6c93290864 SHA512 c34c966e5a3232d1fe97dc720869e6d9f9ea8fe51759fa6a86218d2756f3f81e0f96a66f8568d4413beac1b3d536ad691128358560be2fd83cf42b369283d78a WHIRLPOOL 568657d6e0adea15be505af8f9ef4be744e77ce842b03b89fec699237a75eaf4a3c233cddda352279e6da672372e2ae5d19f7d3a730cb6e4812ecc7127a1c775
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQI76AAAoJEOTDgjZ80txduBsIAKidAno91NCtfG4kwkCUCyXA
-VNqM6aFa2dFIDLWwB2Z9ZCLO5cw9sTfJ5cw8lqKdhIJn6yntAJlC2oGu2Fex3e3v
-gtTxwsUIa/hTb/hgFXZxiyIQj88f7XowwHk+tnQQ9LsifJkuykKeE5RELnmpkPHq
-g0TrH76vAqi4nlkavyIwF8V5hPYv7bbYs2nv3wsQqHiWn0D6206baVG/J0nDSbcI
-gLnoHciEdBVPL9kJvtvoZqwfvHMWpweKLWw1HeAzsgYaqqpEFB4TasXcI3kApZPV
-6s2tDpbO4I4dk87uwd+wnWRvSvNuyTgDv83it0fbgPRF31XXQAGvPEubTSbsLx0=
-=4qtV
+iQEcBAEBCAAGBQJQI8dCAAoJEO+t9ga+3I3aqbcIANIkIwoK3Fr1OGizPCdu5DkW
+WL3dz4MuRa/elf2ROYJOb0c6C2tcMWkNoaUvcDY07qlYyxGpJq+zJrRigeG77ODF
+omB6t1sA70Vkw3pt/MR/flbv3E8en7Z6s9eE8QyGSQG1qkr9vmEkynj0L9EEBjTj
+KZxZs8GATSevfGsPrTymJs81aGh6FV0J6ZJSWIxU9i7w0Jdlrxj4MycF/0Ymro/+
+pi1AJ0PJumw5BSWAW3EEuoApU7lYOllTIbYipwHEvswRpSpOHdPGgftrU46U1Cxp
+ErR6FKlRintDjOgPHbGpXAlP355QXdYCPZ/0uLKiw5yL31YrP4L+D+XlP9ufNJo=
+=t0Tx
 -----END PGP SIGNATURE-----
diff --git a/app-office/calligra/calligra-2.4.2.ebuild b/app-office/calligra/calligra-2.4.2.ebuild
deleted file mode 100644
index efe4dc61133d..000000000000
--- a/app-office/calligra/calligra-2.4.2.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# 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.7 2012/07/19 16:18:40 kensington 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 versionator
-
-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:4
-	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 'semantic-desktop') )
-	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}"
-PDEPEND=">=app-office/calligra-l10n-$(get_version_component_range 1-2)"
-
-RESTRICT=test
-# bug 394273
-
-PATCHES=( "${FILESDIR}/${PN}-2.4.2-marble.patch" )
-
-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
-}