Version bump.

Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64

6 files changed, 165 insertions, 10 deletions

diff --git a/media-sound/denemo/ChangeLog b/media-sound/denemo/ChangeLog
index 2634740bcbaf..baf45987a0c9 100644
--- a/media-sound/denemo/ChangeLog
+++ b/media-sound/denemo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/denemo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/denemo/ChangeLog,v 1.38 2012/07/11 23:44:25 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/denemo/ChangeLog,v 1.39 2012/09/22 00:49:21 radhermit Exp $
+
+*denemo-0.9.6 (22 Sep 2012)
+
+  22 Sep 2012; Tim Harder <radhermit@gentoo.org> +denemo-0.9.6.ebuild,
+  +files/denemo-0.9.6-alsa.patch, +files/denemo-0.9.6-desktop.patch,
+  +files/denemo-0.9.6-implicit-declarations.patch:
+  Version bump.
 
 *denemo-0.9.4 (11 Jul 2012)
 
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index 41238886b0de..51c93830d098 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -1,21 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX denemo-0.9.2-glib-2.31.patch 344 SHA256 9dc1f9178cde512e8ca6fbe955a26004efde9562821e443e36710d3753f9cedc SHA512 6a103c7005c642d4d533fcdeb8aaf86a0a8b2756ad857c8ac595859f845885ba947a926719189a799f62bded5e111d5b3973a9e27e9910d48320b9042f48afd5 WHIRLPOOL 04eda79e5a03aba86d14d7f1493b0766be357ec370dd56980c0fd4bfe0475da12e87d8e245efdd89469d1bf1577cb5df6dc925f01751f0e58aa0c13e1da3970f
+AUX denemo-0.9.6-alsa.patch 625 SHA256 ff60fd20deb33c7d02b9b7c23a422e37a183390f1c96873d176a0ff28fafdc06 SHA512 5821f8f531daee19a34fbf600eb80d7644c77f5ef371df9de8b670dad64908d9f20cbde7635dba11f8f80b50e430b25c50e31e2e90386038c54b9f5ece051ca2 WHIRLPOOL 9d8fac400e0056f89664c54ec63078b44ea56407af77835f5794487881240b9430e78f1ae3738c519d6dd79d0ac4bf7ae63c47085c7261fba46f8db9589a44c6
+AUX denemo-0.9.6-desktop.patch 297 SHA256 62fa7a062d9d734fc0d9c9ad93a60509dec359aeb080cc187622502641733279 SHA512 0a9bc51fc0cd45a1c3e4f5d88f6ea5b147dd733a364b756d02e112ad0254b1d3a6de3217b71ed4aa26699c9961f1c3206777363ef861a924c65912d9b1f563a2 WHIRLPOOL 0319a509bd6de90b69d3ed6509d652eac35e41710cc503907e38e037fd43301ce0fc91312231b9264da71168fd5bad9f3c454fe4e7a54bed33ac38e125a01a25
+AUX denemo-0.9.6-implicit-declarations.patch 1314 SHA256 a52910943f1351af25064b6e81e70618f88b6a29adb11ac2811dae90c7b6665b SHA512 9651fb21c32543dd8ea33a56fb2ea22f7206298805c20a90137bf172711b56ec19ad139a26196d30ed405cfb7a6613849af32e81ed806f3abeeb57d5a0a8d976 WHIRLPOOL e814f99d30961aa8edccb37fbb283cd116e4385b95d0bdbda3af1afbe7bfefd8600174b925b669b0ca6fde26c1f3369e6ad36ba09fac7ab032bc019810be7305
 DIST denemo-0.9.2.tar.gz 12305392 SHA256 4853b831495a732d4dc2cd1dc0ad8c7a9bfc5bd87386e7cf387554bcdbb0deda SHA512 420a432838cfe92b49e8df7048950357e3a43517deba138cef8dbc7ce624916e4f124ffc670b308b9791ab5f79c17d74c2e697d0f8dabc9706755d7d7064820e WHIRLPOOL 38c8b07be30ad16df76999a69a40e01a4406a280c4fdc0d080a1697e7cecf2a50cf1962c99cb96a4602387d09308664019544dd3b69f843a360605e0fe015f7b
 DIST denemo-0.9.4.tar.gz 12471795 SHA256 911cab852151b1d42b39a4047910fe1abd594e2f628bea941d97f0ce53c6954a SHA512 19e70528d54946c53c072b8b55fc005158035c4d697332c66d1174f1176c715601ff92adf06dc15227405e16cafff7c2654017fc408725e6f2295338b37093d8 WHIRLPOOL 4d13adae5aaddf731975fdf117842eae3117af0bc44afceb8e2d97b913890c0819f67209b193d9c43682305f034c1fc2e86817575dc2a4e135de7de8065a2043
