summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <nyhm@gentoo.org>2008-06-30 23:28:11 +0000
committerTristan Heaven <nyhm@gentoo.org>2008-06-30 23:28:11 +0000
commitcff50d16ae1ef8aca8f1bd3ab20c30bab6dc748f (patch)
treef0898a87985d322b300c09d7d2e161c04082ea1a /games-misc/qlife
parentAdd split qt-4 dependencies, bug #217170 (diff)
downloadgentoo-2-cff50d16ae1ef8aca8f1bd3ab20c30bab6dc748f.tar.gz
gentoo-2-cff50d16ae1ef8aca8f1bd3ab20c30bab6dc748f.tar.bz2
gentoo-2-cff50d16ae1ef8aca8f1bd3ab20c30bab6dc748f.zip
Add split qt-4 dependencies, bug #217170
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.9 x86_64)
Diffstat (limited to 'games-misc/qlife')
-rw-r--r--games-misc/qlife/ChangeLog5
-rw-r--r--games-misc/qlife/qlife-0.9.ebuild11
2 files changed, 8 insertions, 8 deletions
diff --git a/games-misc/qlife/ChangeLog b/games-misc/qlife/ChangeLog
index 1c38e9b03c92..0291bf06d2b0 100644
--- a/games-misc/qlife/ChangeLog
+++ b/games-misc/qlife/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-misc/qlife
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/qlife/ChangeLog,v 1.6 2008/06/10 00:29:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/qlife/ChangeLog,v 1.7 2008/06/30 23:28:11 nyhm Exp $
+
+ 30 Jun 2008; Tristan Heaven <nyhm@gentoo.org> qlife-0.9.ebuild:
+ Add split qt-4 dependencies, bug #217170
10 Jun 2008; Michael Sterrett <mr_bones_@gentoo.org> qlife-0.9.ebuild:
use slotted deps for qt for bug #217170
diff --git a/games-misc/qlife/qlife-0.9.ebuild b/games-misc/qlife/qlife-0.9.ebuild
index 594b7699d9d1..5a21048649a2 100644
--- a/games-misc/qlife/qlife-0.9.ebuild
+++ b/games-misc/qlife/qlife-0.9.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/qlife/qlife-0.9.ebuild,v 1.2 2008/06/10 00:29:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/qlife/qlife-0.9.ebuild,v 1.3 2008/06/30 23:28:11 nyhm Exp $
EAPI=1
-inherit toolchain-funcs qt4 games
+inherit qt4 games
MY_P=${PN}-qt4-${PV}
DESCRIPTION="Simulates the classical Game of Life invented by John Conway"
@@ -15,7 +15,7 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
-DEPEND=">=x11-libs/qt-4.1:4"
+DEPEND="|| ( x11-libs/qt-gui:4 x11-libs/qt:4 )"
S=${WORKDIR}/${MY_P}
@@ -29,10 +29,7 @@ src_unpack() {
src_compile() {
eqmake4
- emake \
- CXX=$(tc-getCXX) \
- LINK=$(tc-getCXX) \
- || die "emake failed"
+ emake || die "emake failed"
}
src_install() {