From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6DE881391DB for ; Wed, 19 Mar 2014 15:06:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28ED2E0A5E; Wed, 19 Mar 2014 15:06:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B75A7E0A5E for ; Wed, 19 Mar 2014 15:06:11 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A13D633FCD8 for ; Wed, 19 Mar 2014 15:06:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 56EC218875 for ; Wed, 19 Mar 2014 15:06:09 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1395241225.e984e7ccddfdcc5334eca3938b5e6fdf16090982.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde-frameworks.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: e984e7ccddfdcc5334eca3938b5e6fdf16090982 X-VCS-Branch: master Date: Wed, 19 Mar 2014 15:06:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7030cdd3-bd6c-41a5-8df0-9f269a9f24a0 X-Archives-Hash: 44068524b33053c86c4bde8af1cfd4ec commit: e984e7ccddfdcc5334eca3938b5e6fdf16090982 Author: Michael Palimaka gentoo org> AuthorDate: Wed Mar 19 15:00:25 2014 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Mar 19 15:00:25 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e984e7cc [eclass] Remove environment cleanup stuff for testing. --- eclass/kde-frameworks.eclass | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/eclass/kde-frameworks.eclass b/eclass/kde-frameworks.eclass index 1053c98..00a83d8 100644 --- a/eclass/kde-frameworks.eclass +++ b/eclass/kde-frameworks.eclass @@ -177,9 +177,6 @@ debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}" kde-frameworks_pkg_setup() { debug-print-function ${FUNCNAME} "$@" - # Don't set KDEHOME during compilation, it will cause access violations - unset KDEHOME - # Check if gcc compiler is fresh enough. # In theory should be in pkg_pretend but we check it only for kdelibs there # and for others we do just quick scan in pkg_setup because pkg_pretend @@ -189,12 +186,6 @@ kde-frameworks_pkg_setup() { ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 5 ]] ) \ && die "Sorry, but gcc-4.5 or later is required for KDE frameworks." fi - - # Point to correct QT plugins path - QT_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/kde4/plugins/" - - # Fix XDG collision with sandbox - export XDG_CONFIG_HOME="${T}" } # @FUNCTION: kde-frameworks_src_unpack @@ -246,9 +237,6 @@ kde-frameworks_src_configure() { # Here we set the install prefix tc-is-cross-compiler || cmakeargs+=(-DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX}") - # Shadow existing installations - unset KDEDIRS - #qmake -query QT_INSTALL_LIBS unavailable when cross-compiling # todo: is this still relevant? tc-is-cross-compiler && cmakeargs+=(-DQT_LIBRARY_DIR=${ROOT}/usr/$(get_libdir)/qt4)