gentoo resync : 10.11.2019

3 files changed, 0 insertions, 27 deletions

diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index 0a2247347658..54cfe8d0a119 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -1,9 +1,7 @@
 AUX murmur.confd 172 BLAKE2B 1f25ce417f1b9f504ea59d4e5216774f8eb2b00450577a1d137f645fbbd69f0991b510c35bad81ac739c868ce128f4de0c6b4e4095edcd977d3822fac622524c SHA512 4a05e2a640abf3f7a74c63b47ab87774718ad4e86f985c5308a2ba3167d816abedd9c35b07b8572f7789309ba91fa37bc0c1938493cc8d78844ecdeed7bd4171
 AUX murmur.initd-r1 506 BLAKE2B fd483f5f1c43f1778a909c725abee43b7299251e70e3f4e365804e7da94f674035dbb953167f2143c2d00dfbb4e23d5ed3d378c8aa2acbafbae8e7cf93fab263 SHA512 e1178a42c10f4a62f9b937e977b9e13059cae501851a377aea221ae2bd2bf031a1574e1f29f6df1b0ee08406a6a88fae8fbffd8acd0546f9ff6b27189ef55653
 AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a3004e8ce22b3cc5f3854f46aa2a89629931a0e8cdc826e2d4e1096e837aed41148d8ef87afd485676 SHA512 09bbc2f364e038dc81e55adb86210f4cdc178bd2dba770e373f6c411b2c21d08218fd9784fff0ba133b7e18c84ddc3b2ac86d9d67a99a3169d3be42bd7fe2863
-AUX murmurd-dbus.service 297 BLAKE2B 30ca5427de360cacab404cfff42d8e2355f14def67156039ceff85cbdf77a89cde03f6c096eba0b9d0cce52283f039ea222298e3aa9a8eead7fb8b638ee5aa8c SHA512 e81031efa7cc2736748d5a5fdd001e28cf81430cf25f9f83b9aa8b94714dc787842e76c17c00e3b7a26192d8b4932f1e14bfdde207ee89680f2a696d4f9990a6
 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
-AUX murmurd-no-dbus.service 222 BLAKE2B 11fc296fd5d5445347f077ff9d4aaea3364176dff9c28d06b6b2d0b4a8d0ff8ccd559c68a0fadddbc8363349d9c599c9ebd6da8e0055a680b18aa282e72875a5 SHA512 d58c04dde0286b07a494c99fff8b94cdf1c47f6fcacbb5552445b7e19421f2a9862186e7309886590bc33ae3c64c0c840a9a93c55b35ca600b7a8f9ec53dbab2
 DIST mumble-1.3.0-rc2.tar.gz 8759830 BLAKE2B 4df1001a174d042221a674a21dcdb7165742cba2428f778eb6ef7fcfe8128734f4207230222971fa97622af3ea81e40b676cc089e45704be3fecf76f97f72a36 SHA512 b31a92cbe9d2d973cb06e5f3bb237de22f0fa5f242e6a8141ffaa735268ca41097bda44445a73ea5dafef6ef3ff7a5050c52c7f9b9f5600d400e57aff6f2e4c4
 DIST mumble-1.3.0.tar.gz 8788587 BLAKE2B cb870b043506eaa0fb15a21c95c125eb49082dde55b9c1a49e3ffff318477b27b45d75d18d3db83e247446efaddb2253ff520ec19da04b465a7e9a33b22064d1 SHA512 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122
 EBUILD murmur-1.3.0.ebuild 3554 BLAKE2B 2df9caa9ae5efbb02bc80eb2f9d109943597a1c6fe1cf532f9f6cb3d9c4c2ef3bfd3f9140f37f92a47983037bc88ac05833a6c64cfbcda89f1d9bebb3d559ff1 SHA512 35e5ced14798cdd79fdea77dd4065d19f6c221e5ceed262a26caca1acb83e3587a162750204eb0b1503063dd13277e871c2fb296e627f81154ff8e8db938ee95
diff --git a/media-sound/murmur/files/murmurd-dbus.service b/media-sound/murmur/files/murmurd-dbus.service
deleted file mode 100644
index 46fe5327d4ac..000000000000
--- a/media-sound/murmur/files/murmurd-dbus.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Murmurd - VoIP Server (for Mumble)
-After=network.target mysql.service
-
-[Service]
-User=murmur
-Group=murmur
-Type=dbus
-BusName=net.sourceforge.mumble.murmur
-PIDFile=/run/murmur/murmur.pid
-ExecStart=/usr/bin/murmurd -ini /etc/murmur/murmur.ini
-
-[Install]
-WantedBy=multi-user.target
diff --git a/media-sound/murmur/files/murmurd-no-dbus.service b/media-sound/murmur/files/murmurd-no-dbus.service
deleted file mode 100644
index 8631de20aaa4..000000000000
--- a/media-sound/murmur/files/murmurd-no-dbus.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Murmurd - VoIP Server (for Mumble)
-After=network.target mysql.service
-
-[Service]
-User=murmur
-Group=murmur
-ExecStart=/usr/bin/murmurd -fg -ini /etc/murmur/murmur.ini
-
-[Install]
-WantedBy=multi-user.target