gentoo resync : 31.10.2017

12 files changed, 171 insertions, 78 deletions

diff --git a/media-sound/gmorgan/Manifest b/media-sound/gmorgan/Manifest
index c85d8c3e568c..63cc32975dd2 100644
--- a/media-sound/gmorgan/Manifest
+++ b/media-sound/gmorgan/Manifest
@@ -5,9 +5,7 @@ AUX gmorgan-0.79-remove-gettext-version-check.patch 855 SHA256 c1689dc5724d5087b
 AUX gmorgan-0.79-remove-old-docs.patch 736 SHA256 4905cc3c53017823ac6eeac864480fb68516d6f20dae0d76e37d82e90b443b1b SHA512 55ba54cd3410fe70ad5e2d1f2d60c56e30b335bc90e730e0a9a6265c7e0cc688e5aa15f0e9109af7c61db217e39fbf245ab08a54ae46cbc52f6deda5be769108 WHIRLPOOL 725e899352560744b6b463f3e2f3031e9b4ac491073ac3381308d873ed243b8e2301fc692345ea6ec48d4e1144385577152bb9ec25471694d372a7a82e76e017
 AUX gmorgan-cflags.patch 597 SHA256 cb1e7b196bd252ab7dc8117b09603250ccbcaafaac80a5ae2e7fdc62d3ecf8b5 SHA512 d33092eb45f1716d78902045a5ce1609e6264dd95ed079c05b02c19935f4686598352aeb6007b3d4a3a77215a7663b06865771419ad319c2f583dddb57d9c1b0 WHIRLPOOL 3f6910a4165e52c088f1b9646ea88a9bf000cf9b8c3a12cfa7f885761477c289b1c28fbf313ca7bb01736b287baf84b9bcaae8053cb3223b41045d5f6fee78c8
 DIST gmorgan-0.79.tar.gz 8055701 SHA256 eccdff6d0de745f469e45220de2b41764c0e591eb894695c24ce07cc2a65b1cf SHA512 17fadbe2c8b2b4c7e18816a6f866e4406c005fda1ca3ded628c9497aa46abacd06417d68296c500a2d108e9364eae3702f990f5c1b1b1d83328ed553aa453be0 WHIRLPOOL 96a20bc79ee9a8b62ad1061995fda5542450b5e0faee9677f548d05884e13791af79617bf1ad0546028db2a1f38b7e3882b9dd4778e7a912b6ebcb02efefa7f1
