diff options
| author |   Carsten Lohrke <carlo@gentoo.org> | 2008-07-28 21:29:24 +0000 |
|---|---|---|
| committer | Carsten Lohrke <carlo@gentoo.org> | 2008-07-28 21:29:24 +0000 |
| commit | 9b2fb364dd0e37e16dfddc4d7677dd3c204dfb66 (patch) | |
| tree | d571e5d9f561113cd8967a85f6fc960307d3a2bf /sys-kernel/kccmp | |
| parent | QA: Get rid of deprecated qt4_min_version(). Please fix your ebuilds to supp... (diff) | |
| download | gentoo-2-9b2fb364dd0e37e16dfddc4d7677dd3c204dfb66.tar.gz gentoo-2-9b2fb364dd0e37e16dfddc4d7677dd3c204dfb66.tar.bz2 gentoo-2-9b2fb364dd0e37e16dfddc4d7677dd3c204dfb66.zip | |
QA: Get rid of deprecated qt?_min_version(). Fix invalid monolithic Qt dependency, cf. bug 217161 comment 11.
(Portage version: 2.1.4.4)
Diffstat (limited to 'sys-kernel/kccmp')
| -rw-r--r-- | sys-kernel/kccmp/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-kernel/kccmp/kccmp-0.2-r1.ebuild | 4 | ||||
| -rw-r--r-- | sys-kernel/kccmp/kccmp-0.2.ebuild | 8 |
3 files changed, 13 insertions, 6 deletions
diff --git a/sys-kernel/kccmp/ChangeLog b/sys-kernel/kccmp/ChangeLog index b103ee214b99..9558220efdd6 100644 --- a/sys-kernel/kccmp/ChangeLog +++ b/sys-kernel/kccmp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-kernel/kccmp # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kccmp/ChangeLog,v 1.10 2008/04/27 01:46:25 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kccmp/ChangeLog,v 1.11 2008/07/28 21:29:24 carlo Exp $ + + 28 Jul 2008; Carsten Lohrke <carlo@gentoo.org> kccmp-0.2.ebuild, + kccmp-0.2-r1.ebuild: + QA: Get rid of deprecated qt?_min_version(). Fix invalid monolithic Qt + dependency, cf. bug 217161 comment 11. 27 Apr 2008; Michael Pagano <mpagano@gentoo.org> +files/kccmp-0.2-r1-no-qt4-missing-include.patch, kccmp-0.2-r1.ebuild: diff --git a/sys-kernel/kccmp/kccmp-0.2-r1.ebuild b/sys-kernel/kccmp/kccmp-0.2-r1.ebuild index c8eed120aabf..3cd113532490 100644 --- a/sys-kernel/kccmp/kccmp-0.2-r1.ebuild +++ b/sys-kernel/kccmp/kccmp-0.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kccmp/kccmp-0.2-r1.ebuild,v 1.4 2008/04/27 01:46:25 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kccmp/kccmp-0.2-r1.ebuild,v 1.5 2008/07/28 21:29:24 carlo Exp $ EAPI="1" inherit qt3 qt4 @@ -17,7 +17,7 @@ IUSE="qt4" RDEPEND="!qt4? ( >=x11-libs/qt-3.3.8-r4:3 ) qt4? ( || ( ( x11-libs/qt-core:4 x11-libs/qt-gui:4 ) - >=x11-libs/qt-4.3:4 ) )" + =x11-libs/qt-4.3*:4 ) )" DEPEND="${RDEPEND}" src_unpack() { diff --git a/sys-kernel/kccmp/kccmp-0.2.ebuild b/sys-kernel/kccmp/kccmp-0.2.ebuild index c45ce0f84a5c..2bd8f43c70bc 100644 --- a/sys-kernel/kccmp/kccmp-0.2.ebuild +++ b/sys-kernel/kccmp/kccmp-0.2.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/sys-kernel/kccmp/kccmp-0.2.ebuild,v 1.8 2008/03/07 22:14:12 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kccmp/kccmp-0.2.ebuild,v 1.9 2008/07/28 21:29:24 carlo Exp $ + +EAPI=1 inherit qt3 qt4 @@ -13,8 +15,8 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="qt4" -DEPEND="qt4? ( $(qt4_min_version 4.3.1-r1) >=dev-libs/boost-1.33.1-r1 ) - !qt4? ( $(qt_min_version 3.3.8-r4) )" +DEPEND="qt4? ( =x11-libs/qt-4.3*:4 >=dev-libs/boost-1.33.1-r1 ) + !qt4? ( x11-libs/qt:3 )" src_unpack() { unpack "${A}" |