+DIST denemo-0.9.6.tar.gz 13273412 SHA256 b04299fbf2f3207438da043b1a6d3748c86e48e9ee8af00de8bb2dec7795b6d4 SHA512 6e2e1b71d9ba0338559347742f237e66547feb6158d58cfff191818dbe64b18b86eec5b1eea35bd55c6c2a65b6b97a2de5d62d7bbfa5a6ae0d478d673b3e779a WHIRLPOOL 444648500cb768a12f3e2b1e7fe8b6e36d74a8e46d5d46f79ca2abfe2145d0fd3922c815963f757f1b287f977cae23084c6200e6939a4cfce5cf6f43612d7372
 EBUILD denemo-0.9.2.ebuild 1403 SHA256 f5f54bc9f20a186630749120277123fd3f9f3d6fea68b68b19d2f3d5fb5a7f0b SHA512 94232e6265a1540b7926523f5293e42e0775ef1763fc7d7856b1636bd6396b8aea8165bbd23e4daab7365117068b6c162bfda9e3ce8678e6b8763b4f97cfcdf3 WHIRLPOOL e0eb13be07e3f3c7f93ab6500349c4e85310aea05dabe03f8254719001c7c0f7cf82861106879bb25153bdc23c188703e4e7f7618dd520d143a38b8d33330c38
 EBUILD denemo-0.9.4.ebuild 1537 SHA256 885ce294417735c2e28a45725b1d8129ddae9f6d1178c7751581b6628795ecd5 SHA512 84151f2c43bb2c584e2b0033c17140fde52fc7a135e67de2c5b985252870e6b986eaa34d894c6e4b2004e9999a6db7814e055f15677f2a5f796f11c93914b351 WHIRLPOOL c51ba38110d1263d7bfb71629f0e76a5160d51700b261a180eb562afc7eb1e60811ee41eedc9ef15e277a2467b5ee45aab506f3fe41fea7b9a3d99fbaf840067
-MISC ChangeLog 5261 SHA256 135ed354199f09fa0e1d9be93393f4be31e8b5541a7c5445ff79215854a82b9a SHA512 edcf1d4533842498fb2a10d188171624737e4938ee0105d4466ae85704d78dfd6cffb7eed26d6162b47ff3d220de93c5aa26be78dc93c884ce51955e257adcfe WHIRLPOOL c2f9ecd325f2c5e7ccbfbd44c70cc4cce9fbe64a674b843de9ad0b342ac323469d66809371066fbd78c0a8ca56a3d56038ce6114fb66a9fe58f0b6b13b0cd8c5
+EBUILD denemo-0.9.6.ebuild 1621 SHA256 ea5435629147aafa116aa25ce00482966a43726b3f1499d133f540c3a2afd700 SHA512 a5b3cd2dc989a7f75b47df4c489682667ea894da416c4e8510ac4376005390c979df61aacc255b126ef5c35eaf5bbbc6c4a28a69f4669e5b2dbaeaf856628a9c WHIRLPOOL 3fcaeaaaa414ed6f9129d94700e22865c3c18f97bc8301088d0c47aac553acc000642af949ce9ff4d97d11d989e3d9fbb448e8c588e7d5feb69bfdcf9f21c4d8
+MISC ChangeLog 5498 SHA256 fd459ac1d9a47cdbd491182bd213a7036dcef52037acaf4ecd3e019707bda152 SHA512 676028322c7ef34eb5167c2c53cb9fc5b3ee7421a3bcf2bdaa1f4ecab9fa49be0b1b758d4b0eab0df55eb6c3cf89d8914ae5de64ba7d02772523a5cc5786efa6 WHIRLPOOL 23a1ee7c33422c93e849ec989a7ac4a6c8c4a2793da883547edac6531199ec81d0db8d25e86589af2d28a50e63f180237e4c436cb247bfd9b62be4bfbb4050e0
 MISC metadata.xml 315 SHA256 240995ee7b530755e039fcd7c580073f0002124fa5285dd0520849fae28bc583 SHA512 8fa8070b535b856afea0d5a0f654c75f9562b89b2f0ae21d5ddd621844c234106657ecde7b9dc2294228583de3096c8eb922bf576c66e0eec8ea3c4e0d58546c WHIRLPOOL c2a15d4c45bed54debaa532ef637357e1c4b1fdd5cf31206fae2d0f148d445acb9d451c5bfea2ada9c1a9b694db88006ba97ccb12fc824946bddb0a57126a8b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP/g/fAAoJEEqz6FtPBkyjyrsH/1aXTIlpNGLXflMJkIfyKtuD
