Version bump wrt #208274, thanks to Rudi Lippert for reporting. Keyword ~amd64 and convert to cmake-utils eclass.

Package-Manager: portage-2.1.4.1

5 files changed, 79 insertions, 71 deletions

diff --git a/media-sound/musescore/ChangeLog b/media-sound/musescore/ChangeLog
index 4ef43f21906f..ba3563a77b6e 100644
--- a/media-sound/musescore/ChangeLog
+++ b/media-sound/musescore/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/musescore
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/ChangeLog,v 1.13 2007/10/03 17:44:56 drac Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/ChangeLog,v 1.14 2008/02/01 14:31:20 drac Exp $
+
+*musescore-0.9.1d (01 Feb 2008)
+
+  01 Feb 2008; Samuli Suominen <drac@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
+  ~amd64 and convert to cmake-utils eclass.
 
 *musescore-0.7.0.1 (03 Oct 2007)
 
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 45a6fe4c7f6f..6e9d1d26c015 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,6 +1,7 @@
-DIST mscore-0.6.1.tar.bz2 7699413 RMD160 0fcf578238a4147b4341d0214f4ceed6a646baf2 SHA1 50e00b467e653e4a24f70835dfe77904f890af65 SHA256 ca4b4ebfe9e2e8634e7bb46529b438b41d5d9b329bfce26a4a6169017d5f6ded
+AUX musescore-0.9.1d-desktop-entry.patch 550 RMD160 6d4edaf95b30b7c800bd930a4d5a4fc7131c8221 SHA1 c0fe67bd13cc5c21e0abb314072ec019342d4a26 SHA256 a04db9dfa5c1f64aeed57217a57c8815ea435a0dbbdd54aef89b2816b0bb19e6
 DIST mscore-0.7.0.1.tar.bz2 7623226 RMD160 165f9070eacb02b1e81bcc47638167df36c88c1e SHA1 858792ab4e0caeafda4d8746aa8d7c011e29d13c SHA256 827d6b79fc7c05f29ac67eb72b7482ff3159ddf164f9bb76fd884897a4b1eeed
-EBUILD musescore-0.6.1.ebuild 1636 RMD160 7206de6eac60eb13cc3ceabdd4ab69fd59e15c2e SHA1 fdff8c2cb2dd3117152b611d485f1002f346d8ab SHA256 e922d68e52f4e7f48981cbb45c6e6ac108295c908e8e79cac01266b94de5d6f6
+DIST mscore-0.9.1d.tar.bz2 8345033 RMD160 109412f8602f411059000f3d74d768920e69d2e7 SHA1 2137bc43913479c4204ccd0094209f25cd7e4116 SHA256 a158e796143d43750201255f93ca7323be035f40497bbbeb95c71140bd2f1169
 EBUILD musescore-0.7.0.1.ebuild 1667 RMD160 b5c1afd3b4ac0c0a9134172e14aef13a297d0dfc SHA1 4101f0d3d500e12d75a06041ea1b6e8d88446916 SHA256 832947167308433a7d785ca62ed8d6679ab46523e5886d3e17bbb623eb2ef45a
