From 5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 18 Mar 2018 04:54:42 +0000
Subject: gentoo resync : 18.03.2018

---
 media-sound/Manifest.gz                            | Bin 62798 -> 62794 bytes
 media-sound/cantata/Manifest                       |   2 +
 media-sound/cantata/cantata-2.2.0-r1.ebuild        | 122 +++++++++++++
 .../cantata/files/cantata-2.2.0-qtsql-5.10.patch   |  23 +++
 media-sound/clementine/Manifest                    |   5 +-
 .../clementine/clementine-1.3.1_p20180219.ebuild   | 189 --------------------
 .../clementine/clementine-1.3.1_p20180314.ebuild   | 192 +++++++++++++++++++++
 .../files/clementine-1.3.1_p20180314-qt-5.11.patch |  51 ++++++
 media-sound/gramofile/Manifest                     |   5 +-
 .../files/gramofile-1.6-strlen_and_exit.patch      |  56 ------
 media-sound/gramofile/gramofile-1.6-r1.ebuild      |  39 -----
 media-sound/gramofile/gramofile-1.6_p9.ebuild      |   2 +-
 media-sound/herrie/Manifest                        |   2 +-
 media-sound/herrie/herrie-2.2-r1.ebuild            |   2 +-
 media-sound/hydrogen/Manifest                      |   6 +-
 ...hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch | 101 +++++++++++
 .../hydrogen/files/hydrogen-gnuinstalldirs.patch   | 101 -----------
 .../hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild  |  82 +++++++++
 .../hydrogen/hydrogen-1.0.0_pre20180301.ebuild     |  82 ---------
 media-sound/hydrogen/hydrogen-9999.ebuild          |   2 +-
 media-sound/jaaa/Manifest                          |   8 +-
 media-sound/jaaa/files/jaaa-0.4.2-makefile.patch   |  22 ---
 media-sound/jaaa/files/jaaa-0.6.0-makefile.patch   |  23 ---
 media-sound/jaaa/jaaa-0.4.2.ebuild                 |  38 ----
 media-sound/jaaa/jaaa-0.6.0.ebuild                 |  36 ----
 media-sound/jaaa/jaaa-0.8.4.ebuild                 |   2 +-
 media-sound/jamin/Manifest                         |   3 +-
 media-sound/jamin/jamin-0.95.0-r2.ebuild           |  39 -----
 media-sound/jamin/jamin-0.95.0-r3.ebuild           |   2 +-
 media-sound/lame/Manifest                          |   2 +-
 media-sound/lame/lame-3.100-r1.ebuild              |  77 +++++++++
 media-sound/lame/lame-3.100.ebuild                 |  81 ---------
 media-sound/lilypond/Manifest                      |  12 +-
 media-sound/lilypond/lilypond-2.18.2-r3.ebuild     |   2 +-
 media-sound/lilypond/lilypond-2.19.54.ebuild       |   2 +-
 media-sound/lilypond/lilypond-2.19.64.ebuild       |   2 +-
 media-sound/lilypond/lilypond-2.19.80-r1.ebuild    |   2 +-
 media-sound/lilypond/lilypond-2.19.80.ebuild       |   2 +-
 media-sound/lilypond/lilypond-9999.ebuild          |   2 +-
 media-sound/murmur/Manifest                        |   6 +-
 media-sound/murmur/murmur-1.2.17.ebuild            |   2 +-
 media-sound/murmur/murmur-1.2.18.ebuild            |   2 +-
 media-sound/murmur/murmur-1.2.19.ebuild            |   2 +-
 media-sound/picard/Manifest                        |   2 +-
 media-sound/picard/picard-1.4.2.ebuild             |   2 +-
 media-sound/pnmixer/Manifest                       |   2 +-
 media-sound/pnmixer/pnmixer-0.6_pre20111213.ebuild |   2 +-
 media-sound/rhythmbox/Manifest                     |   2 +-
 media-sound/rhythmbox/rhythmbox-3.4.2.ebuild       |   2 +-
 media-sound/umurmur/Manifest                       |   4 +-
 media-sound/umurmur/umurmur-0.2.16a-r1.ebuild      |   4 +-
 media-sound/umurmur/umurmur-0.2.17-r1.ebuild       |   4 +-
 52 files changed, 696 insertions(+), 761 deletions(-)
 create mode 100644 media-sound/cantata/cantata-2.2.0-r1.ebuild
 create mode 100644 media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch
 delete mode 100644 media-sound/clementine/clementine-1.3.1_p20180219.ebuild
 create mode 100644 media-sound/clementine/clementine-1.3.1_p20180314.ebuild
 create mode 100644 media-sound/clementine/files/clementine-1.3.1_p20180314-qt-5.11.patch
 delete mode 100644 media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch
 delete mode 100644 media-sound/gramofile/gramofile-1.6-r1.ebuild
 create mode 100644 media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch
 delete mode 100644 media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch
 create mode 100644 media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
 delete mode 100644 media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild
 delete mode 100644 media-sound/jaaa/files/jaaa-0.4.2-makefile.patch
 delete mode 100644 media-sound/jaaa/files/jaaa-0.6.0-makefile.patch
 delete mode 100644 media-sound/jaaa/jaaa-0.4.2.ebuild
 delete mode 100644 media-sound/jaaa/jaaa-0.6.0.ebuild
 delete mode 100644 media-sound/jamin/jamin-0.95.0-r2.ebuild
 create mode 100644 media-sound/lame/lame-3.100-r1.ebuild
 delete mode 100644 media-sound/lame/lame-3.100.ebuild

(limited to 'media-sound')

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 662429a58347..92054c240e93 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 91465536253f..13c8b330cdfa 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,4 +1,6 @@
 AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df
+AUX cantata-2.2.0-qtsql-5.10.patch 745 BLAKE2B d0c5e3586bb3303983f6d57bacba275e7b0895c56b43ebde69d7664f4bd57f8e1726982389b3da81487918d41085459f6bb2d9bbf2168f5737d7860d6ee68402 SHA512 1622fe94c814544192453d6ee2fa3158cc19d414e37dd76e88724c5056ff290d0070bb251c2f46a83dace906490625b43bcd51ffafa51c65e2dd500c971ea570
 DIST cantata-2.2.0.tar.bz2 2251649 BLAKE2B 9b28a4e3a77245fcf00f81780adecdc51e066f068798f92300ef8527872313f5fb56d4b90a6f5511caf951ba9fcd5c094dd5e9062fe3d314b75412b3e8e03d37 SHA512 519a2e24c8b2a1c98a2006a1f590945e1bd5e98a2c3a1b5da23e40f2297f1477d48d69b48ec669219f5ab8fdc955486fe29db6914abeef1fba2a47377f694ecd
+EBUILD cantata-2.2.0-r1.ebuild 2959 BLAKE2B 995c1d9bd6d66f62bef6838b8f82377e3c869b73bcbb2c499208ced2e5efac5ced285a9a73a064d19f8af354a04d39ea49b7d5f34cff29d7babe4ace52a02bec SHA512 07cacd181b9296cd1cae56e3ee45ff7e5983b463f9c8cd3dfd58854a74f5ce55f83844ba726de07b80ba2dbbd478edbe000871a4b58f6a4f703b5fb1e31b7241
 EBUILD cantata-2.2.0.ebuild 2906 BLAKE2B afc79b29d42719e018485c8742a21bfe596925b2ff83fd8de69bd699bdff03b7dcf8c4a1b0ac69df26fb140b64457485b62ca542c0632b2ec436a064a29b7532 SHA512 62a3a89fe9661db39cc7a8682fd4df72f8fa911a25a4cb1db66cc8f0cd0acdd00912b60a43442832b2dc01df69ab4015e817b345dbe0dc3b71418f52334ee03a
 MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97
