[gentoo-commits] proj/kde:master commit in: kde-base/kremotecontrol/, kde-base/kdeartwork-kscreensaver/, kde-misc/chromi/, ...

[Jonathan Callen]

commit:     dc0df4190ac2ee090784800f59beee474e1e69b6
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 01:48:28 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 01:48:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=dc0df419

Remove redundant seds to replace the KDE4WORKBASE_ bits, the eclass now handles it

(Portage version: 2.2.0_alpha30/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 229E5838)

---
 dev-util/kdevelop/kdevelop-9999.ebuild             |    9 ---------
 .../kdeartwork-kscreensaver-4.6.9999.ebuild        |    8 --------
 .../kdeartwork-kscreensaver-9999.ebuild            |    8 --------
 .../kdeplasma-addons-4.6.9999.ebuild               |   11 -----------
 .../kdeplasma-addons/kdeplasma-addons-9999.ebuild  |   11 -----------
 .../kremotecontrol/kremotecontrol-4.6.9999.ebuild  |    8 --------
 kde-base/kremotecontrol/kremotecontrol-9999.ebuild |    8 --------
 kde-base/ktux/ktux-4.6.9999.ebuild                 |    7 -------
 kde-base/ktux/ktux-9999.ebuild                     |    7 -------
 kde-misc/chromi/chromi-0.2.ebuild                  |   10 ----------
 10 files changed, 0 insertions(+), 87 deletions(-)

diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index 79453bb..a303b7b 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -28,15 +28,6 @@ RDEPEND="${DEPEND}
 "
 # see bug 347547 about the kdevplatform[subversion] dependency
 
-src_prepare() {
-	kde4-base_src_prepare
-
-	# Remove this and the ksysguard dep after libprocessui moved into kdelibs
-	sed -i -e 's/${KDE4WORKSPACE_PROCESSUI_LIBS}/processui/g' \
-		debuggers/gdb/CMakeLists.txt \
-		|| die "Failed to patch CMake files"
-}
-
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_build cmake)

diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.9999.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.9999.ebuild
index 8bd8ad3..c249823 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.9999.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.9999.ebuild
@@ -29,14 +29,6 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}/${PN}-xscreensaver.patch"
 	"${FILESDIR}/${PN}-4.5.95-webcollage.patch" )
 
-src_prepare() {
-	sed -i -e 's/${KDE4WORKSPACE_KSCREENSAVER_LIBRARY}/kscreensaver/g' \
-		kscreensaver/{kdesavers{,/asciiquarium},kpartsaver}/CMakeLists.txt \
-		|| die "Failed to patch CMake files"
-
-	kde4-meta_src_prepare
-}
-
 src_configure() {
 	mycmakeargs=(
 		-DKSCREENSAVER_SOUND_SUPPORT=ON

diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild
index 8bd8ad3..c249823 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild
@@ -29,14 +29,6 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}/${PN}-xscreensaver.patch"
 	"${FILESDIR}/${PN}-4.5.95-webcollage.patch" )
 