-su/TnsvtdTxVgrR8dvdBgnIt2CENPSVC09oGXocq5sgCr6bUjTxJ9OUrEf9K1KXO
-50k44RvWrjLJV+HjmiJt1CH4zlCOezpRlQBxsDsuXeTmeZWX4TajGlNQUVDGOExR
-Cg4x2n2UXO0tkAysHwcr/oxd5rKHTR1+lLGlWTWtD4RyHh8iAEztXc2ffGjIfCp0
-s1RoXd4Bf8G73BnRdXFw5uR9gAiTgqdMX5FXzyLnJnh8VVDDZkbedtcZmIrMk9a7
-iUq60MCRKnSnkJCGZhavnCtxXHNEClE5WMKCy6rTiMi9wkgBB0y4rI3loDdEpSA=
-=iBWw
+iQEbBAEBCAAGBQJQXQsbAAoJEEqz6FtPBkyjjakH9Rts6OzFdbuluFEM4aF1LpiM
+uNn6YIEgUtLLX8i0Bcfp7BF1v8nsq+xsiWRCk39orz7BgvmC1ykwGfd3dOS5aX53
+H/31akkHFAHbS7Yjm+TZT3SSG31ikK0pdYZvLk+ljbKHxWZ1lRrOUllnOKgJEfLr
+3fe7sEUCUuhtp81JJFOr6q1B5qLBcLhk1la8fT8u0Flp7bIcNREN1+KzkW9pNJV8
+zYfr1f8m9Zz4GavHUPyHqFm6PM0MwAiRcOd8BFHrOFnFfSed3osooqqGAzAKVVpC
+gwTM6zb9uMg/vu3W36mtV0a+uRCj5fskod8472+Na1A2xasOQRLopDwNOrMlbw==
+=0phl
 -----END PGP SIGNATURE-----
