From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QFGRj-0003M8-Cx for garchives@archives.gentoo.org; Thu, 28 Apr 2011 01:55:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 009371C001; Thu, 28 Apr 2011 01:55:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A33CF1C001 for ; Thu, 28 Apr 2011 01:55:03 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 326F11B4085 for ; Thu, 28 Apr 2011 01:55:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5494280505 for ; Thu, 28 Apr 2011 01:55:02 +0000 (UTC) From: "Jonathan Callen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jonathan Callen" Message-ID: Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kremotecontrol/, kde-base/kdeartwork-kscreensaver/, kde-misc/chromi/, ... X-VCS-Repository: proj/kde X-VCS-Files: dev-util/kdevelop/kdevelop-9999.ebuild kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.9999.ebuild kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild kde-base/kremotecontrol/kremotecontrol-4.6.9999.ebuild kde-base/kremotecontrol/kremotecontrol-9999.ebuild kde-base/ktux/ktux-4.6.9999.ebuild kde-base/ktux/ktux-9999.ebuild kde-misc/chromi/chromi-0.2.ebuild X-VCS-Directories: kde-base/kremotecontrol/ kde-base/kdeartwork-kscreensaver/ kde-misc/chromi/ dev-util/kdevelop/ kde-base/kdeplasma-addons/ kde-base/ktux/ X-VCS-Committer: abcd X-VCS-Committer-Name: Jonathan Callen X-VCS-Revision: dc0df4190ac2ee090784800f59beee474e1e69b6 Date: Thu, 28 Apr 2011 01:55:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 3f3f1d188844007d5fb5db1108135ed2 commit: dc0df4190ac2ee090784800f59beee474e1e69b6 Author: Jonathan Callen gentoo org> AuthorDate: Thu Apr 28 01:48:28 2011 +0000 Commit: Jonathan Callen gentoo org> CommitDate: Thu Apr 28 01:48:28 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Ddc0df419 Remove redundant seds to replace the KDE4WORKBASE_ bits, the eclass now h= andles it (Portage version: 2.2.0_alpha30/git/Linux x86_64, RepoMan options: --forc= e, 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/k= develop-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=3D"${DEPEND} " # see bug 347547 about the kdevplatform[subversion] dependency =20 -src_prepare() { - kde4-base_src_prepare - - # Remove this and the ksysguard dep after libprocessui moved into kdeli= bs - sed -i -e 's/${KDE4WORKSPACE_PROCESSUI_LIBS}/processui/g' \ - debuggers/gdb/CMakeLists.txt \ - || die "Failed to patch CMake files" -} - src_configure() { mycmakeargs=3D( $(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.e= build +++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.9999.e= build @@ -29,14 +29,6 @@ DEPEND=3D"${RDEPEND} PATCHES=3D( "${FILESDIR}/${PN}-xscreensaver.patch" "${FILESDIR}/${PN}-4.5.95-webcollage.patch" ) =20 -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=3D( -DKSCREENSAVER_SOUND_SUPPORT=3DON diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-999= 9.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.= ebuild index 8bd8ad3..c249823 100644 --- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuil= d +++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuil= d @@ -29,14 +29,6 @@ DEPEND=3D"${RDEPEND} PATCHES=3D( "${FILESDIR}/${PN}-xscreensaver.patch" "${FILESDIR}/${PN}-4.5.95-webcollage.patch" ) =20 -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=3D( -DKSCREENSAVER_SOUND_SUPPORT=3DON 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=3D"${COMMON_DEPEND} # kdebase-data: some svg icons moved from data directly here. add_blocker kdebase-data '<4.2.88' =20 -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=3D( -DDBUS_INTERFACES_INSTALL_DIR=3D"${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=3D"${COMMON_DEPEND} # kdebase-data: some svg icons moved from data directly here. add_blocker kdebase-data '<4.2.88' =20 -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=3D( -DDBUS_INTERFACES_INSTALL_DIR=3D"${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() { =20 kde4-meta_src_unpack } - -src_prepare() { - kde4-meta_src_prepare - - sed -e 's:${KDE4WORKSPACE_SOLIDCONTROL_LIBRARY}:solidcontrol:g' \ - -i kremotecontrol/{kcmremotecontrol,kded,krcdnotifieritem,libkremoteco= ntrol}/CMakeLists.txt \ - || die -} diff --git a/kde-base/kremotecontrol/kremotecontrol-9999.ebuild b/kde-bas= e/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() { =20 kde4-meta_src_unpack } - -src_prepare() { - kde4-meta_src_prepare - - sed -e 's:${KDE4WORKSPACE_SOLIDCONTROL_LIBRARY}:solidcontrol:g' \ - -i kremotecontrol/{kcmremotecontrol,kded,krcdnotifieritem,libkremoteco= ntrol}/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=3D" $(add_kdebase_dep libkworkspace) " RDEPEND=3D"${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.ebu= ild index afdb309..68d1dec 100644 --- a/kde-base/ktux/ktux-9999.ebuild +++ b/kde-base/ktux/ktux-9999.ebuild @@ -17,10 +17,3 @@ DEPEND=3D" $(add_kdebase_dep libkworkspace) " RDEPEND=3D"${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=3D"${WORKDIR}/jinliu-kwin-deco-chromi-4390e63" =20 DEPEND=3D">kde-base/kwin-4.4.1" RDEPEND=3D"${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!" -} - -