-src_prepare() {
-	sed -i -e 's/${KDE4WORKSPACE_KSCREENSAVER_LIBRARY}/kscreensaver/g' \
-		kscreensaver/{kdesavers{,/asciiquarium},kpartsaver}/CMakeLists.txt \
-		|| die "Failed to patch CMake files"
-
-	kde4-meta_src_prepare
-}
-
 src_configure() {
 	mycmakeargs=(
 		-DKSCREENSAVER_SOUND_SUPPORT=ON

diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild
index 5070cbe..11636ba 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild
@@ -49,17 +49,6 @@ RDEPEND="${COMMON_DEPEND}
 # kdebase-data: some svg icons moved from data directly here.
 add_blocker kdebase-data '<4.2.88'
 
-src_prepare() {
-	find "${S}" -name CMakeLists.txt | \
-		xargs sed -i \
-			-e 's/${KDE4WORKSPACE_PLASMACLOCK_LIBRARY}/plasmaclock/g' \
-			-e 's/${KDE4WORKSPACE_WEATHERION_LIBRARY}/weather_ion/g' \
-			-e 's/${KDE4WORKSPACE_TASKMANAGER_LIBRARY}/taskmanager/g' \
-		|| die "Failed to patch CMake files"
-
-	kde4-base_src_prepare
-}
-
 src_configure() {
 	mycmakeargs=(
 		-DDBUS_INTERFACES_INSTALL_DIR="${EKDEDIR}/share/dbus-1/interfaces/"

diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
index 5070cbe..11636ba 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
@@ -49,17 +49,6 @@ RDEPEND="${COMMON_DEPEND}
 # kdebase-data: some svg icons moved from data directly here.
 add_blocker kdebase-data '<4.2.88'
 
-src_prepare() {
-	find "${S}" -name CMakeLists.txt | \
-		xargs sed -i \
-			-e 's/${KDE4WORKSPACE_PLASMACLOCK_LIBRARY}/plasmaclock/g' \
-			-e 's/${KDE4WORKSPACE_WEATHERION_LIBRARY}/weather_ion/g' \
-			-e 's/${KDE4WORKSPACE_TASKMANAGER_LIBRARY}/taskmanager/g' \
-		|| die "Failed to patch CMake files"
-
-	kde4-base_src_prepare
-}
-
 src_configure() {
 	mycmakeargs=(
 		-DDBUS_INTERFACES_INSTALL_DIR="${EKDEDIR}/share/dbus-1/interfaces/"

diff --git a/kde-base/kremotecontrol/kremotecontrol-4.6.9999.ebuild b/kde-base/kremotecontrol/kremotecontrol-4.6.9999.ebuild
index 71e2f26..cf7c59b 100644
--- a/kde-base/kremotecontrol/kremotecontrol-4.6.9999.ebuild
+++ b/kde-base/kremotecontrol/kremotecontrol-4.6.9999.ebuild
@@ -25,11 +25,3 @@ src_unpack() {
 
 	kde4-meta_src_unpack
 }
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	sed -e 's:${KDE4WORKSPACE_SOLIDCONTROL_LIBRARY}:solidcontrol:g' \
-		-i kremotecontrol/{kcmremotecontrol,kded,krcdnotifieritem,libkremotecontrol}/CMakeLists.txt \
-		|| die
-}

diff --git a/kde-base/kremotecontrol/kremotecontrol-9999.ebuild b/kde-base/kremotecontrol/kremotecontrol-9999.ebuild
index 71e2f26..cf7c59b 100644
--- a/kde-base/kremotecontrol/kremotecontrol-9999.ebuild
+++ b/kde-base/kremotecontrol/kremotecontrol-9999.ebuild
@@ -25,11 +25,3 @@ src_unpack() {
 
 	kde4-meta_src_unpack
 }
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	sed -e 's:${KDE4WORKSPACE_SOLIDCONTROL_LIBRARY}:solidcontrol:g' \
-		-i kremotecontrol/{kcmremotecontrol,kded,krcdnotifieritem,libkremotecontrol}/CMakeLists.txt \
-		|| die
-}

diff --git a/kde-base/ktux/ktux-4.6.9999.ebuild b/kde-base/ktux/ktux-4.6.9999.ebuild
index afdb309..68d1dec 100644
--- a/kde-base/ktux/ktux-4.6.9999.ebuild
+++ b/kde-base/ktux/ktux-4.6.9999.ebuild
@@ -17,10 +17,3 @@ DEPEND="
 	$(add_kdebase_dep libkworkspace)
 "
 RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e's/${KDE4WORKSPACE_KSCREENSAVER_LIBRARY}/kscreensaver/' \
-		"${PN}"/src/CMakeLists.txt || die "Failed to patch CMakeLists.txt"
-
-	kde4-meta_src_prepare
-}

diff --git a/kde-base/ktux/ktux-9999.ebuild b/kde-base/ktux/ktux-9999.ebuild
index afdb309..68d1dec 100644
--- a/kde-base/ktux/ktux-9999.ebuild
+++ b/kde-base/ktux/ktux-9999.ebuild
@@ -17,10 +17,3 @@ DEPEND="
 	$(add_kdebase_dep libkworkspace)
 "
 RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e's/${KDE4WORKSPACE_KSCREENSAVER_LIBRARY}/kscreensaver/' \
-		"${PN}"/src/CMakeLists.txt || die "Failed to patch CMakeLists.txt"
-
-	kde4-meta_src_prepare
-}

diff --git a/kde-misc/chromi/chromi-0.2.ebuild b/kde-misc/chromi/chromi-0.2.ebuild
index 0ac4041..00d5438 100644
--- a/kde-misc/chromi/chromi-0.2.ebuild
+++ b/kde-misc/chromi/chromi-0.2.ebuild
@@ -20,13 +20,3 @@ S="${WORKDIR}/jinliu-kwin-deco-chromi-4390e63"
 
 DEPEND=">kde-base/kwin-4.4.1"
 RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	# Prevent a gentoo-specific linking error.
-	sed -e 's/${KDE4WORKSPACE_KDECORATIONS_LIBS}/kdecorations/g' \
-		-i "${S}"/src/CMakeLists.txt || die "Patching failed!"
-}
-
-