diff --git a/media-sound/denemo/denemo-0.9.6.ebuild b/media-sound/denemo/denemo-0.9.6.ebuild
new file mode 100644
index 000000000000..dcb6cc66833d
--- /dev/null
+++ b/media-sound/denemo/denemo-0.9.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/denemo/denemo-0.9.6.ebuild,v 1.1 2012/09/22 00:49:21 radhermit Exp $
+
+EAPI=4
+inherit eutils fdo-mime
+
+DESCRIPTION="A music notation editor"
+HOMEPAGE="http://www.denemo.org/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa jack +fluidsynth nls +portaudio portmidi"
+
+COMMON_DEPEND="
+	>=app-text/evince-3
+	dev-libs/libxml2:2
+	>=dev-scheme/guile-1.8
+	gnome-base/librsvg:2
+	>=media-libs/libsmf-1.3
+	x11-libs/gtk+:3
+	x11-libs/gtksourceview:3.0
+	alsa? ( media-libs/alsa-lib )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.102 )
+	fluidsynth? ( media-sound/fluidsynth )
+	portaudio? (
+		media-libs/portaudio
+		media-libs/aubio
+		sci-libs/fftw:3.0
+		media-libs/libsamplerate
+	)
+	portmidi? ( media-libs/portmidi )"
+RDEPEND="${COMMON_DEPEND}
+	media-sound/lilypond"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog doc/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-desktop.patch
+	epatch "${FILESDIR}"/${P}-alsa.patch
+	epatch "${FILESDIR}"/${P}-implicit-declarations.patch
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--enable-gtk3 \
+		$(use_enable alsa) \
+		$(use_enable fluidsynth) \
+		$(use_enable jack) \
+		$(use_enable nls) \
+		$(use_enable portaudio) \
+		$(use_enable portmidi)
+}
+
+pkg_postinst() { fdo-mime_desktop_database_update; }
+pkg_postrm() { fdo-mime_desktop_database_update; }
diff --git a/media-sound/denemo/files/denemo-0.9.6-alsa.patch b/media-sound/denemo/files/denemo-0.9.6-alsa.patch
new file mode 100644
index 000000000000..484a11d9f59d
--- /dev/null
+++ b/media-sound/denemo/files/denemo-0.9.6-alsa.patch
@@ -0,0 +1,26 @@
+--- src/alsabackend.h
++++ src/alsabackend.h
+@@ -0,0 +1,23 @@
++/*
++ * alsabackend.h
++ * ALSA sequencer MIDI backend.
++ *
++ * for Denemo, a gtk+ frontend to GNU Lilypond
++ * Copyright (C) 2011  Dominic Sacré
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, either version 3 of the License, or
++ * (at your option) any later version.
++ */
++
++#ifndef ALSABACKEND_H
++#define ALSABACKEND_H
++
++#include "audiointerface.h"
++
++extern backend_t alsa_seq_midi_backend;
++
++
++#endif // ALSABACKEND_H
++
diff --git a/media-sound/denemo/files/denemo-0.9.6-desktop.patch b/media-sound/denemo/files/denemo-0.9.6-desktop.patch
new file mode 100644
index 000000000000..ade8c4595ed0
--- /dev/null
+++ b/media-sound/denemo/files/denemo-0.9.6-desktop.patch
@@ -0,0 +1,11 @@
+--- denemo-0.9.6/pixmaps/denemo.desktop
++++ denemo-0.9.6/pixmaps/denemo.desktop
+@@ -4,7 +4,7 @@
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+-Categories=GNOME;Audio;AudioVideo;Music;Education
++Categories=GNOME;GTK;Audio;AudioVideo;Music;Education;
+ 
+ Name=GNU Denemo
+ Name[de]=GNU Denemo
diff --git a/media-sound/denemo/files/denemo-0.9.6-implicit-declarations.patch b/media-sound/denemo/files/denemo-0.9.6-implicit-declarations.patch
new file mode 100644
index 000000000000..b1f17e3d2df6
--- /dev/null
+++ b/media-sound/denemo/files/denemo-0.9.6-implicit-declarations.patch
@@ -0,0 +1,42 @@
+--- denemo-0.9.6/src/audiointerface.c
++++ denemo-0.9.6/src/audiointerface.c
+@@ -14,6 +14,7 @@
+ #include "audiointerface.h"
+ #include "eventqueue.h"
+ #include "dummybackend.h"
++#include "sourceaudio.h"
+ 
+ #ifdef _HAVE_JACK_
+   #include "jackbackend.h"
+--- denemo-0.9.6/src/audiointerface.h
++++ denemo-0.9.6/src/audiointerface.h
+@@ -228,6 +228,9 @@
+ gboolean read_event_from_queue(backend_type_t backend, unsigned char *event_buffer, size_t *event_length,
+                                double *event_time, double until_time);
+ 
++gboolean read_event_from_mixer_queue(backend_type_t backend, unsigned char *event_buffer, size_t *event_length,
++                               double *event_time, double until_time);
++
+ /**
+  * Called by a backend to notify the audio subsystem that the current playback
+  * time changed. Usually this is called once per period during playback.
+--- denemo-0.9.6/src/eventqueue.c
++++ denemo-0.9.6/src/eventqueue.c
+@@ -13,6 +13,7 @@
+ 
+ #include "eventqueue.h"
+ #include "midi.h"
++#include "moveviewport.h"
+ 
+ #include <glib.h>
+ #include <string.h>
+--- denemo-0.9.6/src/portaudiobackend.c
++++ denemo-0.9.6/src/portaudiobackend.c
+@@ -16,6 +16,7 @@
+ #include "portaudioutil.h"
+ #include "midi.h"
+ #include "fluid.h"
++#include "audiointerface.h"
+ 
+ #include <portaudio.h>
+ #include <glib.h>