Version bump. Removed old

Package-Manager: portage-2.2.11-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 35 insertions, 97 deletions

diff --git a/media-sound/umurmur/ChangeLog b/media-sound/umurmur/ChangeLog
index c8e3100792cb..37016461f5d5 100644
--- a/media-sound/umurmur/ChangeLog
+++ b/media-sound/umurmur/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/umurmur
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/umurmur/ChangeLog,v 1.17 2014/06/24 19:23:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/umurmur/ChangeLog,v 1.18 2014/08/08 18:26:05 polynomial-c Exp $
+
+*umurmur-0.2.15 (08 Aug 2014)
+
+  08 Aug 2014; Lars Wendler <polynomial-c@gentoo.org> -umurmur-0.2.13.ebuild,
+  -umurmur-0.2.13-r1.ebuild, +umurmur-0.2.15.ebuild:
+  Version bump. Removed old.
 
   24 Jun 2014; Markus Meier <maekke@gentoo.org> umurmur-0.2.14.ebuild:
   add ~arm, bug #512550
diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index ed578a2fb556..ebaa0bbcfdfa 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -5,17 +5,26 @@ AUX umurmur.conf 1637 SHA256 6d34c8915d7d2cbd21cdb9d3ff1f9227c48d458046481c785a2
 AUX umurmurd.confd 64 SHA256 f7738665b9c7799df2b805f8570d4307f40c5fd3c84316e4773215b87fd57f67 SHA512 4af070ab4d8f4a9a2d5b59b8be95cfb49c22faae809843d9c8ede954bdf39f1224bb31cc53e5cf0f771a2033dfe904890345a6031055c9e79fdd315447e54840 WHIRLPOOL 334350adfc793a9b9f7681510b7aeb4c6e76d145bb01437124e76049e256ff8224c2f4edb9e3729e6651f699ae71c838c5ecd47fca9a150941db0c8f7c9fa6ba
 AUX umurmurd.initd 578 SHA256 d2ba06b0bb993dff5be4aa35d9cc30d64ec4a256ddcacf8d7ac38d7449db3f15 SHA512 e8502b2513b011a6905558849387821756f07a6c8129c48188051408a920319317c25cd6bba74180656c48a7cd3de7380636064eb4e7e6094faa55e6a8db8dc6 WHIRLPOOL e716bcfee9fa0d6912646b5b527e1ecbcfe66a7b21d4b18dd4a9ff1c97f8c464bbee487b17cf8e9f239b74dd7cfa15079bc241a30b09a37177375ae884ec670c
 AUX umurmurd.service 363 SHA256 24d268fa74f7cd3523df1827d8ef2d429a2e5d40e8746b97f55ef55728639e8d SHA512 3366dc2b35623daf4704e30bc6207cf795e31cb4c9cd0c7e19f64fa9d92da772fcc309e5799261b6c07c95cfeacd2d9b898ec4a4be7b5acc46efda7a98308913 WHIRLPOOL 5a865c97f0639c8a8392df0df8fb8c0092eb6c028f62fced4eb1f452992abec9543c7b6737faf407997d7eb54d69931946cc7d88409de6f750a45df12ac6b175
-DIST umurmur-0.2.13.tar.gz 167500 SHA256 ac1595fa47ce6bd1e0706dd609293f745d73a59af00a7a04ddc0f9ae243997be SHA512 dc33a49594e85244bed1e58f890cf1bbcc561dc455c889a9d1e143b93613cc9f3dfd2913174159cc25d8bc6ba7a5c182e818612ae5a37501403d64bc3f496ba2 WHIRLPOOL 969175818e36029825238bcca0ed9153028fc9be44fb857b36ea7e287a203ffa175da17786f505239c4df78e3993550c5ff5256388816d774b8a236cbe21c516
 DIST umurmur-0.2.14.tar.gz 178513 SHA256 4398cfc121b754277b96760eb3dd1020b5e5f497eacc16b266ea447eeacf68e9 SHA512 88bf65119cfc7ae818c6ad0734ef2e60600826522d8133699d5f589a93b5d534183761b9aa0239ab9d3d3766b48e64fd0859bf74a280b11078e6c38da76d6835 WHIRLPOOL 0dbba4496dd2a59e1b17b5d5efdd3c751624247768d606b55bd949963a6242ca59f9be14b13216fb1822a7ff123ec92b5d26bf01d154dc66ae9ce10411bec3a1
