Migrate to usex. Apply upstream patch to avoid crashing at exporting to lilypond wrt #500344 by Ulf Dambacher

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 104 insertions, 2 deletions

diff --git a/media-sound/rosegarden/ChangeLog b/media-sound/rosegarden/ChangeLog
index c4b4e1e80e37..043f8e7a1c06 100644
--- a/media-sound/rosegarden/ChangeLog
+++ b/media-sound/rosegarden/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/rosegarden
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.114 2013/11/03 09:00:54 radhermit Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.115 2014/02/05 11:26:28 ssuominen Exp $
+
+*rosegarden-13.10-r1 (05 Feb 2014)
+
+  05 Feb 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/rosegarden-13.10-segfault_at_export_to_lilypond.patch,
+  +rosegarden-13.10-r1.ebuild:
+  Migrate to usex. Apply upstream patch to avoid crashing at exporting to
+  lilypond wrt #500344 by Ulf Dambacher
 
 *rosegarden-13.10 (03 Nov 2013)
 
diff --git a/media-sound/rosegarden/files/rosegarden-13.10-segfault_at_export_to_lilypond.patch b/media-sound/rosegarden/files/rosegarden-13.10-segfault_at_export_to_lilypond.patch
new file mode 100644
index 000000000000..5efa65258aa7
--- /dev/null
+++ b/media-sound/rosegarden/files/rosegarden-13.10-segfault_at_export_to_lilypond.patch
@@ -0,0 +1,28 @@
+Index: src/document/io/LilyPondExporter.cpp
+===================================================================
+--- src/document/io/LilyPondExporter.cpp	(revision 13602)
++++ src/document/io/LilyPondExporter.cpp	(revision 13603)
+@@ -706,13 +706,18 @@
+                 std::string header = protectIllegalChars(metadata.get<String>(property));
+                 if (property == headerCopyright) {
+                     // replace a (c) or (C) with a real Copyright symbol
+-                    int posCpy = header.find("c");
+-                    if (!posCpy) posCpy = header.find("C");
+-                    if (posCpy) {
+-                        std::string leftOfCpy = header.substr(0, posCpy - 1);
+-                        std::string rightOfCpy = header.substr(posCpy + 2);
++                    size_t posCpy = header.find("(c)");
++                    if (posCpy == std::string::npos) posCpy = header.find("(C)");
++                    if (posCpy != std::string::npos) {
++                        std::string leftOfCpy = header.substr(0, posCpy);
++                        std::string rightOfCpy = header.substr(posCpy + 3);
+                         str << indent(col) << property << " =  \\markup { \"" << leftOfCpy << "\""
+                             << "\\char ##x00A9" << "\"" << rightOfCpy << "\" }" << std::endl;
++                    } else {
++                        if (header != "") {
++                            str << indent(col) << property << " = \""
++                                << header << "\"" << std::endl;
++                        }
+                     }
+                 } else if (header != "") {
+                     str << indent(col) << property << " = \"" << header << "\"" << std::endl;
diff --git a/media-sound/rosegarden/rosegarden-13.10-r1.ebuild b/media-sound/rosegarden/rosegarden-13.10-r1.ebuild
new file mode 100644
index 000000000000..584ef2115eb6
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-13.10-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-13.10-r1.ebuild,v 1.1 2014/02/05 11:26:28 ssuominen Exp $
+
+EAPI=5
+inherit autotools eutils fdo-mime gnome2-utils multilib
+
+DESCRIPTION="MIDI and audio sequencer and notation editor"
+HOMEPAGE="http://www.rosegardenmusic.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug lirc"
+
+RDEPEND="dev-qt/qtgui:4
+	media-libs/ladspa-sdk:=
+	x11-libs/libSM:=
+	media-sound/jack-audio-connection-kit:=
+	media-libs/alsa-lib:=
+	>=media-libs/dssi-1.0.0:=
+	media-libs/liblo:=
+	media-libs/liblrdf:=
+	sci-libs/fftw:3.0
+	media-libs/libsamplerate:=[sndfile]
+	lirc? ( app-misc/lirc:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-misc/makedepend"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-12.12.25-debug.patch \
+		"${FILESDIR}"/${P}-segfault_at_export_to_lilypond.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	export USER_CXXFLAGS="${CXXFLAGS}"
+
+	export ac_cv_header_lirc_lirc_client_h=$(usex lirc)
+	export ac_cv_lib_lirc_client_lirc_init=$(usex lirc)
+
+	econf \
+		$(use_enable debug) \
+		--with-qtdir=/usr \
+		--with-qtlibdir=/usr/$(get_libdir)/qt4
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}