Merge branch '4.1.2' of git+ssh://git@git.overlays.gentoo.org/proj/kde into 4.1.2

6 files changed, 12 insertions, 32 deletions

diff --git a/kde-base/kalzium/ChangeLog b/kde-base/kalzium/ChangeLog
index 23ea2d21abe..97251f77c48 100644
--- a/kde-base/kalzium/ChangeLog
+++ b/kde-base/kalzium/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Sep 2008; <alexxy@gentoo.org> -files/kdeedu-4.1.0-cmake_modules.patch,
+  kalzium-4.1.2.ebuild:
+  backport of sed fix to file collisionf from kde-4.2 branch
+
   27 Sep 2008; Tomas Chvatal (scarabeus) <tomas.chvatal@gmail.com>
   kalzium-4.1.2.ebuild:
   Move ebuild towards EAPI2 compilance
diff --git a/kde-base/kalzium/Manifest b/kde-base/kalzium/Manifest
index ccbf8d1b78f..0777ba521ba 100644
--- a/kde-base/kalzium/Manifest
+++ b/kde-base/kalzium/Manifest
@@ -1,5 +1,4 @@
-AUX kdeedu-4.1.0-cmake_modules.patch 570 RMD160 067d06b0597dd02dc30ae21e278ed565bb792dd7 SHA1 05fd31f62ca8862d9b319c82f7b91e202f5b22e0 SHA256 6a27bdaf9ffd98abeeaab1bf7c82c58479617af729efce1b277d4a914af5ff3c
 DIST kdeedu-4.1.2.tar.bz2 57396348 RMD160 06c56cbbd3df68214165e9ef533068324130e7a5 SHA1 f7359e415d7fc007b391cb0b3a2a1c17616b55de SHA256 53af35e8bcf2316e5e37cd5c563870357033bf4729d8060808e0743bf354c792
-EBUILD kalzium-4.1.2.ebuild 1451 RMD160 71529b475f89ffb7f293853fd293f76a1452d9f4 SHA1 d979ab0c1e0e6c80dbe2fcfd02e7aa2209fe4372 SHA256 495f428965060a7ec804f7a5cfad767259e819631997a16c6087b588b5fb0da7
-MISC ChangeLog 1023 RMD160 c1be2cea1bf6c173e0100d9aec6db52101c3780e SHA1 fd43cf5fc01f1025544f11bcf75c5e9335270ccd SHA256 3f62f4fd0f78792e39fd7959a8fd6ab8a546d0629c7c0838e4dbf79ad644b661
+EBUILD kalzium-4.1.2.ebuild 1621 RMD160 adc6679842cd29db0457bdc74d5e97de88186219 SHA1 b47a979ba0c154ab7137d42b38fccf822d5e6a80 SHA256 304d6784c6438e0036ccf45fceefbc902720ded93d891b2fceeec9c1ab501c89
+MISC ChangeLog 1185 RMD160 d2d5c6ffafbaa4f32233eac777b573a5ba170e24 SHA1 70bd86a15638125f36d7cbe9e64952307d1379b3 SHA256 742eb3f200c384b2cabce7c2ae72322afa1dcb072f5a627ef780925cbeca31b3
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kalzium/files/kdeedu-4.1.0-cmake_modules.patch b/kde-base/kalzium/files/kdeedu-4.1.0-cmake_modules.patch
deleted file mode 100644
index cb0a05c309a..00000000000
--- a/kde-base/kalzium/files/kdeedu-4.1.0-cmake_modules.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- CMakeLists.txt      2008-05-28 16:07:20.000000000 -0400
-+++ CMakeLists.txt      2008-08-11 14:43:17.000000000 -0400
-@@ -25,7 +25,6 @@
- add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
- include_directories (${QDBUS_INCLUDE_DIRS}  ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
-
--add_subdirectory(cmake)
- macro_optional_add_subdirectory(doc)
- add_subdirectory(libkdeedu)
- macro_optional_add_subdirectory(blinken)
-@@ -53,7 +52,5 @@
-   macro_optional_add_subdirectory(step)
- endif (GMM_FOUND)
-
--add_subdirectory( cmake )
--
- macro_display_feature_log()
diff --git a/kde-base/kalzium/kalzium-4.1.2.ebuild b/kde-base/kalzium/kalzium-4.1.2.ebuild
index b39456def94..af457a837c1 100644
--- a/kde-base/kalzium/kalzium-4.1.2.ebuild
+++ b/kde-base/kalzium/kalzium-4.1.2.ebuild
@@ -24,8 +24,6 @@ RDEPEND="${RDEPEND} ${COMMONDEPEND}"
 
 KMEXTRACTONLY="libkdeedu/kdeeduui libkdeedu/libscience"
 
-PATCHES=("${FILESDIR}/${KMNAME}-4.1.0-cmake_modules.patch")
-
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with editor Eigen)
@@ -33,6 +31,11 @@ src_configure() {
 		$(cmake-utils_use_with editor OpenGL)
 		$(cmake-utils_use_with solver OCaml)
 		$(cmake-utils_use_with solver Libfacile)"
+	
+	sed -i -e "s:add_subdirectory(cmake):#dontwantit:g" CMakeLists.txt \
+		|| die  "disabling cmake includes failed"
+	sed -i -e "s:add_subdirectory( cmake ):#dontwantit:g" CMakeLists.txt \
+		|| die "disabling cmake includes failed"
 
 	kde4-meta_src_configure
 }
diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest
index cae2bc54993..86782bd24b4 100644
--- a/kde-base/marble/Manifest
+++ b/kde-base/marble/Manifest
@@ -1,4 +1,4 @@
 DIST kdeedu-4.1.2.tar.bz2 57396348 RMD160 06c56cbbd3df68214165e9ef533068324130e7a5 SHA1 f7359e415d7fc007b391cb0b3a2a1c17616b55de SHA256 53af35e8bcf2316e5e37cd5c563870357033bf4729d8060808e0743bf354c792
-EBUILD marble-4.1.2.ebuild 1843 RMD160 9b21f815a5d42ef091f6a8b3b97ec3caeefc1dca SHA1 e43957e98f4fc8ae80cf9ba02c1c356459f774c7 SHA256 4f8a99ddd8db5ae2ffc7c72984c9db4fc61ac43754340d113ef47ba0f9b46e7c
+EBUILD marble-4.1.2.ebuild 1545 RMD160 ac1147b0b781a0367deab0a930150b6117ff8a6b SHA1 17d6dce27823701157c02c729a073e07d7bc3d7f SHA256 61f5812d19c97e9024822e01ad7d05d7f556f9c0f568de81bd2e48da74923735
 MISC ChangeLog 1705 RMD160 9f372864a95d396a3bbb59d252074d64c0acd8c6 SHA1 f4893ca119a3e798c1eb27c2bcbd6d2798c15c4f SHA256 0c0d2c949e142709ce151c3abd6f64cb2ba5087a8dd2907ecf5f8076f1b5c6c3
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/marble/marble-4.1.2.ebuild b/kde-base/marble/marble-4.1.2.ebuild
index 283ba3f3a45..070f0ffe296 100644
--- a/kde-base/marble/marble-4.1.2.ebuild
+++ b/kde-base/marble/marble-4.1.2.ebuild
@@ -30,8 +30,6 @@ COMMONDEPEND="gps? ( sci-geosciences/gpsd )
 DEPEND="${COMMONDEPEND}"
 RDEPEND="${COMMONDEPEND}"
 
-PATCHES=("${FILESDIR}/${KMNAME}-4.1.0-cmake_modules.patch")
-
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)"
@@ -55,13 +53,6 @@ src_configure() {
 	kde4-meta_src_configure
 }
 
-src_install() {
-	kde4-meta_src_install
-	# These files are installed by kde-base/libkdeedu (4.1.0)
-	rm "${D}"/usr/kde/4.1/share/apps/cmake/modules/FindMarbleWidget.cmake
-	rm "${D}"/usr/kde/4.1/share/apps/cmake/modules/FindKDEEdu.cmake
-}
-
 src_test() {
 	mycmakeargs="${mycmakeargs} -DENABLE_TESTS=TRUE"
 	kde4-meta_src_test