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

(Portage version: 2.1.4.1)

4 files changed, 75 insertions, 68 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/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
+}