gentoo resync : 05.01.2018

9 files changed, 60 insertions, 17 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 84377cca7ba5..99cba0ed4338 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index af1441f46584..d15f0d27fc8c 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,6 +1,8 @@
 AUX abcmidi-2016.05.05-docs.patch 614 BLAKE2B f9071f832d49d8dcb679843c5724c3a554df5f8f1ac6b545be637c2db6a37096b26c5b80f0b366d4e66f33230431de3b50b1198e2b9fe939e5231321ee1aeb27 SHA512 c06436cab7dbc4eb4bf8595e561402428bd1d45be653fa652841c3378e4b78f246ae5c862addf7bffbcb21d994f11151d464837f20915e91eef31d4f66618213
 DIST abcMIDI-2017.11.27.zip 557045 BLAKE2B 8f341f7217c1a98732bdfe5e4383c6718476714a4f37f629852f46a40c5e50711194d281dafde16293d45bd0c70c9b7506f5d426db03249ba2358b0c76142941 SHA512 006313ef9fcae652996339a682d308a6e931da9692b4662e3272c8bee73a3803dd9aeb54189cb464c68593473339201b20af6b291524ea2f096567053131e7b6
 DIST abcMIDI-2017.12.20.zip 558729 BLAKE2B 8f4ea8e1f162318f4d0abacab2f4f793e9acc6bbe4c1dc549c80a5d30ece9a5938fe0c3477ce5760cf87dff87dd70110ddea3e96a4ec2a3221bbcda1032cedd4 SHA512 3aa198e285e29d716953ab87b9a68a492b13dfba9121664c5457bd4ac1d0f210b4d4780a7c543b65c8b318ec99b547e54f4a30ec600f5608699e1eb7e4d57998
+DIST abcMIDI-2018.01.02.zip 558817 BLAKE2B 6712e12397a793d37ca1e5ecbd8ec42e07e15c4a74addb01a4327b899f469957d3bbece9f627efe65657ded65f399a0d80eade6d1086e6842f8268c68c74a3ef SHA512 2862437f61b08e0fbcb3b456a65f1fd516e3c923376cad7ddc9a09324d67f0f2ff5b3b0466552a42ddd9f9ec70aefed8a0d41a7e968dc0d89b8b9c160ae49700
 EBUILD abcmidi-2017.11.27.ebuild 794 BLAKE2B 16c0fd26186c80200100e38964d5c6afc7f3e92a78dbf32e8b8ae50ceffa5ca862c1de6fbb8aaedcfebaba2c6e9bfbdf76faf782f18cbbfbf488fa4c2f0e5177 SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001
 EBUILD abcmidi-2017.12.20.ebuild 794 BLAKE2B 16c0fd26186c80200100e38964d5c6afc7f3e92a78dbf32e8b8ae50ceffa5ca862c1de6fbb8aaedcfebaba2c6e9bfbdf76faf782f18cbbfbf488fa4c2f0e5177 SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001
+EBUILD abcmidi-2018.01.02.ebuild 794 BLAKE2B 16c0fd26186c80200100e38964d5c6afc7f3e92a78dbf32e8b8ae50ceffa5ca862c1de6fbb8aaedcfebaba2c6e9bfbdf76faf782f18cbbfbf488fa4c2f0e5177 SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001
 MISC metadata.xml 326 BLAKE2B eff21376d5e8fdf74ead04fc307726b50c8d86faaaebdbb8aa748c9fc0025ed9ccbdbf90f6bbafb515d576cd837f72f44991b329eb56f003cfbe3b0ee9cac7d5 SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a
