diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2008-04-14 21:48:03 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2008-04-14 21:48:03 +0000 |
| commit | be520b1be2fac0b94570b179f652b51356a78e8a (patch) | |
| tree | 8bcc5061b9719cc08b6196882409165154a101f0 /media-sound/musescore | |
| parent | Version bump. (diff) | |
| download | historical-be520b1be2fac0b94570b179f652b51356a78e8a.tar.gz historical-be520b1be2fac0b94570b179f652b51356a78e8a.tar.bz2 historical-be520b1be2fac0b94570b179f652b51356a78e8a.zip | |
Fix attempt at fixing 217161, and work it from there.
Package-Manager: portage-2.1.5_rc3
Diffstat (limited to 'media-sound/musescore')
| -rw-r--r-- | media-sound/musescore/ChangeLog | 5 | ||||
| -rw-r--r-- | media-sound/musescore/Manifest | 4 | ||||
| -rw-r--r-- | media-sound/musescore/musescore-0.9.1d.ebuild | 23 |
3 files changed, 21 insertions, 11 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/Manifest b/media-sound/musescore/Manifest index 0bcdecf7c9a7..dd01adde7775 100644 --- a/media-sound/musescore/Manifest +++ b/media-sound/musescore/Manifest @@ -1,5 +1,5 @@ AUX musescore-0.9.1d-desktop-entry.patch 550 RMD160 6d4edaf95b30b7c800bd930a4d5a4fc7131c8221 SHA1 c0fe67bd13cc5c21e0abb314072ec019342d4a26 SHA256 a04db9dfa5c1f64aeed57217a57c8815ea435a0dbbdd54aef89b2816b0bb19e6 DIST mscore-0.9.1d.tar.bz2 8345033 RMD160 109412f8602f411059000f3d74d768920e69d2e7 SHA1 2137bc43913479c4204ccd0094209f25cd7e4116 SHA256 a158e796143d43750201255f93ca7323be035f40497bbbeb95c71140bd2f1169 -EBUILD musescore-0.9.1d.ebuild 1240 RMD160 66ee7f6d7384c4a1b99267520e03f1ae97fc73b4 SHA1 3069a8c9a9f0e30bc5510e2a05a4970abe780ee8 SHA256 573558080f79113376cd03a3ce7f096194dfae8a396c9422dfeb34055e8c76c6 -MISC ChangeLog 2148 RMD160 7c916b7313c07ed45004c1493a3e7b20f3ec5f65 SHA1 37e9e0ba4ad77fe2af1f9ed1102ce3d6c2db97f6 SHA256 602664f36b8151a5ab16dc5efcf95fefbe258dc0fafd0e5b7284e0cc9704200d +EBUILD musescore-0.9.1d.ebuild 1410 RMD160 f06e76626bc1f6a30b06a8fe2d07f6b566e3ca4d SHA1 435b22e351df5289d71941ddf35c44201e7ce135 SHA256 0f44ff71a383b4f6074934171a423ac839fa284e19e08476f64856271bfa7c81 +MISC ChangeLog 2260 RMD160 f21ed9e260c58e0ad3de488d6b87aa4d0393ae41 SHA1 816bdd03b1e5cf43a5a3783763dd0fd841b5fc54 SHA256 3fc8957ee05ce58abce2052ca2ce96eed57383cf30f7876ab88196634a4f8578 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b 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() { |