-EBUILD umurmur-0.2.13-r1.ebuild 2202 SHA256 5a6ca9d7cd56439cb2db11d1b8864e2b5783a36b70d40f77a98f76f99779fdac SHA512 0f792e5019be941db19b0162762a0ae9f23c21eddcc46e15659655e78e66dcfaf2236961a5b0c10ff9368e766d06a790efe739b33d87bebf5a22202500bd2079 WHIRLPOOL a09f30a7ed35c4a32a07a40bc9d72be1f7975713d0d5982a943edbd714d9b23db440b162013b66dac44b2ed1bd3e7e24ae024a01db559e8a05f3198a48d017f2
-EBUILD umurmur-0.2.13.ebuild 2142 SHA256 7be771eb13eac00a1c1e3bb1895be00670a1b5062f347865abe984b6acb91795 SHA512 48ff78e1a11901f378cd170888748abca0241148d37a2e3f31ba56db78377076c614c105e9086101e2d60fa19937d7c7bb7a5dafca3450e3edf4aacc8f11ff06 WHIRLPOOL 93f549e2d5116acca759b90c0196c48578a3db0b7854f4baed82fa9ccade6754f9eec217d4c4e67c54164b51d35e71f57eab4563e0cc086d03fdfe03ffdad7d8
+DIST umurmur-0.2.15.tar.gz 86187 SHA256 edadbda3ee17033d0ed9da1b6550634b6d3fca4226d0113a453b359ad9a88767 SHA512 3cfad4f8f92800cbd0203d765fbcf275de7616ecc2d2f0e8ba23da356d4685cc5fc47176bb20519a87d27dca78a8d0856b774f4cb1a240d1bf1f7bf9aa4111a6 WHIRLPOOL a919c181f0ee231f29f52ad1481847e6e9706c8995c50e93067f4f877d96fc4ffdf3008720c4d4ca747038deda38d455446c283d8f0c82fe8e4158ce2e7aac1f
 EBUILD umurmur-0.2.14.ebuild 2196 SHA256 86a2348aa7c744ba3af9ef80fe2c29d91730e1fcc5dffa297b64979ae6eaa974 SHA512 20b6efff79031716175e07723219b22e05b4ec2d6ab89aee3a002048cfa219a03d4834a51b59c5801c774a0d4ac889e5e5fb5573e11868279e0a826b0e9f93d0 WHIRLPOOL 759b35c203ebb90f6768855221a5206cdf5bf5731ec47c22227f17c9a0339d18b7aa98774e07abe5039c49898984fcd3774d68dd5d316f9bc3552a987eaaec78
