gentoo resync : 02.06.2018

22 files changed, 114 insertions, 66 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index fb3c3a7f8749..e2b4dc4d31e0 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 2fc2ae8bc998..ab0669ea6600 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -3,9 +3,11 @@ DIST grip-3.5.2.tar.gz 952153 BLAKE2B e82ccb50636e68ab9862d2004a4dbe59399372b76a
 DIST grip-3.6.3.tar.gz 960255 BLAKE2B 9aad33c04e98f60e5f7871e36f2e4bf616a16486482e7363d165ae7d9fc5343a52583e490b9b9757d31b051e6e96165d35931370e2681d727db7abb0854db2d5 SHA512 f94c5dc24a1355a024833992d05a7c05d84367a004607c9d6c7aa6d4bc24dd93b11e0a061689eb521a8abe637472011a1a4c8e968c48ac8447457cffc4d2957d
 DIST grip-3.7.1.tar.gz 961428 BLAKE2B 0c31b549577a1bbde17936e8e243d6fa573c6ac0c6035ea303c983c6ac26a0f7ddef193cea74a4148655f2305db97b3e74476bfe763fcbe77c656e012b4fe07a SHA512 812c6d0715e18da78b8657722697cf7b39b345f2d94c5a3002c6a512ff0482d4e96b58910e0c2fd459ac707a24754c6c491e66eac7692c49ec69bb869079202c
 DIST grip-3.8.0.tar.gz 961876 BLAKE2B 72f2bc01868b25f3722ba32b357c728935fef39f82b1c546c7930dc736c6a6c763b00864f41cd5d334bd5209098e5067b036f2c24731128cb7d75ae26074c6dd SHA512 f7b727e5061711ed213638fc281eb399543a7bf0a89c7ad0ab48cdabdb93a8ce3f898bcee6bd0ddb99a04c1c39985935c173f1d908625045d7bbcef514dc93ba
+DIST grip-3.8.1.tar.gz 960857 BLAKE2B 0d1323961eeb9593fb4644a31369852f8d40582b7ba00af3b2255f443a354cca74f5d60c80b135d09bc514d8302807191e6c8f38bf080d5a6237859ccfc90178 SHA512 9e1ebdf6de523c4b818f2b35f976ea0ceb83f7769e3355a7a5af8ea831c34be21ad0dd2106c3ddb8f61d31fe3f32e745ab806fd6aa125a06beda3d2bf381428e
 EBUILD grip-3.4.3.ebuild 1207 BLAKE2B 014b3ae549e72ae4960820532e746337a3d821684f98e19619ab9314441c2be743df3e7049885c921bd5d09f837d275a661116a9c258cfce1008f7978a5fcb00 SHA512 e6fff5d8728217b346a200ee84bec062212be2a2b37e5e942f730d897e53983df66e032a72e7540be6aa83732cd9bd0bdf20566b66ebf6a37a21f1e909a6f44c
 EBUILD grip-3.5.2.ebuild 1214 BLAKE2B bc9c0ff5cd0ae7969eb7ceaa3b328ffacf090c3e76d828d0e9135bf57b50b872dbf9fa0da9abc0b33aae27e045361d306a1c990af424032d15a326a74cafbe11 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92
 EBUILD grip-3.6.3.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
 EBUILD grip-3.7.1.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
 EBUILD grip-3.8.0.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