-DIST gmorgan_0.39.tar.gz 1370780 SHA256 37f6c3d4b43c415e0edaf5d8acc80d7a60fb9318f684acde0eaa723f3ef58b56 SHA512 b66769382de4b2386779d55158d16167d4aba1a2e3425fc46561cfda621854004029b872810844313d64b8fea50d7cdcaa5247a02ef500f7d932deedc691bdf3 WHIRLPOOL 92453194f241cf75d19221dce97aec8a06e16dc19d7b46ab09ab51d8e4541de22b5f6ca46fc18d68e82a18dcdc5fd529f02fb044ea6e4a45f8586d8030148ea1
-EBUILD gmorgan-0.39.ebuild 951 SHA256 3290b7ebbfbe09c20dcd18b34f95dbd3424ef9fbc60ad7c9af78e26f19082ba7 SHA512 6247b536d0c90174b7b122398c803db6310344b812f254cd41d392a9a7639fb235be62e42f46ad6400c13c130e527315f1ba754a3f5b7ac76c474eb33f59b55b WHIRLPOOL 0bcad7de920ac20df832fd8f1aa0dd932d1b7ec7cd7542b8277fe91529b5d2046537e24ccc5697b4e5ca929a899c7e04b7f85557ce4b28e7094e1a685d78907e
-EBUILD gmorgan-0.79.ebuild 785 SHA256 80924fad1a78750069350fdbeda3b108bd1dcdf04a4caa4df9592a53fb65d2db SHA512 b14863f4c2ce179528096cdd31a88ca82954c657783055508027e384acbf6f08c77e6586973df8367c968f7e006975adb3dddcff6e5adc5f425c2e8a16a96e1e WHIRLPOOL 34c69d71c0e19e3c32d0e31584b9aef4a4b1b7be5bbbe1af9dd6a81322a1ea39db5564b14058586d2d11ccc27ed9421ba4c8ced255ac1535685b699a58450a76
+EBUILD gmorgan-0.79-r1.ebuild 859 SHA256 1f2712f75b9cb84406e63144c72d4100701735dc01f7e6dbe52fbdb691459a78 SHA512 232d5250ac1b88594f116bfdc6a9da1cfc991693dc26c3bf19109cdbaee70a54c67e182defffae58a16e98bb753c8f97d33832053786934066c07d87e7a263db WHIRLPOOL 1fa63c19992747b9dbc47c2157325a94fab9985ba9b25ef8b4afe477bb4cb6027734f790bbc3ccf696455d910a2785e811f850e4a5c6e1ec6820fb3a2792f233
 MISC ChangeLog 2545 SHA256 c6d33ee545b9be9f95eeee6fc60d81b7020a89b41449229a909c8111f75f688c SHA512 5ea8880d1b6c9bb3a9d313b666a09610ad95261104aeb428922fa1273e04abf082cd791c235f5920f8f6b588bc972680302fc60db11c12564c66779a66524c0c WHIRLPOOL 9c6a61f106dfc8917bb132087bd1a1c260094e360b3f7c27a0a224c8f07ffe23bdfa77b6a0dc4cd9f60e6128f36f62f591cfc2ae15065912cc2d5a34d7f67f84
 MISC ChangeLog-2015 4540 SHA256 4b3a4451d0260c37a4a1791d1a9ab263aa6fbb7bf368183acf7d5b4fe351e25b SHA512 512b3c24d74de2e08e3a58cc19b12c449c2e2dd8a2be40103e542e7759632c52a954446a309b8226d94606a7053cf992fd2d830b5c4b4554794736a05d7c698d WHIRLPOOL 3cbcc74b2e918462c16240be452dc0459bb0ec7459fe813695a77e8d87a2eb83b94fd670eb104c3f28b01d4c8fc5fb1391ea887a48899de51a4d846ed1c630b4
 MISC metadata.xml 336 SHA256 90555defe0515f8ec9952c40165d83eb9f10254f9f2cf94e48096a03eb9c2bf7 SHA512 3d5245a06c576d8a4f5fdf07ddb0a6cbc9cf0f64799da9e7e58a67fdd23a5fe082d0bc557575914ec7fba42923d8503587b327ad31f270f46710084fb7cba5f8 WHIRLPOOL f54f1d82e3b322a66e4d9bb33c0b90458b00a0d92876899e29f3d7c4a5d8fd3001930f4c2fb66c8b122b24866619c64aafdbe5b1b3e3494808b2d2d72b5f6174
