summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/media-sound/mpd-0.21.14
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-13 21:54:24 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-13 21:54:24 +0100
commitda491770b9ba5f179e18db461c49cb6f1ccf0e1f (patch)
treed3e34a8bd906741ab18cf69d8d4f732853e26ade /metadata/md5-cache/media-sound/mpd-0.21.14
parentad6182343997a405079870a2fe91c4e0c6b94595 (diff)
parent5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff)
gentoo resync : 28.09.2019
Diffstat (limited to 'metadata/md5-cache/media-sound/mpd-0.21.14')
-rw-r--r--metadata/md5-cache/media-sound/mpd-0.21.144
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.14 b/metadata/md5-cache/media-sound/mpd-0.21.14
index b9f1baae36a5..9413a847e20b 100644
--- a/metadata/md5-cache/media-sound/mpd-0.21.14
+++ b/metadata/md5-cache/media-sound/mpd-0.21.14
@@ -12,5 +12,9 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.14.tar.xz
+<<<<<<< HEAD
_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca linux-info 953c3b1c472dcadbf62098a9301327f2 meson b5ee7a05833ab91225acf30ffdeed006 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+=======
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 linux-info 953c3b1c472dcadbf62098a9301327f2 meson b5ee7a05833ab91225acf30ffdeed006 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+>>>>>>> next
_md5_=78cf4497b4c0efea44997a8d4aee313c