diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-09-08 21:04:23 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-09-08 21:04:23 +0000 |
| commit | fde97ac320e433bad96bbd1a15d09e87edfe5206 (patch) | |
| tree | 99a912e8a5787cdf6c891008d1e3ca251434355c /app-cdr | |
| parent | Re-assigning maintainership to sci-electronics. (diff) | |
| download | gentoo-2-fde97ac320e433bad96bbd1a15d09e87edfe5206.tar.gz gentoo-2-fde97ac320e433bad96bbd1a15d09e87edfe5206.tar.bz2 gentoo-2-fde97ac320e433bad96bbd1a15d09e87edfe5206.zip | |
Accept dbus-qt3-old aside from dbus proper, and don't do the useflag check for that case.
(Portage version: 2.1.1_rc1-r7)
Diffstat (limited to 'app-cdr')
| -rw-r--r-- | app-cdr/k3b/ChangeLog | 7 | ||||
| -rw-r--r-- | app-cdr/k3b/k3b-0.12.17.ebuild | 7 | ||||
| -rw-r--r-- | app-cdr/k3b/k3b-1.0_pre2.ebuild | 7 |
3 files changed, 14 insertions, 7 deletions
diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog index 9e96bcd45662..7c554475963c 100644 --- a/app-cdr/k3b/ChangeLog +++ b/app-cdr/k3b/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-cdr/k3b # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.161 2006/09/07 17:02:56 deathwing00 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.162 2006/09/08 21:04:23 flameeyes Exp $ + + 08 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> k3b-0.12.17.ebuild, + k3b-1.0_pre2.ebuild: + Accept dbus-qt3-old aside from dbus proper, and don't do the useflag check + for that case. *k3b-1.0_pre2 (07 Sep 2006) diff --git a/app-cdr/k3b/k3b-0.12.17.ebuild b/app-cdr/k3b/k3b-0.12.17.ebuild index da02538b64e2..45e414528a7c 100644 --- a/app-cdr/k3b/k3b-0.12.17.ebuild +++ b/app-cdr/k3b/k3b-0.12.17.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.12.17.ebuild,v 1.1 2006/08/23 16:30:07 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.12.17.ebuild,v 1.2 2006/09/08 21:04:23 flameeyes Exp $ inherit kde eutils @@ -14,7 +14,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="alsa css dvdr encode ffmpeg flac hal kde mp3 musepack musicbrainz sndfile vcd vorbis" DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) ) - hal? ( sys-apps/dbus sys-apps/hal ) + hal? ( || ( dev-libs/dbus-qt3-old sys-apps/dbus ) + sys-apps/hal ) media-libs/libsamplerate media-libs/taglib >=media-sound/cdparanoia-3.9.8 @@ -54,7 +55,7 @@ for X in ${LANGS}; do done pkg_setup() { - if use hal && ! built_with_use sys-apps/dbus qt3; then + if use hal && has_version '<sys-apps/dbus-0.91' && ! built_with_use sys-apps/dbus qt3; then eerror "You are trying to compile ${CATEGORY}/${PF} with the \"hal\" USE flag enabled," eerror "but sys-apps/dbus is not built with Qt3 support." die "rebuild sys-apps/dbus with the qt3 useflag" diff --git a/app-cdr/k3b/k3b-1.0_pre2.ebuild b/app-cdr/k3b/k3b-1.0_pre2.ebuild index 762371929c3c..e8d4efdad6d1 100644 --- a/app-cdr/k3b/k3b-1.0_pre2.ebuild +++ b/app-cdr/k3b/k3b-1.0_pre2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0_pre2.ebuild,v 1.1 2006/09/07 17:02:56 deathwing00 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0_pre2.ebuild,v 1.2 2006/09/08 21:04:23 flameeyes Exp $ inherit kde eutils @@ -17,7 +17,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="alsa css dvdr dvdread encode ffmpeg flac hal kde mp3 musepack musicbrainz sndfile vcd vorbis" DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) ) - hal? ( sys-apps/dbus sys-apps/hal ) + hal? ( || ( dev-libs/dbus-qt3-old sys-apps/dbus ) + sys-apps/hal ) media-libs/libsamplerate media-libs/taglib >=media-sound/cdparanoia-3.9.8 @@ -60,7 +61,7 @@ need-kde 3.2 #done pkg_setup() { - if use hal && ! built_with_use sys-apps/dbus qt3; then + if use hal && has_version '<sys-apps/dbus-0.91' && ! built_with_use sys-apps/dbus qt3; then eerror "You are trying to compile ${CATEGORY}/${PF} with the \"hal\" USE flag enabled," eerror "but sys-apps/dbus is not built with Qt3 support." die "Please, rebuild sys-apps/dbus with the \"qt3\" USE flag." |