diff --git a/media-sound/abcmidi/abcmidi-2018.01.02.ebuild b/media-sound/abcmidi/abcmidi-2018.01.02.ebuild
new file mode 100644
index 000000000000..adf33138050d
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2018.01.02.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_P="abcMIDI-${PV}"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="http://ifdo.ca/~seymour/runabc/top.html"
+SRC_URI="http://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch )
+	default
+
+	rm configure makefile || die
+	sed -i "s:-O2::" configure.ac || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
+
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.abc
+	fi
+}
diff --git a/media-sound/pragha/Manifest b/media-sound/pragha/Manifest
index f7a6e383a163..1d42e56b5fd4 100644
--- a/media-sound/pragha/Manifest
+++ b/media-sound/pragha/Manifest
@@ -2,6 +2,6 @@ DIST pragha-1.3.1.tar.bz2 621106 BLAKE2B 22d3908c5715c88834403da36bbd871781964a3
 DIST pragha-1.3.3.tar.bz2 679754 BLAKE2B e9e785998d5ae805aa8427d18d1cbdcdd1e23224ce18b3927933c0986fd8793dec9457eedcb005be498b37940cc3c7e36e68940ccaa675f4b350931315c3d997 SHA512 3dc87d4e75cd9f145c3921af4c09140a705611d72176fd80db2d89048bc22c8edda5f87bce75f26e0cce4f6934c927e814e5c54fec7820116485cf4e04e876a9
 DIST pragha-1.3.90.tar.bz2 760153 BLAKE2B 22cb90225cad5b19ecd95691bafd11f55b35e5f2b59e877c2c998b2e4744f1298f28469bdb11f00598f31fc154c55427d000a995d952112b238cf84302993564 SHA512 877d27814927ab67a0b1defe70d753466e3ad14a0274a2168eb2521ded4eddeb04bce5177869b19ca57b38e7374047ee36982cce3f7e8a75b801cd060f8460d2
 EBUILD pragha-1.3.1-r1.ebuild 2602 BLAKE2B 31d242654e528af065c91731d624df1e5fdf989a9e1f259603db65fab0bcfecba913478557b67110719d7c284f8c566fd64442ab97201e2451f01a600dc6e9c5 SHA512 c17edf8c79aa6a16803de9cbcc9c9f62a3a5f9f02c427f80548623b087feccd6be5e10584bbe8fe01b6b559e2344b367d1db06328fd9d1081f7c37c3fd7145a4
-EBUILD pragha-1.3.3.ebuild 2290 BLAKE2B 14be01f165a32a90b7fb019b043b3d74632a10d6739058233502620a5435a017a1f524f92c5623d847749488e433cddbaeb45e4151c5194b7a6eb007d7cd0022 SHA512 7142e1ae0b4ad53588b212fffa572e2ea3f6a002d3d31244db485efbc65fd6cfe329458783b77a3d0d699f4b88d35a78364cd5ed8e27cf1e0b47ad0b5e15e711
+EBUILD pragha-1.3.3.ebuild 2289 BLAKE2B e82e4b5d2bf872b7f8304f51aa43614ed28d17983d3863a444e88d099ecbf70d93ad1062f9b57380b98b99601fffcb1624df916d602f908ad52be2885348914a SHA512 90eaa1639055c3fcfe4f94e1f874acf23e04482e7f55ff805b32a551a1752bbb75d43cf20d2c76e0276ac43dff6a1917e38e83db2d4820ee4c43d298ddce65f4
 EBUILD pragha-1.3.90.ebuild 2487 BLAKE2B 198d2d7ff6b546f1f805cb7fd3c5e7ee8e5d6447514522f01c2329b2ffa42c1549ffdc91dc9b39862fe1a5217b92f4e53e71c807d55a0def06ba1a693ce1352f SHA512 57514988c2f5ef8e19d0abf8c329cee174be7d0e15c71bc1d0d8881cad14ceef6f4938a5610c4e3dfadf43144ddb0b87e9de10c2a031549025c8462bc4eb3c72
 MISC metadata.xml 1158 BLAKE2B b7d3fe9b4867324351eabb050306806202e4af8f4c4b1cbbd02f0d88eae27fcf0d6e52fe39f7cf470508db1528684fe064c1e0861658c883bb0a3f4a04abd799 SHA512 68257f425b4e8634f4ed696e7066a8b0c328b1bca0794a72a54f438d2aaa174b4cf816cf693046221bfef88e6b8fc08dfe2211e9be98c28da0d119d957bf9812
