[kde-base/korganizer,kdepim-wizards] Override it this way

7 files changed, 51 insertions, 42 deletions

diff --git a/kde-base/kdepim-wizards/Manifest b/kde-base/kdepim-wizards/Manifest
index df7a133bae2..5e70cdbe59b 100644
--- a/kde-base/kdepim-wizards/Manifest
+++ b/kde-base/kdepim-wizards/Manifest
@@ -1,4 +1,4 @@
-AUX fix-broken-gpgme-cmake-guard.diff 622 RMD160 3197420398289628ef504cfa836fc489a004fdcb SHA1 0cb380f00a7bd4ae9411b44928e191118182082e SHA256 321b3aac8ad101b14101284e5aa0430b3a3aec28a225df17027606c69a66747a
+AUX fix-broken-gpgme-cmake-guard.diff 634 RMD160 d9e8e07b17e4555522e916bc87249729e42d4dc4 SHA1 3f1bf906a96889fbe068ae28d2161ddd622fb7fa SHA256 5492666251f59a396347eaf074fa0dd0b525b9842321415e92fb7098092e904f
 DIST kdepim-4.3.90.tar.bz2 9388060 RMD160 0559d995c1a67631414cf685ae16c49ee3e57254 SHA1 5b5e73085bebc5b575273714e97b6571d50ee18d SHA256 9d30db595dacaeb643eacc183cb77f0096fc7664d6759c643f33bce2ca5f1dca
 EBUILD kdepim-wizards-4.3.90.ebuild 922 RMD160 e4c4b609492d86f9edf064c043de453dffcf934d SHA1 13f27f6d15f2433bd5ec283d1940a8f7b6746119 SHA256 7ec52f849e723d3708d4f46bc6d8aa16411efec42c6dc8727f660ffa62079855
 EBUILD kdepim-wizards-4.3.9999.ebuild 1002 RMD160 3cb43a9e725ff09fa3f6e977adc36cb57c51094d SHA1 37f5833c749690aaf8fa7722459809beeafb7e8a SHA256 5cedde45c6a1c52c772382ab022e552d6c1603cb34b86135caed2e85a605cea2
diff --git a/kde-base/kdepim-wizards/files/fix-broken-gpgme-cmake-guard.diff b/kde-base/kdepim-wizards/files/fix-broken-gpgme-cmake-guard.diff
index 01842adf54c..084113a5b2d 100644
--- a/kde-base/kdepim-wizards/files/fix-broken-gpgme-cmake-guard.diff
+++ b/kde-base/kdepim-wizards/files/fix-broken-gpgme-cmake-guard.diff
@@ -2,18 +2,20 @@ Index: CMakeLists.txt
 ===================================================================
 --- CMakeLists.txt	(revision 1073383)
 +++ CMakeLists.txt	(working copy)
-@@ -185,11 +185,12 @@
+@@ -185,7 +185,6 @@
    add_subdirectory(messagecore)
    add_subdirectory(messagelist)
  
-+  macro_optional_add_subdirectory(wizards)
-   if(QGPGME_FOUND)
+-  if(QGPGME_FOUND)
      if (Boost_TOPOLOGICAL_SORT_DIR)
        macro_optional_add_subdirectory(kleopatra)
      endif(Boost_TOPOLOGICAL_SORT_DIR)
--    macro_optional_add_subdirectory(wizards)
-+
-     # The following components depend on QGpgME.
-     add_subdirectory(messageviewer)
-     macro_optional_add_subdirectory(kmail)
+@@ -211,7 +210,6 @@
+     include( SopranoAddOntology )
+     add_subdirectory( ontologies )
+     add_subdirectory( nepomuk_email_feeder )
+-  endif(QGPGME_FOUND)
+ 
+   if(KDEPIM_BUILD_EVERYTHING)
+     macro_optional_add_subdirectory(knode)
  
