Revision bump: EAPI 5, add missing lilypond tremolo export patch, wrt bug #437540 and #457400

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 114 insertions, 16 deletions

diff --git a/media-sound/nted/ChangeLog b/media-sound/nted/ChangeLog
index 7b3c8a828ad7..84fc6531f73e 100644
--- a/media-sound/nted/ChangeLog
+++ b/media-sound/nted/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/nted
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/nted/ChangeLog,v 1.29 2012/11/09 20:05:16 hwoarang Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/nted/ChangeLog,v 1.30 2013/02/17 20:46:13 pinkbyte Exp $
+
+*nted-1.10.18-r2 (17 Feb 2013)
+
+  17 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> +nted-1.10.18-r2.ebuild,
+  +files/nted-1.10.18-lilypond-tremolo.patch:
+  Revision bump: EAPI 5, add missing lilypond tremolo export patch, wrt bug
+  #437540 and #457400
 
 *nted-1.10.18-r1 (09 Nov 2012)
 
diff --git a/media-sound/nted/Manifest b/media-sound/nted/Manifest
index 9b7eed5445a1..9a7b1e161aeb 100644
--- a/media-sound/nted/Manifest
+++ b/media-sound/nted/Manifest
@@ -2,26 +2,22 @@
 Hash: SHA256
 
 AUX nted-1.10.18-gcc47.patch 380 SHA256 bd805943c7c01676e92fa469e0541db1525f8dfeb4de3ebcca75438ffd06a2a1 SHA512 d3e390cfc387b12d2cded614b8f40001f9c03002f7da03e1c61a5c490df4a4327263393ced492e204416e006c37278429db2a825d5498b65fd2ad450df256ce0 WHIRLPOOL 76ad3e2f1f1562e1e4720ffa951c368ce9b2ab1635fd1906faa927a02df9850f18c418895d15cb6ca36cbd9449f3f907dbf29500aaf94d359210aeaf6bbcd46f
+AUX nted-1.10.18-lilypond-tremolo.patch 1487 SHA256 b50d328b1924afa17ab7e9ccbd193dfd1bb4ed600d16a9fc73b3bcee23cced5f SHA512 f30cc982ce656d45579cf8af276d71f053de4e8cf403aa21d8edbf990b6a1aa90651d3e887451a2d90f5c91a09532aacc5c5aba15c3ff6d1d25792dd4ced8cf1 WHIRLPOOL 0b6a206099925302e6aa62923024b1e1022c27f7a2cc26ef08aeffba9265f1c4af588aad8cc6ce4e095dbf58501662fc4aa4f209fd8e1238ba4e7cd84b4d663a
 AUX nted-1.10.18-lilypond.patch 2317 SHA256 09bfeb1a8f8c1c4617612251b1a0e8c5ff25a7c57fcad938206faba94d49b9ba SHA512 c6414281c4eee507ab1d3a5499f6b21a0f84bbc94a6c187ec31dae899342e7a3b3b50d7b667eff6f65777682e362c8f9a7885473733f93bd805f66b1f78ead66 WHIRLPOOL e81df81d20ff57ec275f2fa35f7f1d16183ee6acbea275c8df35ef28969bb75d5022b0b4cccb5e7bf70d5c189b21ba45bcdfb45210abdf275782e87ee2a03289
 DIST nted-1.10.18.tar.gz 4099835 SHA256 808df3c851dbc4b24efdbf96c4e6ed28152deb301c4373268831f2a243e8f1ac SHA512 adf5b53afc9017f5fc89524c5b26e16acffd142da98296c598fa53259bb88770a7a2a1f527729adcff4819177173c4ffff90096c577d42534ea9721ecd964981 WHIRLPOOL b450a8082fd95aa2e2cc40122197c528b3500e082d09ee6c9860d0b7290aa8d723ee07c019d4d034afd2e33e648bbc0c29672f1c9a98d88a9788377a8a2a7ff0
 EBUILD nted-1.10.18-r1.ebuild 1246 SHA256 0c54b00a843f923ae7c1c422cc814b950b65fa6be11d331c48dd8d5728935b3b SHA512 fd9d4d0c6b6ce67ab5333cbbd8b2c093b52536656ae867af734915f6275290cc31e6a1c469f39371dc03bce5ed3826225d9d509438db0606e31f80678b720b11 WHIRLPOOL daf1b20f93849453c2e587d2e7d309164533f50f97f44428b8240515d4c427c142e901c7896ed3f3c7ce59334d8434756f3a54bab1fa580e15f9581ac7975a79