+EBUILD grip-3.8.1.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-3.8.1.ebuild b/media-sound/grip/grip-3.8.1.ebuild
new file mode 100644
index 000000000000..b664cc4ecb4e
--- /dev/null
+++ b/media-sound/grip/grip-3.8.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic toolchain-funcs libtool
+
+DESCRIPTION="GTK+ based Audio CD Player/Ripper"
+HOMEPAGE="https://sourceforge.net/projects/grip/"
+SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="vorbis"
+
+# lame and vorbis-tools are no real RDEPENDs. But without them
+# grip cannot convert ripped files to any format. So use them as
+# a sane default.
+RDEPEND="
+	gnome-base/libgnome
+	>=gnome-base/libgnomeui-2.2.0
+	>=media-libs/id3lib-3.8.3
+	media-sound/cdparanoia
+	media-sound/lame
+	net-misc/curl
+	>=x11-libs/gtk+-2.2:2
+	x11-libs/libX11
+	x11-libs/pango
+	x11-libs/vte:0
+	vorbis? ( media-sound/vorbis-tools )
+"
+# gnome-extra/yelp, see bug 416843
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
+}
+
+src_configure() {
+	# Bug #69536
+	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
+
+	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
+
+	econf
+}
diff --git a/media-sound/mp32ogg/Manifest b/media-sound/mp32ogg/Manifest
index 3a6abe363549..f71d3ad4444b 100644
--- a/media-sound/mp32ogg/Manifest
+++ b/media-sound/mp32ogg/Manifest
@@ -1,7 +1,7 @@
-AUX mp32ogg-0.11-r4-mpg321.patch 781 BLAKE2B 9d0e0293bbaf53542621b678fd89a6562b95409298ec1ed32838eaed05b58ab44366b95193537a3349e77f607bfe610d6057f221e856e3a774ce2c6869aacd66 SHA512 d4c93206c424358859dfd0e5474e8b9990458c239ab2f4b3fdf873c5808bdd278fb05355bd7e6c50b8ae40be26ff65b90efa83e19a18df8e84c0de7181fbb8fd
-AUX mp32ogg-0.11-r4-quality.patch 2749 BLAKE2B 8a1d1a4f4f7c0c5d0be5eeb8f796e727054f4da528a228278f7ca6887b07756ac671bf12a50cc84fa5ba4190bf6c4a9dd52a92f76e6cd4e7fd72147e3308be90 SHA512 70ff58791c8704eb78016364f86669576c7101c4d4d34cd0a46e2c3abfaadffc817ae40f1192cc1b295a131d72da72cb1eedfff4032798b033b3e0ad656b0c44
-AUX mp32ogg-0.11-r5-german_umlaut.patch 1858 BLAKE2B e0b1c2ee7ef95b42584208a212a99753a94f1b40f70776f4fbca094c8a0c2bbd2e08a09d64df2f231d5b02f701caecc9370de5a8a931aeaabc826195e92b285b SHA512 aef750075b8af19c1a88c0c78bf55653f91af815aa3ff723a6bb3a2961996f1ff65f29cc5d2f7027371a2b91e5dce6088a6c8582f5dafd8b6346ba129e770b8d
-AUX mp32ogg-0.11-r6-force-filename-stringification.patch 370 BLAKE2B 36dd2daf9ea585878f5e8fdbf96ccc0060117fa9256244fb6f811dcab1a2cd02d8745543787c8df0479fb606066b9ac5bcf4b74064cd4b3effc00910a3ffeb0f SHA512 494d44a6265422270cad2cb81f99809760f1816584b6657e4e9c0d3a500ad6ee9d989277815ecaab613ee03a9d6571b7db06bca6430dcad208015ebbc27f6303
+AUX mp32ogg-0.11-r4-mpg321.patch 708 BLAKE2B d0c5eef64ea12442fd1db61a710840db76a0b203b4a544a9c287ece42d5a2d90abf8c9abbce54b06f0b75607f7e35aef3f11f70daceea492b4e873b21b8e4345 SHA512 b54e2bfb21aae229b1703719b1bc5a231ddeac90e3f40b15ecd36c4a4a6015701358f47170b2aa5e7869bd5cef5ccf24405076835e82e08279f1accd204b27a0
+AUX mp32ogg-0.11-r4-quality.patch 2676 BLAKE2B 7d3b5f6b3fe9e3f8f99031b0cc30a1fc30bea30f3e2f21ef23e1ec161b2d6a319518ba9ae1a6e5c661b6621859c8eb398334c6734990b14815d1593785b92800 SHA512 e66238a8f512013ad9a86acb50d16ed178c291f6f30da96d16f9de779f8c37e023832e6d2adee1d8778d884e1085b6a2821560b7e8cc34422b2e90b83a1bb801
+AUX mp32ogg-0.11-r5-german_umlaut.patch 1786 BLAKE2B b25e35b6a231f4138c137a413c60a9420e63bb453da7df5f53868124c0f581c9d1c4b4350dbad1322470c297d39e9cabdb2fa0372e7aa50417ebf62340ce94c1 SHA512 9e95d4de4bb4656dd9600282a169ed1c47e50dc4b47219375138e0e81d3b5e9ed14f2f8411422a7cb68a0bc458ce34af20bdf9d4f606200118a2a70451e33aeb
+AUX mp32ogg-0.11-r6-force-filename-stringification.patch 374 BLAKE2B 76a3c37e46a94cdf2712bc74bb1d981344ce6a47831d8c63b49137e66e0724df304f7fbe5696cb0a08605b56ef7c9c9b24e992e503e89687c7433acbd07fdb89 SHA512 0179d71462fb6d88f5378d5a82622544eed9869b1bd533c1fccc73337a8b3820030dfa4abe6e04f6a887da92696882d303a6e94f955166b95c7df31a437a9494
 DIST mp32ogg 9216 BLAKE2B b73b17b7005ae53487a78b5e4ae118b1c18b713609ec9d7fb83b9f1295ae21b0cf5a3178445042562cea992c078b432353a40c46cbfa5a5e49c45e8cbae95002 SHA512 342c3e0430d203fed8f793fb14fa532210cac616a0f48d243c9a14477d048bf9da3dbab5712cdf24cff2d98c6a5bc1edb43080f4ee05672fcf8f3e07fa667bd1