\ No newline at end of file
diff --git a/kde-base/korganizer/Manifest b/kde-base/korganizer/Manifest
index 16676b56915..74a30290783 100644
--- a/kde-base/korganizer/Manifest
+++ b/kde-base/korganizer/Manifest
@@ -1,6 +1,7 @@
+AUX fix-broken-gpgme-cmake-guard.diff 634 RMD160 d9e8e07b17e4555522e916bc87249729e42d4dc4 SHA1 3f1bf906a96889fbe068ae28d2161ddd622fb7fa SHA256 5492666251f59a396347eaf074fa0dd0b525b9842321415e92fb7098092e904f
 DIST kdepim-4.3.90.tar.bz2 9388060 RMD160 0559d995c1a67631414cf685ae16c49ee3e57254 SHA1 5b5e73085bebc5b575273714e97b6571d50ee18d SHA256 9d30db595dacaeb643eacc183cb77f0096fc7664d6759c643f33bce2ca5f1dca
-EBUILD korganizer-4.3.90.ebuild 1194 RMD160 b3358158c015080ad7bc24bcd77467147eb531d3 SHA1 e025e6b034b061857bf113d816cc84f87316adc2 SHA256 052e4e3b448296696c22796c06a70a4a77120f73a6f973d2109b5a53142d600b
+EBUILD korganizer-4.3.90.ebuild 1068 RMD160 bccd757c97f92893f53a0d77ffc1d28dbd754308 SHA1 db3b018ace47a0481ce0a2cda3b94ea2983085c5 SHA256 517c323681ef59d47ba9dbae08e4c89e0dede5f6b2e003950020c0b215f1b059
 EBUILD korganizer-4.3.9999.ebuild 1236 RMD160 676af6255d8561c80948592cc2759aa4bbbedb8f SHA1 384171e4ab76b9dedf638378de453c7b48ed8346 SHA256 90185bb84c748b0b6126026b26043f7cd0fe848ff6b14df79854ed9c17e4e8f3
-EBUILD korganizer-4.4.9999.ebuild 1145 RMD160 4725c0fc7c2c99b0fc2de73be0ba23b6ff75eb8b SHA1 6951d0cffb86f47f02411dce9a052d463b0f755c SHA256 f9f45bb3135d03d7a3ab46026de7d0622e197c87ccaeb2de16f1d61faffbf1be
-EBUILD korganizer-9999.ebuild 1145 RMD160 4725c0fc7c2c99b0fc2de73be0ba23b6ff75eb8b SHA1 6951d0cffb86f47f02411dce9a052d463b0f755c SHA256 f9f45bb3135d03d7a3ab46026de7d0622e197c87ccaeb2de16f1d61faffbf1be
+EBUILD korganizer-4.4.9999.ebuild 1019 RMD160 8bfc1a2f4f65e9c2e2cf450e3a1599258dc6c5bb SHA1 631e590195660462ecc7073ed5b0a6fa5f61ee50 SHA256 187bb43401b13911520e66f280d1c831e6ae2477c37bd34698684d0cd1ff28dc
+EBUILD korganizer-9999.ebuild 1019 RMD160 8bfc1a2f4f65e9c2e2cf450e3a1599258dc6c5bb SHA1 631e590195660462ecc7073ed5b0a6fa5f61ee50 SHA256 187bb43401b13911520e66f280d1c831e6ae2477c37bd34698684d0cd1ff28dc
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/korganizer/files/fix-broken-gpgme-cmake-guard.diff b/kde-base/korganizer/files/fix-broken-gpgme-cmake-guard.diff
new file mode 100644
index 00000000000..084113a5b2d
--- /dev/null
+++ b/kde-base/korganizer/files/fix-broken-gpgme-cmake-guard.diff
@@ -0,0 +1,21 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt	(revision 1073383)
++++ CMakeLists.txt	(working copy)
+@@ -185,7 +185,6 @@
+   add_subdirectory(messagecore)
+   add_subdirectory(messagelist)
+ 
+-  if(QGPGME_FOUND)
+     if (Boost_TOPOLOGICAL_SORT_DIR)
+       macro_optional_add_subdirectory(kleopatra)
+     endif(Boost_TOPOLOGICAL_SORT_DIR)
+@@ -211,7 +210,6 @@
+     include( SopranoAddOntology )
+     add_subdirectory( ontologies )
+     add_subdirectory( nepomuk_email_feeder )
+-  endif(QGPGME_FOUND)
+ 
+   if(KDEPIM_BUILD_EVERYTHING)
+     macro_optional_add_subdirectory(knode)
+ 
\ No newline at end of file
diff --git a/kde-base/korganizer/korganizer-4.3.90.ebuild b/kde-base/korganizer/korganizer-4.3.90.ebuild
index 389a5701992..f84294875aa 100644
--- a/kde-base/korganizer/korganizer-4.3.90.ebuild
+++ b/kde-base/korganizer/korganizer-4.3.90.ebuild
@@ -12,12 +12,11 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug +handbook"
 
 DEPEND="
