Version bump.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 66 insertions, 32 deletions

diff --git a/media-sound/musescore/ChangeLog b/media-sound/musescore/ChangeLog
index fd638c1e79bd..ca18f4a4d577 100644
--- a/media-sound/musescore/ChangeLog
+++ b/media-sound/musescore/ChangeLog
@@ -1,6 +1,13 @@
 # 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.19 2009/05/10 08:03:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/ChangeLog,v 1.20 2009/05/10 14:10:48 ssuominen Exp $
+
+*musescore-0.9.4 (10 May 2009)
+
+  10 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  -musescore-0.9.2.ebuild, -files/musescore-0.9.2-install.patch,
+  +musescore-0.9.4.ebuild, +files/musescore-0.9.4-build.patch:
+  Version bump wrt #239962, thanks to Arttu Valo and Rudi Lippert.
 
   10 May 2009; Samuli Suominen <ssuominen@gentoo.org>
   musescore-0.9.2.ebuild:
@@ -8,24 +15,24 @@
 
 *musescore-0.9.2 (13 Jun 2008)
 
-  13 Jun 2008; Samuli Suominen <drac@gentoo.org>
+  13 Jun 2008; Samuli Suominen <ssuominen@gentoo.org>
   -files/musescore-0.9.1d-desktop-entry.patch,
   +files/musescore-0.9.2-install.patch, -musescore-0.9.1d.ebuild,
   +musescore-0.9.2.ebuild:
   Version bump.
 
-  14 Apr 2008; Samuli Suominen <drac@gentoo.org> musescore-0.9.1d.ebuild:
+  14 Apr 2008; Samuli Suominen <ssuominen@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:
+  15 Feb 2008; Samuli Suominen <ssuominen@gentoo.org> musescore-0.9.1d.ebuild:
   Jack is not optional wrt #209298 by Sven Müller.
 
-  01 Feb 2008; Samuli Suominen <drac@gentoo.org> musescore-0.9.1d.ebuild:
+  01 Feb 2008; Samuli Suominen <ssuominen@gentoo.org> musescore-0.9.1d.ebuild:
   Check for use accessibility too.
 
 *musescore-0.9.1d (01 Feb 2008)
 
-  01 Feb 2008; Samuli Suominen <drac@gentoo.org>
+  01 Feb 2008; Samuli Suominen <ssuominen@gentoo.org>
   +files/musescore-0.9.1d-desktop-entry.patch, -musescore-0.6.1.ebuild,
   +musescore-0.9.1d.ebuild:
   Version bump wrt #208274, thanks to Rudi Lippert for reporting. Keyword
@@ -33,17 +40,18 @@
 
 *musescore-0.7.0.1 (03 Oct 2007)
 
-  03 Oct 2007; Samuli Suominen <drac@gentoo.org> +musescore-0.7.0.1.ebuild:
+  03 Oct 2007; Samuli Suominen <ssuominen@gentoo.org>
+  +musescore-0.7.0.1.ebuild:
   Version bump wrt #194509, thanks to Rudi Lippert for reporting.
 
 *musescore-0.6.1 (31 Jul 2007)
 
-  31 Jul 2007; Samuli Suominen <drac@gentoo.org> +musescore-0.6.1.ebuild:
+  31 Jul 2007; Samuli Suominen <ssuominen@gentoo.org> +musescore-0.6.1.ebuild:
   Version bump.
 
 *musescore-0.6.0 (30 Jul 2007)
 
-  30 Jul 2007; Samuli Suominen <drac@gentoo.org> +musescore-0.6.0.ebuild:
+  30 Jul 2007; Samuli Suominen <ssuominen@gentoo.org> +musescore-0.6.0.ebuild:
   Version bump for bug 107848, thanks to kavol <at> email.cz for original
   ebuild and information.
 
