reinit the tree, so we can have metadata

9 files changed, 238 insertions, 0 deletions

diff --git a/media-sound/nted/Manifest b/media-sound/nted/Manifest
new file mode 100644
index 000000000000..af60ab805b1c
--- /dev/null
+++ b/media-sound/nted/Manifest
@@ -0,0 +1,11 @@
+AUX nted-1.10.18-automake-1.12.patch 360 SHA256 096dd97f53fcb99ab104574d03ea5eb8092cf5d3d3a013e2fa0cada11f4ca0d3 SHA512 2651b2e6330b6adb7c0877ed14ed351a7c96439da7f6bb283d1de30a119242fba7bb690586d83d99363084e8f3cc285e3a78ae45b6743e81682af1afeca43201 WHIRLPOOL e34b2604045dfed84e3e6e100ff5b281b9b0ff0f669542928b1d2ed71d57fdc6a3b6afc6ff64191a5f05997e718a311d29f9bf625037dc2a5bb221a984c59d65
+AUX nted-1.10.18-cpp14.patch 394 SHA256 e9a9080a1e81b347962177df92ec6c4c4b1d974da523e51a7cb7f5db799500b9 SHA512 a9abbe0da5bb968ee99f4560285b54f58f98f2727289f235717c58b96ab57f7728cde950f6c7daf44d2545cd5c2eaaeb37ade4f42daeeb92565cff318a1b2a46 WHIRLPOOL a193f431e47c54ede09a96bfccbcca8bfee2520862d747be7d310f1a39c9b527f7d0ed6a25e0f505c5860492e2513d810b3fe73cfb31eb13f36559cd31605637
+AUX nted-1.10.18-freetype.patch 274 SHA256 f912a7905932f2e847ba690a7aa1e4abbe459059887d4ebe222384aea2e43b6d SHA512 37da4f0ab97aaa0eb0f32d836d085dc8bf0310bd7aff40b273697815b3ddf8c6ec035a29b3e556eec892a38f2d64a19a06530dc6c133c29964704fa16a208a3b WHIRLPOOL 07ac0c293e08e9cc4c14232fa6b2c42b41a27ca1f4e36c10df639ca220c26065c5b417c699b376b5e3a631d8b0d86cfad7ff3819f2461e54b7c95dc85a978081
+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-r3.ebuild 1868 SHA256 7aa58d2e82674a981d296487fa448fe1cdb8cd2e474d664fa43125b04b1d6d76 SHA512 0a260f33268a17a804c68271ca513b065097d9aca2bc3800a00c633df6abc2cb04ad12409bbfc902d8a3eef138bab5e75f430d53fdadfe0af4be85097ce70d9d WHIRLPOOL aef78affe3166803bf358fccd91dffb90bed427f4660e678bf01af7ea33c23254c502cab7023f52012368d61aa0b0a7fb19fbb9967ce9bd67741c313aac76463
+MISC ChangeLog 3229 SHA256 525ab87304b8ad12333d726e8ab54f96d20080657b01ea580c4965ab48e15e8f SHA512 dd1d7240306bf674bd08ea5cee5dc3ce6f356cd3a8524533854882d73a53cd74086efb2c112370138bced2aa348d60caae090670fda687280406bdd2eaf25f32 WHIRLPOOL 4ce64e25877963a9fd6ea40bb92924b7345df46c38139144472e919796dd11ee0f8b3b384c1949057897b6826464583bdbce3cbd5abd098aa17d6055eaa87bf1
+MISC ChangeLog-2015 7849 SHA256 e8ecbe43739e99443a6243816e0c23f738925fdcf10a09fb3faa94f2aac81f9b SHA512 d463b1059eb4a9789ec195a8790a124b3adaaa31bc445e9aeeb333ac744ecbf5c8b5303e770a258ef85137755fba311da7fceaad6317b961376e2432b4894e27 WHIRLPOOL a36ac024e35563341445ad88ba27c15f1bddfba05405db98ea2b60ae2333f0d574146556175edd11d2dd27fe41bc7add79460aea4e2617158f7ffe6bff956eea
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/media-sound/nted/files/nted-1.10.18-automake-1.12.patch b/media-sound/nted/files/nted-1.10.18-automake-1.12.patch
new file mode 100644
index 000000000000..0363e06ea6cd
--- /dev/null
+++ b/media-sound/nted/files/nted-1.10.18-automake-1.12.patch
@@ -0,0 +1,11 @@
+--- configure.in.dist	2011-01-27 13:10:04.000000000 +0000
++++ configure.in	2013-03-07 23:17:13.529353811 +0000
+@@ -12,7 +12,7 @@
+ AC_INIT([nted], [1.10.18], [nted-user@tu-chemnitz.de], [nted])
+ AC_CONFIG_SRCDIR([beaming.h])
+ AC_CONFIG_HEADERS([config.h])
+-AM_INIT_AUTOMAKE([-Wall -Werror 1.10 foreign])
++AM_INIT_AUTOMAKE([-Wall 1.10 foreign])
+ 
+ AC_PROG_CXX
+ 
diff --git a/media-sound/nted/files/nted-1.10.18-cpp14.patch b/media-sound/nted/files/nted-1.10.18-cpp14.patch
new file mode 100644
index 000000000000..04a2a15977e0
--- /dev/null
+++ b/media-sound/nted/files/nted-1.10.18-cpp14.patch
@@ -0,0 +1,11 @@
+--- idiotseditor/idiotseditor.cpp.dist	2016-09-18 10:47:58.933319888 +0200
++++ idiotseditor/idiotseditor.cpp	2016-09-18 10:48:28.852321336 +0200
+@@ -2538,7 +2538,7 @@
+ 
+ #define BAR_COLOR 0, 0, 0
+ #define NOMINATOR_COLOR 0, 0, 204
+-#define HALF_COLOR 0.0, 26, 153
++#define HALF_COLOR 0, 26, 153
+ #define QUARTER_COLOR  0, 51, 127
+ #define EIGHTS_COLOR 127, 77, 102
+ #define COLOR_16 0, 102, 77
diff --git a/media-sound/nted/files/nted-1.10.18-freetype.patch b/media-sound/nted/files/nted-1.10.18-freetype.patch
new file mode 100644
index 000000000000..505e756af564
--- /dev/null
+++ b/media-sound/nted/files/nted-1.10.18-freetype.patch
@@ -0,0 +1,11 @@
+--- nted-1.10.18/mainwindow.cpp
++++ nted-1.10.18/mainwindow.cpp
+@@ -24,7 +24,7 @@
+ #include <stdio.h>
+ #include <time.h>
+ #include <ft2build.h>
+-#include <freetype/freetype.h>
++#include FT_FREETYPE_H
+ #include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <cairo-ps.h>
diff --git a/media-sound/nted/files/nted-1.10.18-gcc47.patch b/media-sound/nted/files/nted-1.10.18-gcc47.patch
new file mode 100644
index 000000000000..8e706f62b99b
--- /dev/null
+++ b/media-sound/nted/files/nted-1.10.18-gcc47.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/show_bug.cgi?id=424291
+Index: nted-1.10.18/dynarray.h
+===================================================================
+--- nted-1.10.18.orig/dynarray.h
++++ nted-1.10.18/dynarray.h
+@@ -76,6 +76,7 @@ class NedDynArray {
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <string.h>
+ 
+ static void erroraus(const char *s) {
+ 	fprintf(stderr, "%s\n", s);
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/files/nted-1.10.18-lilypond.patch b/media-sound/nted/files/nted-1.10.18-lilypond.patch
new file mode 100644
index 000000000000..d1e77849e679
--- /dev/null
+++ b/media-sound/nted/files/nted-1.10.18-lilypond.patch
@@ -0,0 +1,58 @@
+From 54881f2bdfc3d18e1496b7739124311d8e7c394a Mon Sep 17 00:00:00 2001
+From: Christopher Harvey <chris@basementcode.com>
+Date: Sun, 7 Oct 2012 15:05:03 -0400
+Subject: [PATCH] Fix LilyPond clef exporting
+
+For example, sometimes NtEd would export "\clef \clef tenor" instead
+of just "\clef tenor"
+---
+ mainwindow.cpp |    4 +++-
+ resource.cpp   |   14 +++++++-------
+ 2 files changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/mainwindow.cpp b/mainwindow.cpp
+index 7263565..3343526 100644
+--- a/mainwindow.cpp
++++ b/mainwindow.cpp
+@@ -3902,7 +3902,9 @@ void NedMainWindow::do_lily_export(FILE *fp, bool with_break, bool *selected_sta
+ 		if (m_staff_contexts[i].m_staff_short_name != NULL && strlen(m_staff_contexts[i].m_staff_short_name->getText()) > 0) {
+ 			fprintf(fp, " \\set Staff.shortInstrumentName = \"%s \"", m_staff_contexts[i].m_staff_short_name->getText());
+ 		}
+-		fprintf(fp, NedResource::getLilyPondClefName(m_staff_contexts[i].m_clef_number));
++		if (m_staff_contexts[i].m_clef_number != NEUTRAL_CLEF3) {
++			fprintf(fp, "\\clef %s", NedResource::getLilyPondClefName(m_staff_contexts[i].m_clef_number));
++		}
+ 		fprintf(fp, NedResource::getLilyPondKeySigName(m_staff_contexts[i].m_key_signature_number));
+ 		fprintf(fp, " \\time %d/%d", m_numerator, m_denominator);
+ 		if (m_upbeat_inverse != 0) {
+diff --git a/resource.cpp b/resource.cpp
+index 11c52b4..cff080f 100644
+--- a/resource.cpp
++++ b/resource.cpp
+@@ -3870,16 +3870,16 @@ int NedResource::determineLastLine(int treble_line, int clef) {
+ 
+ const char *NedResource::getLilyPondClefName(int clef_number) {
+ 	switch (clef_number) {
+-		case TREBLE_CLEF: return "\\clef treble";
+-		case BASS_CLEF: return "\\clef bass";
+-		case ALTO_CLEF: return "\\clef alto";
+-		case SOPRAN_CLEF: return "\\clef soprano";
+-		case TENOR_CLEF: return "\\clef tenor";
++		case TREBLE_CLEF: return "treble";
++		case BASS_CLEF: return "bass";
++		case ALTO_CLEF: return "alto";
++		case SOPRAN_CLEF: return "soprano";
++		case TENOR_CLEF: return "tenor";
+ 		case NEUTRAL_CLEF1: 
+-		case NEUTRAL_CLEF2: return "\\clef percussion";
++		case NEUTRAL_CLEF2: return "percussion";
+ 		case NEUTRAL_CLEF3: return "";
+ 	}
+-	return "\\clef treble";
++	return "treble";
+ }
+ const char *NedResource::getLilyPondKeySigName(int keysig_number) {
+ 	switch (keysig_number) {
+-- 
+1.7.8.6
+
diff --git a/media-sound/nted/metadata.xml b/media-sound/nted/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/media-sound/nted/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/media-sound/nted/nted-1.10.18-r3.ebuild b/media-sound/nted/nted-1.10.18-r3.ebuild
new file mode 100644
index 000000000000..bdd8eaf414f2
--- /dev/null
+++ b/media-sound/nted/nted-1.10.18-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+AUTOTOOLS_IN_SOURCE_BUILD=1
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils eutils toolchain-funcs
+
+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:2
+	media-libs/alsa-lib
+	>=media-libs/freetype-2.5.1
+	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 )
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc47.patch" # bug #424291
+	"${FILESDIR}/${P}-lilypond.patch" # bug #437540
+	"${FILESDIR}/${P}-lilypond-tremolo.patch" # bug #437540
+	"${FILESDIR}/${P}-automake-1.12.patch" # bug #459466
+	"${FILESDIR}/${P}-freetype.patch" # bug #514522
+	"${FILESDIR}/${P}-cpp14.patch" # bug #594056
+)
+
+src_prepare() {
+	# fix desktop file, wrt bug #458080
+	sed -i \
+		-e 's/nted.png/nted/' \
+		-e '/^Categories/s/Application;//' \
+		datafiles/applications/nted.desktop || die 'sed on desktop file failed'
+	# drop -g from CXXFLAGS, wrt bug #458086
+	sed -i -e '/CXXFLAGS/s/ -g//' configure.in || die 'sed on configure.in failed'
+
+	autotools-utils_src_prepare
+}
+
+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)"
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_with doc)
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	# respect AR, wrt bug #458084
+	autotools-utils_src_compile AR="$(tc-getAR)"
+}