Remove masked and Qt 4.6 incompatible version wrt #295573.

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

5 files changed, 6 insertions, 273 deletions

diff --git a/kde-base/kdebindings-csharp/ChangeLog b/kde-base/kdebindings-csharp/ChangeLog
index 674aa2671729..aa2e57bf6f8c 100644
--- a/kde-base/kdebindings-csharp/ChangeLog
+++ b/kde-base/kdebindings-csharp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdebindings-csharp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/ChangeLog,v 1.22 2010/02/09 16:56:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/ChangeLog,v 1.23 2010/03/02 10:28:39 ssuominen Exp $
+
+  02 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  -kdebindings-csharp-4.3.3.ebuild, -kdebindings-csharp-4.3.4.ebuild,
+  -kdebindings-csharp-4.3.5.ebuild:
+  Remove masked and Qt 4.6 incompatible version wrt #295573.
 
   09 Feb 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   kdebindings-csharp-4.4.0.ebuild,
diff --git a/kde-base/kdebindings-csharp/files/kdebindings-csharp-build-fixes.patch b/kde-base/kdebindings-csharp/files/kdebindings-csharp-build-fixes.patch
deleted file mode 100644
index be41f99113bb..000000000000
--- a/kde-base/kdebindings-csharp/files/kdebindings-csharp-build-fixes.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- csharp/qtscript/CMakeLists.txt
-+++ csharp/qtscript/CMakeLists.txt
-@@ -15,7 +15,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
- 	${CMAKE_CURRENT_SOURCE_DIR}/../qyoto/src ${QT_INCLUDES})
- LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
- ADD_LIBRARY(qtscript-sharp MODULE ${SRC_CPP})
--TARGET_LINK_LIBRARIES(qtscript-sharp smokeqt smokeqtscript qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+TARGET_LINK_LIBRARIES(qtscript-sharp smokeqt smokeqtscript qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSCRIPT_LIBRARY})
- 
- SET(CS_FLAGS -r:${LIBRARY_OUTPUT_PATH}/qt-dotnet.dll -warn:0 -keyfile:${KEYFILE})
- ADD_CS_LIBRARY(qtscript "${SRC_CS}" ALL)
---- csharp/qtwebkit/CMakeLists.txt
-+++ csharp/qtwebkit/CMakeLists.txt
-@@ -14,7 +14,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
- 	${CMAKE_CURRENT_SOURCE_DIR}/../qyoto/src ${QT_INCLUDES})
- LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
- ADD_LIBRARY(qtwebkit-sharp MODULE ${SRC_CPP})
--TARGET_LINK_LIBRARIES(qtwebkit-sharp smokeqt smokeqtwebkit qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+TARGET_LINK_LIBRARIES(qtwebkit-sharp smokeqt smokeqtwebkit qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTWEBKIT_LIBRARY})
- 
- SET(CS_FLAGS -r:${LIBRARY_OUTPUT_PATH}/qt-dotnet.dll -warn:0 -keyfile:${KEYFILE})
- ADD_CS_LIBRARY(qtwebkit "${SRC_CS}" ALL)
---- csharp/qyoto/CMakeLists.txt
-+++ csharp/qyoto/CMakeLists.txt
-@@ -39,11 +39,11 @@ INCLUDE_DIRECTORIES (${QT_INCLUDES} ${CM
- LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
- 
- ADD_LIBRARY (qyotoshared SHARED ${SRC_QYOTO_SHARED})
--TARGET_LINK_LIBRARIES (qyotoshared smokeqt ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+TARGET_LINK_LIBRARIES (qyotoshared smokeqt ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY})
- set_target_properties(qyotoshared PROPERTIES VERSION 1.0.0 SOVERSION 1)
- 
- ADD_LIBRARY (qyoto MODULE ${SRC_QYOTO})
--TARGET_LINK_LIBRARIES (qyoto qyotoshared smokeqt ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+TARGET_LINK_LIBRARIES (qyoto qyotoshared smokeqt ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY})
- 
- SET(CS_FLAGS -debug -define:DEBUG -unsafe -warn:0 -keyfile:${KEYFILE})
- ADD_CS_LIBRARY(qt-dotnet "${SRC_CS_QYOTO}" ALL)
---- csharp/soprano/CMakeLists.txt
-+++ csharp/soprano/CMakeLists.txt
-@@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
- LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
- ADD_LIBRARY(soprano-sharp MODULE ${SRC_CPP})
- ADD_DEPENDENCIES(soprano-sharp smokesoprano)
--TARGET_LINK_LIBRARIES(soprano-sharp smokeqt smokesoprano qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+TARGET_LINK_LIBRARIES(soprano-sharp smokeqt smokesoprano qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${SOPRANO_LIBRARIES})
- 
- SET(CS_FLAGS -r:${LIBRARY_OUTPUT_PATH}/qt-dotnet.dll -warn:0 -keyfile:${KEYFILE})
- ADD_CS_LIBRARY(soprano "${SRC_CS}" ALL)
---- csharp/CMakeLists.txt	2009-09-02 13:30:38.045355025 +0300
-+++ csharp/CMakeLists.txt	2009-09-02 13:31:40.426071410 +0300
-@@ -3,6 +3,7 @@
- OPTION(ENABLE_QTTEST "build QtTest" ON)
- OPTION(ENABLE_QTUITOOLS_SHARP "build QtUiTools" ON)
- OPTION(ENABLE_QTWEBKIT_SHARP "build QtWebKit" ON)
-+OPTION(ENABLE_PLASMA_SHARP "build PlasmaSharp" ON)
- OPTION(ENABLE_PHONON_SHARP "build PhononSharp" OFF)
- OPTION(ENABLE_QSCINTILLA_SHARP "build QScintillaSharp" OFF)
- OPTION(ENABLE_KHTML_SHARP "build KHTML" ON)
-@@ -15,7 +16,8 @@
- set(QTTEST_ENABLED "no")
- SET(QTWEBKIT_ENABLED "no")
- SET(QTUITOOLS_ENABLED "no")
--SET(QTWEBKIT_ENABLED "no")
-+SET(QTWEBKIT_SHARP_ENABLED "no")
-+SET(PLASMA_SHARP_ENABLED "no")
- SET(PHONON_SHARP_ENABLED "no")
- SET(QSCINTILLA_SHARP_ENABLED "no")
- SET(AKONADI_ENABLED "no")
-@@ -126,8 +128,10 @@
-         set(AKONADI_ENABLED "yes")
-     endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
- 	
--    SET(PLASMA_SHARP_ENABLED "yes")
--    ADD_SUBDIRECTORY(plasma)
-+    IF(ENABLE_PLASMA_SHARP)
-+	SET(PLASMA_SHARP_ENABLED "yes")
-+	ADD_SUBDIRECTORY(plasma)
-+    ENDIF(ENABLE_PLASMA_SHARP)
- 
-     ENDIF (GMCS_EXECUTABLE AND GACUTIL_EXECUTABLE AND MONO_CECIL_FOUND)
- endif(ENABLE_QYOTO)
-@@ -138,6 +142,7 @@
- message(STATUS "Build SopranoSharp... " ${SOPRANO_SHARP_ENABLED})
- message(STATUS "Build NepomukSharp... " ${NEPOMUK_SHARP_ENABLED})
- message(STATUS "Build PlasmaSharp... " ${PLASMA_SHARP_ENABLED})
-+message(STATUS "Build QtWebkitSharp... " ${QTWEBKIT_SHARP_ENABLED})
- message(STATUS "Build Kimono... " ${KIMONO_ENABLED})
- message(STATUS "Build KHTMLSharp... " ${KHTML_SHARP_ENABLED})
- message(STATUS "Build KTextEditorSharp... " ${KHTML_SHARP_ENABLED})
diff --git a/kde-base/kdebindings-csharp/kdebindings-csharp-4.3.3.ebuild b/kde-base/kdebindings-csharp/kdebindings-csharp-4.3.3.ebuild
deleted file mode 100644
index c1435285834a..000000000000
--- a/kde-base/kdebindings-csharp/kdebindings-csharp-4.3.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/kdebindings-csharp-4.3.3.ebuild,v 1.4 2009/12/10 14:59:28 fauli Exp $
-
-EAPI="2"
-
-KMNAME="kdebindings"
-KMMODULE="csharp"
-WEBKIT_REQUIRED="optional"
-inherit kde4-meta mono
-
-DESCRIPTION="C# bindings for KDE and Qt"
-KEYWORDS="amd64 ppc x86"
-IUSE="akonadi +phonon plasma qscintilla"
-
-COMMON_DEPEND="
-	dev-lang/mono
-	$(add_kdebase_dep smoke 'akonadi?,phonon?,qscintilla?,webkit?')
-"
-
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-KMEXTRACTONLY="smoke/"
-
-PATCHES=( "${FILESDIR}"/${PN}-build-fixes.patch )
-
-pkg_setup() {
-	kde4-meta_pkg_setup
-
-	if use plasma && ! use webkit; then
-		eerror
-		eerror "The plasma USE flag requires the webkit USE flag to be enabled."
-		eerror
-		eerror "Please enable webkit or disable plasma."
-		die "plasma requires webkit"
-	fi
-}
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	sed -i "/add_subdirectory( examples )/ s:^:#:" csharp/plasma/CMakeLists.txt
-}
-
-src_configure() {
-	local mycmakeargs="
-		$(cmake-utils_use_enable webkit QTWEBKIT_SHARP)
-		$(cmake-utils_use_enable plasma PLASMA_SHARP)
-		$(cmake-utils_use_enable phonon PHONON_SHARP)
-		$(cmake-utils_use_enable qscintilla QSCINTILLA_SHARP)
-		$(cmake-utils_use_enable akonadi KdepimLibs)
-		$(cmake-utils_use_enable akonadi)
-	"
-	kde4-meta_src_configure
-}
-
-src_compile() {
-	# Parallel builds seem broken, check later
-	MAKEOPTS=-j1
-	kde4-meta_src_compile
-}
diff --git a/kde-base/kdebindings-csharp/kdebindings-csharp-4.3.4.ebuild b/kde-base/kdebindings-csharp/kdebindings-csharp-4.3.4.ebuild
deleted file mode 100644
index 291f316c9fbd..000000000000
--- a/kde-base/kdebindings-csharp/kdebindings-csharp-4.3.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/kdebindings-csharp-4.3.4.ebuild,v 1.2 2009/12/22 23:43:55 abcd Exp $
-
-EAPI="2"
-
-KMNAME="kdebindings"
-KMMODULE="csharp"
-WEBKIT_REQUIRED="optional"
-inherit kde4-meta mono
-
-DESCRIPTION="C# bindings for KDE and Qt"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="akonadi +phonon plasma qscintilla"
-
-DEPEND="
-	dev-lang/mono
-	$(add_kdebase_dep smoke 'akonadi?,phonon?,qscintilla?,webkit?')
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="smoke/"
-
-PATCHES=( "${FILESDIR}"/${PN}-build-fixes.patch )
-
-pkg_setup() {
-	kde4-meta_pkg_setup
-
-	if use plasma && ! use webkit; then
-		eerror
-		eerror "The plasma USE flag requires the webkit USE flag to be enabled."
-		eerror
-		eerror "Please enable webkit or disable plasma."
-		die "plasma requires webkit"
-	fi
-}
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	sed -i "/add_subdirectory( examples )/ s:^:#:" csharp/plasma/CMakeLists.txt
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_enable webkit QTWEBKIT_SHARP)
-		$(cmake-utils_use_enable plasma PLASMA_SHARP)
-		$(cmake-utils_use_enable phonon PHONON_SHARP)
-		$(cmake-utils_use_enable qscintilla QSCINTILLA_SHARP)
-		$(cmake-utils_use_enable akonadi KdepimLibs)
-		$(cmake-utils_use_enable akonadi)
-	)
-	kde4-meta_src_configure
-}
-
-src_compile() {
-	# Parallel builds seem broken, check later
-	MAKEOPTS=-j1
-	kde4-meta_src_compile
-}
diff --git a/kde-base/kdebindings-csharp/kdebindings-csharp-4.3.5.ebuild b/kde-base/kdebindings-csharp/kdebindings-csharp-4.3.5.ebuild
deleted file mode 100644
index 257c793fbd74..000000000000
--- a/kde-base/kdebindings-csharp/kdebindings-csharp-4.3.5.ebuild
+++ /dev/null
@@ -1,60 +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/kdebindings-csharp/kdebindings-csharp-4.3.5.ebuild,v 1.1 2010/01/25 15:04:47 scarabeus Exp $
-
-EAPI="2"
-
-KMNAME="kdebindings"
-KMMODULE="csharp"
-WEBKIT_REQUIRED="optional"
-inherit kde4-meta mono
-
-DESCRIPTION="C# bindings for KDE and Qt"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="akonadi +phonon plasma qscintilla"
-
-DEPEND="
-	dev-lang/mono
-	$(add_kdebase_dep smoke 'akonadi?,phonon?,qscintilla?,webkit?')
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="smoke/"
-
-PATCHES=( "${FILESDIR}"/${PN}-build-fixes.patch )
-
-pkg_setup() {
-	kde4-meta_pkg_setup
-
-	if use plasma && ! use webkit; then
-		eerror
-		eerror "The plasma USE flag requires the webkit USE flag to be enabled."
-		eerror
-		eerror "Please enable webkit or disable plasma."
-		die "plasma requires webkit"
-	fi
-}
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	sed -i "/add_subdirectory( examples )/ s:^:#:" csharp/plasma/CMakeLists.txt
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_enable webkit QTWEBKIT_SHARP)
-		$(cmake-utils_use_enable plasma PLASMA_SHARP)
-		$(cmake-utils_use_enable phonon PHONON_SHARP)
-		$(cmake-utils_use_enable qscintilla QSCINTILLA_SHARP)
-		$(cmake-utils_use_enable akonadi KdepimLibs)
-		$(cmake-utils_use_enable akonadi)
-	)
-	kde4-meta_src_configure
-}
-
-src_compile() {
-	# Parallel builds seem broken, check later
-	MAKEOPTS=-j1
-	kde4-meta_src_compile
-}