diff --git a/media-sound/gmorgan/gmorgan-0.39.ebuild b/media-sound/gmorgan/gmorgan-0.39.ebuild
deleted file mode 100644
index 76258d47e22f..000000000000
--- a/media-sound/gmorgan/gmorgan-0.39.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils autotools
-
-MY_P=${PN}_${PV}
-DESCRIPTION="Opensource software rhythm station"
-HOMEPAGE="http://gmorgan.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gmorgan/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/alsa-lib
-	x11-libs/fltk:1"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-cflags.patch"
-
-	# Stolen from enlightenment.eclass
-	cp $(type -p gettextize) "${T}/" || die "Could not copy gettextize"
-	sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize"
-
-	einfo "Running gettextize -f --no-changelog..."
-	( "${T}/gettextize" -f --no-changelog > /dev/null ) || die "gettexize failed"
-
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS NEWS README || die
-}
diff --git a/media-sound/gmorgan/gmorgan-0.79.ebuild b/media-sound/gmorgan/gmorgan-0.79-r1.ebuild
index a602c30e99ce..1aaebf4e3107 100644
--- a/media-sound/gmorgan/gmorgan-0.79.ebuild
+++ b/media-sound/gmorgan/gmorgan-0.79-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gmorgan/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND="media-libs/alsa-lib
@@ -29,6 +29,7 @@ PATCHES=(
 
 src_prepare() {
 	default
+	sed -i -e "s#/usr/local/share/#/usr/share/#" src/gmorgan.chord.cpp || die
 	eautoreconf
 }
 
diff --git a/media-sound/jalv/Manifest b/media-sound/jalv/Manifest
index 1af1514ac570..c3706e945a7a 100644
--- a/media-sound/jalv/Manifest
+++ b/media-sound/jalv/Manifest
@@ -1,6 +1,9 @@
 AUX jalv-1.6.0-qt-5.7.0.patch 906 SHA256 373cea63c28d179275da656a0ab09638eeafd0dd269e11185b668c2395af5f2f SHA512 b5ddc63afc7340a0d2d14bd924c7adc1393d469031c3d1c37210e21090b1159c2fd3879e627f8c8e611452d9ade40a9fe18de9e63880bdbd2f05caf96209b163 WHIRLPOOL 2ee62871c06e519cd0486802585974b67a34da22b4e8e42c14dfb69744b9d83484e7be323332bb5a5ff25ee3e465c36b82cb3ab3c664fc8cbcb27c1fcd579038
+AUX jalv-1.6.0-stdin.patch 2008 SHA256 f030f205c8d047e49f460a965c59e721f48f2aa7f39037da75c484b9037df079 SHA512 aab7ccb29a63ebaafe1c05852a9533930181e2c34c6015aff9b4d608bfa95a6d4218849736e960adcaef635f4ecb0c3188bcaf2c1f3feb02a5eaff8866a1cacd WHIRLPOOL 5e19a657f45093bb4d3965423bd46b9c0b168746d84c7d1e010f56a3a56f2a130e1015b191339a89c1656470616904910aeb10f6bba1511629f88ac2efe51e90
+AUX jalv-1.6.0-suil-qt5.patch 1159 SHA256 2118898fba87e7723b94039dffc7cc05889b123059533b33f9ebe196e7897f9e SHA512 22fd7452af3fcfd2c71a24cce218ce2fbcfccc2eaa224d54594a014ca184a72e80fb5489a868c298ff4ac3884805f2fd2bc827dd63eaa22df081804f0b355fc2 WHIRLPOOL 577cfcb50cd07d812749c780881e29b5001186913d3a797491bc048c9d05d6193be41648ccb60ad9787b280987ea7eb05baed44420c3099e17ddb41215d32dd1
 DIST jalv-1.6.0.tar.bz2 157726 SHA256 914625972bb2e99552a0bb0ae3b5d27f70901b92fab1f6daf8fb31d1ffbf5cf4 SHA512 70453404788846774ef88b43653379f97140301e09e8de61779683df9ee85120485bebf03c959624639dc4d8dd71ce83db2a89b14b66be17696a88d1820ac1b3 WHIRLPOOL 67cf715624a0355f1e3927fb9a9a97ea1375069b24c9445c2fecf8c11611a1d884c58ed10134784f6d093fc52181aacdbefb13314d5713ddee032287215573e4
 EBUILD jalv-1.6.0-r1.ebuild 1362 SHA256 a2f9f0a2cb04d6c7f429f56915d9b081cecdb00ec2a40b70d821b013f135b4ec SHA512 12f810c07ed4a7090cfee9dc46d1439595d5b4d9dc194547cf5d4367052ca9a4e2cc043bd062e6e6482dec11fdd17acbbc20c12f08d9c534c4514d93327bf84b WHIRLPOOL 85eac427b90c29c2357ed7f6d0feeccb8aed9dcdd99584f58a42ea797d4f8ad33b702fffe1df959fd3505aa9a8d0719059f6909eddcbe83557faac452e209180
+EBUILD jalv-1.6.0-r2.ebuild 1432 SHA256 556829671eba5527c05f322d0dcdc48743c036f104999af91a8f9f4efda6dbec SHA512 0732bd0f8bca66e5e82736c8d927357795bc7ab779b80f6afbaf712ee69b4602061a87e9cbfc66851921c31c59a5506a51130db25ef4303f2edf55b3578a5900 WHIRLPOOL 87f9386d0102398f296fa564482aa85fff47a52b9af52c72226a2e2ed06036d3b1472b0c4d50cd12d0f0b8f8e85c817bb6414566dee02bbc4eef76cb4a584ea8
 MISC ChangeLog 2912 SHA256 2e9e873c8acaa7d398014d313055e8dfb2d163d6638612771df93d117d32059f SHA512 c2eb731679dc68d2587ffc6732c9f221ba0d2710970f6e7a9566d382cbd0a16cd58b5252c97202a1b93b032ee35335953f4976c08ece478deaea6152723c378e WHIRLPOOL dfbbbd1fdf558d52c4bd71ded52017939d5dfe063db7b437343322168ddf94727236d79e1e8b561a62800b5a2f75b547b13983f9bc82d9235301b1f047078822
 MISC ChangeLog-2015 1273 SHA256 bfbb0dfb9135a46c1bfb1262faf8de7c63d16445792a895bbb9fb1589b55a53c SHA512 9f5e354d1518a587813a462934588ed815ce078bb622ac12bd14f1d5fc8fd87d85eb7990f4b4146836b4e27fd476d67f0d1a020ac6c2d78758026ee5382676fd WHIRLPOOL 657b1d73c4d13a3b835768ec45616d0fc37961036cd7163938aed28b3703f2716a52a779bb35abb4c65f6dc56c52e1ff5e97002af88cb0faf72352fd1dbb68ed
 MISC metadata.xml 1152 SHA256 805b70351efb25fb21883f4a0f428027c69e73f9ef468d47c884c9f3b8c1f481 SHA512 e9b1e1f84df16a830785b7020eeb35369d0c0465b82b3033cc0714f4df706b0b63a946c0dc1051d3c1a3b185e5c9563189a05482c2e1013462592d3b1150b29c WHIRLPOOL cccdfd5fb5b8277e3ca8de981cd899deff7780fc7ec10e6636bae9405594b4cf938ba441010dcdd66358f000fea4fa1764f3d337f3dfd3bd5b06758eeb5bf978
diff --git a/media-sound/jalv/files/jalv-1.6.0-stdin.patch b/media-sound/jalv/files/jalv-1.6.0-stdin.patch
new file mode 100644
index 000000000000..953af7c5f3e3
--- /dev/null
+++ b/media-sound/jalv/files/jalv-1.6.0-stdin.patch
@@ -0,0 +1,67 @@
+From 3a46e861b5b8dbbacb8dd1cec9fa2c69a10b26e0 Mon Sep 17 00:00:00 2001
+From: David Robillard <d@drobilla.net>
+Date: Sat, 18 Feb 2017 18:00:03 +0100
+Subject: Add jalv -i option to ignore stdin for background use
+
+
+diff --git a/doc/jalv.1 b/doc/jalv.1
+index 6d93a72..000ed5a 100644
+--- a/doc/jalv.1
++++ b/doc/jalv.1
+@@ -17,6 +17,10 @@ Print the command line options.
+ Print control output changes to stdout.
+ 
+ .TP
++\fB\-i\fR
++Ignore input on stdin (for background use).
++
++.TP
+ \fB\-c SYM=VAL\fR
+ Set control value (e.g. "vol=1.4").
+ 
+diff --git a/src/jalv_console.c b/src/jalv_console.c
+index c0f369c..e0e114b 100644
+--- a/src/jalv_console.c
++++ b/src/jalv_console.c
+@@ -106,6 +106,8 @@ jalv_init(int* argc, char*** argv, JalvOptions* opts)
+ 				opts->controls, (++n_controls + 1) * sizeof(char*));
+ 			opts->controls[n_controls - 1] = (*argv)[a];
+ 			opts->controls[n_controls]     = NULL;
++		} else if ((*argv)[a][1] == 'i') {
++			opts->non_interactive = true;
+ 		} else if ((*argv)[a][1] == 'd') {
+ 			opts->dump = true;
+ 		} else if ((*argv)[a][1] == 't') {
+@@ -191,7 +193,7 @@ jalv_open_ui(Jalv* jalv)
+ 
+ 		show_iface->hide(suil_instance_get_handle(jalv->ui_instance));
+ 
+-	} else {
++	} else if (!jalv->opts.non_interactive) {
+ 		// Primitive command prompt for setting control values
+ 		while (!zix_sem_try_wait(jalv->done)) {
+ 			char line[128];
+@@ -202,6 +204,8 @@ jalv_open_ui(Jalv* jalv)
+ 				break;
+ 			}
+ 		}
++	} else {
++		zix_sem_wait(jalv->done);
+ 	}
+ 
+ 	// Caller waits on the done sem, so increment it again to exit
+diff --git a/src/jalv_internal.h b/src/jalv_internal.h
+index 3a565ec..06f116a 100644
+--- a/src/jalv_internal.h
++++ b/src/jalv_internal.h
+@@ -172,6 +172,7 @@ typedef struct {
+ 	int      no_menu;           ///< Hide menu iff true
+ 	int      show_ui;           ///< Show non-embedded UI
+ 	int      print_controls;    ///< Print control changes to stdout
++	int      non_interactive;   ///< Do not listen for commands on stdin
+ } JalvOptions;
+ 
+ typedef struct {
+-- 
+cgit v0.10.2
+
diff --git a/media-sound/jalv/files/jalv-1.6.0-suil-qt5.patch b/media-sound/jalv/files/jalv-1.6.0-suil-qt5.patch
new file mode 100644
index 000000000000..a57447ce075b
--- /dev/null
+++ b/media-sound/jalv/files/jalv-1.6.0-suil-qt5.patch
@@ -0,0 +1,34 @@
+From 4d22c6a53ff1dcb657ab1913f1b100e42db19bca Mon Sep 17 00:00:00 2001
+From: David Robillard <d@drobilla.net>
+Date: Sat, 18 Mar 2017 12:00:11 +0100
+Subject: Use new suil init API to fix Qt5 plugin UIs
+
+
+diff --git a/src/jalv.c b/src/jalv.c
+index 78901ca..20f24e7 100644
+--- a/src/jalv.c
++++ b/src/jalv.c
+@@ -777,6 +777,7 @@ main(int argc, char** argv)
+ 	jalv.bpm           = 120.0f;
+ 	jalv.control_in    = (uint32_t)-1;
+ 
++	suil_init(&argc, &argv, SUIL_ARG_NONE);
+ 	if (jalv_init(&argc, &argv, &jalv.opts)) {
+ 		return EXIT_FAILURE;
+ 	}
+diff --git a/wscript b/wscript
+index 19f51bb..e2adc63 100644
+--- a/wscript
++++ b/wscript
+@@ -59,7 +59,7 @@ def configure(conf):
+     autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',
+                       atleast_version='0.12.0', mandatory=True)
+     autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL',
+-                      atleast_version='0.6.0', mandatory=True)
++                      atleast_version='0.8.7', mandatory=True)
+     autowaf.check_pkg(conf, 'sratom-0', uselib_store='SRATOM',
+                       atleast_version='0.6.0', mandatory=True)
+     if Options.options.portaudio:
+-- 
+cgit v0.10.2
+
diff --git a/media-sound/jalv/jalv-1.6.0-r2.ebuild b/media-sound/jalv/jalv-1.6.0-r2.ebuild
new file mode 100644
index 000000000000..eb91d17f85f4
--- /dev/null
+++ b/media-sound/jalv/jalv-1.6.0-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 qmake-utils waf-utils
+
+DESCRIPTION="Simple but fully featured LV2 host for Jack"
+HOMEPAGE="http://drobilla.net/software/jalv/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gtk gtk2 gtkmm portaudio qt5"
+
+RDEPEND="
+	>=dev-libs/serd-0.14.0
+	>=dev-libs/sord-0.12.0
+	>=media-libs/lilv-0.24.0
+	>=media-libs/lv2-1.6.0
+	>=media-libs/sratom-0.6.0
+	>=media-libs/suil-0.6.0
+	gtk? ( >=x11-libs/gtk+-3.0.0:3 )
+	gtk2? ( >=x11-libs/gtk+-2.18.0:2 )
+	gtkmm? ( >=dev-cpp/gtkmm-2.20.0:2.4 )
+	portaudio? ( media-libs/portaudio )
+	!portaudio? ( virtual/jack )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+PATCHES=(
+	"${FILESDIR}/${P}-qt-5.7.0.patch"
+	"${FILESDIR}/${P}-stdin.patch"
+	"${FILESDIR}/${P}-suil-qt5.patch"
+)
+
+src_configure() {
+	use qt5 && export PATH="$(qt5_get_bindir):${PATH}"
+	waf-utils_src_configure \
+		"--docdir=/usr/share/doc/${PF}" \
+		--no-qt4 \
+		$(use qt5       || echo --no-qt5)       \
+		$(use gtk       || echo --no-gtk3)      \
+		$(use gtk2      || echo --no-gtk2)      \
+		$(use gtkmm     || echo --no-gtkmm)     \
+		$(use portaudio && echo --portaudio)
+}
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index cdf4dfe62689..93ddecd0758b 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -5,7 +5,7 @@ DIST picard-1.4.2.tar.gz 2116021 SHA256 f0adee3877bbd66c827a43b57dd2233037b99f6e
 EBUILD picard-1.3.1.ebuild 1305 SHA256 969d0538e9b6b7d7158317481280c51d17558dad59418df82afc6e87864de9fb SHA512 99ffcb297f20dc17f30f188c85c6955fecaf6188e0b9c25d9a5242d08db585ea6fe9b09c754540fd74c4e0724d2f39da88e483f6cfb9b5eabbc74f3dc2d20d5b WHIRLPOOL 912029138bb625e3ca9012d40e8b573550d74118cf971bdfb7d8274de5122d23cad1cc0fc41e794cf4620f864b70dffa452f35d7285cb9ed3e23233dc0e7d761
 EBUILD picard-1.3.2-r1.ebuild 1332 SHA256 d3521816a7cb5dafa4a9ac6447fc62367a0b2fc6cc79ef9738cb7e79ec0714ae SHA512 7b059c984c0ac001fa837197fbf7559a0933777f3667b429560b6d603716faea067cc15ad6005092e800a55b605d47a5e41f2cf420d6b7ffff7afca92c673981 WHIRLPOOL cda05129249c1e89bf17e9d082cb348159a08558d6f7b09e773c04077786ae3ac42f8c59b9ff67b3415e8c251e13e1959c97779c8d9b7fde54965e29f031e639
 EBUILD picard-1.4.1.ebuild 1582 SHA256 2d75f91d37d75856a3318ca14f232e82085db2eba1e8cb481f116784da0f446a SHA512 0a003ed174c9e8cb7159b11d1782d1205f471b3c1c08a3fe33f32e1261e4e4b33c7e71aae3d85b9bb39d3006d2200dc40be078019df472fb2b3ea501bdc537fa WHIRLPOOL 0a2396c9a7d8614ff98254cb5f197a0bfb7308e43222c14cd2e38562ddba6b3397f1c43d142aa6af8a9d767f8abc8255cb489b40d54ee271ad691fa1363df4d4
