KDE SC 4.6.2 version bump. Drop 4.6.{0,1} and 4.5.5. This is our stable candidate so test and test more. Force due to some unmet deps. Filled as bug #362305.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 8 insertions, 106 deletions

diff --git a/kde-base/okular/ChangeLog b/kde-base/okular/ChangeLog
index 4c48175f9f33..4366fb807746 100644
--- a/kde-base/okular/ChangeLog
+++ b/kde-base/okular/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/okular
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.93 2011/03/04 18:00:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.94 2011/04/06 14:19:20 scarabeus Exp $
+
+*okular-4.6.2 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -okular-4.5.5.ebuild,
+  -okular-4.6.0.ebuild, -okular-4.6.1.ebuild, +okular-4.6.2.ebuild:
+  Version bump KDE SC 4.6.2
 
 *okular-4.6.1 (04 Mar 2011)
 
diff --git a/kde-base/okular/okular-4.5.5.ebuild b/kde-base/okular/okular-4.5.5.ebuild
deleted file mode 100644
index 95e2de7734a9..000000000000
--- a/kde-base/okular/okular-4.5.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.5.5.ebuild,v 1.1 2011/01/10 11:53:47 tampakrap Exp $
-
-EAPI="3"
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegraphics"
-inherit kde4-meta
-
-DESCRIPTION="Okular is an universal document viewer based on KPDF for KDE 4."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="chm crypt debug djvu ebook +jpeg +ps +pdf +tiff"
-
-DEPEND="
-	media-libs/freetype
-	sys-libs/zlib
-	chm? ( dev-libs/chmlib )
-	crypt? ( app-crypt/qca:2 )
-	djvu? ( app-text/djvu )
-	ebook? ( app-text/ebook-tools )
-	jpeg? ( virtual/jpeg:0 )
-	pdf? ( >=app-text/poppler-0.12.3-r3[lcms,qt4,-exceptions] )
-	ps? ( app-text/libspectre )
-	tiff? ( media-libs/tiff )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="libs/mobipocket"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with chm)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with djvu DjVuLibre)
-		$(cmake-utils_use_with ebook EPub)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with ps LibSpectre)
-		$(cmake-utils_use_with pdf PopplerQt4)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with tiff)
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	insinto "${KDEDIR}"/share/apps/cmake/modules
-	doins "${S}"/cmake/modules/FindOkular.cmake
-
-	kde4-meta_src_install
-}
diff --git a/kde-base/okular/okular-4.6.0.ebuild b/kde-base/okular/okular-4.6.0.ebuild
deleted file mode 100644
index 1e9f7bb4cbd3..000000000000
--- a/kde-base/okular/okular-4.6.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.6.0.ebuild,v 1.1 2011/01/26 20:29:22 alexxy Exp $
-
-EAPI="3"
-
-KDE_HANDBOOK="optional"
-KMNAME="kdegraphics"
-inherit kde4-meta
-
-DESCRIPTION="Okular is an universal document viewer based on KPDF for KDE 4."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="chm crypt debug djvu ebook +jpeg +ps +pdf +tiff"
-
-DEPEND="
-	media-libs/freetype
-	sys-libs/zlib
-	chm? ( dev-libs/chmlib )
-	crypt? ( app-crypt/qca:2 )
-	djvu? ( app-text/djvu )
-	ebook? ( app-text/ebook-tools )
-	jpeg? ( virtual/jpeg:0 )
-	pdf? ( >=app-text/poppler-0.12.3-r3[lcms,qt4,-exceptions] )
-	ps? ( app-text/libspectre )
-	tiff? ( media-libs/tiff )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="libs/mobipocket"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with chm)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with djvu DjVuLibre)
-		$(cmake-utils_use_with ebook EPub)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with ps LibSpectre)
-		$(cmake-utils_use_with pdf PopplerQt4)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with tiff)
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	insinto "${KDEDIR}"/share/apps/cmake/modules
-	doins "${S}"/cmake/modules/FindOkular.cmake
-
-	kde4-meta_src_install
-}
diff --git a/kde-base/okular/okular-4.6.1.ebuild b/kde-base/okular/okular-4.6.2.ebuild
index 5acedc6230a8..a0e79d88ba4b 100644
--- a/kde-base/okular/okular-4.6.1.ebuild
+++ b/kde-base/okular/okular-4.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.6.1.ebuild,v 1.1 2011/03/04 18:00:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.6.2.ebuild,v 1.1 2011/04/06 14:19:20 scarabeus Exp $
 
 EAPI=3