Remove masked and Qt 4.6 incompatible version wrt #295573.

(Portage version: 2.2_rc63/cvs/Linux x86_64)

4 files changed, 5 insertions, 156 deletions

diff --git a/kde-base/smoke/ChangeLog b/kde-base/smoke/ChangeLog
index ae684dbdf0c8..09e7e5e41bac 100644
--- a/kde-base/smoke/ChangeLog
+++ b/kde-base/smoke/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/smoke
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/ChangeLog,v 1.93 2010/02/09 18:01:59 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/ChangeLog,v 1.94 2010/03/02 10:27:15 ssuominen Exp $
+
+  02 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> -smoke-4.3.3.ebuild,
+  -smoke-4.3.4.ebuild, -smoke-4.3.5.ebuild:
+  Remove masked and Qt 4.6 incompatible version wrt #295573.
 
   09 Feb 2010; Jonathan Callen <abcd@gentoo.org> metadata.xml:
   Add missing IUSE descriptions
diff --git a/kde-base/smoke/smoke-4.3.3.ebuild b/kde-base/smoke/smoke-4.3.3.ebuild
deleted file mode 100644
index 14e7d65c91c1..000000000000
--- a/kde-base/smoke/smoke-4.3.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-4.3.3.ebuild,v 1.6 2010/01/02 21:09:44 yngwin Exp $
-
-EAPI="2"
-
-KMNAME="kdebindings"
-WEBKIT_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="Scripting Meta Object Kompiler Engine"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="akonadi kdevplatform +phonon qscintilla qwt +semantic-desktop"
-# okular
-
-COMMON_DEPEND="
-	>=kde-base/qimageblitz-0.0.4
-	akonadi? (
-		app-office/akonadi-server
-		$(add_kdebase_dep kdepimlibs)
-	)
-	kdevplatform? ( dev-util/kdevplatform:4 )
-	phonon? ( >=media-sound/phonon-4.3.49[xcb] )
-	qscintilla? ( x11-libs/qscintilla )
-	qwt? ( x11-libs/qwt:5 )
-	semantic-desktop? (
-		dev-libs/soprano
-		$(add_kdebase_dep nepomuk)
-	)
-"
-# okular? ( kde-base/okular)  -- it can't find it anyway
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-"
-RDEPEND="${COMMON_DEPEND}"
-
-KMEXTRACTONLY="kalyptus/"
-
-PATCHES=( "${FILESDIR}"/${PN}-phonon-fix.patch )
-
-src_configure() {
-	local mycmakeargs="
-		$(cmake-utils_use_enable webkit QTWEBKIT_SMOKE)
-		$(cmake-utils_use_enable qwt QWT_SMOKE)
-		$(cmake-utils_use_enable qscintilla QSCI_SMOKE)
-		$(cmake-utils_use_enable phonon PHONON_SMOKE)
-		$(cmake-utils_use_enable kdevplatform KDEVPLATFORM_SMOKE)
-		$(cmake-utils_use_enable semantic-desktop Nepomuk)
-		$(cmake-utils_use_enable semantic-desktop Soprano)
-		$(cmake-utils_use_enable akonadi Kdepimlibs)
-		$(cmake-utils_use_enable akonadi)
-		-DENABLE_Okular=OFF
-	"
-		# $(cmake-utils_use_enable okular)
-	kde4-meta_src_configure
-}
diff --git a/kde-base/smoke/smoke-4.3.4.ebuild b/kde-base/smoke/smoke-4.3.4.ebuild
deleted file mode 100644
index 185447eceff8..000000000000
--- a/kde-base/smoke/smoke-4.3.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-4.3.4.ebuild,v 1.4 2010/01/02 21:09:44 yngwin Exp $
-
-EAPI="2"
-
-KMNAME="kdebindings"
-WEBKIT_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="Scripting Meta Object Kompiler Engine"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="akonadi kdevplatform +phonon qscintilla qwt +semantic-desktop"
-# okular
-
-COMMON_DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
-	>=kde-base/qimageblitz-0.0.4
-	akonadi? ( $(add_kdebase_dep kdepimlibs) )
-	kdevplatform? ( dev-util/kdevplatform:4 )
-	phonon? ( >=media-sound/phonon-4.3.49[xcb] )
-	qscintilla? ( x11-libs/qscintilla )
-	qwt? ( x11-libs/qwt:5 )
-"
-# okular? ( kde-base/okular)  -- it can't find it anyway
-
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-KMEXTRACTONLY="kalyptus/"
-
-PATCHES=( "${FILESDIR}"/${PN}-phonon-fix.patch )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_enable akonadi)
-		$(cmake-utils_use_enable akonadi Kdepimlibs)
-		$(cmake-utils_use_enable kdevplatform KDEVPLATFORM_SMOKE)
-		$(cmake-utils_use_enable phonon PHONON_SMOKE)
-		# $(cmake-utils_use_enable okular)
-		-DENABLE_Okular=OFF
-		$(cmake-utils_use_enable qscintilla QSCI_SMOKE)
-		$(cmake-utils_use_enable qwt QWT_SMOKE)
-		$(cmake-utils_use_enable semantic-desktop Nepomuk)
-		$(cmake-utils_use_enable semantic-desktop Soprano)
-		$(cmake-utils_use_enable webkit QTWEBKIT_SMOKE)
-	)
-	kde4-meta_src_configure
-}
diff --git a/kde-base/smoke/smoke-4.3.5.ebuild b/kde-base/smoke/smoke-4.3.5.ebuild
deleted file mode 100644
index 264a97b2357c..000000000000
--- a/kde-base/smoke/smoke-4.3.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-4.3.5.ebuild,v 1.2 2010/01/27 03:15:09 abcd Exp $
-
-EAPI="2"
-
-KMNAME="kdebindings"
-WEBKIT_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="Scripting Meta Object Kompiler Engine"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="akonadi kdevplatform +phonon qscintilla qwt semantic-desktop"
-# okular
-
-COMMON_DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
-	>=kde-base/qimageblitz-0.0.4
-	akonadi? ( $(add_kdebase_dep kdepimlibs) )
-	kdevplatform? ( dev-util/kdevplatform:4 )
-	phonon? ( >=media-sound/phonon-4.3.49[xcb] )
-	qscintilla? ( x11-libs/qscintilla )
-	qwt? ( x11-libs/qwt:5 )
-"
-# okular? ( kde-base/okular)  -- it can't find it anyway
-
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-KMEXTRACTONLY="kalyptus/"
-
-PATCHES=( "${FILESDIR}"/${PN}-phonon-fix.patch )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_enable akonadi)
-		$(cmake-utils_use_enable akonadi Kdepimlibs)
-		$(cmake-utils_use_enable kdevplatform KDEVPLATFORM_SMOKE)
-		$(cmake-utils_use_enable phonon PHONON_SMOKE)
-		# $(cmake-utils_use_enable okular)
-		-DENABLE_Okular=OFF
-		$(cmake-utils_use_enable qscintilla QSCI_SMOKE)
-		$(cmake-utils_use_enable qwt QWT_SMOKE)
-		$(cmake-utils_use_enable semantic-desktop Nepomuk)
-		$(cmake-utils_use_enable semantic-desktop Soprano)
-		$(cmake-utils_use_enable webkit QTWEBKIT_SMOKE)
-	)
-	kde4-meta_src_configure
-}