-EBUILD mp32ogg-0.11-r6.ebuild 802 BLAKE2B 486204cb7ed6fcc452da144bba607833b3de73307c647e84e1ca9977d390075ead08f35427debe2f6b72ec88cacbe2664ce4920e3b8a8dc234089ef54a5290da SHA512 2c88ab384fd4ebc4d6b4f625c4f80fe3876953d859dd748f23eb2da0d3503974ce757a866f5c13cc056b745730a8590edd2733e693e256d505d2fb25d4e0d749
+EBUILD mp32ogg-0.11-r6.ebuild 784 BLAKE2B 8f70106f59b2427cfc3a968b18109383352c3ea06b61909f781c5922d7d301e3906a735ca45290de41a0c5c00807a50a702144c47194e0f64323bf41ab4667fa SHA512 ced29fa6a3e071c0016f83882893501034a7859f1f43c4840f815761f3c5d31a2de678333bc52604dd26a31bb469dac0882eaa03a03c0db1a099a82cc9824169
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch
index b617584f94de..f71f13163e25 100644
--- a/media-sound/mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch
@@ -1,5 +1,5 @@
---- mp32ogg.orig	2004-02-03 01:09:20.000000000 -0800
-+++ mp32ogg	2004-02-03 01:25:01.000000000 -0800
+--- a/mp32ogg
++++ b/mp32ogg
 @@ -6,6 +6,9 @@
  # <http://www.opensource.org/licenses/artistic-license.html>
  
diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r4-quality.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-quality.patch
index 38fad9bc9abc..0bf9b05a5ca4 100644
--- a/media-sound/mp32ogg/files/mp32ogg-0.11-r4-quality.patch
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-quality.patch
@@ -1,5 +1,5 @@
---- mp32ogg.orig	2005-01-01 15:32:32.138906448 +0000
-+++ mp32ogg	2005-01-01 15:52:33.061338488 +0000
+--- a/mp32ogg
++++ b/mp32ogg
 @@ -9,6 +9,8 @@
  # 0.11-gentoo
  #     * Jeremy Huddleston <eradicator@gentoo.org>:
diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch
index 20361f1b9835..10588d87e1d9 100644
--- a/media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch
@@ -1,5 +1,5 @@
---- mp32ogg_old	2008-01-29 10:45:06.000000000 +0100
-+++ mp32ogg	2008-01-29 10:44:34.000000000 +0100
+--- a/mp32ogg
++++ b/mp32ogg
 @@ -6,6 +6,10 @@
  # <http://www.opensource.org/licenses/artistic-license.html>
  
diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch
index 65f7a83454fa..1b08f5453350 100644
--- a/media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch
@@ -1,8 +1,8 @@
 http://bugs.gentoo.org/328953
 http://qa.mandriva.com/53477
 
---- mp32ogg
-+++ mp32ogg
+--- a/mp32ogg
++++ b/mp32ogg
 @@ -167,7 +167,9 @@
  }
  
diff --git a/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild b/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild
index 72c5e39e14aa..92d9ea2f2c79 100644
--- a/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild
+++ b/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
 
 DESCRIPTION="A perl script to convert MP3 files to Ogg Vorbis files"
 HOMEPAGE="http://faceprint.com/code/"
@@ -21,17 +20,17 @@ DEPEND=""
 
 S=${WORKDIR}
 
-src_unpack() {
-	cp -f "${DISTDIR}"/${PN} "${WORKDIR}" || die
-}
+PATCHES=(
+	"${FILESDIR}/${P}-r4-mpg321.patch"
+	"${FILESDIR}/${P}-r4-quality.patch"\
+	"${FILESDIR}/${P}-r5-german_umlaut.patch"
+	"${FILESDIR}/${P}-r6-force-filename-stringification.patch"
+)
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-r4-mpg321.patch \
-		"${FILESDIR}"/${P}-r4-quality.patch \
-		"${FILESDIR}"/${P}-r5-german_umlaut.patch \
-		"${FILESDIR}"/${P}-r6-force-filename-stringification.patch
+src_unpack() {
+	cp -f "${DISTDIR}"/${PN} "${WORKDIR}" || die "Copying sources failed"
 }
 
 src_install() {
-	dobin mp32ogg || die
+	dobin mp32ogg
 }
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index f9e64e30f8d8..844066dcc359 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,8 +1,8 @@
 AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20d60eecf3a62ce6c3eb0e6a8c29252ef6e3045a96af6e8cd12d7c27dfbdf8a79fa3ed025258b8c9cb7b05d SHA512 4b646bc5d8fe4c76421f4cb0dbc7894cf9118492662ea1127f90c48f84760a1167988692c2b63f49182afcd46c578de7203356bbf9dd47787f9129f7c3dbf4a5