-MISC ChangeLog 1610 RMD160 91356363e40c75632a557483903694da25448b76 SHA1 2327a820a53cb1a08e0603bf96efcea2cfb60243 SHA256 3c25bd3aa50324fa81f3bc0f8562ce48a04e19f371c3f8a7617a6fe5d5dadd62
+EBUILD musescore-0.9.1d.ebuild 1200 RMD160 c75cf74fe69027b05b829e6841d7c6305e1969fa SHA1 5a504678cef5adb0a57e61f0f0f787c05f7d6517 SHA256 fd1909c4312a63bc8a7433a59f4134f0a01cb5e2e52293327c0ab0634637758e
+MISC ChangeLog 1911 RMD160 c691a71a2679c50a2476adc329d953e2ca8ddb20 SHA1 506f0013397fcd9c0a1b33c78d1446479807f6bf SHA256 607802525cc3253d19df5fe15d9da37ad1ec7caa5073bd36d5433640315a5cb1
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/musescore/files/musescore-0.9.1d-desktop-entry.patch b/media-sound/musescore/files/musescore-0.9.1d-desktop-entry.patch
new file mode 100644
index 000000000000..e72182ebf5ee
--- /dev/null
+++ b/media-sound/musescore/files/musescore-0.9.1d-desktop-entry.patch
@@ -0,0 +1,13 @@
+diff -ur mscore-0.9.1.orig/mscore/CMakeLists.txt mscore-0.9.1/mscore/CMakeLists.txt
+--- mscore-0.9.1.orig/mscore/CMakeLists.txt	2008-01-24 11:38:17.000000000 +0200
++++ mscore-0.9.1/mscore/CMakeLists.txt	2008-02-01 16:07:49.000000000 +0200
+@@ -146,9 +146,6 @@
+       ${PROJECT_SOURCE_DIR}/config.h.in
+       ${PROJECT_BINARY_DIR}/config.h
+       )
+-if (NOT MINGW)
+-      install( FILES ${PROJECT_BINARY_DIR}/mscore.desktop DESTINATION share/applications)
+-endif (NOT MINGW)
+ 
+ if (USE_GLOBAL_FLUID)
+       subdirs(awl osdabzip mscore share doc demos)
diff --git a/media-sound/musescore/musescore-0.6.1.ebuild b/media-sound/musescore/musescore-0.6.1.ebuild
deleted file mode 100644
index e74bb3a3dbf1..000000000000
--- a/media-sound/musescore/musescore-0.6.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/musescore-0.6.1.ebuild,v 1.1 2007/07/31 14:05:47 drac Exp $
-
-inherit eutils font toolchain-funcs
-
-MY_P=${P/musescore/mscore}
-
-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="~sparc ~x86"
-IUSE="doc jack"
-
-RDEPEND=">=x11-libs/qt-4.3
-	media-sound/fluidsynth
-	media-libs/alsa-lib
-	jack? ( media-sound/jack-audio-connection-kit )"
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.6
-	dev-util/pkgconfig
-	doc? ( virtual/tetex app-doc/doxygen )"
-
-S="${WORKDIR}"/${MY_P}
-BUILDDIR="${S}"/build
-FONT_SUFFIX="otf"
-FONT_S="${S}"/mscore/mscore/fonts
-
-pkg_setup() {
-	if ! built_with_use ">=x11-libs/qt-4.3" qt3support; then
-		eerror "x11-libs/qt is built without qt3support."
-		die "re-emerge x11-libs/qt with USE qt3support."
-	fi
-}
-
-src_compile() {
-	mkdir "${BUILDDIR}"
-	cd "${BUILDDIR}"
-
-	cmake \
-		-DCMAKE_VERBOSE_MAKEFILE="ON" \
-		-DCMAKE_INSTALL_PREFIX="/usr" \
-		-DCMAKE_C_COMPILER="$(type -P $(tc-getCC))" \
-		-DCMAKE_CXX_COMPILER="$(type -P $(tc-getCXX))" \
-		-DCMAKE_C_FLAGS="${CFLAGS}" \
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-		-DCMAKE_LD_FLAGS="${LDFLAGS}" \
-		../mscore || die "cmake failed."
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	cd "${BUILDDIR}"
-	emake DESTDIR="${D}" install || die "emake install failed."
-
-	font_src_install
-
-	cd "${S}"/mscore
-	dodoc ChangeLog NEWS README TODO doc/{MANUAL,README*}
-
-	make_desktop_entry mscore "MuseScore"
-}
diff --git a/media-sound/musescore/musescore-0.9.1d.ebuild b/media-sound/musescore/musescore-0.9.1d.ebuild
new file mode 100644
index 000000000000..38cd0590a2c4
--- /dev/null
+++ b/media-sound/musescore/musescore-0.9.1d.ebuild
@@ -0,0 +1,52 @@
+# 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.1 2008/02/01 14:31:20 drac Exp $
+
+inherit cmake-utils eutils font
+
+MY_P=${P/musescore/mscore}
+
+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 ~sparc ~x86"
+IUSE="doc jack"
+
+RDEPEND=">=x11-libs/qt-4.3
+	media-sound/fluidsynth
+	media-libs/alsa-lib
+	jack? ( media-sound/jack-audio-connection-kit )"
+DEPEND="${RDEPEND}
+	>=dev-util/cmake-2.4.6
+	dev-util/pkgconfig
+	doc? ( virtual/tetex app-doc/doxygen )"
+
+S=${WORKDIR}/${MY_P/d}/mscore
+
+FONT_SUFFIX="otf"
+FONT_S="${S}"/mscore/fonts
+
+pkg_setup() {
+	local fail="Re-emerge x11-libs/qt with USE qt3support."
+
+	if ! built_with_use ">=x11-libs/qt-4.3" qt3support; then
+		eerror "${fail}"
+		die "${fail}"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-desktop-entry.patch
+}
+
+src_install() {
+	cmake-utils_src_install
+	font_src_install
+	dodoc ChangeLog NEWS README doc/README*
+	domenu packaging/mscore.desktop
+}