-EBUILD picard-1.4.2.ebuild 1581 SHA256 257e89e34202126cb98d24c4e0e61be6a53d76df343f1ff2b0b12f719b8411a4 SHA512 ac6f9ee124b70de9bdc2bae6446504397f1c7f6fbb8cc37777c4cc184a55ddb7f999d6e42d91673cb6119edb2171aaec130cc790c950c51eadd76f1087a6c84d WHIRLPOOL beee997cf08f7375fa33f209166ca82e8a442c76f7be836453ef198f89f66e926fb79bcb3e24e71e57ad2a95ee3dc9172f0ff13b772a66c8e33e3245ebe3a07a
+EBUILD picard-1.4.2.ebuild 1580 SHA256 dd3ee12da9ce6cac60b42bf61c1c8083059e16c79b300ab30124909ded6f0c5e SHA512 4026302891e66e1bec8c76d99559f88a336454beab29a22c09e355d32378b0f7d648fb33c50a209ec5da6f696aef2195795e70ba4339f71a8e44cbbe0e80fc3f WHIRLPOOL d49bf0795e5629ff062d0202bf0ca9ec7a697c87ad1fdcc142cd75dfdf385f3f84128f7fc1fdbe0c2101ea31d70cb56246ac1a795bba8e99a4da4b2d61a1ab27
 MISC ChangeLog 2876 SHA256 038428dffbaaa64a27fc3b5a5ce13fb01b272d338effc0d17fb65ef8e81f45bd SHA512 336a643800eba682ddb2cfcd9fa4c557eddee83bfad22ee654652555ab247a0de87d0f4da7362f7e8395b75b3dd198601a374db2882e8f96cdafdfb02f63c8b8 WHIRLPOOL 6d240f5e43223624dde9114d61af037c673e6b423829027bd4759eeec13a7becf2a2c759199b47a767f8f9e149d263fb521274c069efc41cc237d259a7b89be7
 MISC ChangeLog-2015 8587 SHA256 9ff902965e0ec129dace44423ed68df7bdcb1dddb02a9aa60800c519ff5b051b SHA512 840a07393644bf13f5ff52f8e461ebb7e68eba28c953b4c03ac9c2ce67d119f619b4b4b7eef0998aceca03cb38253515d1ace06bdfc1820d3ec0a75e2ee5c80d WHIRLPOOL 6dcd0c1369c1d4d4b730e0ad6820b5eea61a54405279bab89a17fca9fef330b3ad2530a920c20118507732f5f4b693be0591e49555dc17a4a95ce870bbdb3bf6
 MISC metadata.xml 664 SHA256 71d7265f73c9596796cb95e3a47f3fd9a39e62be96b034ce4c4b7fa6457a7d30 SHA512 f0671dca61d99480b92fc90cfdfa456d6a88c692a6e2b86ccc9d9ecf95bff6f634b885b14aa2e2b2e1c140090cd06043cc4f396dce0999c1febef61f831dcd09 WHIRLPOOL d92e2120512f58080b805f27609b1b8eb905e623a744b154cbed865a72d76e90ce35444da29ef99ce027851e6bab86a00e3327f2bc01d351c24d0fe6d287c9a0