-MISC ChangeLog 2467 SHA256 d85ededd363f79362db2a067194aa2422e3c446b932c96adbe30ec0130892eae SHA512 9187522107c1e2424dabf6d7b3e64b2162871607117ef8eae804cdcbd2eb53ce64973c5e38959fc0567fb0a15743ebe84851c0acbb09394d0cf1ce4a243983f2 WHIRLPOOL 389e9b9b6458111c5910b76e66e27c2ab0d50e1ba095f602c13cf65c7b2920b180fd11690cf9ec24b32e5a97b5cc56a0ff0eb1aa970e6d67217f97a125ab8b65
+EBUILD umurmur-0.2.15.ebuild 2313 SHA256 c58083aab65c51eeaebeafb12e5430038a7fa6e28cfb5ad43bb4637863eed59f SHA512 784966b12c53c905d05ca5cb77e5ca28b18f5b184ca5994e0ce3be8ed7e328c404a6e76d2eaa156d37631c8b8d5702c63d2551b951652d67a7a37e21176c1409 WHIRLPOOL acf7198cc88137bd4ef2d02115e5d6a5d4dc6c0fd42bfb6063332b6c08295ad19df12eed9d33b5934b4d27beb36d2b86c422a302c7cdcbcb57df226dfb1a7440
+MISC ChangeLog 2665 SHA256 0481d6a5a3c5c56db3b459298901ba8ddef9d356012e969080ab7884cdbfd4ed SHA512 9979b4f44a45f56512cf9b48dcea0bd3cfd06166e57de49d1d658cda7881e28ee712f282a7f722411cbff32736572159e2deecf411635ff208ef52238a383e44 WHIRLPOOL 51d331a7b551a7d0f6207599697ee4f17198179afffdf4829d0d4cfd1f19f4fcce4e185baed8f0ed32e36036d54effc862228d87a5b2ec9cbd5243f4cdfaa4c3
 MISC metadata.xml 1090 SHA256 14637057ca1f95b6413b36dc9b701ad2119d215c6d597ed46dd0751d0e6cdb4b SHA512 8857792662c9365fad37d625dfed5e94f16667383fcfa6676526b54723f3218d57dd44bf33adcb7cfcc9376f76efadb9343ff613c437139838564b77e7fc34ca WHIRLPOOL 36094750db9e4e3042fcc20c7145e6b82e0c1677f53f922e7c3719524d43f1801b6bdb5264a39b6e7aa3cfee51b443ef5f36b5a737ca7be38c870f03402b1e57
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOp0hMACgkQkKaRLQcq0GK7ggCdHa6ic4M18Hrl238zCwAZjar7
-pdQAn31UbkT0MoUHN1/OUSTQtduDPGhv
-=x/P9
+iQIcBAEBCAAGBQJT5RY+AAoJEPiazRVxLXTF9tEP/3V0fmb0KAcPDdswbnq53LQm
+6XEQGLfNLT1M9XYWMXBynSs14h7uPFlo3o+caYEvh5BRnBhtL3G1R0KnCZ94l8EL
+kIceksV2kcpY+Dks0lZTT/5yDGRNjBls4N4xR01jkMJ8E3A4hxv+NoEe3RzfEybJ
+fimNiBh1w/5aVHMJtSJ3VC6h5h1mu9D/WcNQWWJKl8uCYIG1WafR5ktUSVXFsvva
+inrT+CiXmB0tquNzpDlmlykM1Tbb2bXOeDScMEVG077bBxbGZQqIMS59NEAdhhpa
+gEkaDRV4h6MKpfbtsxgLa91dmg0GjZEnvAZng3N596mBIf4mM+2e2w2kuDXM3nmz
+v4IgZJOgqXa5qS2HXRDzkRFEEZ82gRDngkOXrsk+avldbKIzixwDobQEE2tkXUSi
+jHlJaXc4Amz1MpuEX1Kc/SOuocNdZPPMzKs9Z5g+gYaCPAeWyVNGYQshfUPoZDTO
+WRnkZO77mTCgW6Ac2UL9aZq7yMsSIIkL+8IbQPXL0jntPCF1WRa5QqCsBEUYlNEH
+y2Ood/2aKLnHAkCv+PEr4C2qeE8EciuPBFkEP0wmoa2W7RpnnKc3EfKPSpjsG756
+6rfK7xyfthp0lDdAQgmXBoge7Dz7xPJPV844mF25t3c9vkDfQTmIT1s7c2FrTuVA
+5BPDP0ZCMBZApJ2LcieX
+=S73U
 -----END PGP SIGNATURE-----
