Merge removing patches in favor of sed commands from master branch.

8 files changed, 23 insertions, 42 deletions

diff --git a/kde-base/kstars/ChangeLog b/kde-base/kstars/ChangeLog
index 47816fb672b..9e671e5e332 100644
--- a/kde-base/kstars/ChangeLog
+++ b/kde-base/kstars/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Sep 2008; Tomas Chvatal (scarabeus) <tomas.chvatal@gmail.com>
+  -files/kdeedu-4.1.0-cmake_modules.patch, kstars-4.1.2.ebuild:
+  Remove patch and do its work with simple sed.
+
   27 Sep 2008; Tomas Chvatal (scarabeus) <tomas.chvatal@gmail.com>
   kstars-4.1.2.ebuild:
   Move ebuild towards EAPI2 compilance
diff --git a/kde-base/kstars/Manifest b/kde-base/kstars/Manifest
index 6666419ce38..63016480730 100644
--- a/kde-base/kstars/Manifest
+++ b/kde-base/kstars/Manifest
@@ -1,6 +1,5 @@
-AUX kdeedu-4.1.0-cmake_modules.patch 570 RMD160 067d06b0597dd02dc30ae21e278ed565bb792dd7 SHA1 05fd31f62ca8862d9b319c82f7b91e202f5b22e0 SHA256 6a27bdaf9ffd98abeeaab1bf7c82c58479617af729efce1b277d4a914af5ff3c
 AUX kstars-4.1.0-destdir.patch 1712 RMD160 b10209bddde8e57460c1d1f5dd3a1a252c6aab96 SHA1 b9a846c21627a4bc0441456283e45c4628012bdf SHA256 41c5748fc41a6d8645576d3ccaf29a61bc73c87984647b912776960f41de1443
 DIST kdeedu-4.1.2.tar.bz2 57396348 RMD160 06c56cbbd3df68214165e9ef533068324130e7a5 SHA1 f7359e415d7fc007b391cb0b3a2a1c17616b55de SHA256 53af35e8bcf2316e5e37cd5c563870357033bf4729d8060808e0743bf354c792
-EBUILD kstars-4.1.2.ebuild 1252 RMD160 72bf757ec9634b9d950b7b0bbbaa76be3e6b0b5a SHA1 839b48a1ce18b03ab47844816aaa5051dd94b2d9 SHA256 3d7cbec409901d5e88960faab594be0877d6c926b70b84fae86e953482ad64ce
-MISC ChangeLog 1047 RMD160 b436c265447223d3eeb42c18aca75bd475e2de04 SHA1 97db2434f7554c0973d71c5ff5daf5f2aba188ab SHA256 9f746f6471ae4db70e4eefacdaf9e7b2b7bca8a2e4fcbe44970cb3b138e2f3d1
+EBUILD kstars-4.1.2.ebuild 1431 RMD160 199c9bd0ff4900a7212e2afc347335aa73d0f2a8 SHA1 f11bbfd14e7fd1c99c8f9e5912b1d371d33c2f77 SHA256 286b483835b463bd50bd2b2b5b6e28af29bda7b6d6f65c7ebbe9a376cd78eaab
+MISC ChangeLog 1227 RMD160 44af7203af610319f2c2e2c981b8c28ea1b3339c SHA1 5b19b85c8c48621954794851c99478e228bcf3ae SHA256 11929eca04065f63e39bb7b669c28678c663a369c0ef2146f08905a0914c6ec2
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kstars/files/kdeedu-4.1.0-cmake_modules.patch b/kde-base/kstars/files/kdeedu-4.1.0-cmake_modules.patch
deleted file mode 100644
index cb0a05c309a..00000000000
--- a/kde-base/kstars/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/kstars/kstars-4.1.2.ebuild b/kde-base/kstars/kstars-4.1.2.ebuild
index d8276c72c53..93f86ee9980 100644
--- a/kde-base/kstars/kstars-4.1.2.ebuild
+++ b/kde-base/kstars/kstars-4.1.2.ebuild
@@ -18,8 +18,7 @@ DEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}
 			usb? ( dev-libs/libusb ) )"
 RDEPEND="${DEPEND}"
 
-PATCHES=("${FILESDIR}/${PN}-4.1.0-destdir.patch"
-	"${FILESDIR}/${KMNAME}-4.1.0-cmake_modules.patch")
+PATCHES=("${FILESDIR}/${PN}-4.1.0-destdir.patch")
 
 src_configure() {
 	mycmakeargs="${mycmakeargs}
@@ -28,6 +27,11 @@ src_configure() {
 		$(cmake-utils_use_with sbig SBIG)
 		$(cmake-utils_use_with usb USB)"
 
+	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
 
 	# FIXME Unhandled arguments - added sbig but not sure about use descriptions or flag names...
diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index ce07bb60b39..6e1b6684df0 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Sep 2008; Tomas Chvatal (scarabeus) <tomas.chvatal@gmail.com>
+  -files/kdeedu-4.1.0-cmake_modules.patch, marble-4.1.2.ebuild:
+  Remove patch and do its work with simple sed.
+
   27 Sep 2008; Tomas Chvatal (scarabeus) <tomas.chvatal@gmail.com>
   marble-4.1.2.ebuild:
   Move ebuild towards EAPI2 compilance
diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest
index 1f3f35908cc..cae2bc54993 100644
--- a/kde-base/marble/Manifest
+++ b/kde-base/marble/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 marble-4.1.2.ebuild 1613 RMD160 a2f489dc2387aad5f7531de6ad1f73ad7baec6c3 SHA1 361205bfdc60fe272961cbd606bf0b852d8b3937 SHA256 d5af5189f654c93c39272bd717553b9b8bcde9a1f751df049214f1f9b6a355bb
-MISC ChangeLog 1525 RMD160 547235b40216cddacdf947dd06b9d72fb5d677fe SHA1 3de4ac3e220b00b3953e2f30aadfbdf3aa7ef9da SHA256 3f60aade9f1f08e8dc36aafb461ca9a307f94f961aa28691a63b43ea259895fb
+EBUILD marble-4.1.2.ebuild 1843 RMD160 9b21f815a5d42ef091f6a8b3b97ec3caeefc1dca SHA1 e43957e98f4fc8ae80cf9ba02c1c356459f774c7 SHA256 4f8a99ddd8db5ae2ffc7c72984c9db4fc61ac43754340d113ef47ba0f9b46e7c
+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/files/kdeedu-4.1.0-cmake_modules.patch b/kde-base/marble/files/kdeedu-4.1.0-cmake_modules.patch
deleted file mode 100644
index cb0a05c309a..00000000000
--- a/kde-base/marble/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/marble/marble-4.1.2.ebuild b/kde-base/marble/marble-4.1.2.ebuild
index d141a6d83aa..283ba3f3a45 100644
--- a/kde-base/marble/marble-4.1.2.ebuild
+++ b/kde-base/marble/marble-4.1.2.ebuild
@@ -36,6 +36,11 @@ src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)"
 
+	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"
+
 	if use gps; then
 		mycmakeargs="${mycmakeargs} -DHAVE_LIBGPS=1"
 	else