Version bump (fixes bug #296023).

Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64

diff --git a/media-sound/musescore/ChangeLog b/media-sound/musescore/ChangeLog
index 0c0c9f48f1b62e43d84a6b0c709876b14d6353be..6913fa003475a38ca36665730325af2a020aee80 100644 (file)
--- a/media-sound/musescore/ChangeLog
+++ b/media-sound/musescore/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/musescore
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/ChangeLog,v 1.22 2009/07/22 17:35:31 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/ChangeLog,v 1.23 2011/11/13 07:31:01 radhermit Exp $
+
+*musescore-1.1 (13 Nov 2011)
+
+  13 Nov 2011; Tim Harder <radhermit@gentoo.org> +musescore-1.1.ebuild,
+  +files/musescore-1.1-sline.patch:
+  Version bump (fixes bug #296023).
 
   22 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
   musescore-0.9.4.ebuild:

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index f00a36cb09b4644668fcb74d1009abdf0c745cf4..34c8d4e2ee2f90d794f8e0500bddfe3b04492663 100644 (file)
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,5 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX musescore-0.9.4-build.patch 1225 RMD160 fab0a64a40de9d6afc1d2670bb1e32f4bfd8fd8b SHA1 4427edf5db8a26ff481a368e9a9d9f3079f30dcc SHA256 438b7853099126ace6895fc1e05ce34e76c71c9b98f857a944e02d664066ae7c
+AUX musescore-1.1-sline.patch 566 RMD160 0d9a307f7de37d3b7cad7b02d0600d85b396d9d6 SHA1 654537c1d047487a59b50de25c3a4b43bb13a8a6 SHA256 0bdee4ec9f9e871a706ab477287e310b6c1fd57cee94a572591a158f58760479
 DIST mscore-0.9.4.tar.bz2 11940191 RMD160 a79ad30cf613eb10ebe792ea7541219187d2dbe1 SHA1 bf7cd42601a04975c98c959113be360f91770986 SHA256 f06449b542b32199e264e1f38bd8bf64a4f144feba551a9418e96a99c2bcd928
+DIST mscore-1.1.tar.bz2 82410619 RMD160 f9eca274b3199107a2f4a18a7a68d948a07cdedb SHA1 a4e3963b995bbadf0f9a9ecdb6134d58414fd6cc SHA256 d160b4dabbee5bbe7c0ba6e653e90fd36fae07ab7fffed2c6991b65123fee10c
 EBUILD musescore-0.9.4.ebuild 1213 RMD160 77f678e83f74b3fd8be7c5c84b60a3454a5714e9 SHA1 875b0f778402234d884a6450f039c28536328f83 SHA256 49f0b6c53fbfc34b291ef7e886ae86de3068eaaaa200cbe8912f884d420fa443
-MISC ChangeLog 3240 RMD160 fc0c18547a3da30a691479101042224a006ccbf9 SHA1 c3d1a2b93730d98d608ecf5a8c74af3e7f77e785 SHA256 6108dc5b91d5b584311be1026ab332d28c23dd4117af6aba241aa89ac14b8c58
+EBUILD musescore-1.1.ebuild 1399 RMD160 9854fdf22a09310a43913152eea20d8845f0ca84 SHA1 259dd238b91dc3fc4440189aa2eaa8a320c1b22f SHA256 daf2bb7fc08bcc5e2b5ab8fe08d8a5ddcaf7ab4821cda438d644ca450bc2a5bd
+MISC ChangeLog 3415 RMD160 05c5acf352a2d61441cd698af65cfba221c16db8 SHA1 c4641d0584c3ea69e169cc839cbe657003693f44 SHA256 9adad229937caa64e3487122a9a965cf6daf6e356df98fc3b5a5c51b0c3d9194
 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJOv3I/AAoJEEqz6FtPBkyjZ9MH/iVSUINWidyEME6TKUswN7Z8
+t37E0RLr/3F81fQv4KSUFdR2BBCUcqa10DCwab3YmT5JWRgifubk/V7O2HxSlCaX
+0552vYQpq5r2GceJfeDT+hNR688fb86sr4RyEpKesN/F5+4agVEuKB4qqjt510En
+k8LtoLUXLCYoSgAZZXR6daHeCTZsvG8tT4Q46KYPsVNGbA54OExKWdCNJR82ct0O
+CutEBT1h3Wx4yvLKP9syn2an/TElFtMr7kpvqCT8tGzsGogGkFxu6IC7f+oyg7SV
+wNzV4VSyeSbC9z/yvnp7EVFf8bfOrblnFTHXCdJEns/Blg2GSvlUegQgod78rSI=
+=nwVV
+-----END PGP SIGNATURE-----

diff --git a/media-sound/musescore/files/musescore-1.1-sline.patch b/media-sound/musescore/files/musescore-1.1-sline.patch
new file mode 100644 (file)
index 0000000..1534580
--- /dev/null
+++ b/media-sound/musescore/files/musescore-1.1-sline.patch
@@ -0,0 +1,11 @@
+--- mscore-1.1/mscore/mscore/exportxml.cpp.orig
++++ mscore-1.1/mscore/mscore/exportxml.cpp
+@@ -2363,7 +2363,7 @@
+                    el->userOff().y());
+ */
+             if (el->type() == HAIRPIN || el->type() == OTTAVA || el->type() == TEXTLINE) {
+-                  SLine* sl = static_cast<const SLine*>(el);
++                  SLine* sl = static_cast<SLine*>(el);
+ //                  printf("slin segsz=%d", sl->lineSegments().size());
+                   if (sl->lineSegments().size() > 0) {
+                         LineSegment* seg = sl->lineSegments().at(0);

diff --git a/media-sound/musescore/musescore-1.1.ebuild b/media-sound/musescore/musescore-1.1.ebuild
new file mode 100644 (file)
index 0000000..b44e04a
--- /dev/null
+++ b/media-sound/musescore/musescore-1.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/musescore-1.1.ebuild,v 1.1 2011/11/13 07:31:01 radhermit Exp $
+
+EAPI=4
+inherit cmake-utils eutils font
+
+MY_P="mscore-${PV}"
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="http://mscore.sourceforge.net"
+SRC_URI="mirror://sourceforge/mscore/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib
+       >=media-libs/libsndfile-1.0.19
+       media-libs/portaudio
+       media-sound/fluidsynth
+       media-sound/jack-audio-connection-kit
+       sys-libs/zlib
+       x11-libs/qt-core:4
+       x11-libs/qt-gui:4
+       x11-libs/qt-qt3support:4
+       x11-libs/qt-script:4
+       x11-libs/qt-svg:4
+       x11-libs/qtscriptgenerator"
+DEPEND="${RDEPEND}
+       dev-texlive/texlive-context
+       app-doc/doxygen
+       dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}/mscore"
+VARTEXFONTS="${T}/fonts"
+FONT_SUFFIX="ttf"
+FONT_S="${S}/mscore/fonts"
+
+src_prepare() {
+       # Fix invalid conversion error
+       epatch "${FILESDIR}"/${P}-sline.patch
+
+       # Don't build redundant qtscriptgenerator libs
+       sed -i -e '/^set(BUILD_SCRIPTGEN/s/TRUE/FALSE/' CMakeLists.txt || die
+}
+
+src_compile() {
+       cmake-utils_src_make lupdate
+       cmake-utils_src_make lrelease
+       cmake-utils_src_make
+}
+
+src_install() {
+       cmake-utils_src_install
+       font_src_install
+       dodoc ChangeLog NEWS README
+       doman packaging/mscore.1
+}