diff --git a/media-sound/picard/picard-1.4.2.ebuild b/media-sound/picard/picard-1.4.2.ebuild
index c1ae248b2ba2..dd2fee9820be 100644
--- a/media-sound/picard/picard-1.4.2.ebuild
+++ b/media-sound/picard/picard-1.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/picard/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="nls"
 
 DEPEND="
diff --git a/media-sound/qmidiroute/Manifest b/media-sound/qmidiroute/Manifest
index 62fa425b866d..743191f494f4 100644
--- a/media-sound/qmidiroute/Manifest
+++ b/media-sound/qmidiroute/Manifest
@@ -1,8 +1,6 @@
 AUX qmidiroute-0.4.0-drop-qtopengl.patch 1031 SHA256 a301886ff273125024f1c93696c28d15e86cc37b5d2c67912832d3f217bedf84 SHA512 e7fb53f481818912646502fa84ab32e2f115443f662f9a3442aa63f04794847d4be7973e4e5d2d7d718825ca5b5bf9c099d1ffecd8e90a0adbd7ba7edef1a501 WHIRLPOOL 16a562dc3f6ffb7e491e55803cd56ca112e318b263145485ad0ecc1edf31690e9950798c28aadf11856e6e1e4b69e0d7aeea7719be72bb6394ec866d168a6c79
