diff options
| author |   Samuli Suominen <drac@gentoo.org> | 2008-04-14 21:48:03 +0000 |
|---|---|---|
| committer | Samuli Suominen <drac@gentoo.org> | 2008-04-14 21:48:03 +0000 |
| commit | f8626accfe7bddc16b583ab6f2ad9cd4bf538ad2 (patch) | |
| tree | df223c934e345f7773cf768e5f6139f639326940 /media-sound | |
| parent | Version bump. (diff) | |
| download | gentoo-2-f8626accfe7bddc16b583ab6f2ad9cd4bf538ad2.tar.gz gentoo-2-f8626accfe7bddc16b583ab6f2ad9cd4bf538ad2.tar.bz2 gentoo-2-f8626accfe7bddc16b583ab6f2ad9cd4bf538ad2.zip | |
Fix attempt at fixing 217161, and work it from there.
(Portage version: 2.1.5_rc3)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/musescore/ChangeLog | 5 | ||||
| -rw-r--r-- | media-sound/musescore/musescore-0.9.1d.ebuild | 23 |
2 files changed, 19 insertions, 9 deletions
diff --git a/media-sound/musescore/ChangeLog b/media-sound/musescore/ChangeLog index 92025dceaf33..f6d8c2833204 100644 --- a/media-sound/musescore/ChangeLog +++ b/media-sound/musescore/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/musescore # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/ChangeLog,v 1.16 2008/02/15 12:36:18 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/ChangeLog,v 1.17 2008/04/14 21:48:03 drac Exp $ + + 14 Apr 2008; Samuli Suominen <drac@gentoo.org> musescore-0.9.1d.ebuild: + Change qt4 depends for bug 217161. 15 Feb 2008; Samuli Suominen <drac@gentoo.org> musescore-0.9.1d.ebuild: Jack is not optional wrt #209298 by Sven Müller. diff --git a/media-sound/musescore/musescore-0.9.1d.ebuild b/media-sound/musescore/musescore-0.9.1d.ebuild index 2e45776846ff..163446484cf3 100644 --- a/media-sound/musescore/musescore-0.9.1d.ebuild +++ b/media-sound/musescore/musescore-0.9.1d.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/media-sound/musescore/musescore-0.9.1d.ebuild,v 1.3 2008/02/15 12:36:18 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/musescore-0.9.1d.ebuild,v 1.4 2008/04/14 21:48:03 drac Exp $ + +EAPI=1 inherit cmake-utils eutils font @@ -15,10 +17,12 @@ SLOT="0" KEYWORDS="~amd64 ~sparc ~x86" IUSE="doc" -RDEPEND=">=x11-libs/qt-4.3 +RDEPEND="media-libs/alsa-lib media-sound/fluidsynth - media-libs/alsa-lib - media-sound/jack-audio-connection-kit" + media-sound/jack-audio-connection-kit + || ( ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 + x11-libs/qt-qt3support:4 ) + >=x11-libs/qt-4.3:4 )" DEPEND="${RDEPEND} >=dev-util/cmake-2.4.6 dev-util/pkgconfig @@ -26,13 +30,16 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P/d}/mscore -FONT_SUFFIX="otf" +FONT_SUFFIX=otf FONT_S=${S}/mscore/fonts pkg_setup() { - local fail="Re-emerge >=x11-libs/qt-4.3 with USE accessibility and qt3support." - built_with_use ">=x11-libs/qt-4.3" qt3support || die "${fail}" - built_with_use ">=x11-libs/qt-4.3" accessibility || die "${fail}" + # fixme. we need some checking also for split pkgs. + if has_version "=x11-libs/qt-4.3*"; then + local fail="Re-emerge =x11-libs/qt-4.3* with USE accessibility and qt3support." + built_with_use x11-libs/qt qt3support || die "${fail}" + built_with_use x11-libs/qt accessibility || die "${fail}" + fi } src_unpack() { |