[kde-base/kdebindings-csharp] Rename patch, use proper patch name for all versions

6 files changed, 7 insertions, 98 deletions

diff --git a/kde-base/kdebindings-csharp/Manifest b/kde-base/kdebindings-csharp/Manifest
index 0a0776ff11d..42372db73d0 100644
--- a/kde-base/kdebindings-csharp/Manifest
+++ b/kde-base/kdebindings-csharp/Manifest
@@ -1,7 +1,6 @@
-AUX kdebindings-csharp-9999-build-fixes.patch 4750 RMD160 a0a7ff494851da27f34af84f40375cdeaf0b2fb8 SHA1 3c2bee22445c6ebd748c1262ed3ebeb798331dea SHA256 62c21602db7a44cf6c058a89de892074581091f3096627663f46302dadd683d4
-AUX kdebindings-csharp-build-fixes.patch 4461 RMD160 39443416a09e87fdfc533b2656ef851693559f60 SHA1 0c77db7022ee6ff99c5c1d7c5960338c13391264 SHA256 33fe31520b3772fc4d72495ecd534e212942e5e0513c52e24faba1e1356eca7b
+AUX kdebindings-csharp-4.4-build-fixes.patch 4750 RMD160 a0a7ff494851da27f34af84f40375cdeaf0b2fb8 SHA1 3c2bee22445c6ebd748c1262ed3ebeb798331dea SHA256 62c21602db7a44cf6c058a89de892074581091f3096627663f46302dadd683d4
 DIST kdebindings-4.3.98.tar.bz2 5002968 RMD160 65753c1215beb1816ce5dcb227cf32f76282f24c SHA1 bc0a1b90506062114aabd627e59d4b84887e5127 SHA256 5b6e586f09a8a2df7834bc6d6ef8855a8ce977ce16d93569f310f8c212f15c22
-EBUILD kdebindings-csharp-4.3.98.ebuild 1348 RMD160 31fb6af5ec043cacd119d2ed41f549322d010031 SHA1 5c8ffa3b24d3fafd1a815e48d2bddfaa012ac336 SHA256 4d835898f601329302ac899d1735af9ae6e23773866b66dfb38b5afca33e6a77
-EBUILD kdebindings-csharp-4.4.9999.ebuild 1332 RMD160 a48e30c12f3f5d1973ceb23cc8f11865241b6c28 SHA1 0d5d6bc93b100d63cce8f08c3d6e737a2089038f SHA256 764db3438113f41eb5d29a1fc626dc833c45fc220731afb8596379d1ed279acc
-EBUILD kdebindings-csharp-9999.ebuild 1332 RMD160 a48e30c12f3f5d1973ceb23cc8f11865241b6c28 SHA1 0d5d6bc93b100d63cce8f08c3d6e737a2089038f SHA256 764db3438113f41eb5d29a1fc626dc833c45fc220731afb8596379d1ed279acc
+EBUILD kdebindings-csharp-4.3.98.ebuild 1353 RMD160 7fad32a3fc8bb5ca6e1626bef6e42866b8dd09c4 SHA1 e91f66be013c3f548f4c925f9559ccbcc9d92a50 SHA256 ff9b8070f33a39360952227c89fc987bf30581fe47f958a20324e887c01187c3
+EBUILD kdebindings-csharp-4.4.9999.ebuild 1337 RMD160 f1f3815025afddcb20acfc2fec1c5cd09d6e5c8b SHA1 adae7358512ac0afac27f917e9378ee0cae028dc SHA256 8a0513104ef00caf35cc7a59d2a61c6fee9f81ce0d47fc2d1bfa25d8fc12f342
+EBUILD kdebindings-csharp-9999.ebuild 1337 RMD160 f1f3815025afddcb20acfc2fec1c5cd09d6e5c8b SHA1 adae7358512ac0afac27f917e9378ee0cae028dc SHA256 8a0513104ef00caf35cc7a59d2a61c6fee9f81ce0d47fc2d1bfa25d8fc12f342
 MISC metadata.xml 553 RMD160 07bd37da27f0090d0a4a2b2972a0345810590eda SHA1 1062f220972b268718182c5cc282a81546403037 SHA256 771ea1c1f71de07e2b1ea4304a79ba9e0dab1234c2e2a0889cf6944a5d0e3f87
diff --git a/kde-base/kdebindings-csharp/files/kdebindings-csharp-9999-build-fixes.patch b/kde-base/kdebindings-csharp/files/kdebindings-csharp-4.4-build-fixes.patch
index 01c17d4110e..01c17d4110e 100644
--- a/kde-base/kdebindings-csharp/files/kdebindings-csharp-9999-build-fixes.patch
+++ b/kde-base/kdebindings-csharp/files/kdebindings-csharp-4.4-build-fixes.patch
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 be41f99113b..00000000000
--- 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.98.ebuild b/kde-base/kdebindings-csharp/kdebindings-csharp-4.3.98.ebuild
index 6f2955b8a23..bc69e9165cb 100644
--- a/kde-base/kdebindings-csharp/kdebindings-csharp-4.3.98.ebuild
+++ b/kde-base/kdebindings-csharp/kdebindings-csharp-4.3.98.ebuild
@@ -21,7 +21,7 @@ RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY="smoke/"
 
-PATCHES=( "${FILESDIR}"/${P}-build-fixes.patch )
+PATCHES=( "${FILESDIR}"/${PN}-4.4-build-fixes.patch )
 
 pkg_setup() {
 	kde4-meta_pkg_setup
diff --git a/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.9999.ebuild b/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.9999.ebuild
index 0cdca6566d4..7994a247b7c 100644
--- a/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.9999.ebuild
+++ b/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.9999.ebuild
@@ -21,7 +21,7 @@ RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY="smoke/"
 
-PATCHES=( "${FILESDIR}"/${P}-build-fixes.patch )
+PATCHES=( "${FILESDIR}"/${PN}-4.4-build-fixes.patch )
 
 pkg_setup() {
 	kde4-meta_pkg_setup
diff --git a/kde-base/kdebindings-csharp/kdebindings-csharp-9999.ebuild b/kde-base/kdebindings-csharp/kdebindings-csharp-9999.ebuild
index 0cdca6566d4..7994a247b7c 100644
--- a/kde-base/kdebindings-csharp/kdebindings-csharp-9999.ebuild
+++ b/kde-base/kdebindings-csharp/kdebindings-csharp-9999.ebuild
@@ -21,7 +21,7 @@ RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY="smoke/"
 
-PATCHES=( "${FILESDIR}"/${P}-build-fixes.patch )
+PATCHES=( "${FILESDIR}"/${PN}-4.4-build-fixes.patch )
 
 pkg_setup() {
 	kde4-meta_pkg_setup