Drop non-applicable patch.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 12 insertions, 103 deletions

diff --git a/kde-base/kdebindings-csharp/ChangeLog b/kde-base/kdebindings-csharp/ChangeLog
index 1ccba39f4d41..674aa2671729 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.21 2010/02/09 06:58:45 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/ChangeLog,v 1.22 2010/02/09 16:56:22 scarabeus Exp $
+
+  09 Feb 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  kdebindings-csharp-4.4.0.ebuild,
+  -files/kdebindings-csharp-4.4-build-fixes.patch:
+  Drop non-applicable patch.
 
   09 Feb 2010; Jonathan Callen <abcd@gentoo.org> metadata.xml:
   Update metadata.xml from overlay
diff --git a/kde-base/kdebindings-csharp/Manifest b/kde-base/kdebindings-csharp/Manifest
index bb981e0139c1..bfef5c914aa9 100644
--- a/kde-base/kdebindings-csharp/Manifest
+++ b/kde-base/kdebindings-csharp/Manifest
@@ -1,7 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX kdebindings-csharp-4.4-build-fixes.patch 4750 RMD160 a0a7ff494851da27f34af84f40375cdeaf0b2fb8 SHA1 3c2bee22445c6ebd748c1262ed3ebeb798331dea SHA256 62c21602db7a44cf6c058a89de892074581091f3096627663f46302dadd683d4
 AUX kdebindings-csharp-build-fixes.patch 4461 RMD160 39443416a09e87fdfc533b2656ef851693559f60 SHA1 0c77db7022ee6ff99c5c1d7c5960338c13391264 SHA256 33fe31520b3772fc4d72495ecd534e212942e5e0513c52e24faba1e1356eca7b
 DIST kdebindings-4.3.3.tar.bz2 4881799 RMD160 587fd37cc2369a39fb1cf97e164afc40294f97b2 SHA1 34ddcfd5d338962b8623b9dd9c2b850a621e4040 SHA256 d182e110201ac9dc63dbdbc1baecf845b90a56d6ba2c9c0a5b34dee211358f8d
 DIST kdebindings-4.3.4.tar.bz2 4880929 RMD160 71bf95f667a5e3d7b165987e582ef9deafad0145 SHA1 0c7bf45bd3d81bf6aa1d2b085c17b4ce925c656b SHA256 bd07532289e9caa5b56d6adf8008babbe301d6e48bc378b4f3a9e96f685f3b1e
@@ -10,13 +9,13 @@ DIST kdebindings-4.4.0.tar.bz2 5004654 RMD160 5afaef8c4e71796baf0154528a1e8d9601
 EBUILD kdebindings-csharp-4.3.3.ebuild 1506 RMD160 53b3ee70d073bcd2fc4c75abacb04158a02493fd SHA1 143ac25861b5d23e299c276a2cb20e5ea90a1e60 SHA256 88e71265467f15f0cc86ffac5186c0cd5417cec6a3a96aefe59bca8893973053
 EBUILD kdebindings-csharp-4.3.4.ebuild 1461 RMD160 662a451ae293ce4872e59c5c00820b66a4cade40 SHA1 57368e96dfcee1e2216d6a145d53bf31de8f2415 SHA256 ee121163f2f0c1bbf0914d38bcbe1ba8569a9a66f120b1c425b2134dd0ecfccb
 EBUILD kdebindings-csharp-4.3.5.ebuild 1466 RMD160 4979be44a289724e5fb488d6ea8a23dc22c26c76 SHA1 e38be1473fcc937c7fdcbea067c07b5a763bdee0 SHA256 9343c8427f553ff48a600af2f21a15eb534b5e441a971e0b18addd85813f95d1