-	app-crypt/gpgme
+	$(add_kdebase_dep kdepimlibs)
 	$(add_kdebase_dep libkdepim)
+	sys-libs/zlib
 "
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kaddressbook)
-"
+RDEPEND="${DEPEND}"
 
 # Tests hang, last checked in 4.3.3
 RESTRICT="test"
@@ -40,13 +39,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	if use kontact; then
-		# Fix target_link_libraries for now
-		sed -i -e's/kaddressbookprivate//' \
-			kontact/plugins/planner/CMakeLists.txt \
-			|| die "Failed to remove kaddressbookprivate from link"
-	fi
+	epatch "${FILESDIR}/fix-broken-gpgme-cmake-guard.diff"
 
+	# Needs to be done this way
 	kde4-meta_src_prepare
 }
 
diff --git a/kde-base/korganizer/korganizer-4.4.9999.ebuild b/kde-base/korganizer/korganizer-4.4.9999.ebuild
index 8b166675036..d7767a7ba01 100644
--- a/kde-base/korganizer/korganizer-4.4.9999.ebuild
+++ b/kde-base/korganizer/korganizer-4.4.9999.ebuild
@@ -12,12 +12,11 @@ KEYWORDS=""
 IUSE="debug +handbook"
 
 DEPEND="
-	app-crypt/gpgme
+	$(add_kdebase_dep kdepimlibs)
 	$(add_kdebase_dep libkdepim)
+	sys-libs/zlib
 "
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kaddressbook)
-"
+RDEPEND="${DEPEND}"
 
 # Tests hang, last checked in 4.3.3
 RESTRICT="test"
@@ -40,13 +39,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	if use kontact; then
-		# Fix target_link_libraries for now
-		sed -i -e's/kaddressbookprivate//' \
-			kontact/plugins/planner/CMakeLists.txt \
-			|| die "Failed to remove kaddressbookprivate from link"
-	fi
+	epatch "${FILESDIR}/fix-broken-gpgme-cmake-guard.diff"
 
+	# Needs to be done this way
 	kde4-meta_src_prepare
 }
 
diff --git a/kde-base/korganizer/korganizer-9999.ebuild b/kde-base/korganizer/korganizer-9999.ebuild
index 8b166675036..d7767a7ba01 100644
--- a/kde-base/korganizer/korganizer-9999.ebuild
+++ b/kde-base/korganizer/korganizer-9999.ebuild
@@ -12,12 +12,11 @@ KEYWORDS=""
 IUSE="debug +handbook"
 
 DEPEND="
-	app-crypt/gpgme
+	$(add_kdebase_dep kdepimlibs)
 	$(add_kdebase_dep libkdepim)
+	sys-libs/zlib
 "
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kaddressbook)
-"
+RDEPEND="${DEPEND}"
 
 # Tests hang, last checked in 4.3.3
 RESTRICT="test"
@@ -40,13 +39,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	if use kontact; then
-		# Fix target_link_libraries for now
-		sed -i -e's/kaddressbookprivate//' \
-			kontact/plugins/planner/CMakeLists.txt \
-			|| die "Failed to remove kaddressbookprivate from link"
-	fi
+	epatch "${FILESDIR}/fix-broken-gpgme-cmake-guard.diff"
 
+	# Needs to be done this way
 	kde4-meta_src_prepare
 }