diff --git a/media-sound/cantata/cantata-2.2.0-r1.ebuild b/media-sound/cantata/cantata-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..9b255bbabbb8
--- /dev/null
+++ b/media-sound/cantata/cantata-2.2.0-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="cs de en_GB es fr hu it ja ko pl ru zh_CN"
+inherit cmake-utils gnome2-utils l10n qmake-utils xdg
+
+DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
+HOMEPAGE="https://github.com/CDrummond/cantata"
+SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks"
+REQUIRED_USE="
+	?? ( cdda cdio )
+	cdda? ( udisks || ( cddb musicbrainz ) )
+	cddb? ( || ( cdio cdda ) taglib )
+	cdio? ( udisks || ( cddb musicbrainz ) )
+	mtp? ( taglib udisks )
+	musicbrainz? ( || ( cdio cdda ) taglib )
+	replaygain? ( taglib )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	|| ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
+	sys-libs/zlib
+	virtual/libudev:=
+	cdda? ( media-sound/cdparanoia )
+	cddb? ( media-libs/libcddb )
+	cdio? ( dev-libs/libcdio-paranoia )
+	mtp? ( media-libs/libmtp )
+	musicbrainz? ( media-libs/musicbrainz:5= )
+	replaygain? (
+		media-libs/libebur128
+		media-sound/mpg123
+		virtual/ffmpeg
+	)
+	streaming? ( media-video/vlc:0= )
+	taglib? (
+		media-libs/taglib[asf(+),mp4(+)]
+		media-libs/taglib-extras
+		udisks? ( sys-fs/udisks:2 )
+	)
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	dev-qt/linguist-tools:5
+"
+
+# cantata has no tests
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-headers.patch"
+	"${FILESDIR}/${P}-qtsql-5.10.patch" # bug 642196
+)
+
+src_prepare() {
+	remove_locale() {
+		rm "translations/${PN}_${1}".ts || die
+	}
+
+	cmake-utils_src_prepare
+
+	# Unbundle 3rd party libs
+	rm -r 3rdparty/{ebur128,qtsingleapplication} || die
+
+	l10n_find_plocales_changes "translations" "${PN}_" ".ts"
+	l10n_for_each_disabled_locale_do remove_locale
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
+		-DENABLE_CDPARANOIA=$(usex cdda)
+		-DENABLE_CDDB=$(usex cddb)
+		-DENABLE_CDIOPARANOIA=$(usex cdio)
+		-DENABLE_HTTP_SERVER=$(usex http-server)
+		-DENABLE_MTP=$(usex mtp)
+		-DENABLE_MUSICBRAINZ=$(usex musicbrainz)
+		-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
+		-DENABLE_FFMPEG=$(usex replaygain)
+		-DENABLE_MPG123=$(usex replaygain)
+		-DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming)
+		-DENABLE_TAGLIB=$(usex taglib)
+		-DENABLE_TAGLIB_EXTRAS=$(usex taglib)
+		-DENABLE_DEVICES_SUPPORT=$(usex udisks)
+		-DENABLE_REMOTE_DEVICES=OFF
+		-DENABLE_UDISKS2=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_pkg_postinst
+
+	has_version media-sound/mpd || \
+		elog "An instance of media-sound/mpd, local or remote, is required to set up Cantata."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_pkg_postrm
+}
diff --git a/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch b/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch
new file mode 100644
index 000000000000..16cb6d8c2d1f
--- /dev/null
+++ b/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch
@@ -0,0 +1,23 @@
+From 4da7a9128f2c5eaf23ae2a5006d300dc4f21fc6a Mon Sep 17 00:00:00 2001
+From: Craig Drummond <craig.p.drummond@gmail.com>
+Date: Tue, 28 Nov 2017 22:37:01 +0000
+Subject: [PATCH] Create QSqlQuery, then call prepare Issue #1130
+
+---
+ db/librarydb.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/db/librarydb.cpp b/db/librarydb.cpp
+index 603d8abc1..4f75dc28f 100644
+--- a/db/librarydb.cpp
++++ b/db/librarydb.cpp
+@@ -453,7 +453,8 @@ class SqlQuery
+         if (limit>0) {
+             sql+=" LIMIT "+QString::number(limit);
+         }
+-        query=QSqlQuery(sql, db);
++        query = QSqlQuery(db);
++        query.prepare(sql);
+ 
+         for (const QVariant &value: boundValues) {
+             query.addBindValue(value);
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index f57739d54774..0aa5229aa185 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,8 +1,9 @@
 AUX clementine-1.3-fix-tokenizer.patch 674 BLAKE2B 6f5b0c6bd71887cbe9ce0f85a85db134710f5aaf62c4e8105ab1b8ab0e69a0953b6177fb91dd89fcdcf5493dfc1e634f51658eea9f050689aa1e219dbd8db189 SHA512 4f520dcd4937634ebf5bb814ec64267d42473886fc5abd4924ac551bbae8ecc7643ddbacd9e2f9a5b0d8c7b0f67cf5aec420b5eb73162b248cbf6b3eafafbbd8
+AUX clementine-1.3.1_p20180314-qt-5.11.patch 1554 BLAKE2B e30ad68f0acf8f93a88204d5d03b951cafa2612ae45b9e8902a14111bc93aebd99ce0dc37072ba6ef1ab609dd858bb9da7f22cc1edbce22ba317ff786f033952 SHA512 438c4d1385929ee1d0fea9970fcf4ea6d91c6faf81add6099511e4a8e2c174fb79d65af1fea78c9b7a158f520e915ab32fa7f12474de2a7b7accd8d9b8767ffd
 AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195a7016a7dcd0f01128dc24a22c10ea5cba0cc302852272ca4d45844c0003572809fa8d8c1a2e37524d2e8c75e64d96290f SHA512 c4623333086cebb9d56d11c4deb8837fc23aaff8ddda07bcb8bb1c0df90700d6923d51324823d23b317366180660de3993053d9de0ff5103d88f59143328627a
 DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674
-DIST clementine-1.3.1_p20180219.tar.gz 8486446 BLAKE2B f0d34dae90acfd41a4dad6943ea088fb64d16308caf8dce569c0c5a900c149a0c40838b8f420a42e9e5cf6718965cec8fe7f9bb2ed7489719f3d8316308f2d49 SHA512 7464f03be6894202ecfeb9f2dd97821cd76cec1285be2dc82155b023406c57ec1a94e3659438726b6bf3c667579ab43f668f03e12c261aea05aa468e73a05146
+DIST clementine-1.3.1_p20180314.tar.gz 8486396 BLAKE2B 978651924c50ee3669f82a51f98978869103edac3f7f7cfef372dc1f1483caa2f543d9d626a4552647acaeabb4f329a69cb5c76d8c6e9b8d605de2f86025344c SHA512 5c21540a91dae9f0db336947552548e44eec80fc9e6ebf95cbca3d2ab60cd096be963aec105f0c8d72d2628777cb6628e4a7e50f54a3edbcc22708c59f620e4a
 EBUILD clementine-1.3.1_p20171113.ebuild 4924 BLAKE2B 09cd8a038fccadaf0a023e1092e4c38047bc398f9d1239aa67a96fe216a0c8642719613da76171d6a9f30e49e916d943b207eb8436f69f1a4a6a623aec0a4706 SHA512 f12a7cad0d39622df4b1ef47f7a4844c97957ab802f25d43a489fbbd7d722d644c336436153f297f52d2d3397241d0002606b13a71cbd2dc52564e2d7164d453
-EBUILD clementine-1.3.1_p20180219.ebuild 5572 BLAKE2B e17a5eefb07b64db960211662ccbe2db81fbdf666f3a38e999becef3ec75eb300db3978f5e60fb48994cb0997035576520108985858aeedf563622cd0b144851 SHA512 66320677b9e59c3064a76c120e3baf13f797317a2846e3d3b76dbf93bc33e71bb7db22049bb4a47f8ca4edce4057098d1784e43b288ff68c56dabd6f48a37e18
+EBUILD clementine-1.3.1_p20180314.ebuild 5607 BLAKE2B 268c4804444e10563a88cfbc6a255a8bc4d6b639b906fd1e6513ade1e7f008f9dfe3bfa8e66cdea341d34bb7730078fdcea2b1c4f311f93247b5a2b998e6478d SHA512 ec5e43ffa5feaebbeeb3fd9ac40ad4e836a56b23cd1ba4aa0abf63c742776aaeedcacd4e59f16a8e5cf484bb53813b4199feb8038844df39613510c325c9aebe
 EBUILD clementine-9999.ebuild 5542 BLAKE2B d53c697df82d75b78745a7b3bf682a3e0062babe7656e8fb86c1dcd3bd1da96b5f004af5315eaeab134eb7c053a6e216621b668ec47449fb130547550ba1487e SHA512 c18099280c91ac11269535b9a5c0cc4dbee9895c4ff90687a25a217ff6b4461e587628667a1068cc68eb97139072be833510ab34f6e6910fc12b5c0eb84ca9e9
 MISC metadata.xml 1270 BLAKE2B 42b3ad43defebc30898db95bac41edde89d345e4776fa81f84581f8f35df8fa962024f0d08e84bfceba1080966988308434c7aac90d244ead02cc3a1fe01c58e SHA512 9d69291b66803e4dbe1ca50309891fcd9ee5ad5264bb7827a88a550367d770482744f3b5689f60a584b3fda7614cd27743085492dc72727275b470b225b96cf4
diff --git a/media-sound/clementine/clementine-1.3.1_p20180219.ebuild b/media-sound/clementine/clementine-1.3.1_p20180219.ebuild
deleted file mode 100644
index 0cbf9b6da163..000000000000
--- a/media-sound/clementine/clementine-1.3.1_p20180219.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
-
-MY_P="${P/_}"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_BRANCH="qt5"
-	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
-	GIT_ECLASS="git-r3"
-else
-	COMMIT=4273c0313298c2f7cb6f1b02cb5461fb66865c30
-	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS} vcs-snapshot
-unset GIT_ECLASS
-
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
-HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
-
-REQUIRED_USE="
-	udisks? ( dbus )
-	wiimote? ( dbus )
-"
-
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
-	dev-db/sqlite:=
-	dev-libs/crypto++
-	dev-libs/glib:2
-	dev-libs/libxml2
-	dev-libs/protobuf:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	media-libs/chromaprint:=
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
-	media-libs/taglib
-	sys-libs/zlib
-	virtual/glu
-	virtual/opengl
-	x11-libs/libX11
-	cdda? ( dev-libs/libcdio:= )
-	dbus? ( dev-qt/qtdbus:5 )
-	ipod? ( >=media-libs/libgpod-0.8.0 )
-	lastfm? ( >=media-libs/liblastfm-1[qt5(+)] )
-	moodbar? ( sci-libs/fftw:3.0 )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	projectm? (
-		media-libs/glew:=
-		>=media-libs/libprojectm-1.2.0
-	)
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches:
-# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# Still possibly essential but not applied yet patches are:
-# 06-fix-numeric-locale.patch
-# 08-stdlib.h-for-rand.patch
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-soup:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	mms? ( media-plugins/gst-plugins-libmms:1.0 )
-	mtp? ( gnome-base/gvfs[mtp] )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-cpp/gtest-1.8.0
-	dev-libs/boost
-	dev-qt/linguist-tools:5
-	dev-qt/qtopengl:5
-	sys-devel/gettext
-	virtual/pkgconfig
-	box? ( dev-cpp/sparsehash )
-	dropbox? ( dev-cpp/sparsehash )
-	googledrive? ( dev-cpp/sparsehash )
-	pulseaudio? ( media-sound/pulseaudio )
-	seafile? ( dev-cpp/sparsehash )
-	skydrive? ( dev-cpp/sparsehash )
-	test? (
-		dev-qt/qttest:5
-		gnome-base/gsettings-desktop-schemas
-	)
-"
-
-DOCS=( Changelog README.md )
-
-PATCHES=( "${FILESDIR}"/${PN}-fts3-tokenizer.patch )
-
-src_prepare() {
-	l10n_find_plocales_changes "src/translations" "" ".po"
-
-	cmake-utils_src_prepare
-	# some tests fail or hang
-	sed -i \
-		-e '/add_test_file(translations_test.cpp/d' \
-		tests/CMakeLists.txt || die
-
-	if ! use test; then
-		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
-		cmake_comment_add_subdirectory tests
-	fi
-
-	# Fix clementine relying on downstream renaming of lastfm header dir
-	sed -i -e "/^#include/s/lastfm5/lastfm/" \
-		tests/albumcoverfetcher_test.cpp \
-		src/internet/lastfm/lastfm{settingspage.cpp,service.cpp,compat.h} \
-		src/core/song.cpp || die "Failed to sed lastfm header suffix"
-	sed -e "/^find_path.*LASTFM5/s/lastfm5/lastfm/" \
-		-i CMakeLists.txt || die "Failed to sed lastfm header suffix"
-}
-
-src_configure() {
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		# force to find crypto++ see bug #548544
-		-DCRYPTOPP_LIBRARIES="crypto++"
-		-DCRYPTOPP_FOUND=ON
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
-		-DENABLE_DEVICEKIT=OFF
-		-DENABLE_GIO=ON
-		-DENABLE_SPOTIFY_BLOB=OFF
-		-DUSE_BUILTIN_TAGLIB=OFF
-		-DUSE_SYSTEM_GMOCK=ON
-		-DUSE_SYSTEM_PROJECTM=ON
-		-DBUNDLE_PROJECTM_PRESETS=OFF
-		-DLINGUAS="$(l10n_get_locales)"
-		-DENABLE_BOX="$(usex box)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DENABLE_DBUS="$(usex dbus)"
-		-DENABLE_DROPBOX="$(usex dropbox)"
-		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
-		-DENABLE_LIBGPOD="$(usex ipod)"
-		-DENABLE_LIBLASTFM="$(usex lastfm)"
-		-DENABLE_MOODBAR="$(usex moodbar)"
-		-DENABLE_LIBMTP="$(usex mtp)"
-		-DENABLE_VISUALISATIONS="$(usex projectm)"
-		-DENABLE_SEAFILE="$(usex seafile)"
-		-DENABLE_SKYDRIVE="$(usex skydrive)"
-		-DENABLE_LIBPULSE="$(usex pulseaudio)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
-	)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}" || die
-	virtx emake test
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-
-	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
-	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
-	elog "depending on your preferences"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/clementine/clementine-1.3.1_p20180314.ebuild b/media-sound/clementine/clementine-1.3.1_p20180314.ebuild
new file mode 100644
index 000000000000..296ae7151dfe
--- /dev/null
+++ b/media-sound/clementine/clementine-1.3.1_p20180314.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
+
+MY_P="${P/_}"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_BRANCH="qt5"
+	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
+	GIT_ECLASS="git-r3"
+else
+	COMMIT=2d7894915dfc9043da9282d216775ef75041c773
+	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS} vcs-snapshot
+unset GIT_ECLASS
+
+DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
+HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+	wiimote? ( dbus )
+"
+
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+)]
+	dev-db/sqlite:=
+	dev-libs/crypto++
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/protobuf:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/chromaprint:=
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+	media-libs/taglib
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio:= )
+	dbus? ( dev-qt/qtdbus:5 )
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	lastfm? ( >=media-libs/liblastfm-1[qt5(+)] )
+	moodbar? ( sci-libs/fftw:3.0 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	projectm? (
+		media-libs/glew:=
+		>=media-libs/libprojectm-1.2.0
+	)
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches:
+# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
+# Still possibly essential but not applied yet patches are:
+# 06-fix-numeric-locale.patch
+# 08-stdlib.h-for-rand.patch
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	mms? ( media-plugins/gst-plugins-libmms:1.0 )
+	mtp? ( gnome-base/gvfs[mtp] )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-cpp/gtest-1.8.0
+	dev-libs/boost
+	dev-qt/linguist-tools:5
+	dev-qt/qtopengl:5
+	sys-devel/gettext
+	virtual/pkgconfig
+	box? ( dev-cpp/sparsehash )
+	dropbox? ( dev-cpp/sparsehash )
+	googledrive? ( dev-cpp/sparsehash )
+	pulseaudio? ( media-sound/pulseaudio )
+	seafile? ( dev-cpp/sparsehash )
+	skydrive? ( dev-cpp/sparsehash )
+	test? (
+		dev-qt/qttest:5
+		gnome-base/gsettings-desktop-schemas
+	)
+"
+
+DOCS=( Changelog README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-fts3-tokenizer.patch
+	"${FILESDIR}"/${P}-qt-5.11.patch
+)
+
+src_prepare() {
+	l10n_find_plocales_changes "src/translations" "" ".po"
+
+	cmake-utils_src_prepare
+	# some tests fail or hang
+	sed -i \
+		-e '/add_test_file(translations_test.cpp/d' \
+		tests/CMakeLists.txt || die
+
+	if ! use test; then
+		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
+		cmake_comment_add_subdirectory tests
+	fi
+
+	# Fix clementine relying on downstream renaming of lastfm header dir
+	sed -i -e "/^#include/s/lastfm5/lastfm/" \
+		tests/albumcoverfetcher_test.cpp \
+		src/internet/lastfm/lastfm{settingspage.cpp,service.cpp,compat.h} \
+		src/core/song.cpp || die "Failed to sed lastfm header suffix"
+	sed -e "/^find_path.*LASTFM5/s/lastfm5/lastfm/" \
+		-i CMakeLists.txt || die "Failed to sed lastfm header suffix"
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# force to find crypto++ see bug #548544
+		-DCRYPTOPP_LIBRARIES="crypto++"
+		-DCRYPTOPP_FOUND=ON
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
+		-DENABLE_DEVICEKIT=OFF
+		-DENABLE_GIO=ON
+		-DENABLE_SPOTIFY_BLOB=OFF
+		-DUSE_BUILTIN_TAGLIB=OFF
+		-DUSE_SYSTEM_GMOCK=ON
+		-DUSE_SYSTEM_PROJECTM=ON
+		-DBUNDLE_PROJECTM_PRESETS=OFF
+		-DLINGUAS="$(l10n_get_locales)"
+		-DENABLE_BOX="$(usex box)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DENABLE_DBUS="$(usex dbus)"
+		-DENABLE_DROPBOX="$(usex dropbox)"
+		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBLASTFM="$(usex lastfm)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_VISUALISATIONS="$(usex projectm)"
+		-DENABLE_SEAFILE="$(usex seafile)"
+		-DENABLE_SKYDRIVE="$(usex skydrive)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}" || die
+	virtx emake test
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+	elog "depending on your preferences"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/clementine/files/clementine-1.3.1_p20180314-qt-5.11.patch b/media-sound/clementine/files/clementine-1.3.1_p20180314-qt-5.11.patch
new file mode 100644
index 000000000000..8903da174984
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.3.1_p20180314-qt-5.11.patch
@@ -0,0 +1,51 @@
+From b0b72ccfee2484ec05861879cca45d62d87055ae Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat, 17 Mar 2018 00:29:11 +0100
+Subject: [PATCH] Fix build with Qt 5.11
+
+---
+ src/playlist/playlistcontainer.cpp     | 1 +
+ src/ui/globalshortcutssettingspage.cpp | 1 +
+ src/widgets/errordialog.cpp            | 2 ++
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/playlist/playlistcontainer.cpp b/src/playlist/playlistcontainer.cpp
+index 58f1ad2d6..2ba1a3ff1 100644
+--- a/src/playlist/playlistcontainer.cpp
++++ b/src/playlist/playlistcontainer.cpp
+@@ -23,6 +23,7 @@
+ #include "playlistparsers/playlistparser.h"
+ #include "ui/iconloader.h"
+ 
++#include <QAction>
+ #include <QFileDialog>
+ #include <QInputDialog>
+ #include <QKeyEvent>
+diff --git a/src/ui/globalshortcutssettingspage.cpp b/src/ui/globalshortcutssettingspage.cpp
+index ec5d29b28..c60a9561d 100644
+--- a/src/ui/globalshortcutssettingspage.cpp
++++ b/src/ui/globalshortcutssettingspage.cpp
+@@ -24,6 +24,7 @@
+ #include "ui/iconloader.h"
+ #include "ui/settingsdialog.h"
+ 
++#include <QAction>
+ #include <QKeyEvent>
+ #include <QMessageBox>
+ #include <QProcess>
+diff --git a/src/widgets/errordialog.cpp b/src/widgets/errordialog.cpp
+index 1086305f3..3fd590840 100644
+--- a/src/widgets/errordialog.cpp
++++ b/src/widgets/errordialog.cpp
+@@ -18,6 +18,8 @@
+ #include "errordialog.h"
+ #include "ui_errordialog.h"
+ 
++#include <QStyle>
++
+ ErrorDialog::ErrorDialog(QWidget* parent)
+     : QDialog(parent), ui_(new Ui_ErrorDialog) {
+   ui_->setupUi(this);
+-- 
+2.16.2
+
diff --git a/media-sound/gramofile/Manifest b/media-sound/gramofile/Manifest
index 290cee8e52ea..025b4f8c406c 100644
--- a/media-sound/gramofile/Manifest
+++ b/media-sound/gramofile/Manifest
@@ -1,9 +1,6 @@
-AUX gramofile-1.6-strlen_and_exit.patch 1296 BLAKE2B c3a16410e7e12e7206cb369c13b4a356865732fff9d5bd64275c646ff9ad484a05622a8471849c13f619fe2f337e6cd4c6ac2137b63e2fc3e1e818525dd5c39d SHA512 ec630b85aa7099968a84e73e4efa014488c10e899080e2745dacd36808502d24f965905f08b02f11dbed6230cf33f3ce63fc2593d9b0f2bb2e268b75b9a10513
 AUX gramofile-1.6_p9-gentoo.patch 1100 BLAKE2B 69842cf58285f4621c04b6bc290f28aa79a056edac8f0870d166ea47a7c8fedc84a154493bd6470eaad1c474d875688f1b2723e100e0dead97fc4c09ff813865 SHA512 bd385cf856c6463e0e04a61b0e02bc2b15fced806fa9fed6612451da99823d526dba3f077c773c14cc0b860301ba56b7a8903c5df12c6ed23b31014b60c8ee3e
 AUX gramofile-1.6_p9-strlen_and_exit.patch 392 BLAKE2B a42c5dedc28f607c77c308154cf61e5012309904862a34c20efc91b2748e3cffd6585a9c1c75a0da68683e80444ad144a17cfe9b2617b24c3c448d54b0de775c SHA512 266dcbce4654c31e120d97e30e56764bac9f44dd412015c602bd43d902c38eb9fd9aa47dd7fe64961a1ea28eee1bcc992ec1d83a024cb1482a2b8d9e70c55034
-DIST gramofile_1.6-8.diff.gz 26697 BLAKE2B 67b620351d87b297d9a7f62e85f5159993e7850c47841fc36eb4d9dd9df545b91a9c09b86f960a0a54b7bd062f39410691d96c194cf6ae641b5161721b4cea5b SHA512 f03ab82de0aa8fca44bd5be4e64c0606c08a083ed09039728e163a2e535348c8984acd958bc6589139907101faf867e3030ff2ad09abdc8e3b292864f69e64ae
 DIST gramofile_1.6-9.diff.gz 25244 BLAKE2B 60170f960693932d894022d0c576b2d58764e546e6f2a13461ab78abfb92235007047bb9f35964859908c580c815d21e8c80d73ddd4e33b0c1d25deda78d395a SHA512 2c3b0131afcbae680432e5fc1bb753bae7c19d5bb4372808a0f86ef704800aea218e3bfe625bffe46ee3cd4a38f89a488141223d22b8f467cab45ee4a962c249
 DIST gramofile_1.6.orig.tar.gz 108596 BLAKE2B fc076c60d3f2f46ab33f63194db165b6d0df6bd76996bade730968dfd821d234b0a88f486e98f84e76804efb8b08fb2538cb553de5f9eb09eb3dde60b441fbf4 SHA512 171a7cff4066d625b9263f5462bf3e8fba30a02b629f20f7b38031cf037eb0940cfb54b73671d10948ac3326e272b3576de785310022007e0d4dca4f164815a5
-EBUILD gramofile-1.6-r1.ebuild 1023 BLAKE2B ec2d7daf44a878813c3db5f70db4f924d3af0bf9503f84f581cba1cec1f9b2d71650bef9be5318513ef4134686775d86d7195e9c8a58699a8be34789462fbca3 SHA512 bbce995fc183f5ad06fc4f3eddd8cb494f0b4af852124cba710d118ece440062fa9b685c4aa1299202165397619b149213d079c0d0f6b916c0b8858842cbe178
-EBUILD gramofile-1.6_p9.ebuild 1031 BLAKE2B 51688b714ce029740099cab62914bf3eef9c6ce19b2f81758a64b1dcd26440362cea106cdf7f2dceb7f070fa7a9f3f65797517e761b0ba2b03d57103863154e3 SHA512 a6f9c1f906744257eab916dd463d53f8c1da074ce2f10ca7112f5ecd1c2aada55bfe02006c7ec2e7faac0de4ca9f7390e4b3050a7a0913a95abab036cec57482
+EBUILD gramofile-1.6_p9.ebuild 1030 BLAKE2B cfbd8db5cdd4e121f65444110f22b0ee2d30ab66be12df097d83d606a52c43ec16eae35d6ab98b3c69b28bfaada415a322b80bc01cbefee3848dc97e6e9932ab SHA512 70953a351837675088878537887c964a109a985c524de264f8ab358fbcb52d4f2f0707f272fb72ee86502ee7ad61f3d7b31594a97f218b2f1881a4a29a6a77e0
 MISC metadata.xml 871 BLAKE2B 19a80d0e429503c3b745ec38782480b79631e083c51e676e831ffebcf38ad342013e3cafec545dbe05f830e1267db85634f5c6c83fb6188fe1666e4a9d7d97c9 SHA512 12ff2b2a524bb2e9b3d54c4a1cb4f1739f4ff5a664a01074a1759cf34593e110ddd80f5128a2d2ed222e20f80e329cd3af231ec726665c23bc36cd25cd384b22
diff --git a/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch b/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch
deleted file mode 100644
index 4c35dd3eb2ff..000000000000
--- a/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/bplaysrc/Makefile
-+++ b/bplaysrc/Makefile
-@@ -6,13 +6,12 @@
-         ../clrscr.o ../secshms.o
- #SRCS = bplay.c sndfunc.o shmbuf.c
- 
--CC = gcc
--LDFLAGS = 
-+CC ?= gcc
- 
- ########## CHOOSE YOUR ARCHITECTURE:    (NOTE: also see ../Makefile!)
- 
- # For Linux (and maybe others), use these:
--CFLAGS = -Wall -O2 -DUSEBUFFLOCK -DLP2CD -DVUMETER # -DDEBUG
-+CFLAGS += -Wall -DUSEBUFFLOCK -DLP2CD -DVUMETER
- LIBS = -lncurses
- 
- # For FreeBSD (and maybe others), use these:
---- a/gramofile.c
-+++ b/gramofile.c
-@@ -11,6 +11,7 @@
- #include "splashscr.h"
- #include <signal.h>
- #include <unistd.h>
-+#include <stdlib.h>
- #include <string.h>
- #ifndef OLD_CURSES
- #include <ncurses.h>
---- a/Makefile
-+++ b/Makefile
-@@ -14,13 +14,12 @@
- OBJS = $(SRCS:.c=.o)
- SHELL = /bin/sh
- 
--CC = gcc
--LDFLAGS = 
-+CC ?= gcc
- 
- ########## CHOOSE YOUR ARCHITECTURE:    (NOTE: also see bplaysrc/Makefile!)
- 
- # For Linux (and maybe others), use these:
--CFLAGS = -Wall -O2 -funroll-loops -DTURBO_MEDIAN -DTURBO_BUFFER
-+CFLAGS += -Wall -DTURBO_MEDIAN -DTURBO_BUFFER
- DEPS = $(OBJS) makebplay
- LIBS = -lncurses -lrfftw -lfftw -lm
- COPY_A = -a
---- a/signpr_cmf3.c
-+++ b/signpr_cmf3.c
-@@ -34,6 +34,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <math.h>
-+#include <string.h>
- #ifndef OLD_CURSES
- #include <ncurses.h>
- #else
diff --git a/media-sound/gramofile/gramofile-1.6-r1.ebuild b/media-sound/gramofile/gramofile-1.6-r1.ebuild
deleted file mode 100644
index bd252d4a6936..000000000000
--- a/media-sound/gramofile/gramofile-1.6-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-PATCH_LEVEL=8
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Transfer sound from gramophone records to CD"
-HOMEPAGE="http://www.opensourcepartners.nl/~costar/gramofile"
-SRC_URI="mirror://debian/pool/main/g/${PN}/${PN}_${PV}.orig.tar.gz
-	mirror://debian/pool/main/g/${PN}/${PN}_${PV}-${PATCH_LEVEL}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses
-	sci-libs/fftw:2.1"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff
-	EPATCH_SUFFIX="dpatch" EPATCH_FORCE="yes" epatch ${P}/debian
-	epatch "${FILESDIR}"/${P}-strlen_and_exit.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin ${PN} || die "dobin failed"
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe bplay_gramo brec_gramo || die "doexe failed"
-	dodoc ChangeLog README TODO *.txt
-	newdoc ${P}/debian/changelog ChangeLog.debian
-}
diff --git a/media-sound/gramofile/gramofile-1.6_p9.ebuild b/media-sound/gramofile/gramofile-1.6_p9.ebuild
index d05d50cec097..481ba2576b05 100644
--- a/media-sound/gramofile/gramofile-1.6_p9.ebuild
+++ b/media-sound/gramofile/gramofile-1.6_p9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	sys-libs/ncurses
diff --git a/media-sound/herrie/Manifest b/media-sound/herrie/Manifest
index 40387ec3ddfe..4b8293476c92 100644
--- a/media-sound/herrie/Manifest
+++ b/media-sound/herrie/Manifest
@@ -2,6 +2,6 @@ AUX herrie-2.2-fix-buildsystem.patch 1183 BLAKE2B fc3752e625b75d50f0aa3c72bcf738
 AUX herrie-2.2-libxspf.patch 3025 BLAKE2B 22deefb9b02e26b184e5801ac9543a66e4cf4e140368ec34bfa2bee36c99d72899abfac7c62489f3b2efeb121ec478734952054e9626fbe11644050c37ff30e2 SHA512 35122f8a0f16c54085d0c4ce8f1acf409266618116bbb94a8cae2b35c8856270a023d16d3c863ed3c1d06ea1f89a8f1d3d29e244881fb50bfed72b5ca1960192
 AUX herrie-chost_issue.patch 547 BLAKE2B 2310336da0c3e9af7f7758cfe33293694d5a5c0efbf03a3eae4010c2a3ff1e3d62107e001bdb012a166ae84fe9cb9ab3f08b59d3c737e2bca03e3e2d9a53d5e2 SHA512 09b0720ab8f94fef7533d7e16d2ef086aaad3d306487bca6e2f42d0fba96642ad9672f67183bd58542c3af06af643421be66e3c0afff43f023239d4602c13150
 DIST herrie-2.2.tar.bz2 71596 BLAKE2B 7065711dea83c1ff3bb2ede9b155f032f463dc8f51657adcfc1b46076a241cd9bcb62a80284de93b076b3ab9419a4cac01a9edbb8f76f1b07565b20c93e2c3a8 SHA512 7f89100f1c3376d03ebc5e5e3caadccb063470ab623c7b207e9e6aaa01d7e1885d4234e3a50675bc1ade07f5ab52a34022f4e18c9a5b4f9537baa7318f4ab213
-EBUILD herrie-2.2-r1.ebuild 1834 BLAKE2B e025e42582e169a821a163c799405bb797c365e0d8d98a334d52f0397f720e5c3fbcb7869c6f92d2949850b9b832fc854fe64a331c0bb8fe6684d3db749a0804 SHA512 54fdcde336dfe8e14ad31e0c10e3d1f6232475170147bb7fc56e2072f7dcf3cb628f65115fe69a1fb7aeca61a3e0c1683fbb9a7c8c5b52cacc409656478195a2
+EBUILD herrie-2.2-r1.ebuild 1833 BLAKE2B 0d781fdb2ba65af7d9acfed58fc1c8ee1d80199b1c4c2f17b19113f543de728dee876c785c8dd1d82fffe9558dca719f3e91e21ab0ae7c3763e90ad2c2a0f475 SHA512 fc66509b828993cc0b3acfbca626ea5394ad7a021d8ae91d802d5dd5cfe3851a35a271378568129aa3794097bba6909ad102aa3faa54582d8b1de7df585df5b6
 EBUILD herrie-2.2.ebuild 2082 BLAKE2B 3c0b90662572380ba58e3e2b86960b7fd60d5fc46e263f47f673fec0c7bf8fb9202ef9f5850380e5f2a0829d9ec67689efa738ca97512df39cbde55fe0e1b0d6 SHA512 53fb61e64bc52f0d5cb414d5aa8c97980ea1cdaf1fcaaa0e8254f795787744028e99280e2cf938482904efbc4c9f2a27adbbc78a331526af0c467d9e18b2081d
 MISC metadata.xml 1055 BLAKE2B fe6982ef85121180c38c9beaa2699940a56dc68f996d1a49c56ad7d16401b3dd2e23a6101357e577b5f271e8313390a979aabe79c9b8e591543dd81ef3fffd39 SHA512 0a987472d87f237e821363b4c6b4cdafce6a5ce43d31a30f09e7f8e9499a9b7b013a02e2d31cbf61be62ff845dec0c21f6b13f7c64ecf2a72666008450ee7dc3
diff --git a/media-sound/herrie/herrie-2.2-r1.ebuild b/media-sound/herrie/herrie-2.2-r1.ebuild
index ac128f74c5da..d17a5548fe00 100644
--- a/media-sound/herrie/herrie-2.2-r1.ebuild
+++ b/media-sound/herrie/herrie-2.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://herrie.info/distfiles/${P}.tar.bz2"
 
 LICENSE="BSD-2 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="ao +alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls"
 REQUIRED_USE="|| ( ao alsa pulseaudio oss )"
 
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index f79e6b5f5d56..02e74c6bd9e1 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,10 +1,10 @@
 AUX hydrogen-0.9.5-gcc47.patch 761 BLAKE2B 4dcf893c24a6cd8f3669af7f1b5517488adfd6aaf5018959732225f46ce0013faea98554a2e370c0d724100f64cd92308e00bf619271e9de4125dc7b7971f1fe SHA512 ff3a06fbafdce19bf04f9fb71c04ff754e22caa36148a0f5e4a56efc53ce9b9478e9f1aeacdcc037234104762d9fce208aef351c70941b044e2d83bac4131304
 AUX hydrogen-0.9.5-gcc6.patch 609 BLAKE2B f34496e0c3c251f135262ff30efaff243ae4fc0a279ad529f0bceb1e6b854b6b8b513a2f2b1c6e15ce1f68d51032817147ae7a357205345bf64876b5f2c7096b SHA512 0078c02e9cb2de557825cd6119ccfb6247f171ccc4a53ea93241891850c82f0924e9e0a4740764d13f1deefcb5e9469137e5d4a69c2bfceedeae8fb110deea8f
 AUX hydrogen-0.9.5-use_lrdf_pkgconfig.patch 858 BLAKE2B c43e9a0de36e1eee2c184b6405b3a01284dea8f058ba77aa415e85ee5e4e2bc27b975ee5a1d959471c64154f9be6cc0fe51e66db31abd7149e0350f91e8a9735 SHA512 251a74287370f66df9eeecd3b6c7963c2614cf6b17a56fc71dc9f99077c3267a2e79469e2993ae22d017ea7f6cc7c581455c97c125e3be73860321112a67fd31
-AUX hydrogen-gnuinstalldirs.patch 4495 BLAKE2B a76126880cdd1c3fe9b1715f61b819e763bd817632056db483e07c3f3c30e9c3bb2b23ee06667fee7fc7de816b788e324df05982df949d881408ba541decab3b SHA512 22f5add8c025a6c284b79b3a8eeb0dc0ea19a525abc761d808a5f966f9bb8ea250db850b649b9a5a61bd1ff794fcff0593211f51ef2b14ee9c15a20042bff8e5
+AUX hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch 4495 BLAKE2B 8342dd95dc1cd5ad89948d417c440e791e30c62e365fe9d1d3f8d7c5fa40180475d93a27958e64d4b587846067a4266f87a21d76e0b6ea57acde9154fb5d2e4c SHA512 cb7b068bd0690630ac49060aa8cbe2b3f250f6670ccd3035ad0b412df248c21753ea094dc67d5e3ceb80343b066b833cf3377b2c166e58119de1c112c5bb4c42
 DIST hydrogen-0.9.5.tar.gz 5239702 BLAKE2B 5fb1e7561b65587a6a4b8e642a4e0262cf8521a6847f04e57d4f99af2ef38fecb05f779cd5b0c25d487360db6455b0912729e7deac0d9959e8c32938a44b1adb SHA512 0053f0cb301c541326b66eb416dc548561a973ade993c055e7bc2acbdf28732e627a605061c8b487644026510f5b8395946bba209ddfd19230c960e9bb619f97
 DIST hydrogen-1.0.0_pre20180301.tar.gz 9865493 BLAKE2B 7a29440189b51f9e85560823a1e41b9a7392b51caf6808c0e06ac693a028580f78fac8f3bfe08eda5800a69d00b0f9b6235b6b5c0b7f19971e6bec4c1cf45d6d SHA512 376013ec99c3a3cdb87c03b11919c365b579a81377879ecfe11ed49ae9e7548a938ba23882e32e1921d6a1085ea7f7bc4e8520bc49bc61311dce1a01c8dc5e47
 EBUILD hydrogen-0.9.5-r1.ebuild 1816 BLAKE2B b66901bef46726ad957b37074ec247d7c9d502f324c8a0a2da2bca3af036a204b6f63fb0047672ef6fa38194c263c210efae02ae33d8eb56a4169bbf4a8529cf SHA512 0bd6ded8debf0915399c1dcc56537730d3c8a8b219262223d567f2240f3019de5675196102da55840c039ab30814ef27ec1f7b1c4313e537e07970e353956b86
-EBUILD hydrogen-1.0.0_pre20180301.ebuild 1942 BLAKE2B a052108ced2aeaba4dfddaa79c17ce93791325dfe0db95326cfb0bfc618ec566de63fb0420c412c9a899347be54a0d9a6983776ee37c70af1beebb3db23756c1 SHA512 d4e21c6e9df31a86b3f05863734f2bd745588a40e0ae315c0068a73e61030082034dd5ac75f825bd8eceb5124362c3b797835783741ec6ece0e30a05f50273fc
-EBUILD hydrogen-9999.ebuild 1831 BLAKE2B b05a1bb7a184ccf69846132a79a82c4677b77ac8e6b51bb8114734bc1ac47e19c7d4a9deb3b3ca14237f17d360a702253b8318ffe4bda7d1811ac572b79b9c63 SHA512 26532173d65743e0b102e2169a32bc1e39464e51bcdc4185080be069e49b66a5eb224a31510e79e4f118e09e617754e26d2da85123d1a79967888bae113bc9ca
+EBUILD hydrogen-1.0.0_pre20180301-r1.ebuild 1941 BLAKE2B e57bd18c9532314ea0f02ad666a1231f43fb07f26022ef91ac6b3296353c7150a4f49e432277c7076324cdca59ec958f757a6f8a18bd46a06a6c4a680792b751 SHA512 8c76340d5a017a548883e37bff8436c4fdd5b760a865fc3c3fae94d58e6946acfa9bfd023c12e92200391e6bd149cc42af511e74cbe5d496643948bffbb5bc76
+EBUILD hydrogen-9999.ebuild 1849 BLAKE2B 7c8e0555d88dcd682ef01503f0f80a04851f9515eb411949078cab0f3194ae032fade26cd1dfac870c06ea9fb2fc96c76f9a882cec9c5d51252a8f9f9c1f2ea2 SHA512 aacae6cc35be6f45302b40dde8d997424617ead7681956db9659408aa79d103a980bd376893f72b1305e66c88b2e5e8b3847733f3b31cb17ba58f84da04a6ca7
 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch
new file mode 100644
index 000000000000..59a5486e2cad
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch
@@ -0,0 +1,101 @@
+From 11c72da8b2bf96f650ca6e1e38af0819c4f49c45 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon, 1 Jan 2018 11:52:18 +0100
+Subject: [PATCH] Use GNUInstallDirs
+
+Fixes multiarch and deprecated man dir location.
+---
+ CMakeLists.txt            | 14 ++++++++------
+ src/cli/CMakeLists.txt    |  2 +-
+ src/core/CMakeLists.txt   |  6 +++---
+ src/gui/CMakeLists.txt    |  2 +-
+ src/player/CMakeLists.txt |  2 +-
+ 5 files changed, 14 insertions(+), 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 96dbf47a..2caab298 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,6 +30,8 @@ ELSE()
+ 	SET(DISPLAY_VERSION "${VERSION}-${GIT_REVISION}")
+ ENDIF(VERSION_SUFFIX)
+ 
++include(GNUInstallDirs)
++
+ SET(LIBSNDFILE_VERSION_PREV "1.0.17")
+ 
+ #
+@@ -150,7 +152,7 @@ ELSE(MINGW)
+ 
+ #Installation paths
+ # TODO remove data from path
+-SET(SYS_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen/data")
++SET(SYS_DATA_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/hydrogen/data")
+ # TODO remove data from path, could be .config/hydrogen
+ SET(USR_DATA_PATH ".hydrogen/data")
+ 
+@@ -358,10 +360,10 @@ ELSE()
+ 	INSTALL(DIRECTORY data DESTINATION ${SYS_DATA_PATH}/.. PATTERN ".git" EXCLUDE)
+ ENDIF()
+ IF(NOT MINGW AND NOT APPLE)
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/appdata")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "/usr/share/pixmaps")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/appdata")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/pixmaps")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1")
+ ENDIF()
+ 
+ #
+diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
+--- a/src/cli/CMakeLists.txt
++++ b/src/cli/CMakeLists.txt
+@@ -20,4 +20,4 @@ TARGET_LINK_LIBRARIES(h2cli
+ 
+ ADD_DEPENDENCIES(h2cli hydrogen-core-${VERSION})
+ 
+-INSTALL(TARGETS h2cli RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
++INSTALL(TARGETS h2cli RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -57,13 +57,13 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VERSION}
+ #SET_TARGET_PROPERTIES(hydrogen-core-${VERSION} PROPERTIES PUBLIC_HEADER   "${hydrogen_INCLUDES}" )
+ 
+ INSTALL(TARGETS hydrogen-core-${VERSION}
+-    LIBRARY DESTINATION "lib${LIB_SUFFIX}"
+-    ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
++    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+     # do not copy directory hierarchy
+     #PUBLIC_HEADER DESTINATION include/hydrogen
+ )
+ 
+ IF(NOT APPLE AND NOT WIN32)
+     INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
+-    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/include/hydrogen" )
++    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" )
+ ENDIF()
+diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
+--- a/src/gui/CMakeLists.txt
++++ b/src/gui/CMakeLists.txt
+@@ -57,4 +57,4 @@ TARGET_LINK_LIBRARIES(hydrogen
+ qt5_use_modules(hydrogen Widgets)
+ ADD_DEPENDENCIES(hydrogen hydrogen-core-${VERSION})
+ 
+-INSTALL(TARGETS hydrogen RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
++INSTALL(TARGETS hydrogen RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/src/player/CMakeLists.txt b/src/player/CMakeLists.txt
+--- a/src/player/CMakeLists.txt
++++ b/src/player/CMakeLists.txt
+@@ -16,4 +16,4 @@ TARGET_LINK_LIBRARIES(h2player
+ 
+ ADD_DEPENDENCIES(h2player hydrogen-core-${VERSION})
+ 
+-INSTALL(TARGETS h2player RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
++INSTALL(TARGETS h2player RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
+-- 
+2.15.1
+
diff --git a/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch
deleted file mode 100644
index e0100eedf7cc..000000000000
--- a/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 11c72da8b2bf96f650ca6e1e38af0819c4f49c45 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Mon, 1 Jan 2018 11:52:18 +0100
-Subject: [PATCH] Use GNUInstallDirs
-
-Fixes multiarch and deprecated man dir location.
----
- CMakeLists.txt            | 14 ++++++++------
- src/cli/CMakeLists.txt    |  2 +-
- src/core/CMakeLists.txt   |  6 +++---
- src/gui/CMakeLists.txt    |  2 +-
- src/player/CMakeLists.txt |  2 +-
- 5 files changed, 14 insertions(+), 12 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 96dbf47a..2caab298 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -30,6 +30,8 @@ ELSE()
- 	SET(DISPLAY_VERSION "${VERSION}-${GIT_REVISION}")
- ENDIF(VERSION_SUFFIX)
- 
-+include(GNUInstallDirs)
-+
- SET(LIBSNDFILE_VERSION_PREV "1.0.17")
- 
- #
-@@ -150,7 +152,7 @@ ELSE(MINGW)
- 
- #Installation paths
- # TODO remove data from path
--SET(SYS_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen/data")
-+SET(SYS_DATA_PATH "${CMAKE_FULL_INSTALL_DATAROOTDIR}/hydrogen/data")
- # TODO remove data from path, could be .config/hydrogen
- SET(USR_DATA_PATH ".hydrogen/data")
- 
-@@ -358,10 +360,10 @@ ELSE()
- 	INSTALL(DIRECTORY data DESTINATION ${SYS_DATA_PATH}/.. PATTERN ".git" EXCLUDE)
- ENDIF()
- IF(NOT MINGW AND NOT APPLE)
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/appdata")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "/usr/share/pixmaps")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_FULL_INSTALL_DATAROOTDIR}/appdata")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_FULL_INSTALL_DATAROOTDIR}/applications")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_FULL_INSTALL_DATAROOTDIR}/pixmaps")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_FULL_INSTALL_MANDIR}/man1")
- ENDIF()
- 
- #
-diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
---- a/src/cli/CMakeLists.txt
-+++ b/src/cli/CMakeLists.txt
-@@ -20,4 +20,4 @@ TARGET_LINK_LIBRARIES(h2cli
- 
- ADD_DEPENDENCIES(h2cli hydrogen-core-${VERSION})
- 
--INSTALL(TARGETS h2cli RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
-+INSTALL(TARGETS h2cli RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -57,13 +57,13 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VERSION}
- #SET_TARGET_PROPERTIES(hydrogen-core-${VERSION} PROPERTIES PUBLIC_HEADER   "${hydrogen_INCLUDES}" )
- 
- INSTALL(TARGETS hydrogen-core-${VERSION}
--    LIBRARY DESTINATION "lib${LIB_SUFFIX}"
--    ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
-+    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-     # do not copy directory hierarchy
-     #PUBLIC_HEADER DESTINATION include/hydrogen
- )
- 
- IF(NOT APPLE AND NOT WIN32)
-     INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
--    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/include/hydrogen" )
-+    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_FULL_INSTALL_INCLUDEDIR}/hydrogen" )
- ENDIF()
-diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
---- a/src/gui/CMakeLists.txt
-+++ b/src/gui/CMakeLists.txt
-@@ -57,4 +57,4 @@ TARGET_LINK_LIBRARIES(hydrogen
- qt5_use_modules(hydrogen Widgets)
- ADD_DEPENDENCIES(hydrogen hydrogen-core-${VERSION})
- 
--INSTALL(TARGETS hydrogen RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
-+INSTALL(TARGETS hydrogen RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/src/player/CMakeLists.txt b/src/player/CMakeLists.txt
---- a/src/player/CMakeLists.txt
-+++ b/src/player/CMakeLists.txt
-@@ -16,4 +16,4 @@ TARGET_LINK_LIBRARIES(h2player
- 
- ADD_DEPENDENCIES(h2player hydrogen-core-${VERSION})
- 
--INSTALL(TARGETS h2player RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
-+INSTALL(TARGETS h2player RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
--- 
-2.15.1
-
diff --git a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
new file mode 100644
index 000000000000..61d6269e79d3
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=1a477ffe380f153c5d9fb3495d9874df7f75334f
+inherit cmake-utils vcs-snapshot xdg-utils
+
+DESCRIPTION="Advanced drum machine"
+HOMEPAGE="http://www.hydrogen-music.org/"
+SRC_URI="https://github.com/${PN}-music/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="alsa +archive jack ladspa lash osc oss portaudio portmidi pulseaudio"
+
+REQUIRED_USE="lash? ( alsa )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/libsndfile-1.0.18
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
+	jack? ( virtual/jack )
+	ladspa? ( media-libs/liblrdf )
+	lash? ( media-sound/lash )
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
+
+PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_CPPUNIT=OFF
+		-DWANT_DEBUG=OFF
+		-DWANT_JACK=$(usex jack)
+		-DWANT_JACKSESSION=$(usex jack)
+		-DWANT_LADSPA=$(usex ladspa)
+		-DWANT_LASH=$(usex lash)
+		-DWANT_LIBARCHIVE=$(usex archive)
+		-DWANT_LRDF=$(usex ladspa)
+		-DWANT_OSC=$(usex osc)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PORTAUDIO=$(usex portaudio)
+		-DWANT_PORTMIDI=$(usex portmidi)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+		-DWANT_RUBBERBAND=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dosym ../../${PN}/data/doc /usr/share/doc/${PF}/html
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild
deleted file mode 100644
index c54815796c43..000000000000
--- a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=1a477ffe380f153c5d9fb3495d9874df7f75334f
-inherit cmake-utils vcs-snapshot xdg-utils
-
-DESCRIPTION="Advanced drum machine"
-HOMEPAGE="http://www.hydrogen-music.org/"
-SRC_URI="https://github.com/${PN}-music/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="alsa +archive jack ladspa lash osc oss portaudio portmidi pulseaudio"
-
-REQUIRED_USE="lash? ( alsa )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/libsndfile-1.0.18
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
-	jack? ( virtual/jack )
-	ladspa? ( media-libs/liblrdf )
-	lash? ( media-sound/lash )
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
-
-PATCHES=( "${FILESDIR}/${PN}-gnuinstalldirs.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_CPPUNIT=OFF
-		-DWANT_DEBUG=OFF
-		-DWANT_JACK=$(usex jack)
-		-DWANT_JACKSESSION=$(usex jack)
-		-DWANT_LADSPA=$(usex ladspa)
-		-DWANT_LASH=$(usex lash)
-		-DWANT_LIBARCHIVE=$(usex archive)
-		-DWANT_LRDF=$(usex ladspa)
-		-DWANT_OSC=$(usex osc)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PORTAUDIO=$(usex portaudio)
-		-DWANT_PORTMIDI=$(usex portmidi)
-		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-		-DWANT_RUBBERBAND=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dosym ../../${PN}/data/doc /usr/share/doc/${PF}/html
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 3d14fb4a6533..c5712d4665c7 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 
-PATCHES=( "${FILESDIR}/${PN}-gnuinstalldirs.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.0.0_pre20180301-gnuinstalldirs.patch" )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-sound/jaaa/Manifest b/media-sound/jaaa/Manifest
index beba4c391b1e..4ba18604082c 100644
--- a/media-sound/jaaa/Manifest
+++ b/media-sound/jaaa/Manifest
@@ -1,10 +1,4 @@
-AUX jaaa-0.4.2-makefile.patch 725 BLAKE2B 531bae6e462ed083c0132593232f5feb911316f501fce2433791a465e04abfec9ab3ec6457229b5f666c433c3142131088c294f91b23572f4db434060e6a66b3 SHA512 17827e9b24813288eb53ac8a50d3183a10e7f0b7908b8d2f5b2b09ccff84d93e13d4d3423d248d04941b2abdee92c2abeed3ecbeff9907ffa03dab900f85fb1e
-AUX jaaa-0.6.0-makefile.patch 937 BLAKE2B 6440d6cf3632888398f10eff20f6041ec2b8ae8d281fb4a16e7d69f75228e31b4b7cf513fd82a78804ceca112e0547610a9c83240dfe34795144983046b652d8 SHA512 b1fe792967c1e34e20d991a3afbeeac46b2c4697c8622d8f929652945995f9056b1b0e3a49c64cbde5f8df7d9b7981b5ffcae44b0707367ff26003d0aa4fd84a
 AUX jaaa-0.8.4-makefile.patch 649 BLAKE2B 55eb43842ac70b21dd1028f643524daac61c90de94303da813129efb91d91c292aeae015556224b322997384fb8ada5cdbdb02c9eb1612debe7d58ef27d3657e SHA512 10576c2d2266eb5d793ac322784627b55fc4c2a3f72c11e5117b035215f5df2569717e0a1c20be33b8dd63874d257a51298dbba0e5741b0f654341f5b793a442
-DIST jaaa-0.4.2.tar.bz2 25307 BLAKE2B 81896c0a5030404c2f451ccf6f6fb3aa5ed9e69be9a4038a5771b85be517dba83d321e8b9fa00c225bc2cdcc41fca4ff8757b04401b7d124f20b07eaf765bdd7 SHA512 c587a616f5ed882c238bf8fc9673d9072fc63d7e345434348427f6c0f64e134685ad3dfbb4bd6abdbc992ba33c69fb96e44be7ef36c7dfcbe7561a53ed481292
-DIST jaaa-0.6.0.tar.bz2 25375 BLAKE2B 773183f25846a6a56a55c0fc2e9d72bd6bc4bea2e5416b0d2c3b768f133887c6d7b6a2afd829ae04a0d5623e0afb9e5ec8212eb5cd0856cc518ceed9bea6935e SHA512 a93ea4c8a5fe9b1589a5c47052eb56b74164a6baaee835f11c261dd8cfa1141354d52ec71519bff93ecce9d7787138b5d12ead10f44fa3f4d0d83ecc390f3538
 DIST jaaa-0.8.4.tar.bz2 25282 BLAKE2B b42d5f21fcdcc522724bb609e4e0d2c151a23d10368d7db1ba7b4d34fb648b924a623ed1d21501733af236be1b73a819d2b4cdfe6075047e6f709b4ecdfa6416 SHA512 d83dad995d4d6919e719671e19610be9cc6b9c14d922eabc6892f3427584baaacc212b37f0466373a38f1fcc65838851c09bb2ae72d9dfdc9c52921b594cbe8d
-EBUILD jaaa-0.4.2.ebuild 828 BLAKE2B 09d40349e6be32a57dd6f8a4cb04df27d2a35e8946243465776da8e2c1faa5a5a964c882a6a64eb9fdb66b37bd4bc2127c25db4885e1c7d871a717b1f16e3866 SHA512 8bf0eea950e5a1bd775c6ab36045217e5180452fe90c76f6d7e13213b90a842c677feb1d3f29b7682234d7589cb785fd822bd4dd4f72cead99fbb34ce6e74ba0
-EBUILD jaaa-0.6.0.ebuild 853 BLAKE2B f2d5402d07be9d730918375827c69354a36ae79ae812c3724a054dcbadaa3411f8b40bbf8c2a97268e4c4024c2559d479636c60838c23ec6d6edaacf90546e43 SHA512 5ee1a764c3599480d826e475daec4700355ac331cc8e5d540b8efc90118e6abc2348a9d320430599e3ae463f27ccba651e8591a52db9ec3bf9405a1aad63ca55
-EBUILD jaaa-0.8.4.ebuild 892 BLAKE2B a07b2ae80caa8f6042d63f698f4633158889e46348970938f98c143840c458b1f970716c032c9004f7ea349871fc45e6abc3e212a5d231ec6333c8abdb49f8bb SHA512 7c3fcf3e17d82c6a8aa6334a085195f5ad86dc3ad8f9dad7cd0fc77e42275745455f0f35dd51336303b2346fe4ea17dcce3e64c546978868673124b7fc257911
+EBUILD jaaa-0.8.4.ebuild 891 BLAKE2B e777b57b846021cb6a4d464363dd13484a93db111b4bf3c4de7b7b46a62b09dc25870d387a9df14a3fb0d30d1da1f6f1b85601ca00c1f756cf58293383019c49 SHA512 5edc2de6318abf7a54287c05506a87dc0efee81085ec0f46feedd05003afc9b286315a407a6d6daaaab7b5756e9903d7d060738eec1c428735a0af70403da721
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/jaaa/files/jaaa-0.4.2-makefile.patch b/media-sound/jaaa/files/jaaa-0.4.2-makefile.patch
deleted file mode 100644
index 1b483c0de2d3..000000000000
--- a/media-sound/jaaa/files/jaaa-0.4.2-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: jaaa/Makefile
-===================================================================
---- jaaa.orig/Makefile
-+++ jaaa/Makefile
-@@ -20,7 +20,7 @@ SUFFIX := $(shell uname -m | sed -e 's/^
- LIBDIR = lib$(SUFFIX)
- VERSION = 0.4.2
- DISTDIR = jaaa-$(VERSION)
--CPPFLAGS += -O3 -Wall -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
-+CPPFLAGS += -Wall -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
- #CPPFLAGS += -march=pentium4
- 
- LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR)
-@@ -31,7 +31,7 @@ JAAA_O = jaaa.o styles.o spectwin.o audi
- 
- 
- jaaa:	$(JAAA_O)
--	g++ $(LDFLAGS) -o jaaa $(JAAA_O) $(LDLIBS)
-+	$(CXX) $(LDFLAGS) -o jaaa $(JAAA_O) $(LDLIBS)
- 
- 
- install:	jaaa
diff --git a/media-sound/jaaa/files/jaaa-0.6.0-makefile.patch b/media-sound/jaaa/files/jaaa-0.6.0-makefile.patch
deleted file mode 100644
index cfbe5be6b175..000000000000
--- a/media-sound/jaaa/files/jaaa-0.6.0-makefile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: jaaa-0.6.0/Makefile
-===================================================================
---- jaaa-0.6.0.orig/Makefile
-+++ jaaa-0.6.0/Makefile
-@@ -24,8 +24,7 @@ SUFFIX := $(shell uname -m | sed -e 's/^
- LIBDIR = lib$(SUFFIX)
- VERSION = 0.6.0
- DISTDIR = jaaa-$(VERSION)
--CPPFLAGS += -O2 -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
--CPPFLAGS += -march=native
-+CPPFLAGS += -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
- 
- LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR)
- LDLIBS += -lclalsadrv -lclthreads -lclxclient -lpthread -lfftw3f -ljack -lasound -lpthread -lXft -lX11 -lrt
-@@ -33,7 +32,7 @@ LDLIBS += -lclalsadrv -lclthreads -lclxc
- 
- JAAA_O = jaaa.o styles.o spectwin.o audio.o rngen.o
- jaaa:	$(JAAA_O)
--	g++ $(LDFLAGS) -o $@ $(JAAA_O) $(LDLIBS)
-+	$(CXX) $(LDFLAGS) -o $@ $(JAAA_O) $(LDLIBS)
- 
- $(JAAA_O):
- -include $(JAAA_O:%.o=%.d)
diff --git a/media-sound/jaaa/jaaa-0.4.2.ebuild b/media-sound/jaaa/jaaa-0.4.2.ebuild
deleted file mode 100644
index b1a2f3947a31..000000000000
--- a/media-sound/jaaa/jaaa-0.4.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="JACK and ALSA Audio Analyser is an audio signal generator and spectrum analyser"
-HOMEPAGE="http://www.kokkinizita.net/linuxaudio"
-SRC_URI="http://www.kokkinizita.net/linuxaudio/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="media-sound/jack-audio-connection-kit
-	>=media-libs/libclalsadrv-1.2.1
-	>=media-libs/libclthreads-2.2.1
-	>=media-libs/libclxclient-3.3.2
-	>=sci-libs/fftw-3.0.0
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake || die
-}
-
-src_install() {
-	dobin jaaa || die
-	dodoc AUTHORS README
-}
diff --git a/media-sound/jaaa/jaaa-0.6.0.ebuild b/media-sound/jaaa/jaaa-0.6.0.ebuild
deleted file mode 100644
index 6a3b2345d6b7..000000000000
--- a/media-sound/jaaa/jaaa-0.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="JACK and ALSA Audio Analyser is an audio signal generator and spectrum analyser"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="media-sound/jack-audio-connection-kit
-	>=media-libs/libclalsadrv-2.0.0
-	>=media-libs/libclthreads-2.2.1
-	>=media-libs/libclxclient-3.3.2
-	>=sci-libs/fftw-3.0.0
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake PREFIX=/usr
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-	dodoc AUTHORS README
-}
diff --git a/media-sound/jaaa/jaaa-0.8.4.ebuild b/media-sound/jaaa/jaaa-0.8.4.ebuild
index adabb85a3275..c14055e896d3 100644
--- a/media-sound/jaaa/jaaa-0.8.4.ebuild
+++ b/media-sound/jaaa/jaaa-0.8.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="media-libs/zita-alsa-pcmi
diff --git a/media-sound/jamin/Manifest b/media-sound/jamin/Manifest
index 87632f246f73..359dd5029abc 100644
--- a/media-sound/jamin/Manifest
+++ b/media-sound/jamin/Manifest
@@ -1,6 +1,5 @@
 AUX jamin-0.95.0-desktop.patch 308 BLAKE2B 0c7a0dcdc4d58229fc1d15d50bcbbe53721ae3fcae0bb6c0539a81e0c11b2fa8d3a8f6f5b5975a47bd8097540af3cb4cb6b4ce40e53d34b82656a83ba06ee303 SHA512 e8a5af5ab288af1f4dceb9db09dd42a4eafc1beee14437b5b017085b597d014b76df03320c3089398f24fca9fe95dc49d4bb9ec107d7776b5102b4518d652775
 AUX jamin-0.95.0-multilib-strict.patch 335 BLAKE2B c6cd90004e8ee7ec6191dd251d41ffb462e500dba5774c82dfb71b8e77455fd5f96008b5a8bfc094c138223afb734dd2bed00033d93d88eacc5b5ba342de6918 SHA512 14adfe893d4ea18efbb3a936df34f163689a0cf734ca391d80558d92c4ef82cb944f94d962ecba25fc358e2756b252302ac648d789a850fab608216588d5ed03
 DIST jamin-0.95.0.tar.gz 1007290 BLAKE2B 52e28f05170880307a5e50424fce3511ece30ea9e36e479c38efbbfe80c8c6a4116742c42e74a5ded717ad6d3f6b5c780e6b79c764ad280cba3538678b223866 SHA512 c57079b65e89623ee6b3f1e71d4ce1c2d995e4a14f8decd17b5d936e99469bb85089da063358e966fdc19a6fa419698c9ca586909d85d69b0525e929a3bd2555
-EBUILD jamin-0.95.0-r2.ebuild 889 BLAKE2B 24324e0ac38f13f525db82ca799e97fa8eb263b08c4424ca70e7f51373f179d6cf364bd8a6b2cc314cbaf6626bb4cecd1292f8c58f31451eabae224a6b1c2a82 SHA512 acebc8735d41e94771917b271236e88e2eca5d0dedaafa2ac42952e4c1754cdedb66c6945bf2dc04c61f2f4922cf07cb8b801ec9dacd9710a2d10c909e0b503d
-EBUILD jamin-0.95.0-r3.ebuild 887 BLAKE2B 35e2f6fb54b38902266f1208bb2829ff1c8833a270ab320899793a5d9d9b4d9d997c8d0a982ca0d3e823b2ccf5a6bf30b1378abbbdd32111d7bab38ea6454054 SHA512 3b97e33487f30521ef791df48e8035582aaec49179f0699feda3a944f64ff4b647e2687010eb66579dc39d2300bce58dea87fdd0dbf89b67f1ab0ccd5edc98ba
+EBUILD jamin-0.95.0-r3.ebuild 886 BLAKE2B 889c50fe1315fccb050b756c0fabd7120e9c2423208128419366bac33aee45c50ec71ebff377718752aab75d13f31e013b80de78b975c9ac88bbcd3899e43012 SHA512 ce179b56433bf6737b1f1ad56b495e670ea0af623198df16eec1918bc6563d000e7b0f3ed398f94f9636d901110e17cec419a589baf9776fa5ee316f3a451bd7
 MISC metadata.xml 334 BLAKE2B 49b789d957dd730e2d74f25297b90b83357f29cb2ef4c9b8820a39841c334c566bf82752a1ab1d53d7925d9fad8fd1243f00bfbe0bb71ee5edd0999aff303a71 SHA512 4b263c4fc008cbc6e415426fa782c934c55ad5d5f7d7d257ca79e414234cc5284c0edc938d138dcadb670bfbe35857a6103ac0b990f099e694c69e7ae349656a
diff --git a/media-sound/jamin/jamin-0.95.0-r2.ebuild b/media-sound/jamin/jamin-0.95.0-r2.ebuild
deleted file mode 100644
index 5b1cdbc5ebea..000000000000
--- a/media-sound/jamin/jamin-0.95.0-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="JAMin is the JACK Audio Connection Kit (JACK) Audio Mastering interface"
-HOMEPAGE="http://jamin.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="osc"
-
-RDEPEND=">=media-sound/jack-audio-connection-kit-0.80.0
-	>=media-plugins/swh-plugins-0.4.6
-	media-libs/ladspa-sdk
-	>=sci-libs/fftw-3.0.1
-	media-libs/libsndfile
-	media-libs/alsa-lib
-	>=dev-libs/libxml2-2.5
-	>=x11-libs/gtk+-2:2
-	osc? ( >=media-libs/liblo-0.5 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-multilib-strict.patch"
-}
-
-src_configure() {
-	econf \
-		$(use_enable osc)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-sound/jamin/jamin-0.95.0-r3.ebuild b/media-sound/jamin/jamin-0.95.0-r3.ebuild
index 4cbda8f70780..6592e96b1cb1 100644
--- a/media-sound/jamin/jamin-0.95.0-r3.ebuild
+++ b/media-sound/jamin/jamin-0.95.0-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="osc"
 
 RDEPEND="
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index 940106438198..cd68b7313622 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -5,6 +5,6 @@ AUX lame-3.99.5-tinfo.patch 768 BLAKE2B 3fbbd31b0b5752ee4c2dad573d053edcbfb80d24
 DIST lame-3.100.tar.gz 1524133 BLAKE2B 6954d30cfd3951ea07762ba5dd7ff27038b78455f423099a225ebf748abddf9970e444456ca5a6179bd381e2205b32293392cb757c203901674860710fe2c183 SHA512 0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b
 DIST lame-3.99.5-automake-2.12.patch.gz 536 BLAKE2B d8e3aa813abdd255c4e95d55936f0f53bec08af8dcfa0eec7ed9978d569fe566085f92e2bb4962b13ef56c7f8a57e2100ca767b3ae9bc13ca5dfe3bad012fc77 SHA512 9d6211e257d573ced5c29c43ba5d5cc98a231b213d6e0cfc352b14776c06c9e656ed1873d5caae466afb27dfe753eeac0842c7221a8538ccecea8f4ba0f8bfe2
 DIST lame-3.99.5.tar.gz 1445348 BLAKE2B 3bb2e3b680fb03a2af517b9d03a20e9366326a410fe9c3688323eb7cad7186273d25071258fe4df38bb47f9ee033a5b9e3fa8a508e65058f37485f204c580c72 SHA512 ce62d7eb9fc8c53c343374ded30f11153a296910f0be7e649197bca7412c6660aad1aa6143d56b750f866229eb492cf7bb4f682535c383fb4aa57d7077d8b4d8
-EBUILD lame-3.100.ebuild 2238 BLAKE2B d448363be8b3cbedd56219d1d7bdb861ed34e7c9964fa9c3f7049419541c7c0cc90d6ac39ef94c72be85604eaefa20891a960eba582b73bd5802ceeb64d0d374 SHA512 198437a7f2d6dc94d305a0951f919414434c71d3afb787e6db0948ee8df5c56b9ad6196195a7ca2c17518b129f9d2e2f016452f6e1eef9aaa81835cfff771095
+EBUILD lame-3.100-r1.ebuild 2142 BLAKE2B a733e4bf5610e8d246e2648a500252315b09e4149d3c1c454d67bc91e5b6f097e43e59fc7298dc75a0d41331bf7f5f448f2097416339ffc5d987c01f77f12e78 SHA512 58d0897f2c5591aefc38e4ab872787d3b08dade10dc56983a8b127b7250c245dbea11ad2624ef623948881d95bfaa4f0a6f483b4b3c334dd1a3bbd223cd6cc9f
 EBUILD lame-3.99.5-r1.ebuild 2402 BLAKE2B f69842907db899e1dae026baa536e1d18b42bac040c05cb8e3eab7022944f9b4567eff3b7b2baab19d33a285a5606ed32d0d277af243ada2b390ba18b7efffca SHA512 44b525e5c78e1907a1a4f7e9991c727c378d3033cffd36ded7b2c6621abe7f8265da8b592864a2979ef180ac100f67d85ac3c5e966dc7167fe32f7e7b7d19945
 MISC metadata.xml 542 BLAKE2B 726f3dfefda9c1905739448f1a3124e05ddc90e261d147da12a7839185ef3eeb440678d185510a6bdd4bb71ab987b7a24f52ed108f7c646ca6b651434f9fade1 SHA512 8fc2e2658ae34d146894786f1c66800eecf818e2bd9bb807c6b32a8e132340c1568e9f47220be3daaabce2ab6e1e1d5aa817157f2c0131ed01944abbab6593fb
diff --git a/media-sound/lame/lame-3.100-r1.ebuild b/media-sound/lame/lame-3.100-r1.ebuild
new file mode 100644
index 000000000000..662dd8835736
--- /dev/null
+++ b/media-sound/lame/lame-3.100-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="LAME Ain't an MP3 Encoder"
+HOMEPAGE="http://lame.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
+
+# These deps are without MULTILIB_USEDEP and are correct since we only build
+# libmp3lame for multilib and these deps apply to the lame frontend executable.
+RDEPEND="
+	frontend? (
+		>=sys-libs/ncurses-5.7-r7:0=
+		sndfile? ( >=media-libs/libsndfile-1.0.2 )
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	cpu_flags_x86_mmx? ( dev-lang/nasm )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.96-ccc.patch
+	"${FILESDIR}"/${PN}-3.98-gtk-path.patch
+	"${FILESDIR}"/${PN}-3.99.5-tinfo.patch
+	"${FILESDIR}"/${PN}-3.99.5-msse.patch
+)
+
+src_prepare() {
+	default
+
+	mkdir libmp3lame/i386/.libs || die #workaround parallel build with nasm
+
+	sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h || die
+
+	use cpu_flags_x86_mmx || sed -i -e '/AC_PATH_PROG/s:nasm:dIsAbLe&:' configure.in #361879
+
+	AT_M4DIR=. eautoreconf
+}
+
+multilib_src_configure() {
+	# Only build the frontend for the default ABI.
+	local myconf=(
+		--disable-mp3x
+		--enable-dynamic-frontends
+		$(multilib_native_use_enable frontend)
+		$(multilib_native_use_enable mp3rtp)
+		$(multilib_native_usex sndfile '--with-fileio=sndfile' '')
+		$(use_enable debug debug norm)
+		$(use_enable static-libs static)
+		$(usex cpu_flags_x86_mmx '--enable-nasm' '') #361879
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		pkghtmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		install
+}
+
+multilib_src_install_all() {
+	dodoc API ChangeLog HACKING README STYLEGUIDE TODO USAGE
+	docinto html
+	dodoc misc/lameGUI.html Dll/LameDLLInterface.htm
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/media-sound/lame/lame-3.100.ebuild b/media-sound/lame/lame-3.100.ebuild
deleted file mode 100644
index 50c2f1cf6963..000000000000
--- a/media-sound/lame/lame-3.100.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="LAME Ain't an MP3 Encoder"
-HOMEPAGE="http://lame.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
-
-# These deps are without MULTILIB_USEDEP and are correct since we only build
-# libmp3lame for multilib and these deps apply to the lame frontend executable.
-RDEPEND="
-	frontend? (
-		>=sys-libs/ncurses-5.7-r7:0=
-		sndfile? ( >=media-libs/libsndfile-1.0.2 )
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	cpu_flags_x86_mmx? ( dev-lang/nasm )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.96-ccc.patch
-	"${FILESDIR}"/${PN}-3.98-gtk-path.patch
-	"${FILESDIR}"/${PN}-3.99.5-tinfo.patch
-	"${FILESDIR}"/${PN}-3.99.5-msse.patch
-)
-
-src_prepare() {
-	default
-
-	mkdir libmp3lame/i386/.libs || die #workaround parallel build with nasm
-
-	sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h || die
-
-	use cpu_flags_x86_mmx || sed -i -e '/AC_PATH_PROG/s:nasm:dIsAbLe&:' configure.in #361879
-
-	AT_M4DIR=. eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(use_enable static-libs static)
-		$(use_enable debug debug norm)
-		--disable-mp3x
-		--enable-dynamic-frontends
-	)
-	use cpu_flags_x86_mmx && myconf+=( --enable-nasm ) #361879
-
-	# Only build the frontend for the default ABI.
-	if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then
-		myconf+=( $(use_enable mp3rtp) $(use_enable frontend) )
-		use sndfile && myconf+=( --with-fileio=sndfile )
-	else
-		myconf+=( --disable-frontend --disable-mp3rtp )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" pkghtmldir="${EPREFIX}/usr/share/doc/${PF}/html" install
-}
-
-multilib_src_install_all() {
-	cd "${S}"
-	dobin misc/mlame
-
-	dodoc API ChangeLog HACKING README STYLEGUIDE TODO USAGE
-	docinto html
-	dodoc misc/lameGUI.html Dll/LameDLLInterface.htm
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 4d90051e657d..82fd015485c4 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -7,10 +7,10 @@ DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c8
 DIST lilypond-2.19.54.tar.gz 17068093 BLAKE2B ebc3100a55affd9b89fa93abf32c7c74cf1fc3f3b026c77d7893d7cd622079a236f5690692a98bf258bea4f3cfd764307c730a1896da0b853eddda6498414d00 SHA512 bcf682595017e5ad9125c3c8e89c00faa3ab7f84ac92dce06ac6ea1d93f358d779f83b2391e36219ea8f76fa569c9f3c17120024cca4cf43a0facb2b24127c8b
 DIST lilypond-2.19.64.tar.gz 17174255 BLAKE2B 840b91ff39648e7ad741d1139a2040ee33aa922934a7bf891649ea99cf4aa95b0e82a98421e154cae3fb617ac8b38dc412e072206e3437e770801fe91ab914a3 SHA512 f0728496b0271c55e29871f23df53ea1be7036029c85a5ba4b88cd7c6005ff0ec880ab0992e9d99c36c7e82e83023a809f783e69f10982de3ccdd161f38ecec9
 DIST lilypond-2.19.80.tar.gz 17244725 BLAKE2B f0883d59b1a14634d5d32e6a6f02c0a224643d6d28a3da623d5163396b74ebd15c3307c33c4d96778254fb6486a74c3324d26e3015d51fa163e3765f2c3767aa SHA512 13a7f258bac8ff77ad6d3879f128e86dd5bf45c7780c9738e6976915574d2dfc5404e6f49ca61dcaf8bb15eb266e65fedec4131a50ded7ab305d1856bbd7a3d6
-EBUILD lilypond-2.18.2-r3.ebuild 3218 BLAKE2B b0ae7fcd18dbc5801139b982c9e7b14992b811a115e20319de1742ae6dcf9090f5dc64a70c000ca17b840dc4564de6eec918489fed41159b81de403d99a75c76 SHA512 fd882d95c2b3ca3c74bbe361082cf4eaf56caf59965d4e5c42c20a8f8de1742b4d6cd733e29d7ebcbe4b036d20169a62d03a23914d3b3df9bb70fee54a64ecda
-EBUILD lilypond-2.19.54.ebuild 3405 BLAKE2B 11cda4b12db9ffd74848b34dd67631b99c3e0081b38f5d45454d3cb41674eb0b95e309feb4abb7cc2563e6df2818473a96bfc2d17da3bc3fb8e2ded8e869286b SHA512 bc36d734846b06d50496d92a90f716733ae9cc458df000c88c9e53cbcc4f273b376487de298f8c3b365e3e6b1882fd9d693fa722cfd9f13256c5c124bbc342b3
-EBUILD lilypond-2.19.64.ebuild 3412 BLAKE2B 9123385f5ee2db9cc62a1d3c2d624c656d85704d240ee0fcf7d84bed6eb3b3f8d146287a9485006e737912d21e932ed83c72bf55886c025f80886bf4fda47f5e SHA512 572971acf6aeef2c1b61caf0588fa66e1d63d9a5b4a3b1c43af3e515817f50816be698f9e6c910cd16bf854d4a19a1a8c06711c7b515fbaa2fddb45ed25935a6
-EBUILD lilypond-2.19.80-r1.ebuild 3309 BLAKE2B 25c1bd50f48201552a27feddb85f27c11bf85c0706273c9489ce568bf5fcc5c5d23b69dc7b258db1890eb66da203443e2d5df562c189c33564a0784bcf132edc SHA512 f22a2d7f16cbe85580c19e62ec7fc64fe2314e05bceb63b8af617ef4e6c76bcf18fd1c44474ba4fb0601cd9e687df3e5095400613f6397f0943c7a5a6598eb32
-EBUILD lilypond-2.19.80.ebuild 3412 BLAKE2B 1dfd0e40c1bf89ce8203d4423110e3c2b307ef9a0ef40989ac86dccd34322120de6335f989a14d429a25ece14f57ae6c3acd0dccae5e887f2044000a6f37c60d SHA512 b10abfa1293fd20f275949690509c1076d007161b92551887da975e22667f92fd364228c9b85090d234709ade9410cce428f5f7b6a61b900aebc9d4283d4ba14
-EBUILD lilypond-9999.ebuild 3473 BLAKE2B 26df57f7367039a721e8c9d9d513c5e35b0298c9bec13f23cfbb5f50a681164e5e13697868e00c00396349d5a4b91adeb446c2c216a6b04f4423ebc0edbb1c6c SHA512 dfad11b831dd3d3245925c0e869ff8542cb080d7da3ac1146fba8633ddccb9d4bc055c730e3ba9e114d340ef9ee0f6dff8508b569f7c8334ae2baba71632b5f2
+EBUILD lilypond-2.18.2-r3.ebuild 3211 BLAKE2B 3e87556e56d9fdf00535b816a952fe5a133ad46f71668a0d02102c09c9f73b799c5d370d6ed788434901da5217524ee7675a3a10338831f5d2df44ef95525b9f SHA512 3f8ad4d240e1df1ed32c1b2fcfb2755dc4aa9f1c018693df543074cf776034bf4b4b89c7129952004ea72ef7f053dadfb9d9bf696be9e6ebd04951b6f366677b
+EBUILD lilypond-2.19.54.ebuild 3399 BLAKE2B 77abc9030a62433771b1391e122227f2e0427e13d6f5950e7ba8cb62098597fceb9a9e3bd6230d708ce34f5307093dddb1d22f3eb04bd6c49810936ea30f19a2 SHA512 ce3e64258da9585188d53c6ca079194a5f0bdff0286bec3fcdcea118572cce2ef3b8e81a56536f3b66cd82e174ba6c3435723ed451c2a58b7471f8d15e76fbaa
+EBUILD lilypond-2.19.64.ebuild 3405 BLAKE2B 44137d183cc0e07cf32edb43fe505c6d307b3f80eda13aa0ebbf40660f5f874b4956845726568f62fe3b49f6a70a975b62f64df5e6cbe0c573a448ba453d18ba SHA512 48bc34b48055afa2432765df4294a0ae79f83f5b08c746186110b827f783e461654b3ff7b8d2311f8bba320395d35049a6abb09634af0b636e9b01adb915a484
+EBUILD lilypond-2.19.80-r1.ebuild 3302 BLAKE2B 36c03e9469678de4d3ee1488eb3e67211ff01e347d378ee1987bfdecd7d6ee750bff8a67db2fa96cec9fca5d720de477bf27a0cd8bf94fe25644dd835b9c4cd5 SHA512 ce49ec706ecfea0abe12d79c6eb9de79616f034e857ad3409bf0a183ee853da05bf710de57c11f69c1f520d978f5880238c4f3d2d3399314bc996b99a9bf945d
+EBUILD lilypond-2.19.80.ebuild 3405 BLAKE2B 590150b5bd3ccb27db5a3655d21fb7142716e7a172feaf2edab15286deae282ba9510237bd7f492f97effa8ba4b9f7b1329bf1d3b6e4e44a8747edba92f8caf9 SHA512 9275eb273fc55be8b723dc83e816936b3ee610685568de823446150617862667e9ffb68a1664e700ef1a42454d071260f3cb3e645973a7d21fb87010aac85192
+EBUILD lilypond-9999.ebuild 3466 BLAKE2B d68e1e1962510d9653b2bbee3647eb88c9bdb4a9f1824ad41ff30f07ad927f3b93f0f8ddbf7eb92f42530e4a40a778c9b2ea4c648e0c4443f82705983a41a987 SHA512 5e8a7e0fea9896c76e3187d7417dea2c38f05ebd0b5cb06aba66770608a0c2c315412c1e24f22dcbdc182371c617e911785ccfbf1ac731e67e9b8914d9f00f6a
 MISC metadata.xml 861 BLAKE2B c7214caf915ce8f32dad9cd6f08c72bb42490de9f679f073bb6e68c6f14e209f6b3013554fc786d3fb765d271bbb39d54ecdc4df2967700507ab0c9f782d4621 SHA512 d20e7dc27a7836585c7ca28cb78c073c3767a1749d16bca3989bb552d4920e949b3caf36f2227862655e61be0914602aa3af41f17a0f61246b3f305228c9b70c
diff --git a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild b/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
index 2bb07eef3355..3c3dc3ec94a4 100644
--- a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
+++ b/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://lilypond.org/"
 
 LICENSE="GPL-3 FDL-1.3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa x86"
+KEYWORDS="amd64 ~arm ~hppa x86"
 LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
 IUSE="debug emacs profile vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-sound/lilypond/lilypond-2.19.54.ebuild b/media-sound/lilypond/lilypond-2.19.54.ebuild
index ba9f48995807..36867682c196 100644
--- a/media-sound/lilypond/lilypond-2.19.54.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.54.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" = "9999" ]]; then
 	EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
 else
 	SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
-	KEYWORDS="alpha ~amd64 ~arm ~hppa ~x86"
+	KEYWORDS="~amd64 ~arm ~hppa ~x86"
 fi
 
 DESCRIPTION="GNU Music Typesetter"
diff --git a/media-sound/lilypond/lilypond-2.19.64.ebuild b/media-sound/lilypond/lilypond-2.19.64.ebuild
index 2388951c7771..bd8d61ad63c0 100644
--- a/media-sound/lilypond/lilypond-2.19.64.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.64.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" = "9999" ]]; then
 	EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
 else
 	SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 fi
 
 DESCRIPTION="GNU Music Typesetter"
diff --git a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
index 7bada7ba83ea..783231bbe340 100644
--- a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" = "9999" ]]; then
 	EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
 else
 	SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 fi
 
 DESCRIPTION="GNU Music Typesetter"
diff --git a/media-sound/lilypond/lilypond-2.19.80.ebuild b/media-sound/lilypond/lilypond-2.19.80.ebuild
index 893b3b8c8147..2fe3ef42d3ec 100644
--- a/media-sound/lilypond/lilypond-2.19.80.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.80.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" = "9999" ]]; then
 	EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
 else
 	SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 fi
 
 DESCRIPTION="GNU Music Typesetter"
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index e24a72ba576e..93bb8d785b9b 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" = "9999" ]]; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"
 else
 	SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 fi
 
 DESCRIPTION="GNU Music Typesetter"
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index 451df71bea99..ebc185dc023f 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -8,7 +8,7 @@ AUX murmurd-no-dbus.service 222 BLAKE2B 11fc296fd5d5445347f077ff9d4aaea3364176df
 DIST mumble-1.2.17.tar.gz 3207840 BLAKE2B c10eb489cf9555ac02126d007515632c08c1de755ff0e734a13b112fc7496c356fd0eadeb99f1f0c58e7cf3bef355c91a8d73a2907d9fd38f3dae5b221200e78 SHA512 03cb0a2048d42bd480741e0580cb4bf6961d607d6cf9b620434aea87ac0cd7cdbfae33863b71821ac8b931300df490ae5436f3c8098d6a5f37dd1eab0fb34dbe
 DIST mumble-1.2.18.tar.gz 3210749 BLAKE2B 3614d9714fc6825ed86a308d8dc7be0f30463a016eca37b0d25943f23dfc8b57dd2dc6a1e472a9bd355edd97d7ec58cd2f4318015c78803f78342b788f7019cd SHA512 bd8b10cb34733d566fd6aae2410e8fe5f098efe5c5b106f569112d4e5205d8a045d43a0adc02a7a9d3e16b15e3515d908784596f293a7e2972fba20830161074
 DIST mumble-1.2.19.tar.gz 3210865 BLAKE2B 7ce466ab9d5ca761308d08633abf8efb6105b3097b7fde0a886f957dff4a16442d1f12c93123bd0291b37d14b412e0087b89f781d0f63a5182bd6ca2d3f2d3fe SHA512 f91111194a899149b500a94afcf7cc5b9691c7ce8669f07fca2c66adbb3916ddb863bf703d04fb8387133fb75f3c8edb52974d1acf3febfafa1f73da19946de4
-EBUILD murmur-1.2.17.ebuild 3049 BLAKE2B fde7880aea081f1eb90c8e252003b35936bd52a2e3718e6204d4e6fb9968ab264a31f89443334d7dcccc139bc06bc176629ad7e75ed2f5d02329c86680b36f4f SHA512 6db076184403d984ca57148666ef927db41ffe1c288755095c90ddd52bc3293e9cb81e764992634733d0a1e1cb9d730357f4e26bd5aa115003c71efb3ea60483
-EBUILD murmur-1.2.18.ebuild 3059 BLAKE2B 99866f6d100d14dbde7dcc58d3f5c9541244f0379c8cf08173fb5169288d5699b439a9948bad185862edd82ea6c8b22126ecdffaa650fb2e9558856e0ad8dc2a SHA512 8ca29caa896b059994bbc576a52dcb568467e9f4d6d81d07ce1160f31ce566ff11beb00fcf7614669456443bc841a1b14aa31182b2032445c8944c4384bf82a1
-EBUILD murmur-1.2.19.ebuild 3064 BLAKE2B 3571805b03f1b6e36db02c9bd3b90fa902e4cbee02d8c36b1225bfd2e33caac825643c3ed34d4e87f4f2aeeed7f035b1e6a7f2eafec5498d9d24b86567efdffe SHA512 21fb60bdaed26ddac67429dde614abf8f8b2cda5e6974c3165fef6d472cb05f539f4ebf4de7c159823fd03ae2336f1d7caf379b71547107dad6c7a782eb9c4ac
+EBUILD murmur-1.2.17.ebuild 3043 BLAKE2B 3b9ab76954ee4c507ea7c4051db4adc96035ef257ec7b6068d46d40877c60108a357acefa0172158a61a6cfd674d79ef464da2f3ce20600c2e2bdcffe9181250 SHA512 2aaf7d9482bc978f4e3b2b98f507b242ff0b6914342577fe51135e97e7489605c0e13a20d3f1794252236675778af0bab3d13f766e70de09081186af6e444ff0
+EBUILD murmur-1.2.18.ebuild 3053 BLAKE2B 334667336631ae79048d7ab85cdcc60b32a7f5ffd4231983f87b2cb4650614b395b9e8883660b2aa22690b63d67d3f762e46c7761ec19ba608317786b892ffc4 SHA512 f64b5651303f97b403d3c15e757e7e01756f15df931d452fc3487e72987a449ba91a95d6d3c9e851a1ebcfeeb72bb9b4f485f8afb6a913a60e63ee0635fd0b1b
+EBUILD murmur-1.2.19.ebuild 3058 BLAKE2B c357596d720a14c2a5009dd0fdcfb516846c5a0dcbeb3c05980d42b1d0cd40df79d0a54a3a8e86037a1a6d0dedbb34133c8305dfa4c30f9daf862e453a79002b SHA512 fa4bc5a124e7d172b665ea42fa246c1a890069bcd7275f544f59232b5c0f505edbbcdc34c5cf8b41759863293a90e7d76e07a3b85d3736b049b13a0f65261645
 MISC metadata.xml 597 BLAKE2B 6eece3d62949bfb7c01c6249764ee6e47ca0273972ed0aa2bae704ed7acb9267e7cef706d2c3eeafb5becd4695d8665c975f67e577ef3ce4def50e78ba1ce273 SHA512 d7ffb25e7b3919cb27417debe5b2f84f2f2c330e1a238583f154bb44b697a3b3c3749794baf896807874633b0659076e93c2845a56e49acb24047958d29d2beb
diff --git a/media-sound/murmur/murmur-1.2.17.ebuild b/media-sound/murmur/murmur-1.2.17.ebuild
index caddfe2abb1a..4f8e869a8ccd 100644
--- a/media-sound/murmur/murmur-1.2.17.ebuild
+++ b/media-sound/murmur/murmur-1.2.17.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+dbus debug +ice pch zeroconf"
 
 RDEPEND=">=dev-libs/openssl-1.0.0b:0=
diff --git a/media-sound/murmur/murmur-1.2.18.ebuild b/media-sound/murmur/murmur-1.2.18.ebuild
index 63197d8730ce..3bb302525ebf 100644
--- a/media-sound/murmur/murmur-1.2.18.ebuild
+++ b/media-sound/murmur/murmur-1.2.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+dbus debug +ice pch zeroconf"
 
 RDEPEND=">=dev-libs/openssl-1.0.0b:0=
diff --git a/media-sound/murmur/murmur-1.2.19.ebuild b/media-sound/murmur/murmur-1.2.19.ebuild
index 3ee8728d366d..8129f26ff354 100644
--- a/media-sound/murmur/murmur-1.2.19.ebuild
+++ b/media-sound/murmur/murmur-1.2.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+dbus debug +ice pch zeroconf"
 
 RDEPEND=">=dev-libs/openssl-1.0.0b:0=
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 9559e24b825e..d8ad37c9f899 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,6 +1,6 @@
 DIST picard-1.4.2.tar.gz 2116021 BLAKE2B 9629d312df20a8c69b383b424724ef4cf9f774ae70b9e11b1c6c7f96cafea575657875642af70a73633ca79eb8c79237ada16dd5ff7c021d4bdb4a0df7890de3 SHA512 5e4a6a8cfadd86b7015ab77da1969acec26e0ed92564c6634afeee5060d33d34e8fc83015880e6c8f17df66c8d15b86a85031dbe5b596c995579fb449cf8a74e
 DIST picard-2.0.0_beta1.tar.gz 2661429 BLAKE2B ebffb2651e778c2cec8a4e41307d99c30038f36096b343489d7384b1cb4ac9a3492f23a4c69ec8a0be59306efc5cf4c9098a114445be6965ed243156dcee2803 SHA512 e2fc5dadf3e469df4ed16b1827909a60a54e7dc047e1ecd80480d9283a5795e3e792b31970eb6834590ba2ea12378ec18ef404b47237c38299350ee1d9acec9d
-EBUILD picard-1.4.2.ebuild 1580 BLAKE2B 6eb8fdc3564238a16750c5d3d4872430bfc57d8fdda0901549fc6d9ffb77451d888995abe3690c8fac65da465181bbbeadd1b2988680ee4b062cdef9611cb9b2 SHA512 4026302891e66e1bec8c76d99559f88a336454beab29a22c09e355d32378b0f7d648fb33c50a209ec5da6f696aef2195795e70ba4339f71a8e44cbbe0e80fc3f
+EBUILD picard-1.4.2.ebuild 1575 BLAKE2B 12569c5ec7b03149bd3531b43a9e4f1aa793fd4f4479dac64eddef330121a60b64d266bc137f23f173338f50f82a51ddc25a524402f8cc0b5cd914a80a5c7942 SHA512 6aa9a13582a27d8647cdfe63f3b87369c7a14c642d5dde95f0a5add6d910fe3ac1794c956503d4e73a5ad786f80b4aef3cf689907afd9238e657945bbdbf43e3
 EBUILD picard-2.0.0_beta1.ebuild 1804 BLAKE2B d9a5c1a5b39a1185dcd78a824b8e5eed5e3e302dadff43c5688757c30ff8ac19357d85866f8cba0330a504e08a8d0ae8378f727ff778d01f7b8439f30f16bafd SHA512 650fbf6458e6a3c51bd06f30f87fd51dcd4618189fb1c23ece30910f2432ab7ea7a9094c603d8d97430fdadd35d4f900098edab347b33eaf107bca6ace37ef11
 EBUILD picard-9999.ebuild 1633 BLAKE2B 8452d681019ae06f61be3257d120acc36b3d999d03e2f58b97a082deb9c55545d9768ae5b2a5376978d9a65b0355df4132c92242c4f75a7228ef71d8ee3428fa SHA512 4fe7b209a51dbb3a6940367cf5868174034cdb603c382f3efaf3ea6ce1f07f14840e3dc16e9ac4ec3b9c25373dd32d56cd4516387d3feb935dfa1cf2bce26cbd
 MISC metadata.xml 564 BLAKE2B 0408874b350710d85cd50f27158d074ee0a22c392822bfd7d90ae455906934c6ec1fd5963f4f225d2852a7bcbb5f74ec756b8c5ae449d2159ef52d552f6da954 SHA512 ce79b6abdff9db80eeac888838dea351058b17e90ffc5b13d4b446203531948f80705ef4184b35623fef1a0952f0071d5b4588f2fee5d93cebbc902a1a97577d
diff --git a/media-sound/picard/picard-1.4.2.ebuild b/media-sound/picard/picard-1.4.2.ebuild
index dd2fee9820be..504b0acf3c7b 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 x86"
 IUSE="nls"
 
 DEPEND="
diff --git a/media-sound/pnmixer/Manifest b/media-sound/pnmixer/Manifest
index c041453e3772..1fe1c603119c 100644
--- a/media-sound/pnmixer/Manifest
+++ b/media-sound/pnmixer/Manifest
@@ -2,7 +2,7 @@ AUX pnmixer-0.6_pre20111213-build.patch 1571 BLAKE2B a1133b3c0d916397c2d29eb9676
 AUX pnmixer-0.6_pre20111213-desktopfile.patch 328 BLAKE2B 283d3e2e791b0ef3de7a2ad4f0980c923dc48adda1839bed00ad1606dfed2adfbaa338636f4e76669761a51ad6f5418e25010eeeb94b27a2dca01aaaee2c49ff SHA512 ee9eee6503291e9bfeddbb5e5758aea496785e50722246fc9119bc69fd285e9145d63d9e61c4f01a52769f3142a12211d01c32a7c6a9edd31bc3a7e1fa044657
 DIST pnmixer-0.6_pre20111213.tar.xz 131328 BLAKE2B dabfa6e8270116eb325dc6dfd59c6f650975f1efce27603b0495f11efebd743aaba17ad19efba82d4c1d75753418a89295277853c9095d6a4fffdf6b17c5b9fe SHA512 967a685593256f9f2e8ab2ef955a91a03c3710d96956087ac55301d5232e6f01897efbb064bd6dc1804836af1b66c038cb3d04203043462de5246e4f14dd37c4
 DIST pnmixer-0.7.1.tar.gz 237949 BLAKE2B 87b309f3dd844009abe5f5bb2c5ca16ba80069932c2833a9d472130a6f0d7c36a050dc393bca097372c44fca5f90742cfad07c40a6f51ff877080f5eee25b2d2 SHA512 08d83424d921ef6112700fe8c3b55e147ace7767698a9d3ee4bb79ed0e727be7bcc82d55d3debc4b805e75f07c5702443be157e1bccce44d76072c36f8825816
-EBUILD pnmixer-0.6_pre20111213.ebuild 959 BLAKE2B 3fe712bb34864e022a17d18cc3200e8df1d9d765b5c4d1c520cca58df6bafeea44d3a489fe703292a13b4c18897b1aa07e9e4196a5296f580a529bf1a08b6210 SHA512 c3301b8ac6715307517bc7ca402421216b0878a0233d9f44c55132f513d61befc95eae83b2b64bfb183f268bac6cd0540692224239deb021612beb7ead00ffa9
+EBUILD pnmixer-0.6_pre20111213.ebuild 955 BLAKE2B 37cf36212e41748bddc0a8231c1d791616f558391f2360b632f0368108e49071b27cf23c4a2d57141fd20ad379458b022f6c5118deccfe29778fc9c62ef7bb86 SHA512 d8a62a6cee60a1095167a60c78ee11b509f68a7f3f925083bd0c079ac8129bbc867af63fe0132133fb49589ecf04202e59a0e0ee6b39f1b3e48d87aebb1234f5
 EBUILD pnmixer-0.7.1.ebuild 817 BLAKE2B aeb53c81444386fc20facb2765cc93474837b329ec40718622e37c92b01709dfbcf0091fae0fb997e571e77f969bd61a411de36e1c7a9ecab30ea7324424de80 SHA512 c648143edc699c2a4eeeed324436d01328eae8177be4bf34535d8dda648b0a4b3353f1b5b07c5c328dd4be8a470d35e0cd57a784efa3281f51e2bac74228e42a
 EBUILD pnmixer-9999.ebuild 819 BLAKE2B f11e945d77d82fd0d22b3c8f62f67bc563f7d5672528c71c1ad04d778d35cef8516a372e5586387afa1b5caca2ffe0c70a97af176b058d87a871df4da80c86c6 SHA512 126ae9a4c6e539fc34dec05d9210ceffe01fd1279958e4e89df7295c8cc4e6dcb95c81cef9f8c0839190ed826b0b143f38538310190d0e8fa16372d0c7094189
 MISC metadata.xml 2085 BLAKE2B 0408ed12d5d83f1c71d058902dc9c5e7afaba5d36fc2177e7cc393714f46c111188f28ed09eb622d7e3250995f136173e185a201c38387b34e7665680d4d8860 SHA512 57421f90ca52f34dc76db9fef86c7e01bb35222ff9bf37e4ca98a245289bcdeb3e77b6e1a8224394ba07d6def209065cfc81e2e48dac3338f0dca96db85f2f9e
diff --git a/media-sound/pnmixer/pnmixer-0.6_pre20111213.ebuild b/media-sound/pnmixer/pnmixer-0.6_pre20111213.ebuild
index 809462325d8b..090b3915ff7e 100644
--- a/media-sound/pnmixer/pnmixer-0.6_pre20111213.ebuild
+++ b/media-sound/pnmixer/pnmixer-0.6_pre20111213.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="debug libnotify"
 
 RDEPEND="media-libs/alsa-lib
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 04d5f8922ce9..83992b743778 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,5 +1,5 @@
 DIST rhythmbox-3.4.1.tar.xz 6914220 BLAKE2B f98aa43ca6929cf99bc5cfdcfcc8893e35610c04f1357579d64d3cd85cd66672dbfcb4a4a9a55ff6ae79ae54bc3034deff6a955b7bf59d7ff313de9a5747360c SHA512 b00034e9369222f64d5d9c5e246b99f5d738336d3faf2d303c444f84c316688871e0a09992e96012f38e2e90e8efc936ad231bed5057a5aaf31ee66963f59ae6
 DIST rhythmbox-3.4.2.tar.xz 6909436 BLAKE2B f5714485b253370a161f2255030d85bc8a697d795f97011c2acf6acbf8c9312f5180c0ec06ebe2d6e70730dc3fd4e97289b1f3a5e4dd4989a4e8135433430aab SHA512 275f7c6344c88c7331d433895d479517e7a4b854f6ae660abd79b3c324f5e7a06132fa44387443ec9ce50b20187e1abf1ec9683ec4bedbd4b17da6efece8399b
 EBUILD rhythmbox-3.4.1-r1.ebuild 3584 BLAKE2B 766825621a5d0bcb6749bbd378b1493b79533db83e49e8f63eb8cd5e48764bfa9c3cddc344c265d64bc92e84c1d9f209ec8d502de26dacbd9f6ae3c0bc175494 SHA512 741e89664c0bc10270ccf396a225b24188eda89f92bdc21364fff2d8e7797e27bd70017a1c9fa57beff89ad9363a1cb8f4355198087d6364545822ec4460d1c6
-EBUILD rhythmbox-3.4.2.ebuild 3366 BLAKE2B 1596638e054c51557c6757dfaf86d140412d2fc338a6ccc69f7218653177c3823fa3b3c130c9e9e6847ff986c2dd7d56f3b95ec9771478bd7b6b5edabc12d733 SHA512 439fa58bb315e52bfb636da72b8af32fa334fa5d0656f60020d003ee65d1881753f22c52b40688353c4a1c3c365deb031f5b165f22c6f9852bbd8c2917e834fc
+EBUILD rhythmbox-3.4.2.ebuild 3365 BLAKE2B 2f1abfb4279268304c67712b8981a19e36f1b92317ee39b4d7ca168a05cdedda67550cefa6fe80cd65c9ebf8782c24f43944e5152b508696fbc8afa1acd8c5ee SHA512 9b24ec1a136d6545f847bd4d65330bad2a571cef9fbe16a74203ff5f2b85bdc6e13229c9f7f8c199cc8cd621c77e5f098257f1d87db3dd1bb5910af1bfc8848e
 MISC metadata.xml 667 BLAKE2B 7c46e770537887cb18d74dec63531852f4df3dd278255776883aa44a99a05f0a2a590a2520595d5311132bc8494a048ac8bb56ef56a1ed2d02c422a54c1b3807 SHA512 b6835f5abe6ee0fac5854666a857a589e7ece955e1615f2adde7007f1b4077f0a11965175381654408ac40b09a4d14e0c707302f9026984cde239b8f183ab60d
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild
index 951da542ba51..3fc2aa573a9a 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index 32528b15501e..799120d88f3c 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -4,6 +4,6 @@ AUX umurmurd.initd 458 BLAKE2B e1f8dc704fa6237edfcfbb936e9d1c679e0f1a57ec862ec72
 AUX umurmurd.service 363 BLAKE2B 373b02c3d2d9f80e3b1a44dc98032f68310e8c5b82682efc1001cf130bef21f6f925f4b535d0d02209617c92b4d4a3dad4a7b459c8dbbcf6f97b050bab933de0 SHA512 3366dc2b35623daf4704e30bc6207cf795e31cb4c9cd0c7e19f64fa9d92da772fcc309e5799261b6c07c95cfeacd2d9b898ec4a4be7b5acc46efda7a98308913
 DIST umurmur-0.2.16a.tar.gz 91187 BLAKE2B ba306dfa4c6fa958735ab02bd262729d582acdd5f33e642066712c2188549b8675f1b9305642af198c608108e5277820d6aac2c09470cce0d5e9e3f272b11c2f SHA512 432a85e93cb7d53c505caf8b97c1bb7c173c8f625127510de61cc0a1e3abaea9abcf96ab1c0a8c5039ba82af5d29710e4973f70c1438bfd44ba00fa0c3f64c9e
 DIST umurmur-0.2.17.tar.gz 93786 BLAKE2B 92fc7d63dc0eed228c3fbcb0d18861cd49967f44378d980e856f8fb24fe7abc3429a4ca8e811eda6096727b76780724c909c46c04975b5edef70d848b7511618 SHA512 a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15
-EBUILD umurmur-0.2.16a-r1.ebuild 2135 BLAKE2B 64d386001a81128c5aab66a35bf3b22b0f15b52f79838094e875ff86594f699ff9f35b52477c1d50dd0b0299b3eba0f50d8ae6a93039aa599f105f18fe34c2ec SHA512 33849901fc0e7d8dcf7592e95be1f73a5309c8dcd98d07340d48c37889cec1b5759616f6de5591ad5a5c94450fd71512f796a44ca20b5188e5d4a9b0f19aefc4
-EBUILD umurmur-0.2.17-r1.ebuild 2162 BLAKE2B 369aaefb129136e11ed135e4d521ef9056ecba8528c441d3f25d88952dc1b5999a7d135759765aa62b1f59b9e1b995e0e2399b33fbfede89cd3f2fe0e2321e71 SHA512 d48f9b896acf82d0fbc727d07ad694d174274f26da4316cb36af623e588df96724cc1e3765a03e647b649466370f34b3bf3bb7a143702a7b96676121aeb6b827
+EBUILD umurmur-0.2.16a-r1.ebuild 2136 BLAKE2B e8ccba8b874014b89991f731abd0c2f1b724c126aeedd6563c4b118efcc630004d3cdd46a122678499f680d4e065f410bf5656e442d8c7ca560b64e05e96f406 SHA512 d65241e668ebb560a8f4ca482374c2d4a3738ee7eb700ae7273bb2c350b5b508678c19b174848f4b59adf3f077a108cca0aaf472fe87947473aac0a7d81251f3
+EBUILD umurmur-0.2.17-r1.ebuild 2163 BLAKE2B 95d724db07bd1f6b6a405a921d21569bcda8f4baa781ef2a6e1c21e167adbc61d9f8dd975caf2f228577f30b7fff4f0a713af3a630313f7b5a5d0a27a7625d88 SHA512 265168d48225f8df2263cdaf37bc665c7f624071a63fe33b9570cc3f5e1ca9121e61923e6e0f07f45f8c2750e6090882752327e1e031b527ceee722a759c5837
 MISC metadata.xml 1232 BLAKE2B c4c8e20529e868b6a21a85ea3e29a225c13e292a547a7aa0b178dde2332441e5d19b33614cb04024d25baf6b220b39b8136eef9e46a47d32c5150f6d7f65476a SHA512 24ed9e195f98584b84b01acd4f3fb1cb84415b63f8967f2ac7e47770eafb48585299cdd0f8d742cd086d8d730cd4b16407b9ba9d6c69803b447efa19b6c6c097
diff --git a/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild b/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
index 348df9a213b0..137b63342690 100644
--- a/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
 	dev-libs/libconfig
 	gnutls? ( >=net-libs/gnutls-3.0.0 )
 	libressl? ( !gnutls? ( dev-libs/libressl ) )
-	!gnutls? ( !libressl? ( dev-libs/openssl:0 ) )"
+	!gnutls? ( !libressl? ( dev-libs/openssl:0= ) )"
 
 RDEPEND="${DEPEND}"
 
diff --git a/media-sound/umurmur/umurmur-0.2.17-r1.ebuild b/media-sound/umurmur/umurmur-0.2.17-r1.ebuild
index fd839fd58312..4ca66ad93d0b 100644
--- a/media-sound/umurmur/umurmur-0.2.17-r1.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
 	dev-libs/libconfig
 	gnutls? ( >=net-libs/gnutls-3.0.0 )
 	libressl? ( !gnutls? ( dev-libs/libressl ) )
-	!gnutls? ( !libressl? ( dev-libs/openssl:0 ) )"
+	!gnutls? ( !libressl? ( dev-libs/openssl:0= ) )"
 
 RDEPEND="${DEPEND}"
 
-- 
cgit v1.2.3