diff --git a/media-sound/umurmur/umurmur-0.2.13.ebuild b/media-sound/umurmur/umurmur-0.2.13.ebuild
deleted file mode 100644
index cccd435b6fbd..000000000000
--- a/media-sound/umurmur/umurmur-0.2.13.ebuild
+++ /dev/null
@@ -1,81 +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/umurmur/umurmur-0.2.13.ebuild,v 1.6 2013/12/26 17:14:11 polynomial-c Exp $
-
-EAPI=5
-
-inherit eutils readme.gentoo user
-
-DESCRIPTION="Minimalistic Murmur (Mumble server)"
-HOMEPAGE="http://code.google.com/p/umurmur/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="polarssl"
-
-DEPEND=">=dev-libs/protobuf-c-0.14
-	dev-libs/libconfig
-	polarssl? ( >=net-libs/polarssl-1.0.0 )
-	!polarssl? ( dev-libs/openssl:0 )"
-
-RDEPEND="${DEPEND}"
-
-DOC_CONTENTS="
-	A configuration file has been installed at /etc/umurmur.conf - you may
-	want to review it. See also\n
-	http://code.google.com/p/umurmur/wiki/Configuring02x
-"
-
-pkg_setup() {
-	enewgroup murmur
-	enewuser murmur "" "" "" murmur
-}
-
-src_configure() {
-	local myconf
-
-	# build uses polarssl by default, but instead, make it use openssl
-	# unless polarssl is desired.
-	use !polarssl && myconf="${myconf} --with-ssl=openssl"
-
-	econf ${myconf}
-}
-
-src_install() {
-	local confdir
-
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/umurmurd.initd umurmurd
-	newconfd "${FILESDIR}"/umurmurd.confd umurmurd
-
-	dodoc AUTHORS ChangeLog
-	newdoc README.md README
-
-	confdir="/etc/umurmur"
-	insinto "${confdir}"
-	doins "${FILESDIR}"/umurmur.conf
-
-	# Some permissions are adjusted as the config may contain a server
-	# password, and /etc/umurmur will typically contain the cert and the
-	# key used to sign it, which are read after priveleges are dropped.
-	fperms 0750 "${confdir}"
-	fowners -R root:murmur "${confdir}"
-	fperms 0640 "${confdir}"/umurmur.conf
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if use polarssl ; then
-		elog
-		elog "Because you have enabled PolarSSL support, umurmurd will use a"
-		elog "predefined test-certificate and key if none are configured, which"
-		elog "is insecure. See http://code.google.com/p/umurmur/wiki/Installing02x#Installing_uMurmur_with_PolarSSL_support"
-		elog "for more information on how to create your certificate and key"
-	fi
-}
diff --git a/media-sound/umurmur/umurmur-0.2.13-r1.ebuild b/media-sound/umurmur/umurmur-0.2.15.ebuild
index f29874fc8beb..fe4fd826100a 100644
--- a/media-sound/umurmur/umurmur-0.2.13-r1.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.15.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/umurmur/umurmur-0.2.13-r1.ebuild,v 1.2 2013/12/26 17:14:11 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/umurmur/umurmur-0.2.15.ebuild,v 1.1 2014/08/08 18:26:05 polynomial-c Exp $
 
 EAPI=5
 
-inherit systemd eutils readme.gentoo user
+inherit autotools systemd eutils readme.gentoo user
 
 DESCRIPTION="Minimalistic Murmur (Mumble server)"
-HOMEPAGE="http://code.google.com/p/umurmur/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+HOMEPAGE="http://code.google.com/p/umurmur/ https://github.com/fatbob313/umurmur"
+SRC_URI="https://github.com/fatbob313/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="polarssl"
 
-DEPEND=">=dev-libs/protobuf-c-0.14
+DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
 	dev-libs/libconfig
 	polarssl? ( >=net-libs/polarssl-1.0.0 )
 	!polarssl? ( dev-libs/openssl:0 )"
@@ -33,6 +33,10 @@ pkg_setup() {
 	enewuser murmur "" "" "" murmur
 }
 
+src_prepare() {
+	eautoreconf
+}
+
 src_configure() {
 	local myconf