-EBUILD kdebindings-csharp-4.4.0.ebuild 1474 RMD160 99cb618b657a5bff3fdad746aa0ce167270fe5bf SHA1 0939af947267b16b4b5ce8ad38cc18939c8adb0b SHA256 e46fa75a950cd69e66bab13c8750d9098e7e5c850b3f35354f37835dd1af4943
-MISC ChangeLog 3005 RMD160 506ca3097df647d3b2d3973a7109c339d67100ef SHA1 df96350b0e211fe6cab6737fd896689254fa1d31 SHA256 97feb6eb631f669456f6e7ca0de1b830164f213d34b6fb9eb1d332961c611f48
+EBUILD kdebindings-csharp-4.4.0.ebuild 1422 RMD160 409cda86db714aaa3cb660000ac825e0dfff80d3 SHA1 57c27fbb80744c2f09d14753e41eb5d28e1bf717 SHA256 daeb0f5f9191cd8525d790c61f974d4628e715f3cbd6340a4b35d6defcefbe30
+MISC ChangeLog 3181 RMD160 d34adbd8b569d40055955986873c6882cbaa1479 SHA1 97c2cd67cdd1f7fc29637902840bd55123c48114 SHA256 1e9032ac33f22d69077b1983996957d831eb505b5a6f440d6060d6b46ceecd52
 MISC metadata.xml 553 RMD160 07bd37da27f0090d0a4a2b2972a0345810590eda SHA1 1062f220972b268718182c5cc282a81546403037 SHA256 771ea1c1f71de07e2b1ea4304a79ba9e0dab1234c2e2a0889cf6944a5d0e3f87
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktxB6sACgkQOypDUo0oQOofugCgud45045dh9Luhm5hgY+sJ+Xr
-ePYAn1lzsrWVvG2u2YKChksZPQtSudva
-=9YPR
+iEYEARECAAYFAktxk4AACgkQHB6c3gNBRYec/ACgt7l/N3IGwuvijxJ0xQC13c+J
+BOMAoLXPXvcacx9IASfaCzrRdYTz6yrs
+=fElx
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdebindings-csharp/files/kdebindings-csharp-4.4-build-fixes.patch b/kde-base/kdebindings-csharp/files/kdebindings-csharp-4.4-build-fixes.patch
deleted file mode 100644
index 01c17d4110e4..000000000000
--- a/kde-base/kdebindings-csharp/files/kdebindings-csharp-4.4-build-fixes.patch
+++ /dev/null
@@ -1,93 +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 smokeqtscript qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+TARGET_LINK_LIBRARIES(qtscript-sharp 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 smokeqtwebkit qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+TARGET_LINK_LIBRARIES(qtwebkit-sharp 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,13 +39,13 @@ INCLUDE_DIRECTORIES (${QT_INCLUDES} ${CM
- LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
- 
- ADD_LIBRARY (qyotoshared SHARED ${SRC_QYOTO_SHARED})
- TARGET_LINK_LIBRARIES (qyotoshared smokeqtcore smokeqtgui smokeqtxml smokeqtopengl smokeqtsql smokeqtnetwork smokeqtnetwork smokeqtdbus smokeqtsvg
--                       ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+                       ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QNETWORK_LIBRARY})
- set_target_properties(qyotoshared PROPERTIES VERSION 1.0.0 SOVERSION 1 COMPILE_DEFINITIONS QYOTOSHARED_BUILDING)
- 
- ADD_LIBRARY (qyoto MODULE ${SRC_QYOTO})
- TARGET_LINK_LIBRARIES (qyoto qyotoshared
-                        smokeqtcore smokeqtgui smokeqtxml smokeqtopengl smokeqtsql smokeqtnetwork smokeqtnetwork smokeqtdbus smokeqtsvg
--                       ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+                       ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY})
- 
- CSHARP_ADD_LIBRARY(qt-dotnet ${SRC_CS_QYOTO} COMPILE_FLAGS /warn:0 "/keyfile:${KEYFILE}" UNSAFE)
- SET_PROPERTY(TARGET qt-dotnet PROPERTY pkg-config_template_basename "qyoto")
---- 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 smokesoprano qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+TARGET_LINK_LIBRARIES(soprano-sharp 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")
-@@ -102,8 +104,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 (CMAKE_CSharp_COMPILER_LOADED)
- endif(ENABLE_QYOTO)
-@@ -114,6 +118,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.4.0.ebuild b/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.0.ebuild
index edf7ad1f8390..8e1fafcf3156 100644
--- a/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.0.ebuild
+++ b/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.0.ebuild
@@ -1,6 +1,6 @@
 # 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.4.0.ebuild,v 1.1 2010/02/09 00:21:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.0.ebuild,v 1.2 2010/02/09 16:56:22 scarabeus Exp $
 
 EAPI="2"
 
@@ -21,8 +21,6 @@ RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY="smoke/"
 
-PATCHES=( "${FILESDIR}"/${PN}-4.4-build-fixes.patch )
-
 pkg_setup() {
 	kde4-meta_pkg_setup