[gentoo-commits] proj/kde:master commit in: kde-base/dolphin-plugins/

["Andreas Hüttel" <dilfridge@gentoo.org>]

commit:     026626b750d323fb5072d4d6e92d693d3c6acabb
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Fri Jun  8 18:01:12 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jun  8 18:01:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=026626b7

[kde-base/dolphin-plugins] This hack does not work anymore. Fixed in eclass now.

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

---
 .../dolphin-plugins/dolphin-plugins-4.8.90.ebuild  |   14 --------------
 .../dolphin-plugins/dolphin-plugins-9999.ebuild    |   14 --------------
 2 files changed, 0 insertions(+), 28 deletions(-)

diff --git a/kde-base/dolphin-plugins/dolphin-plugins-4.8.90.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-4.8.90.ebuild
index 391e455..f0dc5cc 100644
--- a/kde-base/dolphin-plugins/dolphin-plugins-4.8.90.ebuild
+++ b/kde-base/dolphin-plugins/dolphin-plugins-4.8.90.ebuild
@@ -24,20 +24,6 @@ RDEPEND="${DEPEND}
 
 KMLOADLIBS="libkonq"
 
-#
-# See bug 351147 for why this is necessary
-#
-src_prepare() {
-	echo 'macro_optional_add_subdirectory ( dolphin-plugins )' >> CMakeLists.txt || die
-	echo > dolphin-plugins/CMakeLists.txt || die
-	use bazaar && echo 'add_subdirectory ( bazaar )' >> dolphin-plugins/CMakeLists.txt
-	use git && echo 'add_subdirectory ( git )' >> dolphin-plugins/CMakeLists.txt
-	use mercurial && echo 'add_subdirectory ( hg )' >> dolphin-plugins/CMakeLists.txt
-	use subversion && echo 'add_subdirectory ( svn )' >> dolphin-plugins/CMakeLists.txt
-
-	kde4-meta_src_prepare
-}
-
 src_install() {
 	{ use bazaar || use git || use mercurial || use subversion; } && kde4-meta_src_install
 }

diff --git a/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
index e189af5..a017ebd 100644
--- a/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
+++ b/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
@@ -24,20 +24,6 @@ RDEPEND="${DEPEND}
 
 KMLOADLIBS="libkonq"
 
-#
-# See bug 351147 for why this is necessary
-#
-src_prepare() {
-	echo 'macro_optional_add_subdirectory ( dolphin-plugins )' >> CMakeLists.txt || die
-	echo > dolphin-plugins/CMakeLists.txt || die
-	use bazaar && echo 'add_subdirectory ( bazaar )' >> dolphin-plugins/CMakeLists.txt
-	use git && echo 'add_subdirectory ( git )' >> dolphin-plugins/CMakeLists.txt
-	use mercurial && echo 'add_subdirectory ( hg )' >> dolphin-plugins/CMakeLists.txt
-	use subversion && echo 'add_subdirectory ( svn )' >> dolphin-plugins/CMakeLists.txt
-
-	kde4-meta_src_prepare
-}
-
 src_install() {
 	{ use bazaar || use git || use mercurial || use subversion; } && kde4-meta_src_install
 }