Remove old.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 5270BA51)

7 files changed, 7 insertions, 456 deletions

diff --git a/media-sound/murmur/ChangeLog b/media-sound/murmur/ChangeLog
index c9aa9c2f670b..67af4aab9ba6 100644
--- a/media-sound/murmur/ChangeLog
+++ b/media-sound/murmur/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/murmur
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.50 2013/11/17 23:40:26 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.51 2013/11/17 23:50:12 tgurr Exp $
+
+  17 Nov 2013; Timo Gurr <tgurr@gentoo.org> -murmur-1.2.3-r4.ebuild,
+  -murmur-1.2.4.ebuild, -files/mumble-1.2.3-fix-cert-validation.patch,
+  -files/murmur-1.2.3-ice-3.4.2-compat.patch,
+  -files/mumble-1.2.3-remove-certs.patch, -files/murmur.initd:
+  Remove old.
 
   17 Nov 2013; Timo Gurr <tgurr@gentoo.org> murmur-1.2.4-r2.ebuild,
   +files/murmur-1.2.4-ice-3.5.1-compat.patch:
diff --git a/media-sound/murmur/files/mumble-1.2.3-fix-cert-validation.patch b/media-sound/murmur/files/mumble-1.2.3-fix-cert-validation.patch
deleted file mode 100644
index 2cfd9d6f9c8d..000000000000
--- a/media-sound/murmur/files/mumble-1.2.3-fix-cert-validation.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d16876d804d028153f37f4f8aff770469edf6997 Mon Sep 17 00:00:00 2001
-From: Benjamin Jemlich <pcgod@users.sourceforge.net>
-Date: Sun, 19 Feb 2012 08:55:06 +0100
-Subject: [PATCH] Fix certificate validation with QT 4.8
-
-Changed from setDefaultCaCertificates to addDefaultCaCertificates because
-Murmur adds CA certificates in sslCert before calling MumbleSSL::addSystemCA.
-
-Original patch written by Marc Deslauriers <marc.deslauriers@canonical.com>
----
- src/SSL.cpp |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/src/SSL.cpp b/src/SSL.cpp
-index f94d528..2ba3d27 100644
---- a/src/SSL.cpp
-+++ b/src/SSL.cpp
-@@ -142,4 +142,9 @@ void MumbleSSL::addSystemCA() {
- 	}
- 	QSslSocket::setDefaultCaCertificates(ql);
- #endif // NO_SYSTEM_CA_OVERRIDE
-+
-+#if QT_VERSION >= 0x040800
-+	// Don't perform on-demand loading of root certificates
-+	QSslSocket::addDefaultCaCertificates(QSslSocket::systemCaCertificates());
-+#endif
- }
--- 
-1.7.5.4
-
diff --git a/media-sound/murmur/files/mumble-1.2.3-remove-certs.patch b/media-sound/murmur/files/mumble-1.2.3-remove-certs.patch
deleted file mode 100644
index 9cc9eb49dcd5..000000000000
--- a/media-sound/murmur/files/mumble-1.2.3-remove-certs.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 2d9d78ad68535b94e2eddf66b97183662ae67bef Mon Sep 17 00:00:00 2001
-From: Benjamin Jemlich <pcgod@users.sourceforge.net>
-Date: Sat, 18 Feb 2012 10:41:22 +0100
-Subject: [PATCH] Remove hardcoded CA certificates
-
----
- src/SSL.cpp |  119 -----------------------------------------------------------
- 1 files changed, 0 insertions(+), 119 deletions(-)
-
-diff --git a/src/SSL.cpp b/src/SSL.cpp
-index ab9f0c8..f94d528 100644
---- a/src/SSL.cpp
-+++ b/src/SSL.cpp
-@@ -34,117 +34,6 @@
- 
- #include "Version.h"
- 
--/* CAs we recommend to end users, so support these */
--
--static const char *recommended_cas[] = {
--	/* StartSSL */
--	"-----BEGIN CERTIFICATE-----\n"
--	"MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW\n"
--	"MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg\n"
--	"Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh\n"
--	"dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9\n"
--	"MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi\n"
--	"U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh\n"
--	"cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA\n"
--	"A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk\n"
--	"pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf\n"
--	"OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C\n"
--	"Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT\n"
--	"Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi\n"
--	"HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM\n"
--	"Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w\n"
--	"+2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+\n"
--	"Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3\n"
--	"Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B\n"
--	"26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID\n"
--	"AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE\n"
--	"FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j\n"
--	"ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js\n"
--	"LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM\n"
--	"BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0\n"
--	"Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy\n"
--	"dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh\n"
--	"cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh\n"
--	"YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg\n"
--	"dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp\n"
--	"bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ\n"
--	"YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT\n"
--	"TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ\n"
--	"9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8\n"
--	"jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW\n"
--	"FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz\n"
--	"ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1\n"
--	"ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L\n"
--	"EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu\n"
--	"L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq\n"
--	"yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC\n"
--	"O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V\n"
--	"um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh\n"
--	"NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14=\n"
--	"-----END CERTIFICATE-----\n"
--	,
--	/* Comodo */
--	"-----BEGIN CERTIFICATE-----\n"
--	"MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb\n"
--	"MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow\n"
--	"GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj\n"
--	"YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL\n"
--	"MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE\n"
--	"BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM\n"
--	"GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP\n"
--	"ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua\n"
--	"BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe\n"
--	"3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4\n"
--	"YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR\n"
--	"rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm\n"
--	"ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU\n"
--	"oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF\n"
--	"MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v\n"
--	"QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t\n"
--	"b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF\n"
--	"AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q\n"
--	"GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz\n"
--	"Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2\n"
--	"G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi\n"
--	"l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3\n"
--	"smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==\n"
--	"-----END CERTIFICATE-----\n"
--	,
--	/* Comodo UserTrust */
--	"-----BEGIN CERTIFICATE-----\n"
--	"MIIE3TCCA8WgAwIBAgIQcZL75hlfrE0ShXRxNKIYpzANBgkqhkiG9w0BAQUFADB7\n"
--	"MQswCQYDVQQGEwJHQjEbMBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYD\n"
--	"VQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UE\n"
--	"AwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4\n"
--	"MTIzMTIzNTk1OVowga4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UE\n"
--	"BxMOU2FsdCBMYWtlIENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29y\n"
--	"azEhMB8GA1UECxMYaHR0cDovL3d3dy51c2VydHJ1c3QuY29tMTYwNAYDVQQDEy1V\n"
--	"VE4tVVNFUkZpcnN0LUNsaWVudCBBdXRoZW50aWNhdGlvbiBhbmQgRW1haWwwggEi\n"
--	"MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyOYWk8n2rQTtiRjeuzcFgdbw5\n"
--	"ZflKGkeiucxIzGqY1U01GbmkQuXOSeKKLx580jEHx060g2SdLinVomTEhb2FUTV5\n"
--	"pE5okHsceqSSqBfymBXyk8zJpDKVuwxPML2YoAuL5W4bokb6eLyib6tZXqUvz8ra\n"
--	"baov66yhs2qqty5nNYt54R5piOLmRs2gpeq+C852OnoOm+r82idbPXMfIuZIYcZM\n"
--	"82mxqC4bttQxICy8goqOpA6l14lD/BZarx1x1xFZ2rqHDa/68+HC8KTFZ4zW1lQ6\n"
--	"3gqkugN3s2XI/R7TdGKqGMpokx6hhX71R2XL+E1XKHTSNP8wtu72YjAUjCzrAgMB\n"
--	"AAGjggEnMIIBIzAfBgNVHSMEGDAWgBSgEQojPpbxB+zirynvgqV/0DCktDAdBgNV\n"
--	"HQ4EFgQUiYJnfcSdJnAAS7RQSHzePa4Ebn0wDgYDVR0PAQH/BAQDAgEGMA8GA1Ud\n"
--	"EwEB/wQFMAMBAf8wHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMBEGA1Ud\n"
--	"IAQKMAgwBgYEVR0gADB7BgNVHR8EdDByMDigNqA0hjJodHRwOi8vY3JsLmNvbW9k\n"
--	"b2NhLmNvbS9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDA2oDSgMoYwaHR0cDov\n"
--	"L2NybC5jb21vZG8ubmV0L0FBQUNlcnRpZmljYXRlU2VydmljZXMuY3JsMBEGCWCG\n"
--	"SAGG+EIBAQQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAnZXLPLh+pQnEHr8Lwsd2\n"
--	"jjk8lMYQqk8MyeCrhF2JVOBlO/NtHHw3LCVUX5Yh/DeEkZ0V3BRPgc9UHWtsRWDH\n"
--	"LfmXUUz5Zso8oIKMpsjw4unUSvnsP1bJ3XaMw4IBT2wA8x4aYXQERwOpxkBXkbxl\n"
--	"IsUnZ09X22Ra2Y0fuoYv9AaunGnt6fTPKRfY4EqfGiAvl0xRu0YHxIo3TiDjCTFo\n"
--	"x57Ei53ofhG8MmgQlhGYRNgqUWBNiOt0Ot9DBjLIOVaMOhFS00GkQwP07e8zJ9s5\n"
--	"4BROJsnY9TniibiTXbcpJkHqs5uug/x3dcroyrX+4mVKYz5ExNDDXodzqZgcr38V\n"
--	"fw==\n"
--	"-----END CERTIFICATE-----\n"
--
--
--};
--
--
- void MumbleSSL::addSystemCA() {
- #if QT_VERSION < 0x040700 && !defined(NO_SYSTEM_CA_OVERRIDE)
- #if defined(Q_OS_WIN)
-@@ -253,12 +142,4 @@ void MumbleSSL::addSystemCA() {
- 	}
- 	QSslSocket::setDefaultCaCertificates(ql);
- #endif // NO_SYSTEM_CA_OVERRIDE
--
--	for (unsigned int i=0;i<sizeof(recommended_cas)/sizeof(recommended_cas[0]);++i) {
--		QSslCertificate cert(recommended_cas[i]);
--		if (! QSslSocket::defaultCaCertificates().contains(cert)) {
--			qWarning("SSL: Adding recommended CA %s", qPrintable(cert.subjectInfo(QSslCertificate::CommonName)));
--			QSslSocket::addDefaultCaCertificates(QList<QSslCertificate>() << cert);
--		}
--	}
- }
--- 
-1.7.5.4
-
diff --git a/media-sound/murmur/files/murmur-1.2.3-ice-3.4.2-compat.patch b/media-sound/murmur/files/murmur-1.2.3-ice-3.4.2-compat.patch
deleted file mode 100644
index 430ae74d9c1b..000000000000
--- a/media-sound/murmur/files/murmur-1.2.3-ice-3.4.2-compat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mumble-1.2.3/src/murmur/murmur.pro
-+++ mumble-1.2.3/src/murmur/murmur.pro
-@@ -69,7 +69,7 @@
- 	win32 {
- 		slice.commands = slice2cpp --checksum -I\"$$ICE_PATH/slice\" Murmur.ice
- 	} else {
--		slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ Murmur.ice
-+		slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.2/slice/ -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ Murmur.ice
- 	}
- 
- 	slice.depends = Murmur.ice
diff --git a/media-sound/murmur/files/murmur.initd b/media-sound/murmur/files/murmur.initd
deleted file mode 100644
index 25f8aebad019..000000000000
--- a/media-sound/murmur/files/murmur.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-
-pidfile="/var/run/murmur/murmur.pid"
-command="/usr/bin/murmurd"
-command_args="-ini \"${MURMUR_CONF}\""
-start_stop_daemon_args="-u \"${MURMUR_USER}\" --env HOME=\"${MURMUR_HOME}\" --wait 20"
-extra_started_commands="reload"
-
-depend() {
-	need localmount net
-	use dbus logger
-	after bootmisc mysql
-}
-
-start_pre() {
-	checkpath -d -o ${MURMUR_USER} ${pidfile%/*}
-}
-
-reload() {
-	ebegin "Reloading Murmur"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}" \
-		--exec ${command}
-	eend $?
-}
-
diff --git a/media-sound/murmur/murmur-1.2.3-r4.ebuild b/media-sound/murmur/murmur-1.2.3-r4.ebuild
deleted file mode 100644
index 4c63ec8f573a..000000000000
--- a/media-sound/murmur/murmur-1.2.3-r4.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.2.3-r4.ebuild,v 1.2 2013/03/02 21:58:23 hwoarang Exp $
-
-EAPI="4"
-
-inherit eutils qt4-r2 user
-
-MY_P="${PN/murmur/mumble}-${PV/_/~}"
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="http://mumble.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mumble/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 x86"
-IUSE="+dbus debug +ice pch zeroconf"
-
-RDEPEND=">=dev-libs/openssl-1.0.0b
-	>=dev-libs/protobuf-2.2.0
-	sys-apps/lsb-release
-	>=sys-libs/libcap-2.15
-	dev-qt/qtcore:4[ssl]
-	|| ( dev-qt/qtsql:4[sqlite] dev-qt/qtsql:4[mysql] )
-	dev-qt/qtxmlpatterns:4
-	dbus? ( dev-qt/qtdbus:4 )
-	ice? ( dev-libs/Ice )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.3-ice-3.4.2-compat.patch
-	"${FILESDIR}"/mumble-1.2.3-remove-certs.patch
-	"${FILESDIR}"/mumble-1.2.3-fix-cert-validation.patch
-)
-
-pkg_setup() {
-	enewgroup murmur
-	enewuser murmur -1 -1 /var/lib/murmur murmur
-}
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	sed -i -e 's:mumble-server:murmur:g' \
-		"${S}"/scripts/murmur.{conf,ini.system} || die
-}
-
-src_configure() {
-	local conf_add
-
-	use dbus || conf_add="${conf_add} no-dbus"
-	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
-	use ice || conf_add="${conf_add} no-ice"
-	use pch || conf_add="${conf_add} no-pch"
-	use zeroconf || conf_add="${conf_add} no-bonjour"
-
-	eqmake4 main.pro -recursive \
-		CONFIG+="${conf_add} no-client"
-}
-
-src_compile() {
-	# parallel make workaround, upstream bug #3190498
-	emake -j1
-}
-
-src_install() {
-	dodoc README CHANGES
-
-	docinto scripts
-	dodoc scripts/*.php scripts/*.pl
-
-	local dir
-	if use debug; then
-		dir=debug
-	else
-		dir=release
-	fi
-
-	dobin "${dir}"/murmurd
-
-	insinto /etc/murmur/
-	newins scripts/murmur.ini.system murmur.ini
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/murmur.logrotate murmur
-
-	insinto /etc/dbus-1/system.d/
-	doins scripts/murmur.conf
-
-	insinto /usr/share/murmur/
-	doins src/murmur/Murmur.ice
-
-	newinitd "${FILESDIR}"/murmur.initd murmur
-	newconfd "${FILESDIR}"/murmur.confd murmur
-
-	keepdir /var/lib/murmur /var/run/murmur /var/log/murmur
-	fowners -R murmur /var/lib/murmur /var/run/murmur /var/log/murmur
-	fperms 750 /var/lib/murmur /var/run/murmur /var/log/murmur
-
-	doman man/murmurd.1
-}
-
-pkg_postinst() {
-	echo
-	elog "Useful scripts are located in /usr/share/doc/${PF}/scripts."
-	elog "Please execute:"
-	elog "murmurd -ini /etc/murmur/murmur.ini -supw <pw>"
-	elog "chown murmur:murmur /var/lib/murmur/murmur.sqlite"
-	elog "to set the build-in 'SuperUser' password before starting murmur."
-	elog "Please restart dbus before starting murmur, or else dbus"
-	elog "registration will fail."
-	echo
-}
diff --git a/media-sound/murmur/murmur-1.2.4.ebuild b/media-sound/murmur/murmur-1.2.4.ebuild
deleted file mode 100644
index 6236cfac773e..000000000000
--- a/media-sound/murmur/murmur-1.2.4.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.2.4.ebuild,v 1.3 2013/07/13 06:51:30 ago Exp $
-
-EAPI="5"
-
-QT_MINIMAL="4.6"
-
-inherit eutils qt4-r2 user
-
-MY_P="${PN/murmur/mumble}-${PV/_/~}"
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="http://mumble.sourceforge.net/"
-SRC_URI="http://mumble.info/snapshot/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 x86"
-IUSE="+dbus debug +ice pch zeroconf"
-
-RDEPEND=">=dev-libs/openssl-1.0.0b
-	>=dev-libs/protobuf-2.2.0
-	sys-apps/lsb-release
-	>=sys-libs/libcap-2.15
-	dev-qt/qtcore:4[ssl]
-	|| ( dev-qt/qtsql:4[sqlite] dev-qt/qtsql:4[mysql] )
-	dev-qt/qtxmlpatterns:4
-	dbus? ( dev-qt/qtdbus:4 )
-	ice? ( dev-libs/Ice )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.4-ice-3.5.0-compat.patch
-)
-
-pkg_setup() {
-	enewgroup murmur
-	enewuser murmur -1 -1 /var/lib/murmur murmur
-}
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	sed \
-		-e 's:mumble-server:murmur:g' \
-		-e 's:/var/run:/run:g' \
-		-i "${S}"/scripts/murmur.{conf,ini.system} || die
-}
-
-src_configure() {
-	local conf_add
-
-	use dbus || conf_add="${conf_add} no-dbus"
-	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
-	use ice || conf_add="${conf_add} no-ice"
-	use pch || conf_add="${conf_add} no-pch"
-	use zeroconf || conf_add="${conf_add} no-bonjour"
-
-	eqmake4 main.pro -recursive \
-		CONFIG+="${conf_add} no-client"
-}
-
-src_compile() {
-	# parallel make workaround, upstream bug #3190498
-	emake -j1
-}
-
-src_install() {
-	dodoc README CHANGES
-
-	docinto scripts
-	dodoc scripts/*.php scripts/*.pl
-
-	local dir
-	if use debug; then
-		dir=debug
-	else
-		dir=release
-	fi
-
-	dobin "${dir}"/murmurd
-
-	insinto /etc/murmur/
-	newins scripts/murmur.ini.system murmur.ini
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/murmur.logrotate murmur
-
-	insinto /etc/dbus-1/system.d/
-	doins scripts/murmur.conf
-
-	insinto /usr/share/murmur/
-	doins src/murmur/Murmur.ice
-
-	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
-	newconfd "${FILESDIR}"/murmur.confd murmur
-
-	keepdir /var/lib/murmur /var/log/murmur
-	fowners -R murmur /var/lib/murmur /var/log/murmur
-	fperms 750 /var/lib/murmur /var/log/murmur
-
-	doman man/murmurd.1
-}
-
-pkg_postinst() {
-	echo
-	elog "Useful scripts are located in /usr/share/doc/${PF}/scripts."
-	elog "Please execute:"
-	elog "murmurd -ini /etc/murmur/murmur.ini -supw <pw>"
-	elog "chown murmur:murmur /var/lib/murmur/murmur.sqlite"
-	elog "to set the build-in 'SuperUser' password before starting murmur."
-	elog "Please restart dbus before starting murmur, or else dbus"
-	elog "registration will fail."
-	echo
-}