gentoo resync : 13.10.2019

3 files changed, 16 insertions, 10 deletions

diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 02f1edf022b9..dddab00fb4e1 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -2,11 +2,7 @@ AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20
 AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732
 AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57e4614727d7425e9323836db997a6876ae4b8266182f34cbb72199f8db5ef8aed79f5beb4fb5ea483 SHA512 ad67bee1e614b2901e977e0a7a9bfea7ec9bdf3af9546664f42c1d1426eb5e7990028546390219912e724eeca8ad063a2ac39a048be281527b19b0a79e819961
 DIST mpd-0.21.14.tar.xz 673036 BLAKE2B 73eed90c0d48e26d747e26b0cd000d3e0a12dfebb015f865fe9d3ddbe5f7fa564b1655b7e0639951e9aeb2554185063b11d6bc818813ca6366688ea05705ba4a SHA512 d5ce06741444d545c7334f4c4ab32dbfacaa264df5a1ac61b73d951e0a6f952c8ea1e4df1b5bfc827e7faa35a6b8026e78cbf3a057ee35adf448fa7204389cd9
-<<<<<<< HEAD
-EBUILD mpd-0.21.14.ebuild 8127 BLAKE2B b1b725c5704f4b7ae9eabd50ab31543f1f0893c2377a9eb62acb97109bdac197a898de0597dbc13778932d22a769f613890f1bd3e5b49e55312dd81779f1c8f9 SHA512 61c95152724bcc672d0dbc8597b83802928edefb74bbd6cfaf74735d06683cded78fac33a7bec08de1b5d23e3f8ea6e213e223d2a634e2f67e09d575391ad3cf
-=======
 DIST mpd-0.21.15.tar.xz 673056 BLAKE2B e399c0439e790ac62525b33c5d2d26b47d36687edc877169934dd5379646d1d38ed7fec75532498a4c0f6e51e355e872847873045ae2446d037cce8781be3067 SHA512 c67ebdb7609b36b4b8504ce0751ca2dcc38a2fba03a5b8419185e8be64bce7e19560347a600773b65f55ba0a3cedeff051117071db8e7fe0a90c9771de8bd37e
-EBUILD mpd-0.21.14.ebuild 8127 BLAKE2B b1b725c5704f4b7ae9eabd50ab31543f1f0893c2377a9eb62acb97109bdac197a898de0597dbc13778932d22a769f613890f1bd3e5b49e55312dd81779f1c8f9 SHA512 61c95152724bcc672d0dbc8597b83802928edefb74bbd6cfaf74735d06683cded78fac33a7bec08de1b5d23e3f8ea6e213e223d2a634e2f67e09d575391ad3cf
-EBUILD mpd-0.21.15.ebuild 8130 BLAKE2B 1ec6da3cd0207ab701ef1571cc2a3ec1711302104eb480b456f0c507c1819f2be28b8e8c6c9913afdc4181bae4b3d25970aab94ab51711aa6f9f865f72e4cd62 SHA512 6ec92a3c7f9d0676d733c3b14fe2c936aacce2dc585f3b6d078170964664add5a2f94ac53a978c6db417cf32791f5af7bf91c4291fe1597c98db3bca1c908c62
->>>>>>> next
+EBUILD mpd-0.21.14.ebuild 8191 BLAKE2B 9851cb110f9059babe6e5095f87a79a769871f755c78439b01fbde57a0c8fde354a1318e0d2da9b0ec1df3c4964ed3b23eede05cd17d1727380ffeba282911c0 SHA512 2ac00aa81d9d3ae49f65ec77d73d798d7d3170823039ab50e2c5735c7e454b8fcc9647cb5e37afc8a900ce3a456aca2536b0e861a2f9587f78c430696b8aa0cc
+EBUILD mpd-0.21.15.ebuild 8194 BLAKE2B 312fddb816b472d5851c34249d10f78bb03f0b22d622f1c6719acf46de05767b6b36671ccfab8e93c8402004ecf439f6d3ad5cd0b9ed00298f9d765fba9956cc SHA512 b2c2fe8011db9aae9721e9314d5888fb5a7d3b10503f0f8a53b2f44d4af10a7ca4cfa4ae8d7fa05600094f0600fc2de204ceb2540ba7935e16315d9f716480c8
 MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/mpd-0.21.14.ebuild b/media-sound/mpd/mpd-0.21.14.ebuild
index c886ec4ed037..603f91529c25 100644
--- a/media-sound/mpd/mpd-0.21.14.ebuild
+++ b/media-sound/mpd/mpd-0.21.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic linux-info meson systemd user
+inherit flag-o-matic linux-info meson systemd user xdg-utils
 
 DESCRIPTION="The Music Player Daemon (mpd)"
 HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sh x86 ~x64-macos"
 IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
@@ -291,4 +291,9 @@ src_install() {
 pkg_postinst() {
 	# also change the homedir if the user has existed before
 	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
 }
diff --git a/media-sound/mpd/mpd-0.21.15.ebuild b/media-sound/mpd/mpd-0.21.15.ebuild
index 984310bc5363..a5cdc87afb48 100644
--- a/media-sound/mpd/mpd-0.21.15.ebuild
+++ b/media-sound/mpd/mpd-0.21.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic linux-info meson systemd user
+inherit flag-o-matic linux-info meson systemd user xdg-utils
 
 DESCRIPTION="The Music Player Daemon (mpd)"
 HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x64-macos"
 IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
@@ -291,4 +291,9 @@ src_install() {
 pkg_postinst() {
 	# also change the homedir if the user has existed before
 	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
 }