-AUX mpd-0.20.4.init 690 BLAKE2B f7674cb5d20d307c63c3fd438a364c0bf660c63fafc21553ad5f6706ff038ee7f74786a586f58656bebdf3b79456f0bb14c137728c748380da5b8204b2958947 SHA512 d4c60d7b5b6e4067439be96aaa9d8d6f7bd7607ad42a618b04af94815cdbe900e06f11c6897f96cab623d6859d681feb11fa02f36fdce4841ed59c88ef86666f
+AUX mpd-0.20.4.init 681 BLAKE2B 36f48fe4f2432f659c455e75c3e6a773e7d49b9194fea75cd08251cc661b4885fe4ca16cc1008b679cb441ce8eb6a309c60b132570b89e4cf8f9560e130e71be SHA512 e9dbbab915e0e84dec9bd084347e608db7802386b281dc35fa1a9401bd3a40652735a02c98a8d51074c061cbe05ff038e0a16f379638c133b6ae8a6a70ca8f39
 AUX mpd-0.20.4.logrotate 79 BLAKE2B fcff807fb7557d480378ae6712f598147c9dbc3381ca89b21529277bfc636448e474b610096eae5c02963bc5aa5cf1055f0a9bbde36f2cc8d178e373a755fa84 SHA512 b4616307eb4b06e42a53120bb37276ea19cb1b3096094214062835f71093a1d196bc515b6b6f1e23dbd83a49151565807071959408c4f1078d95925660d3b324
 DIST mpd-0.20.10.tar.xz 778828 BLAKE2B c16b955ace770cf3d5da2ccad81fd3089cf2e60bf47774745d75babcff38fa344646b26dd32617fa2fe86ee0c785b9c8272ea6c90f77266b1a0cba2d48145236 SHA512 bac6a71e5b85600c590eae6b785474574cf0d7b03d9add537161b968a2997a975a597639a9fece119a01a7e27b5207523e4ae30b2f4f35791eff8c3ff26d107c
 DIST mpd-0.20.12.tar.xz 781072 BLAKE2B 0f305efa94dca844ebc9e4548d0f57ce01c0274c49f40fe3fc8510b8f2748f2cf623125c16da382a8495aa6eeb1a8b9707a3bb46a5fa8a0657c9ffa11fbcb5dc SHA512 3e221edc71cc65f9da46aa4f1d0bc2f8ca701cc4a103ea8efb08191918312b2f3b0023288e3dcabe0779e81ee6f628773d779462e09a55f2c090cca0e3d099af
 EBUILD mpd-0.20.10.ebuild 7246 BLAKE2B beb040eb0eca988c33fa5aef07022c3eeeda6afbc50d86ba8ee0f4d96137935ebf5abb3e094130de5cd83dec109527e06c3b95d2178f856a214896615debba48 SHA512 53d08548f75b6be0530c0ff6f0e4210e99020ff79f36515b1abbf4bf7c3db5e64bdf0c3a5396c5c89d07e37f23c28dc81d7e4a75bfeb17970e53d0892e84fe44
-EBUILD mpd-0.20.12.ebuild 7314 BLAKE2B dde2d3d78b80234f8019a533ea57314336590b4fc6c6488a3c9fa411bbc0e92f3a89a99ac9b99113f68c281a24b3dc31713deaafb37c915fe4d47e3ca05510d0 SHA512 a7c94315bf5213daa24015c90ab01468403a2dae5018f56a6a33f8c6b09e6a0433a49336c1e29f1cfca4439f70c622465a5c9d3e367eeb1ad24bf965fd340a31
+EBUILD mpd-0.20.12-r1.ebuild 7314 BLAKE2B 3ea5038f8073e7d126c5d5d79980fc07438c6ce50816b7157888b095746489dea0e64c5a43ae0b9df9031ad4c22b2f82bb0284b4e36e8c724a95293a4a7203f7 SHA512 0fee3d76b274a1d151e0393278808f6d7be219ffdd0b8c72e9569b766ff83ef341b3fb748c3a370aab33cae91a56da3842def0fec6232f953e85a0ba36d61b08
 MISC metadata.xml 2449 BLAKE2B 33ffee8d5e8872a91eabb6006590828efe68da58117872aa4d36471cb7af858e00ec36e1193dd4ed08469b9522e9b953d7a5d0726890a8cf1333420c7ae9f2a2 SHA512 3092f8928c4dc74118306584f3766f78559672613336668c7e0dc8cffb0f46413d8d046b7fd54f6d69e8ac171e571666d8f5defac36d629bc0091e2550660e02
