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

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 114 insertions, 10 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/Manifest b/media-sound/rosegarden/Manifest
index cd824cfc7a2c..6a42ff3afd73 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -2,22 +2,24 @@
 Hash: SHA256
 
 AUX rosegarden-12.12.25-debug.patch 762 SHA256 51634e806a7876e4c944c0ce302934644d48c0f4f2cffb4e1f5ec8e7246831dc SHA512 20897f94f366c1f8cf0df503a7949fc7b77f84cd893bbf24819e84a061e8b9fd0d179e3d95bbb13edfbd413e8c9bf8db1f92178781566c30a66a56b61bec83ca WHIRLPOOL 02ba461651d8aab8bc2aa85b5235450349bcec9d11ea6ed7c7c9cabf61fb065ccae46de6d90717d22d8371d8e95a0d7c59a9febb44caf6f9765ed94c77a3836e
+AUX rosegarden-13.10-segfault_at_export_to_lilypond.patch 1714 SHA256 23c4030cc58f725c389e75c28cd8f9ae5db28962106b251981051c8666b24104 SHA512 aee47dd62b49d7ae1edb02b8bc585a81f4277adf812b6a252fe315392a1ae744416fdbe1fb14e1867b8b4c1d755ef83085032694f05c96cfbeda92a15422c911 WHIRLPOOL b712f7205c881adbf2088f0cf2d82dcfb103acd566b44e61681caeaf59c79b12e47358ee26ad18f11f3170b103c505b080ad0f04e625d0a1e28e7c9d5d83a2e9
 DIST rosegarden-13.04.tar.bz2 5858085 SHA256 4d8dabb08a7b807cad46d64d808752a82e26dc6d0144e5849392c51421936c7d SHA512 a01bf391be92c564d20d53c03556552cf5e9cd8f1b1eda49de18432dbcb97ed8c65795efb2275ae9a2f91c7701ea71d3497bbf062606331dbe3487a41c33cdfa WHIRLPOOL 5b4fe5a149350a64cabbde04b5c16cdda92f848c1aa45adbf4136c3f55da75dc07434f8d126404334a477e36922e5fd1c5efe66fa46e9b38d42b661b3c158ecd
 DIST rosegarden-13.06.tar.bz2 6246199 SHA256 d21777da4e17242502eff464a1c620f7c5672272733899da21e3e4a38f8e2d15 SHA512 43ebe10b949bb04762f1c2b41064c9a6460b3c9b82e6e89d1d63b5f8ddc31c35549bc848af30379e5d6e28c85e3bf4e1a2284987c5550b33919cdbfb91c2715d WHIRLPOOL fbdb6e53046ee99797686afe53eaac2ec75092a91cf77262b100a8c6bf420df2f8404a2feb66f4192e40b303ddbebe5dd714d728b4cb963dc25975e599a690c5
 DIST rosegarden-13.10.tar.bz2 6355164 SHA256 6c3a1961b75ded3ded634e9c24f194fd483b11bc797a2603cf5a61fec674e6d5 SHA512 f65bf1c2098b2e2266131e6c430c598ee881e43a5daf77d6ef843be0e2543a07264af4442335573f4408568dde74357c596d8b99cf77b311fb9a55ca3584d18a WHIRLPOOL c39fbe2939411ee10ba8370bce41578e6e683839645c935ee9dfd341d2d0be4d18866893e9cbc10d15245c5d6bc5a8cf5ca90279dde53a979a3d9f7750f0a916
 EBUILD rosegarden-13.04.ebuild 1495 SHA256 e2fc24c2d7283812f91695426861be4398eadf0f88a5c10e5e832acf3c737ffc SHA512 cf819489e94058cb5a1e61283e0da22abba7c9a4bee6915c9c6c005cb3c96a718f1990097d8b6700fc3163514d169c3e980ea88753d6d732e2c51b380c647e54 WHIRLPOOL 270958e7d8da34d0b0ffd19d7f10451d7231da893119855599632642561e680248a7bbc61532b41c5c96179bae7e98857a84abcfc14300ca608f719d6efc09ea
 EBUILD rosegarden-13.06.ebuild 1503 SHA256 35981655ac8dd1e60bbba530f6fef1e11f3ae584a0990c156801b16359bcb662 SHA512 1afe53655a5420b4eca41f7896bfd76dc3ced4dd49c0eb1e6b7fefd12bb01d9c98402b671c6032236e0af6aed496cac4128729441ed3aa89314aa3aa4f784e39 WHIRLPOOL 28a1ab2654cd48228119237dd9c33e40c9776981f8566486e953082a63b3a687056843d322650e6d0771910a63bee4ec4f0044b38f0c558123af87f06d5e788f
+EBUILD rosegarden-13.10-r1.ebuild 1536 SHA256 dcf08795062a3b8d8995c39962ec167c9f91f7d3bd8ba5fb32a438d0053520c5 SHA512 e659c068aa129891967e1bb4d1fc66f5ea51bc41e4194f6763ca5621d8f0084fa0afde8d7ad86081fa50a63d55edc5bc2cd4e6e39cbe23220048ea8e0c0b9ec8 WHIRLPOOL 5a1dbd19aaaf1704f643aac25cb8e029eb346d011cbd58a3ec4ff30dc3be14863d1edec4743babc9f4ad44a1a5023f0a18a3493a1370ef0e255cd3ed7d91cdb4
 EBUILD rosegarden-13.10.ebuild 1503 SHA256 9e69946971e73ab6ecd9465484100e32f7aab8c08e259d4826fa35f07ef5add3 SHA512 a3ea1880f866796f7fc76d8d96fd061b686b4a1f381b2851355fa7ff519d1a036de8067145c2831fceb525de6b18f24613b08895f22f517f458f8fdc8cdc266c WHIRLPOOL b8ce2b4ccb412ff1a00ffe2a2e09eba8bd74b1af6b166f86b58c819f2227bd8e3dfa57cffe229c034c134832033be27ca9ae59c6531da80e3bb347e70386f7a7
-MISC ChangeLog 16567 SHA256 8a0806e297c95ff7559933ade8ce61ef78d3958e7ad86445c8b1fbd953d74deb SHA512 f995aa62401eaddd586fc9c85dc062fd48caa58f82738062a9e632eb7616b7fb1f2495b9a476c740c9f8476a8b72e8f22bb7860c3d74720b3cedb41109c7977b WHIRLPOOL 7c407fdeaf2ead05ae78abae0b00a7b431517bc78e0edd523c540cc653c5b0b79da0619f1a4cbf841896037b64c836520a93ccbca72bbdd5c64c90b447008220
+MISC ChangeLog 16867 SHA256 55bdf0b5d138e6facce6f5e62ef2a0604cbc7d5a2b7e42a4e87114ebd9f2dabc SHA512 27ff9aec9d6fd847c714ec74d4e61285f8ec400440babd323f694bd4103f8db4012f811ac32164260626f713c82fdc991316ce69edc105c273ed57349bdd0776 WHIRLPOOL bde928548461caeaed8d75473a1cda3244619d89b3840e323c90c8a67ed5890365fe40ee6734e8aef57aa4229de1c0c00b3281b0e51db6ddd3d32b271730adc0
 MISC metadata.xml 163 SHA256 39a67c65d2e7583b6ee9e20fcab1fd821e28c51134eb2f76a7fe0598a2c2b4cb SHA512 9f75bebfe63cca16660e90ff8d0f4fb6a7b2923630c72616134f69273306434c3060eb2be81b6bc619dfdce11bc0e76d3ba874007ddf866367a81fc2279b9496 WHIRLPOOL 6de4b890a3933fb8231bf774fbb466595fee98bb2a4cfcbd1592f30f9aa50ac0f53a32d57703d55cfcd5a7e5af8c407229cd72cbaf1382cc2a2147ddf5cc4e05
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSdhDHAAoJEEqz6FtPBkyjjTsH/1MI0qFaqoSYNT5Hv2URQSO+
-Kq2U2Ne8tu4kAwhwT/+Nc9cHNBGLaE5ARAHLCfHKd062m8+6I/n3hSaa8d+xkBCq
-rlcWccSTJ6+Hxm7alMvDYBwrCNvtIMGAPtGDfDuj0+ua9gWuEFq3U6bpCcq/KRVZ
-eDKxq/7Alpwt8h/9UpU5b0Kn7pIcurkjGSds0Ad9OkeeGVCV/DN1l/Z18YjoPp/K
-vis5mAflQPusPZ+abLgtTnqmXhX8ByUhrTpbbHrp+8dQRYt2GCBbb8KtR3hoxuYV
-OuVgQ7UNsMYT+OoqhXD/i0++AfT82ivwpHccOI2jjaJNwJ5V/4BIpNfz199xz9A=
-=0a32
+iQEcBAEBCAAGBQJS8h+3AAoJEEdUh39IaPFNUncH/A/Vmwnhn7JaR3JNYa3+W+o3
+1dzFNTYrfTF0MEOV2tuFVtXxLYXLaljDcdl4Gah3GawIif+fSl8XtwW4zE4zzCd/
+WjF3IK2ZqwvAHXS8+LZRa4+ON2dh97hTeqth9FbDImA6NQGoZqWfQoXYbXyPWDOu
+fnlLVBlcmBGB/pzB5vRlkUyDnV23B9OSH5mxBMD+Wd18kgQwWK75rA1jT/UcStzN
++ijM25TMBak+VIJn9HluGAsHgGz43ns6ezzvhUitOZGfaPaxdHDaGr/0o2iH2Kv9
+xk1W7HTyT4JJmyUR9aP6y1/bS5UJTSg6un4hyHNRtgFjgCEoEByZItyUbq36Z4k=
+=7ETB
 -----END PGP SIGNATURE-----
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
+}