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 1RKF44-0002AO-4I for garchives@archives.gentoo.org; Sat, 29 Oct 2011 19:59:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2026E21C06E; Sat, 29 Oct 2011 19:59:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E4DAC21C06E for ; Sat, 29 Oct 2011 19:59:28 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 653CB1B4004 for ; Sat, 29 Oct 2011 19:59:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id CF52280042 for ; Sat, 29 Oct 2011 19:59:27 +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/kdebase-startkde/, kde-base/kdebase-startkde/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdebase-startkde/files/kdebase-startkde_do_not_set_MALLOC_CHECK.patch kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild X-VCS-Directories: kde-base/kdebase-startkde/ kde-base/kdebase-startkde/files/ X-VCS-Committer: abcd X-VCS-Committer-Name: Jonathan Callen X-VCS-Revision: ff970431bb0db3643e8c66a492fdcea8e0a217cc Date: Sat, 29 Oct 2011 19:59:27 +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: a7efd7502e297d7c2f5d8ac25f7bc207 commit: ff970431bb0db3643e8c66a492fdcea8e0a217cc Author: Jonathan Callen gentoo org> AuthorDate: Sat Oct 29 19:58:46 2011 +0000 Commit: Jonathan Callen gentoo org> CommitDate: Sat Oct 29 19:59:03 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Dff970431 [kde-base/kdebase-startkde] Upstream changed a variable --- .../kdebase-startkde_do_not_set_MALLOC_CHECK.patch | 21 --------------= ------ .../kdebase-startkde/kdebase-startkde-9999.ebuild | 2 +- 2 files changed, 1 insertions(+), 22 deletions(-) diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde_do_not_set_= MALLOC_CHECK.patch b/kde-base/kdebase-startkde/files/kdebase-startkde_do_= not_set_MALLOC_CHECK.patch deleted file mode 100644 index 8c62f8c..0000000 --- a/kde-base/kdebase-startkde/files/kdebase-startkde_do_not_set_MALLOC_= CHECK.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/startkde.cmake -+++ b/startkde.cmake -@@ -36,18 +36,6 @@ fi - # we have to unset this for Darwin since it will screw up KDE's dynamic= -loading - unset DYLD_FORCE_FLAT_NAMESPACE -=20 --# Enable lightweight memory corruption checker if not already set --# -- this is for trunk only, we remove it for releases --if [ "x$MALLOC_CHECK_" =3D "x" ] && [ -x /lib/libc.so.6 ]; then -- # Extract the first two components of the version from the output. -- glibc_version=3D$(LC_ALL=3DC /lib/libc.so.6 | sed -e 's/[^0-9]*\([0= -9]\.[0-9]\+\).*/\1/;s/\.\([0-9]\)$/.0\1/;q') -- -- MALLOC_CHECK_=3D2 # Default to 2 unless glibc 2.9 or higher. -- test $glibc_version \> 2.08 && MALLOC_CHECK_=3D3 -- -- export MALLOC_CHECK_ --fi -- - # in case we have been started with full pathname spec without being in= PATH - bindir=3D`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` - if [ -n "$bindir" ]; then diff --git a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild b/kde= -base/kdebase-startkde/kdebase-startkde-9999.ebuild index 7df5355..7e9525c 100644 --- a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild +++ b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild @@ -71,7 +71,7 @@ src_install() { doexe "${T}/KDE-4" =20 # freedesktop compliant session script - sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g" \ + sed -e "s:\${BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g" \ "${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/KDE-4.d= esktop" insinto /usr/share/xsessions doins "${T}/KDE-4.desktop"