-DIST qmidiroute-0.3.0.tar.bz2 103285 SHA256 238ab3af3fdfaccab1366ecfec3d203d29e459b39f1ea579a3929b8035e19479 SHA512 34f626573f02803267b50a0e85b4343dcccfb28ef7ad9655a0234e25f2b6a5bdf6bd61e3d988e086f1d29e46ed64d644b4c6d5c115ec8d5235aa583385c07f94 WHIRLPOOL d7502e4cabec519f932d1691a0dcf7c4e9ff9cf0070b4a63bc7598c570fd4eac3b3e88ea0e0057512789919a82c456f445eb0a637f5626fae0946604ebc29194
 DIST qmidiroute-0.4.0.tar.bz2 121625 SHA256 09c6fc7c3be7c7a3dd86d1b4a310c62c1c3ec6040cb77e76fa833efad6bd61a7 SHA512 b3b5ded66c0e226848a3181d67f61ea9e4e76c253400dac63592e4f462f4cf06760b3f2d24a33bbc836f4fe29950a4d702adc048ad80c9b6d673ade8c1a88342 WHIRLPOOL 9a52dbb75cdeb273eb8a5650ac150d3d17a074a0790df11905068263925d78c69c6ed09de6319f404180797483e6efabacbc2c79092fcf8d7d2ef1cdcf1889c6
