diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2008-07-14 18:34:30 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2008-07-14 18:34:30 +0000 |
| commit | ea674e714b3762bb7a89b57a364893dcb3c313ab (patch) | |
| tree | cd1642043ebd023e90af5510a867fe10d79c499a /net-im | |
| parent | Stable for HPPA (bug #231779). (diff) | |
| download | gentoo-2-ea674e714b3762bb7a89b57a364893dcb3c313ab.tar.gz gentoo-2-ea674e714b3762bb7a89b57a364893dcb3c313ab.tar.bz2 gentoo-2-ea674e714b3762bb7a89b57a364893dcb3c313ab.zip | |
Apply Qt-4 dependencies patch by yngwin (bug #215962 comment #12).
(Portage version: 2.2_rc1/cvs/Linux 2.6.24-gentoo-r2-JeR i686)
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/psi/ChangeLog | 5 | ||||
| -rw-r--r-- | net-im/psi/psi-0.12_rc4.ebuild | 24 |
2 files changed, 24 insertions, 5 deletions
diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog index 3605569df830..bc4d63449775 100644 --- a/net-im/psi/ChangeLog +++ b/net-im/psi/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-im/psi # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.134 2008/07/14 05:09:09 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.135 2008/07/14 18:34:30 jer Exp $ + + 14 Jul 2008; Jeroen Roovers <jer@gentoo.org> psi-0.12_rc4.ebuild: + Apply Qt-4 dependencies patch by yngwin (bug #215962 comment #12). *psi-0.12_rc4 (14 Jul 2008) diff --git a/net-im/psi/psi-0.12_rc4.ebuild b/net-im/psi/psi-0.12_rc4.ebuild index 7e0014d24cc3..94ffc4597a2e 100644 --- a/net-im/psi/psi-0.12_rc4.ebuild +++ b/net-im/psi/psi-0.12_rc4.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.12_rc4.ebuild,v 1.1 2008/07/14 05:07:30 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.12_rc4.ebuild,v 1.2 2008/07/14 18:34:30 jer Exp $ + +EAPI="1" inherit eutils qt4 multilib @@ -16,7 +18,7 @@ LICENSE="GPL-2" KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" RESTRICT="test" -COMMON_DEPEND="$(qt4_min_version 4.2.3) +COMMON_DEPEND="|| ( >=x11-libs/qt-4.3:4 x11-libs/qt-gui:4 ) =app-crypt/qca-2* spell? ( app-text/aspell ) xscreensaver? ( x11-libs/libXScrnSaver )" @@ -30,8 +32,22 @@ RDEPEND="${COMMON_DEPEND} S="${WORKDIR}/${MY_P}" -QT4_BUILT_WITH_USE_CHECK="qt3support png" -QT4_OPTIONAL_BUILT_WITH_USE_CHECK="dbus" +pkg_setup() { + if has_version "=x11-libs/qt-4.3*"; then + QT4_BUILT_WITH_USE_CHECK="qt3support png" + QT4_OPTIONAL_BUILT_WITH_USE_CHECK="dbus" + else + if ! built_with_use "x11-libs/qt-gui:4" qt3support; then + eerror "You have to build x11-libs/qt-gui:4 with qt3support." + die "qt3support in qt-gui disabled" + fi + if ( use dbus && ! built_with_use "x11-libs/qt-gui:4" dbus ); then + eerror "You have to build x11-libs/qt-gui:4 with dbus" + die "dbus in qt-gui disabled" + fi + fi + qt4_pkg_setup +} src_compile() { # disable growl as it is a MacOS X extension only |