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 1LhSQH-0002lv-RM for garchives@archives.gentoo.org; Wed, 11 Mar 2009 17:40:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C28EDE01FC; Wed, 11 Mar 2009 17:40:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 94BEFE01FC for ; Wed, 11 Mar 2009 17:40:52 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 30C47648BE for ; Wed, 11 Mar 2009 17:40:52 +0000 (UTC) Received: from scarabeus by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1LhSQF-0003fz-QP for gentoo-commits@lists.gentoo.org; Wed, 11 Mar 2009 17:40:51 +0000 From: "Tomas Chvatal (scarabeus)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, scarabeus@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: kde4-base.eclass X-VCS-Directories: eclass X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal Content-Type: text/plain; charset=utf8 Message-Id: Sender: Tomas Chvatal Date: Wed, 11 Mar 2009 17:40:51 +0000 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: 6cfe4925-3996-478e-8a11-435b80d02866 X-Archives-Hash: 2c9191720c2d17fd84ee8322c705117c scarabeus 09/03/11 17:40:51 Modified: kde4-base.eclass Log: Fix broken DOC=3D variable. Cleanup eclass not to duplicate cmake-utils= function calls. Revision Changes Path 1.32 eclass/kde4-base.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.e= class?rev=3D1.32&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.e= class?rev=3D1.32&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.e= class?r1=3D1.31&r2=3D1.32 Index: kde4-base.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- kde4-base.eclass 9 Mar 2009 19:41:26 -0000 1.31 +++ kde4-base.eclass 11 Mar 2009 17:40:51 -0000 1.32 @@ -1,6 +1,6 @@ # Copyright 2007-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.31 2009/0= 3/09 19:41:26 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.32 2009/0= 3/11 17:40:51 scarabeus Exp $ =20 # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -610,20 +610,7 @@ kde4-base_src_compile() { debug-print-function ${FUNCNAME} "$@" =20 - kde4-base_src_make -} - -# @FUNCTION: kde4-base_src_make -# @DESCRIPTION: -# Function for building KDE4 applications. -# Options are passed to cmake-utils_src_make. -kde4-base_src_make() { - debug-print-function ${FUNCNAME} "$@" - - if [[ -d "$WORKDIR/${PN}_build" ]]; then - pushd "${WORKDIR}/${PN}_build" > /dev/null - fi - [ -e [Mm]akefile ] && cmake-utils_src_make "$@" + cmake-utils_src_compile } =20 # @FUNCTION: kde4-base_src_test @@ -651,10 +638,7 @@ fi =20 kde4-base_src_make_doc - if [[ -d "$WORKDIR/${PN}_build" ]]; then - pushd "${WORKDIR}/${PN}_build" > /dev/null - fi - [ -e [Mm]akefile ] && cmake-utils_src_install + cmake-utils_src_install } =20 # @FUNCTION: kde4-base_src_make_doc