From d4c35b9e1272c50eb06b9d7fd0f26247da5637f2 Mon Sep 17 00:00:00 2001 From: Dror Levin Date: Tue, 17 Nov 2009 22:35:37 +0000 Subject: Fix pch USE flag handling, bug 271658. (Portage version: 2.2_rc50/cvs/Linux x86_64) --- app-admin/keepassx/ChangeLog | 5 ++++- app-admin/keepassx/keepassx-0.4.1.ebuild | 10 ++++------ 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'app-admin/keepassx') diff --git a/app-admin/keepassx/ChangeLog b/app-admin/keepassx/ChangeLog index ffe7f26f34d3..93970806e89a 100644 --- a/app-admin/keepassx/ChangeLog +++ b/app-admin/keepassx/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-admin/keepassx # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.41 2009/11/16 00:20:35 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.42 2009/11/17 22:35:37 spatz Exp $ + + 17 Nov 2009; Dror Levin keepassx-0.4.1.ebuild: + Fix pch USE flag handling, bug 271658. 16 Nov 2009; Jeremy Olexa keepassx-0.4.1.ebuild: (non maintainer commit) Fix erroneous dep of USE=qt3support, bug 286598 diff --git a/app-admin/keepassx/keepassx-0.4.1.ebuild b/app-admin/keepassx/keepassx-0.4.1.ebuild index 3691fdc34ee5..9f195244214e 100644 --- a/app-admin/keepassx/keepassx-0.4.1.ebuild +++ b/app-admin/keepassx/keepassx-0.4.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.4.1.ebuild,v 1.2 2009/11/16 00:20:35 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.4.1.ebuild,v 1.3 2009/11/17 22:35:37 spatz Exp $ EAPI="2" @@ -21,14 +21,12 @@ DEPEND="x11-libs/qt-core:4 RDEPEND="${DEPEND}" src_configure() { - local conf_add - use debug && conf_add="${conf_add} debug" || conf_add="${conf_add} release" - use pch && conf_add="${conf_add} PRECOMPILED=1" || conf_add="${conf_add} PRECOMPILED=0" + local conf_pch + use pch && conf_pch="PRECOMPILED=1" || conf_pch="PRECOMPILED=0" eqmake4 ${PN}.pro -recursive \ PREFIX="${D}/usr" \ - CONFIG+="${conf_add}" \ - || die "eqmake4 failed." + "${conf_pch}" } src_compile() { -- cgit v1.2.3-65-gdbad