diff --git a/media-sound/pragha/pragha-1.3.3.ebuild b/media-sound/pragha/pragha-1.3.3.ebuild
index 5fadecd16a18..ffe4ebe7efdd 100644
--- a/media-sound/pragha/pragha-1.3.3.ebuild
+++ b/media-sound/pragha/pragha-1.3.3.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pragha-music-player/${PN}/releases/download/v${PV}/$
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cdda +glyr grilo +keybinder lastfm libnotify mtp +peas +playlist rygel soup +udev"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
diff --git a/media-sound/terminatorx/Manifest b/media-sound/terminatorx/Manifest
index 63f15e281b2b..38777a1c7da2 100644
--- a/media-sound/terminatorx/Manifest
+++ b/media-sound/terminatorx/Manifest
@@ -4,5 +4,5 @@ AUX terminatorx-4.0.1-gtkcombotext.patch 437 BLAKE2B 582d82d04bd443188325f127a97
 DIST terminatorX-3.84.tar.gz 572143 BLAKE2B 9ee576ae34b5349347a4f8dda429d5366ad6e8f9d1907e3cf22af3287e6340d616b59e5f3e56d56b6652768ac216c5ac8e598eb4fac54291fb00ce8bc6dd2d0c SHA512 9b538007acc98b1dd7bb2e310be53bcf1971a94e5c03ea8ca48c59b05f1a0bddd75bf30ab4cfb03d49165098ba63643eaa3bda117cdf833df2438c29a774db6c
 DIST terminatorX-4.0.1.tar.bz2 1832692 BLAKE2B 61eeb6362cdf56cb73df3bfbff65cf3699a0ef686d77894b87feab5f25f927267bc28573c3ee41981ded3b452b1d37c035260ffbe0fdcf6d0b0c0319c61a6137 SHA512 06128633e128f2158367dcde0e913dafc68d62644e7a5182a2391829dadcb9c46430d0cac16cb17113939623266f32cb4624a8548a51b8c01bdfa2860a6c0093
 EBUILD terminatorx-3.84-r1.ebuild 1458 BLAKE2B 36915b95eb05620a8c30285366101441db11b74005a4cea0a05a1c0cbc40d66359a378b4c5f7de70f70e2120c0e5d6884c515cf78520a2a6c9496ba970d57582 SHA512 8a872bf1af96f6a8f6e1836bb6c32454a885993da86a478281ceb45813b99e887fec831df5d3f5058bcc53870ab5962ed31d56a49039877127537e6bfb8a079e
-EBUILD terminatorx-4.0.1.ebuild 1357 BLAKE2B 02816eff476abffee08e685cc60b7bf55526c07d6fcf6f1eb25d87fb3c1170bd2379258193356e8b94b4fa831d9175cfe591e0b269fda57ac0e96bcfa8a971ea SHA512 8dda0a9853f245434cfcc9d8b6954c836eea219dc3d4a4854ce4186f3359868ffcf694beb078c7fe8caf862d9d3dd0ffa0bfc7a878fd3ce5ca750fa59bfc5ab9
+EBUILD terminatorx-4.0.1-r1.ebuild 1408 BLAKE2B 359d59897947d9ccb9751bc7cd74e97cdab32937bb2806034ba65cbae8a621e0f504929cfdf092d43a063cb8ee8b9b391dcd8e49986b7b67b37edc8500857937 SHA512 d326d969ec588b0190750ab1af77a502efcfc2fb1f88d1c0ac766900438667a24cbcdc96db62101bc25cf91bebfaf7215c1cd185de69b007ee2f0407328d4c9a
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/terminatorx/terminatorx-4.0.1.ebuild b/media-sound/terminatorx/terminatorx-4.0.1-r1.ebuild
index 745580ace2d4..3ce3c4f5ac0c 100644
--- a/media-sound/terminatorx/terminatorx-4.0.1.ebuild
+++ b/media-sound/terminatorx/terminatorx-4.0.1-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
@@ -13,7 +13,8 @@ SRC_URI="http://www.terminatorx.org/dist/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X alsa debug mad pulseaudio vorbis sox"
+# Making X optional fails when disabled: https://bugs.gentoo.org/636832
+IUSE="alsa debug mad pulseaudio vorbis sox"
 
 RDEPEND="
 	alsa? ( media-libs/alsa-lib )
@@ -25,12 +26,12 @@ RDEPEND="
 	x11-libs/gtk+:3
 	>=dev-libs/glib-2.2:2
 
-	X? (
-		x11-libs/libXi
-		x11-libs/libXxf86dga
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/xf86dgaproto )
+	x11-libs/libXi
+	x11-libs/libXxf86dga
+	x11-proto/xproto
+	x11-proto/inputproto
+	x11-proto/xf86dgaproto
+
 	dev-libs/libxml2:2
 	media-libs/audiofile:=
 	media-libs/ladspa-sdk
@@ -52,11 +53,11 @@ PATCHES=(
 
 src_configure() {
 	gnome2_src_configure \
+		--enable-x11 \
 		$(use_enable alsa) \
 		$(use_enable debug) \
 		$(use_enable mad) \
 		$(use_enable pulseaudio pulse) \
 		$(use_enable vorbis) \
-		$(use_enable sox) \
-		$(use_enable X x11)
+		$(use_enable sox)
 }
diff --git a/media-sound/xfmpc/Manifest b/media-sound/xfmpc/Manifest
index 9516949dcb3a..cfa030da5c3b 100644
--- a/media-sound/xfmpc/Manifest
+++ b/media-sound/xfmpc/Manifest
@@ -1,6 +1,6 @@
 DIST xfmpc-0.2.2.tar.bz2 404906 BLAKE2B bdef74eac80451064c2ea8004a329735f26e4f2e4761533a05fd1cb6f83b1d361f27fcef82e90c94c44f76f2fbbcbaf183851b08b301afe69cd02aae83d3a949 SHA512 a90697bcd86e7f3952faa4d37800755a49a09886de7a95ae69b4e8a59b7750b1098d372b1734eadf3bb1d2c74fc5447707fc0203de435cfa51423530c663f6c7
 DIST xfmpc-0.2.3.tar.bz2 414680 BLAKE2B 167af8e53d7ddf2a629d585e8ca9f15507e54ee92ceae0f48d3462fc1667b07570d2489cc5058c0521aae2f0b1493a1101655ae702e48b3c4d0c6be493a4ec57 SHA512 3f592fdd559817051f7720bafc07fc66b39f682cc20286c12d54c4bd607e85bb0a722c567264a29224971b4ac14db51b0b44b233a16cccd9d17579a50549a3be
 EBUILD xfmpc-0.2.2.ebuild 693 BLAKE2B 37161bc72f2c6965263e085e79802da7294d19645dc39706fc770fa261b38b9c5e17298c52e5afec2e354660d497a2677734b8e8edca76326301ec052437427a SHA512 5db626e67a68842a15ee1f49680bfb977fa64ed0382e336db94a9c915d7d3546a7a288735e7f70628019e78de9766dfb62d141c53b3cd589b35844d8b9415387
-EBUILD xfmpc-0.2.3-r1.ebuild 765 BLAKE2B 41aed50c4e48b9c65d13fb757ec790be437bcc4db80029340c3dd8ab6badc7967d6412092d142ee86b5e6c2bbbc17329a735ebc7cb076c0e43fd9ffb658b0ad0 SHA512 4dbaf6a08941a74c4fe79f44a31e59f8ac6cf1436e9ea7578c2de8216c29d71de3648b4ff5756169d058adcbade3a9e220324448623f2948c07010ffc7123e63
+EBUILD xfmpc-0.2.3-r1.ebuild 764 BLAKE2B db4fa17309686521de8d421089eb220ab430ee3914a862bbf3d9e6554bae622af4f97101cc445d55228d103517a2a130678099eb61a9ea1b565a9fa9bf073b07 SHA512 1b467028fb60f7dca5d2bbbb8cd4b3e3493fb5aeb7f32e44f470d364f007170b22042deb73bd7a8817553c95ec61b03536d6b8fd3bf1fc53bc01d9c180ef8c30
 EBUILD xfmpc-0.2.3.ebuild 703 BLAKE2B 936e73b42b78f2eec2b1041c5b6c54b566e1a7dd387507dd0f5dfe3ca95295f275403a6754ba4326c057a7c26c8ca2d8b8956cda78568f0ee2513d8edcf99f4d SHA512 5e667066d598c0088306c2c5188f97cd8ae642551183304cb478ba20dbff722748a4a9fd0d5b9314a41863f6dbcc90c60d90d6fdecefe92a16c3c3c803d14070
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/media-sound/xfmpc/xfmpc-0.2.3-r1.ebuild b/media-sound/xfmpc/xfmpc-0.2.3-r1.ebuild
index d66820c1341d..edac05663d88 100644
--- a/media-sound/xfmpc/xfmpc-0.2.3-r1.ebuild
+++ b/media-sound/xfmpc/xfmpc-0.2.3-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
@@ -10,7 +10,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/0.2/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.18:2=