-EBUILD qmidiroute-0.3.0.ebuild 577 SHA256 07c91778b05d63e21b10738c19f226ddce111351c36fe698ceb20510702eee7b SHA512 7d48ea547c0e10b8723ccf692930097aba4f03141e0b6383fbdedb62937baa50282a0c987446c9357c5727d162c0dadc2006ab80ecdd34b0b43a8b3663951500 WHIRLPOOL 9b685123c9842e27685b4ba8144141e48f131dc9e9679b8fb11de51a984b20d0959a72cc196c248d947d7f093a7c738accfa637ccf0c370a40a2e3ac4593cba4
-EBUILD qmidiroute-0.4.0.ebuild 714 SHA256 b0de9f0bff6b2167d4807b33250568e5f7833c7e2502047065cd42d79b39ae4a SHA512 2256a7e0fa84fceea71dfbb55000cfee7733b716f6a8444c78e05208732d61906cf9ce56717313d5bb2224aced4900106b308a8c653545b8775868b7e98ebb7f WHIRLPOOL af345cbed7026f5c97b89ea615a495306511a04af719bfd169414639b825be5eee2b1328e26df65c938977892c39d46c7f2c1a4d7c9cc94f6b87192052266451
+EBUILD qmidiroute-0.4.0.ebuild 713 SHA256 4c679e34504e49fe1f40149be0fe431b30b1929e0f5e22a6bc63e946ea4ab505 SHA512 b47c35923b23292e69bee8fa903d75f1db77274152922de0466009b291d3ea1cd18f6cb2b943ca0cdd31a6007086e9bf9dafacc1d5a2c1ab5cf8a56fdeccba01 WHIRLPOOL aab422bdc7d7d8fe383c23cfabb5896718328254aa6f03e8c78cf1b7e8350fb004a55250c7de62a13bfa128e0f19c74721cb97f423608f7895b89f6335d18f85
 MISC ChangeLog 2439 SHA256 479c958aa71c3a3f9dca45f559ef390cb3dd1fb2fe5ccdfedb7313b0a44aafb7 SHA512 dbeca9308fe94340946cde4dfb41eea00e11595da34719fc2015c9f4bbe0c371ac07f98deffa722d9ed92a587f7fc2b7be7d3cce002366076f18a3e40e094364 WHIRLPOOL 1aca967b8e4454a0af6d895ac167a681ad02a45b43876d31821778b868aa1074e48005292f4d7c8a729aa501cacdc28f3ce3a46ac5a793c10444f4045c365392
 MISC ChangeLog-2015 1045 SHA256 74c0c668c2b4298312c3bcfb26007d48a82a88282e3ffe87fc260ca2a5f94089 SHA512 b72198d4329c84de1f65d5c37499eeb25c7653b0ba4d5b00ca1119201e6fb3fc4db61acf41f3486d343e73e0b39283699379e0e264aa102fc78e46b3e677d15b WHIRLPOOL 45734f31dfe267720ed7431682483905377c6c08cdb0f9a83a175e6dc7e34a537e809c754d31f17a49c9299ccc3cd599559b8196971a6d89f993d0127bce85f9
 MISC metadata.xml 334 SHA256 cedf85634f2e592ae02fe8074867d136e0f34bfe99b568b46e7e0d2bf7e12623 SHA512 e2486625819d1be0d7f0e638a5bb9312633c085d1d568dc329d1aae35575a8eff40845baab9ac171c0739667becc59332996ed8162db168b6fbf2250f71ded60 WHIRLPOOL 231178c25af8ac6f59249f48f2f89b3ac17598735f88a78fbdec5ec0e9fe65b34844dc815b6ef8c72e676febf48d275e6f7efe9238e76934aca137754545c82a
diff --git a/media-sound/qmidiroute/qmidiroute-0.3.0.ebuild b/media-sound/qmidiroute/qmidiroute-0.3.0.ebuild
deleted file mode 100644
index ee6752b3831b..000000000000
--- a/media-sound/qmidiroute/qmidiroute-0.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit flag-o-matic multilib
-
-DESCRIPTION="QMidiRoute is a filter/router for MIDI events"
-HOMEPAGE="http://alsamodular.sourceforge.net"
-SRC_URI="mirror://sourceforge/alsamodular/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtgui:4
-	media-libs/alsa-lib"
-
-src_configure() {
-	append-ldflags -L/usr/$(get_libdir)/qt4
-	econf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild b/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild
index 782410c6e9e3..4524f98cc911 100644
--- a/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild
+++ b/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/alsamodular/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="