diff --git a/media-sound/musescore/files/musescore-0.9.2-install.patch b/media-sound/musescore/files/musescore-0.9.2-install.patch
deleted file mode 100644
index c4bc728ea4f9..000000000000
--- a/media-sound/musescore/files/musescore-0.9.2-install.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur mscore-0.9.2.orig/mscore/share/locale/CMakeLists.txt mscore-0.9.2/mscore/share/locale/CMakeLists.txt
---- mscore-0.9.2.orig/mscore/share/locale/CMakeLists.txt	2008-04-12 19:49:01.000000000 +0300
-+++ mscore-0.9.2/mscore/share/locale/CMakeLists.txt	2008-06-13 22:19:27.000000000 +0300
-@@ -19,13 +19,9 @@
- #=============================================================================
- 
- install(FILES
--      mscore_de.qm
-       mscore_de.ts
--      mscore_it.qm
-       mscore_it.ts
--      mscore_pt.qm
-       mscore_pt.ts
--      mscore_ru.qm
-       mscore_ru.ts
-       DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}locale
-       )
diff --git a/media-sound/musescore/files/musescore-0.9.4-build.patch b/media-sound/musescore/files/musescore-0.9.4-build.patch
new file mode 100644
index 000000000000..03da90c06bea
--- /dev/null
+++ b/media-sound/musescore/files/musescore-0.9.4-build.patch
@@ -0,0 +1,35 @@
+diff -ur mscore-0.9.4.orig/mscore/awl/CMakeLists.txt mscore-0.9.4/mscore/awl/CMakeLists.txt
+--- mscore-0.9.4.orig/mscore/awl/CMakeLists.txt	2009-02-06 12:32:19.000000000 +0200
++++ mscore-0.9.4/mscore/awl/CMakeLists.txt	2009-05-10 16:34:42.000000000 +0300
+@@ -83,6 +83,8 @@
+       colorlabel.h
+       )
+ 
++if (BUILD_AWL_PLUGIN)
++
+ add_library (
+       awlplugin SHARED
+       ${PROJECT_BINARY_DIR}/all.h
+@@ -107,4 +109,6 @@
+ 
+ install( TARGETS awlplugin DESTINATION ${QT_PLUGINS_DIR}/designer/ )
+ 
++endif (BUILD_AWL_PLUGIN)
++
+ endif (NOT MINGW AND NOT APPLE)
+diff -ur mscore-0.9.4.orig/mscore/CMakeLists.txt mscore-0.9.4/mscore/CMakeLists.txt
+--- mscore-0.9.4.orig/mscore/CMakeLists.txt	2009-02-06 12:37:31.000000000 +0200
++++ mscore-0.9.4/mscore/CMakeLists.txt	2009-05-10 16:34:42.000000000 +0300
+@@ -28,8 +28,10 @@
+ 
+ set(USE_GLOBAL_FLUID FALSE)               # use internal fluid lib
+ 
+-set(BUILD_SCRIPT_INTERFACE TRUE)          # this requires qt >= 4.4 && cmake 2.6
+-set(BUILD_SCRIPT_DEBUG TRUE)
++set(BUILD_AWL_PLUGIN FALSE)
++
++set(BUILD_SCRIPT_INTERFACE FALSE)          # this requires qt >= 4.4 && cmake 2.6
++set(BUILD_SCRIPT_DEBUG FALSE)
+ set(STATIC_SCRIPT_BINDINGS FALSE)         # this requires qt 4.5
+ 
+ if (MINGW)
diff --git a/media-sound/musescore/metadata.xml b/media-sound/musescore/metadata.xml
index e1774e3d9ad7..ae573a60407f 100644
--- a/media-sound/musescore/metadata.xml
+++ b/media-sound/musescore/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+	<herd>sound</herd>
 </pkgmetadata>
diff --git a/media-sound/musescore/musescore-0.9.2.ebuild b/media-sound/musescore/musescore-0.9.4.ebuild
index 95855967b471..cb6ac54dee6f 100644
--- a/media-sound/musescore/musescore-0.9.2.ebuild
+++ b/media-sound/musescore/musescore-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/musescore-0.9.2.ebuild,v 1.3 2009/05/10 08:03:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/musescore-0.9.4.ebuild,v 1.1 2009/05/10 14:10:48 ssuominen Exp $
 
 EAPI=2
 inherit cmake-utils eutils font
@@ -21,21 +21,29 @@ RDEPEND="sys-libs/zlib
 	media-sound/fluidsynth
 	media-sound/jack-audio-connection-kit
 	media-libs/portaudio
+	x11-libs/qt-core:4
+	x11-libs/qt-script:4
 	x11-libs/qt-gui:4
-	x11-libs/qt-svg:4
-	x11-libs/qt-qt3support:4"
+	x11-libs/qt-svg:4"
 DEPEND="${RDEPEND}
 	|| ( dev-texlive/texlive-context app-text/tetex )
+	app-doc/doxygen
 	dev-util/pkgconfig"
 
 S=${WORKDIR}/${MY_P}/mscore
 VARTEXFONTS=${T}/fonts
-FONT_SUFFIX=otf
+FONT_SUFFIX=ttf
 FONT_S=${S}/mscore/fonts
 MAKEOPTS="${MAKEOPTS} -j1"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-install.patch
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_compile() {
+	cmake-utils_src_make lupdate
+	cmake-utils_src_make lrelease
+	cmake-utils_src_make
 }
 
 src_install() {