[gentoo-commits] proj/kde:master commit in: kde-base/nepomuk-core/files/, kde-base/nepomuk-core/

["Johannes Huber" <johu@gentoo.org>]

commit:     b1827c1a10e4b92b66d4f64aea5aaaac35dea82a
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  1 16:12:58 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jun  1 16:12:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b1827c1a

[[kde-base/nepomuk-core] Drop patches, now included in re-packed tarball.

(Portage version: 2.2.0_alpha108/git/Linux x86_64, unsigned Manifest commit)

---
 .../files/nepomuk-core-4.8.80-remove-rcgen.patch   |   23 -------------------
 .../files/nepomuk-core-4.8.80-workspace.patch      |   24 --------------------
 kde-base/nepomuk-core/nepomuk-core-4.8.80.ebuild   |    5 ----
 3 files changed, 0 insertions(+), 52 deletions(-)

diff --git a/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-remove-rcgen.patch b/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-remove-rcgen.patch
deleted file mode 100644
index 0f96371..0000000
--- a/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-remove-rcgen.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 6ec4e729e2426dac37e9e27932d4d9e579d53ba4
-Author: Vishesh Handa <handa.vish@gmail.com>
-Date:   Fri May 25 19:57:26 2012 +0530
-
-    Do not compile and install the rcgen
-    
-    Conflicts with kdelibs.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5c7c8ab..3bd49c2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -57,7 +57,9 @@ include_directories(
- )
- 
- add_subdirectory(libnepomukcore)
--add_subdirectory(rcgen)
-+# Do not install rcgen, it's installed by kdelibs
-+# If it needs to be installed then we need to change the name
-+#add_subdirectory(rcgen)
- add_subdirectory(ontologies)
- add_subdirectory(common)
- add_subdirectory(server)

diff --git a/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-workspace.patch b/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-workspace.patch
deleted file mode 100644
index 24616b4..0000000
--- a/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-workspace.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit b60025c6d5d6201b2bbe6881f11c431ec2671677
-Author: Vishesh Handa <handa.vish@gmail.com>
-Date:   Fri May 25 23:31:47 2012 +0530
-
-    Do not depend on KDE4Workspace
-    
-    Weird cyclic dependency. Plus we do not need anything from the
-    workspace.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3bd49c2..32e1909 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,8 +14,8 @@ set(CMAKE_NEPOMUK_CORE_VERSION_STRING "${CMAKE_NEPOMUK_CORE_VERSION_MAJOR}.${CMA
- set(KDE_MIN_VERSION "4.7.00")
- find_package(KDE4 4.7.00 REQUIRED)
- include(KDE4Defaults)
--find_package(KDE4Workspace)
--include(MacroLibrary)
-+#find_package(KDE4Workspace)
-+#include(MacroLibrary)
- 
- set(SDO_MIN_VERSION "0.7")
- find_package(SharedDesktopOntologies)

diff --git a/kde-base/nepomuk-core/nepomuk-core-4.8.80.ebuild b/kde-base/nepomuk-core/nepomuk-core-4.8.80.ebuild
index 741c13e..e43b6df 100644
--- a/kde-base/nepomuk-core/nepomuk-core-4.8.80.ebuild
+++ b/kde-base/nepomuk-core/nepomuk-core-4.8.80.ebuild
@@ -21,8 +21,3 @@ add_blocker nepomuk '<4.8.80'
 
 RESTRICT="test"
 # bug 392989
-
-PATCHES=(
-	"${FILESDIR}/${P}-remove-rcgen.patch"
-	"${FILESDIR}/${P}-workspace.patch"
-)