diff --git a/media-sound/mpd/files/mpd-0.20.4.init b/media-sound/mpd/files/mpd-0.20.4.init
index 3eb0bc2bcb82..0a4c61677bcb 100644
--- a/media-sound/mpd/files/mpd-0.20.4.init
+++ b/media-sound/mpd/files/mpd-0.20.4.init
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 : CFGFILE=${CFGFILE:=/etc/mpd.conf}
@@ -20,7 +20,7 @@ get_config() {
 
 extra_started_commands='reload'
 command=/usr/bin/mpd
-command_args=${opts:=${CFGFILE}}
+command_args=${CFGFILE}
 required_files=${CFGFILE}
 pidfile=$(get_config pid_file)
 description="Music Player Daemon"
diff --git a/media-sound/mpd/mpd-0.20.12.ebuild b/media-sound/mpd/mpd-0.20.12-r1.ebuild
index 856bef046087..413a9c53b120 100644
--- a/media-sound/mpd/mpd-0.20.12.ebuild
+++ b/media-sound/mpd/mpd-0.20.12-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
diff --git a/media-sound/ogg2mp3/Manifest b/media-sound/ogg2mp3/Manifest
index 726a631125b6..43ca04616121 100644
--- a/media-sound/ogg2mp3/Manifest
+++ b/media-sound/ogg2mp3/Manifest
@@ -1,3 +1,3 @@
 DIST ogg2mp3-0.6.1.tar.bz2 12424 BLAKE2B 6a43814adc2763bc4ccefdcbdbc6e1bcc4bb2d245af51be1f1c949c8fa29cefcbe3175d89a1a34299f7ae0b71b24e62a65e0f4ed8b0011f23a733960c549baaf SHA512 ba4be78b14c3647af52c0c64c95949e75998847391612f6d66fa281e15283929d6ae3e5df15b0c242d2930b3941e68653934261f6d9804c576f77c8304ef4f14
-EBUILD ogg2mp3-0.6.1.ebuild 569 BLAKE2B e633a75d54bf6a12cdc438c47381cb2c942dcd8fefcdcd31690836e0e688f23e67e91b94dfd62f23d8c59e22fa6d87cb7bdf189dcdb3050583705a0f1e4f525f SHA512 74f233b4c24b61cde3f4dee09d80b9ea1bf4fc89916c01341c592db27f1d8cc3d3fe991b05129b1bc82e4ea90b745fd522213537ae8151d4eebd742a30a02305
+EBUILD ogg2mp3-0.6.1.ebuild 547 BLAKE2B 7ff2b65054f175f78f2a8971878fd08428b6d4a29607d9505dedb3b82fafd877ca5ddbea37454faee81f4bac15e50234d5c4791561411f609b9f5deb916d9b28 SHA512 e238c4441b459eecec080a3d249304b451fd0077c4fe2b6e08c21965d66f584f6e89c07cc2ec0da984e9bedb70db6721dc4c631e7d356ab0acea77b882271755
 MISC metadata.xml 780 BLAKE2B 234c25b6f649afbccae547a90da27d4414c4b357e0185513e73d86b3ce01eb99c36399fab8f62d6b840cbdf31558ed9d6aa7204b135a9c64936c623effcdc5fd SHA512 aef8bed925fee6d914dd3f1ab3315b40743715c2499f72459de8ff3765cdd774755ec3a31872228cb6a8da8726cd3aa4256079431641c188c26c0c0553b51342
diff --git a/media-sound/ogg2mp3/ogg2mp3-0.6.1.ebuild b/media-sound/ogg2mp3/ogg2mp3-0.6.1.ebuild
index 469306c080f7..e62c87864b42 100644
--- a/media-sound/ogg2mp3/ogg2mp3-0.6.1.ebuild
+++ b/media-sound/ogg2mp3/ogg2mp3-0.6.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
 DESCRIPTION="A perl script to convert Ogg Vorbis files to MP3 files"
 HOMEPAGE="http://www.gitorious.org/ogg2mp3/pages/Home"
@@ -18,6 +18,6 @@ RDEPEND="media-sound/lame
 DEPEND=""
 
 src_install() {
-	dobin ogg2mp3 || die "dobin failed"
+	dobin ogg2mp3
 	dodoc doc/{AUTHORS,ChangeLog,README,TODO}
 }
diff --git a/media-sound/ogmtools/Manifest b/media-sound/ogmtools/Manifest
index d828f3355b6e..1ba4c5bfdd86 100644
--- a/media-sound/ogmtools/Manifest
+++ b/media-sound/ogmtools/Manifest
@@ -1,7 +1,7 @@
-AUX ogmtools-1.5-comments.patch 1028 BLAKE2B de7d80d0683b9065ec6d9a2d786cbdb0789e6dde39e7bc715f30b93a167a458bcb8670b1c5fbce6f1884959781e70ea34afb069d7301b83852e695243697a2aa SHA512 65aac830c44f73ce68eccfcd9e1d1616f62e5b340b2335c75b7363a99a94ae62b9b7d23a0e06de103dc7ea054373191e0fbfc6cfe06df3e03961bf7cc91c75d9
-AUX ogmtools-1.5-endian-fix.patch 406 BLAKE2B 212020a52a4de97fc95665752ed4f2b829aac6a7ec5729d9090da317b810d5ec20874ce7680e579b5b494cb17edb9a833ddf061e33066c207b93f3dd1c92c76f SHA512 eeefe3bca9d39486a090a2735badc3996f087488d8b2e4121479efc247b9bfe53148f2ef60d95031fc0e0452e891d9ff6c3715bcf0e833266c946ac22b71d934
-AUX ogmtools-1.5-summary_length.patch 489 BLAKE2B a5fae26d83882035e5d204ef67b5adce67866f205185b6e9638e9f8dd02c580cbf639e4e9e6a44547cbba72cb01f5bb02a370e1b201442cfc234dd6882c319bc SHA512 ddbde11040a9426455fa91fa5c92ce4d729da91b661014b7abdb25614d3108c2f32321bf738fb984c6869a6ffcddb651541dbdd53446cb33cb9c5dc902cd6c99
-AUX ogmtools-1.5-vorbis_verbosity.patch 524 BLAKE2B 851b955376a81580ce52e90f795c5688437c7a9ccbaaa1ce6c761b02d8767843ca85c25ebcd54eb462529727fe0aa21a369ebefcd100fa7e609b337539ee39a0 SHA512 5f3b1a76aa6f414ebd29805f1a986e7050879a72610518f35025b783985d3eaa5157be7e1084541cc52dc5ad2f380ef3395d7ebaf33c73098f0844d8e0822146
+AUX ogmtools-1.5-comments.patch 977 BLAKE2B d12a056f8e6773737e612076bbda53b8c50912f99c7d1649d762c6d8c3c81a8f7fc9230b46e74724a03046a7367ad2331d755e1a2db19d665f2055d33d29d2df SHA512 345ca99a0685df2c9904e182c6046a367541d07f0eff8a7667650557d1729059dcd995320c7ffd40e5c52bdd7fa0ab648a53e85fb0f8a7628753dd5a2c4d027a
+AUX ogmtools-1.5-endian-fix.patch 333 BLAKE2B c1d544bc210eeb464467b7a324f048af234986e4d52573f6d9ed060fd8f6d2aaa96d7a6868a10caf2e1c895db38f6deadb4bd605a5d5920f0e052b4f781d5959 SHA512 a2de28d2063227c6f9d4e8ca2d5d10210f5bd72c1cf02087cd4d437fe211095ff8035320c75f23221cbfb11ade6bdfaa20e27fc09fbaeee26dcd2dc0d1239221
+AUX ogmtools-1.5-summary_length.patch 330 BLAKE2B b59fa0606b2a1bf60c355c4d2ecb2ee58c6f5419aee1471cd27bbbf365bad32d123f57c6f40deb02139a453efca50daa15f255ec56173e9e49803f434c56f063 SHA512 00212dd740d2de3702b717089949ae6961c0faeffe857bef61f1b3f019b8fc88c510302f5802d28d88d07e051d6859612a46b06f603cfbeb3a72afca565e5cae
+AUX ogmtools-1.5-vorbis_verbosity.patch 365 BLAKE2B 57b1ca8a076f8ccc5a09e77a869e784fd7dfc79240b9b14315918d95fab45cc91ce92f8a8914d5c7efdad9981389f4c1e4f41f61bb55ec4507b120159fcda549 SHA512 8d5fe06c22404198f3956c18bf91c986d212fda1987f33b8c247f6af8cd7f3ab690c105278d0f1ba188130bcfdf8dca3659a9da1c42fe19fac0692e7a853064e
 DIST ogmtools-1.5.tar.bz2 214934 BLAKE2B d9d3aa3afe0a64a6dd8201c030120a2ec9cc752037c48c1ff58b3334a5006bbd5974ff2eacb4c7e8a17c722f8fbc5ac033a64840edb179da9d66bda6743eb71d SHA512 1ed573531f9783c491a01e419667229b28540ad48c08b46131ae09ce3a4d771e3a54cde5dd09c585c0b85952e82abb3d1353864dc5223736f6eb6480158badee
-EBUILD ogmtools-1.5-r2.ebuild 921 BLAKE2B a4bd0a2e31729bc854bf7fd07f5118d5e16b19075693c0a33f1fe003be34c3f56d218d7fc4fe7ea3668826047b64c2af66dd16e5316b32deb809aeceda57317e SHA512 9f677033ba90ca407081ea7264754289efb5d2fbd3a3ec65fdac51458a083555ed374fe3b8c1716a0fe41c29b54081788b7336e78dc5c96478d5222dda545339
+EBUILD ogmtools-1.5-r2.ebuild 813 BLAKE2B d74853852e5c94afcc1c8c6dda27b43e838d9e792729c4f44ffb0cdfe60d7177ffa0a29ae0f30fa9198f324110e76aba63086fb2c34cc2b99e845e1dee351d04 SHA512 f3cbce5dcd9eebbc5286b54b69567cc88d4f0786a29f88b723ce7d8614100d543dca0abd4ead68038108e284c4835e4c7b38de069c5eaa89b0adc20fecfd899c
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-comments.patch b/media-sound/ogmtools/files/ogmtools-1.5-comments.patch
index 0440a8040b8c..c331baa8b906 100644
--- a/media-sound/ogmtools/files/ogmtools-1.5-comments.patch
+++ b/media-sound/ogmtools/files/ogmtools-1.5-comments.patch
@@ -1,5 +1,5 @@
---- vorbis_header_utils.c.orig	Fri Aug 31 14:47:55 2007
-+++ vorbis_header_utils.c	Fri Aug 31 14:51:23 2007
+--- a/vorbis_header_utils.c
++++ b/vorbis_header_utils.c
 @@ -153,15 +153,15 @@
      die("malloc");
    
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch b/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch
index 8945ca47c082..0c8758027a00 100644
--- a/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch
+++ b/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch
@@ -1,5 +1,5 @@
---- avilib/avidump.c.orig	2004-11-02 15:30:16.000000000 +0000
-+++ avilib/avidump.c	2004-11-17 19:12:02.730255128 +0000
+--- a/avilib/avidump.c
++++ b/avilib/avidump.c
 @@ -54,7 +54,7 @@
                     ((x<<8)  & 0x00ff0000) |\
                     ((x<<24) & 0xff000000))
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch b/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch
index 8457918beb8f..00c2ee06c6b9 100644
--- a/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch
+++ b/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch
@@ -1,6 +1,5 @@
-diff -ur ogmtools-1.5.orig/ogminfo.c ogmtools-1.5/ogminfo.c
---- ogmtools-1.5.orig/ogminfo.c	2003-11-21 00:21:36.000000000 +0200
-+++ ogmtools-1.5/ogminfo.c	2009-05-12 12:41:58.000000000 +0300
+--- a/ogminfo.c
++++ b/ogminfo.c
 @@ -513,7 +513,7 @@
                stream->serial, stream->size,
                (stream->size * 8.0 / 1000.0) / now,
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch b/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch
index 085cc5d978d3..5b71402649eb 100644
--- a/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch
+++ b/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch
@@ -1,6 +1,5 @@
-diff -ur ogmtools-1.5.orig/ogminfo.c ogmtools-1.5/ogminfo.c
---- ogmtools-1.5.orig/ogminfo.c	2003-11-21 00:21:36.000000000 +0200
-+++ ogmtools-1.5/ogminfo.c	2009-05-12 12:42:56.000000000 +0300
+--- a/ogminfo.c
++++ b/ogminfo.c
 @@ -188,7 +188,7 @@
      }
      vorbis_comment_clear(&vc);