+EBUILD nted-1.10.18-r2.ebuild 1298 SHA256 bf1874c66aec412e830dd7ba8bf55c8542e7efad53dd50f1fcd3ab612c666256 SHA512 2e62cfb2e764e98d08a980da38b0d1ae2ce740cead97bb87ac74d92951cafbaeb65f416677240f47bbafeb125889aea0969d2c91705a34823be860a7e3e34517 WHIRLPOOL 1f2337962a5f58fd9905463c1f009ed13fc381b5ebbcb2684f5744a565d393d6a422081e50235e797ff1685074f4b4bfb708cd4ed2e67f48dc3494c6e2f13c7c
 EBUILD nted-1.10.18.ebuild 1184 SHA256 8f36625f8135a3bba7d2c3219cf96f560e858741652a0e79bf925b02d49394ed SHA512 ac94a09c138d981c47b5956f48debad04d239a7b3c3d942e279a610f9ab625c0c53d91da38a66bbae0c54906fb7f9eb6391f7dab4f15eecef85a004eec9f6e7b WHIRLPOOL 52085a9da945066ab451c1f5ce86fe875e9aece0ff1ff2620eab6194889cb53a84ec0a4b36ed9c355315be287a8b8d029d4572eb8efd940b0133291cda4d2f64
-MISC ChangeLog 5442 SHA256 7b493e8bb5249cd30cf367dc7c3e82929d1a431d43e525f21b58d029933dd2df SHA512 44356c0eb57d7087ce4f56b87475a2b1931a13c4712a093ed96d770d00240fbe1f01b11c2594f55c7f89c3673e6565e24365297df4105f13a60e807522f1f3f6 WHIRLPOOL 2bafbf67c9ae54a34aef43ed29b0d96b6a7599d9d945e816a1b0d6012437726a0e959a400b5eded33c8e3522f6eeb697da2658ffcd641271db9dabccbfc3587c
+MISC ChangeLog 5694 SHA256 647c9957d3873f553d7e500ff25afe4e55662818af7322cb6e713f3e690475ac SHA512 b61cf0ce0e63df7cc0c176312753e3a659ecc99ad2e95cefc286f83a1a9d46751248a12106dcdee5b9ee6971e9fd5fc17304bdaad9358c2076c1cec9a75b3489 WHIRLPOOL e5cc4e09ed732cdf9880c6c7aa85ad81951e29884e654fcc699ad4f695827ed7d720022b6dfd35f45d24328e18905c581fc2a50f4d091d3dd9962fb9d1a10517
 MISC metadata.xml 359 SHA256 94211173f2953d7ee51ca7b8e41bc315425f28318f3477e6a21538908d2e07b0 SHA512 57b12d3b01bb472f4c8cdfc81ab0ba119a9cba175d5ba5e418f6dc4de93160aa67e0d5a257efc5443bf3d5fb7acdc47da2c6b6a5dfaed71138df220633ecc9af WHIRLPOOL 4193192d7aa64a12ac41e635082d4de7357154c32fee622f4a47d4215da240d3947768d3669e9a38dfc0b940512891fce8d68af9e4084dfac28188bdffc56f64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQnWH9AAoJEPqDWhW0r/LCc+UP/jkTThIm4ImwvhsrnHoizNva
-u7eVK2eNmHkKmYuvE6rQRw80noFiUH0bHeoCP3898PRj2YVy7+IxnZxYr05NliFX
-7k6TGyveJ9Fx4JAWB8ctIQ+pdaqDtR2ZR3GetwNZr/U9rrz7ZwSvEwLzVvm426fZ
-SV8nOn6o5EVV4DN5h39r5d1dL0U89MT1owqrduXMcPBV+W5PQ5fWSaEni6bwcA/u
-/m9q7B5FrPMSmzg0Q1i1K0FC/+XFTLswq+xQdZxR7hUUibBMFl7WyPp9g/CByq9C
-d5JToL4pqoIH/WlzE5OWQUZQLKmoil5HuaPEQCGDs2wIHVh3j8zaASeyqFhB26+x
-3STvVosTdluUyzmnwO1yfLN/QR6TMkZKSBl81kX1B6wh7l8Tz08RkJKS53iNXwcM
-VdzP00MyKqpGYNTcrnudm/sMnRsRLkykUYryIPY4LcI/qVoDvDh8kbGnAujFOkk+
-UOY8CXTq3bbCOWxPYyFasVSloFAtm5w7zPOkuiPUQk4PwP0Al5Gek5aXR9L15yW6
-OFLkBiS4JmBqdvnOCxuUKrIXdS8NwdPJ+L60fnhZODJnyk5jYSGXo94OGBtKU3yz
-oemMoO7f/dCbCYHe3u7ccZGIEqLS8Nv2XIH0zwhunmeYba//t/N52mXFhWD5wv0t
-uiDsSOzi9jThFrAnaxhz
-=2GEi
+iQEcBAEBCAAGBQJRIUGWAAoJECo/aRed9267i2YH/3zEmpddISXVhPVdgbEbQZ97
+E61qpMaRAXVCRG8iirYDHqYNDahEXBvMbYxwpGVWy+OGlLyvdGojANiMsXS8aYNy
+CVGNo3olvUaETgddr24FbcwNpEXtETbNmGbs4ZFPGKeKHxwSbzF4ZhXIx7SwM6Qf
+95J1i5hE8mA1EB5T9065H2Y4sk5X9oO13j5409dfsv7V2DoNkiL51NXrDDOk9Zrg
+hq1AFlAHI0D83t71OMiptZMcX1uiZP+Dndh378+exwYJ/GYCu6247/DMm2QAbtIL
+qpTT5NufGBM4pBLAX711FQZmrKyS+TqB4CDGmKwjl5gjTC5zZPJULTMKef5XG6Q=
+=+TrN
 -----END PGP SIGNATURE-----
diff --git a/media-sound/nted/files/nted-1.10.18-lilypond-tremolo.patch b/media-sound/nted/files/nted-1.10.18-lilypond-tremolo.patch
new file mode 100644
index 000000000000..a3c46c849a0e
--- /dev/null
+++ b/media-sound/nted/files/nted-1.10.18-lilypond-tremolo.patch
@@ -0,0 +1,45 @@
+From 161e7cf6d2f0f18e9b44ef9ce960efb07c210c79 Mon Sep 17 00:00:00 2001
+From: Christopher Harvey <chris@basementcode.com>
+Date: Sun, 7 Oct 2012 15:41:00 -0400
+Subject: [PATCH] Fix LilyPond tremolo dotted chord export
+
+For example, NtEd would export "< a f' >4:8.", but the correct syntax
+is "< a f' >4.:8"
+---
+ chordorrest.cpp |   13 ++++++-------
+ 1 files changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/chordorrest.cpp b/chordorrest.cpp
+index cd93dab..9367f32 100644
+--- a/chordorrest.cpp
++++ b/chordorrest.cpp
+@@ -3821,6 +3821,10 @@ void NedChordOrRest::exportLilyPond(FILE *fp, int *last_line, unsigned int *midi
+ 				fprintf(fp, " >");
+ 			}
+ 			if (duration != *midi_len || (m_status & TREMOLO_MASK)) {
++				sprintf(Str, "%d", WHOLE_NOTE / m_length);
++				for (i = 0; i < m_dot_count; i++) {
++					strcat(Str, ".");
++				}
+ 				if (m_status & TREMOLO_MASK) {
+ 					switch (m_status & TREMOLO_MASK) {
+ 						case STAT_TREMOLO1: tremolo =  8; break;
+@@ -3828,13 +3832,8 @@ void NedChordOrRest::exportLilyPond(FILE *fp, int *last_line, unsigned int *midi
+ 						case STAT_TREMOLO3: tremolo = 32; break;
+ 						case STAT_TREMOLO4: tremolo = 64; break;
+ 					}
+-					sprintf(Str, "%d:%d", WHOLE_NOTE / m_length, tremolo);
+-				}
+-				else {
+-					sprintf(Str, "%d", WHOLE_NOTE / m_length);
+-				}
+-				for (i = 0; i < m_dot_count; i++) {
+-					strcat(Str, ".");
++					sprintf(Str2, ":%d", tremolo);
++					strcat(Str, &Str2[0]);
+ 				}
+ 				force_length = true;
+ 			}
+-- 
+1.7.8.6
+
diff --git a/media-sound/nted/nted-1.10.18-r2.ebuild b/media-sound/nted/nted-1.10.18-r2.ebuild
new file mode 100644
index 000000000000..9dc29eacf1e2
--- /dev/null
+++ b/media-sound/nted/nted-1.10.18-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/nted/nted-1.10.18-r2.ebuild,v 1.1 2013/02/17 20:46:13 pinkbyte Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="WYSIWYG score editor for GTK+"
+HOMEPAGE="http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml"
+SRC_URI="http://vsr.informatik.tu-chemnitz.de/staff/jan/${PN}/sources/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.2 NTED_FONT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug nls"
+
+RDEPEND=">=dev-libs/glib-2
+	media-libs/alsa-lib
+	>=media-libs/freetype-2
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+	nls? ( sys-devel/gettext )"
+
+DOCS=( ABOUT_THE_EXAMPLES.TXT AUTHORS FAQ README )
+
+src_prepare() {
+	# bug #424291
+	epatch "${FILESDIR}"/${P}-gcc47.patch
+	# bug #437540
+	epatch "${FILESDIR}"/${P}-lilypond.patch
+	epatch "${FILESDIR}"/${P}-lilypond-tremolo.patch
+}
+
+src_configure() {
+	# Trick ./configure to believe we have gnome-extra/yelp installed.
+	has_version gnome-extra/yelp || export ac_cv_path_YELP="$(type -P true)"
+
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_with doc)
+}