diff --git a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
index 8e6971a61fc0..2615313a813f 100644
--- a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
+++ b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
 
 DESCRIPTION="Information, extraction or creation for OGG media streams"
 HOMEPAGE="http://www.bunkus.org/videotools/ogmtools/"
@@ -17,12 +16,12 @@ RDEPEND="dvd? ( media-libs/libdvdread )
 	media-sound/vorbis-tools"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-comments.patch \
-		"${FILESDIR}"/${P}-endian-fix.patch \
-		"${FILESDIR}"/${P}-vorbis_verbosity.patch \
-		"${FILESDIR}"/${P}-summary_length.patch
-}
+PATCHES=(
+	"${FILESDIR}/${P}-comments.patch"
+	"${FILESDIR}/${P}-endian-fix.patch"
+	"${FILESDIR}/${P}-vorbis_verbosity.patch"
+	"${FILESDIR}/${P}-summary_length.patch"
+)
 
 src_configure() {
 	econf \
@@ -30,12 +29,10 @@ src_configure() {
 }
 
 src_install() {
-	dobin ogmmerge ogmdemux ogminfo ogmsplit ogmcat || die "dobin failed"
+	dobin ogmmerge ogmdemux ogminfo ogmsplit ogmcat
 
-	if use dvd; then
-		dobin dvdxchap || die "dobin failed"
-	fi
+	use dvd && dobin dvdxchap
 
-	dodoc ChangeLog README TODO
+	einstalldocs
 	doman *.1
 }
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index f423cba8c6d0..f8420f7d0ede 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,7 +1,7 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
 DIST spotify-client_1.0.77.338.g758ebd78-41_amd64.deb 96717978 BLAKE2B 91a4e8099076e7ccb9f44e67f2ba4ee2899ef6c5c818093a62fafd7e31e84b3bd6f44aa1439d4c0c9b8818be89c6898067ca1694946bf92da19fd92ecde6d2e7 SHA512 c0c08d4f6af8ffef3d9784e176c6112975ce56c7eec961df11821f4ac52785dc090e794c25874fce004da5f3e42979402e921ef12fbe1cfc80f02034448724db
-DIST spotify-client_1.0.79.223.g92622cc2-21_amd64.deb 96544088 BLAKE2B 084d0131911dff2c8913a8160375ae13f6b8c21927e533d88a16506455b6c52545d7cc426ec35bf855561328586e6d08c4b7f9bfc8aefb7ce39399ec0b9ac89e SHA512 0a45594ab920fc963cf78a71d5b77c39648b77eb4437345a5220bce5f7ee760b6a970019b4bc8fba51856c8cbc27ba0c4ee5ac0f514894fa36a68fff5ccbcd4e
+DIST spotify-client_1.0.80.480.g51b03ac3-13_amd64.deb 97542898 BLAKE2B a89f3f607c9fb03327886fc1b6eb8d433b32913aa7ff32e95f626a8ef7710c4d6102721b76e9a83f1342d1ac6f6941d85376b4cb878cf641f42f3c3756582eb9 SHA512 a46b1d28e6c40dbe9a86a38794186f2cdf31341fff953eaa5a5fdbb37c27c00ffe14a918b2552df0996d2842f009e6700bf8683e0667fc671dfd5b343251f20e
 EBUILD spotify-1.0.72.ebuild 3417 BLAKE2B ea84409bbe8dc6eb029fe6ee0393aacb9e8fbc15f018cca4887e4f7c1ff13c6417aa0b750fe0bc08860126a0c53e39e14f2ab8f291deca5536ce5b436b3e58d4 SHA512 a9d1fced3b9ec9518a7e0eab950895c270e77d377211ee68d8a49b673bf1ee77dceb9180e417b8dc5323b82f1a44b44e15b28b287602218bb7bcca86a88ba51b
 EBUILD spotify-1.0.77-r1.ebuild 3643 BLAKE2B e1b1c93e01a3782b45d6b4d6424c0ae109933dbbc1275325db295f493ba513bd4d2c4ff1e06750d9c1417b0300cead228f6f17d2bef27e1eac686ff1cc3e178d SHA512 33caa3cd3b4e9f8e90409ba7f001a6d81320a5825dc51efbcb3e34d67a4e173875a6406feb74cf301a512306e94484f8fa8e2671e39adc38cd9f945b31b0c983
-EBUILD spotify-1.0.79.ebuild 3643 BLAKE2B 8fa1949b9e3deba87697a4b35d3090552f6d43e2cd0765ee44a90db712d0f631c0a9fc4da4c49585aa84c419c965e46dde35f1f28aa0daa293ab08e025eab996 SHA512 ec895f9999e51cffeaf9d0c09731b45e59feb3632c7e53c2fdb4dbc8238481bcb97e76692389efafc6a0e780fdd56e6aea0ac6e1ff031403812faea3b84e9c20
+EBUILD spotify-1.0.80.ebuild 3643 BLAKE2B 6e890c7c44aefb42842f51febc5e357b4df6600e904dbb6a189beba956e511fadd91f0936113dbcfa6f7b7959ea2e02496902a68137c09b2ad643e89697b1505 SHA512 59490d8f948f090c7c101f0f3d489b7955bedca2d19b7c080c038e13c36c2b2c9d823f462033f021dabad3b50f8ef9b461080cf547f7be1ea464381117b65b9a
 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/spotify-1.0.79.ebuild b/media-sound/spotify/spotify-1.0.80.ebuild
index 4d18560b4d83..da910ba96d62 100644
--- a/media-sound/spotify/spotify-1.0.79.ebuild
+++ b/media-sound/spotify/spotify-1.0.80.ebuild
@@ -7,7 +7,7 @@ inherit eutils xdg-utils gnome2-utils pax-utils unpacker
 DESCRIPTION="Spotify is a social music platform"
 HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
 SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="223.g92622cc2-21"
+BUILD_ID_AMD64="480.g51b03ac3-13"
 #BUILD_ID_X86=""
 #SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb )
 #	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )"