Re-added polarssl USE flag and have it package.use.mask-ed for now. Should settle the complaints from qa

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

4 files changed, 69 insertions, 27 deletions

diff --git a/media-sound/umurmur/ChangeLog b/media-sound/umurmur/ChangeLog
index 99a4219c8d28..2af221301195 100644
--- a/media-sound/umurmur/ChangeLog
+++ b/media-sound/umurmur/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/umurmur
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/umurmur/ChangeLog,v 1.12 2013/12/25 12:20:31 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/umurmur/ChangeLog,v 1.13 2013/12/26 17:14:11 polynomial-c Exp $
+
+  26 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> umurmur-0.2.13.ebuild,
+  umurmur-0.2.13-r1.ebuild:
+  Re-added polarssl USE flag and have it package.use.mask-ed for now. Should
+  settle the complaints from qa.
 
   25 Dec 2013; Julian Ospald <hasufell@gentoo.org> metadata.xml:
   revert pseudo-QA commit
diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index 41831ed7bb99..73fa652c0989 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -6,18 +6,24 @@ AUX umurmurd.confd 64 SHA256 f7738665b9c7799df2b805f8570d4307f40c5fd3c84316e4773
 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
-EBUILD umurmur-0.2.13-r1.ebuild 1598 SHA256 9711da5914892910a4ab0661a2cba6946589ab932d8f682bfdb343b9cc098281 SHA512 191ea7c36f0e4ddf2f97b71f318103812a40e38f609d02f12c59921b5003151b3e71c6b2cbf9a81bc983e028e450db2054fa008d6b6f60b1beda61948cf7b6d6 WHIRLPOOL e6f480c0d8b97f80bf2706c07858e4c4ce6f4a6aedd1e396032a6802b75963bdbd18aeb160ac468b05333eeed7d9ed315f3ce47054b973e9893cecbb888a4ba0
-EBUILD umurmur-0.2.13.ebuild 1535 SHA256 20ff1632c538dff36ad1f141ee2212a16790a70f9fd23a657bcd574c2dba894c SHA512 2b2c3cbae0b0233bcc4ff7c068dc2297226f56da2539bda9b58e0f7336ecdde75c42f0c43272338b9b8e330096335d80eb2d7ea7e61354f2360a84fe617241b2 WHIRLPOOL 5badc98a97c5fe73a342f34f18255d1d60c95fd97bd1e7c19e628343916661f13b5fd9e72587526f22fdb35f5d05e3e65a2b5646f38d3ed689bd835ad555ff28
-MISC ChangeLog 1826 SHA256 2c8d7537cae71378636a9d1d12cc77c5a1e56adf058512212b43cbb16695c28d SHA512 c4b67a61eede5958a309da8abcfeb99bb137b83e6c223410b58a77addf397600152b5d05ff681e11614d10d53cb2fd169a26109a7feb5e5ab65dc05629073b95 WHIRLPOOL b333f41f20f6cce4700c2eb0dec63f6c987f80995a174ee347734eb1c163b2e3800ab74009451dbd9f2aeb70286be4a0c55b49d320b41157d7b7372175897a7a
+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
+MISC ChangeLog 2046 SHA256 db8eac340892aa03fc265faa77a45006e5345b3d9cb835b12cfca977b2bdef4e SHA512 328c034276023e7bdacf20fd88f693fc7ebd14f96d23277381aa709cc8bdf1d99d9e283160759839fb80afab168e932f800a1afb7bbb8e0ddca6df711e9c6555 WHIRLPOOL 8a3e74c1dc95468bfb66f342f154a11b10afcb490971abc31495c907a0c0bf6677568eaf200682fadc7f6200b73d20d0d663278e0cad058873e8ecc786c4a84d
 MISC metadata.xml 1090 SHA256 14637057ca1f95b6413b36dc9b701ad2119d215c6d597ed46dd0751d0e6cdb4b SHA512 8857792662c9365fad37d625dfed5e94f16667383fcfa6676526b54723f3218d57dd44bf33adcb7cfcc9376f76efadb9343ff613c437139838564b77e7fc34ca WHIRLPOOL 36094750db9e4e3042fcc20c7145e6b82e0c1677f53f922e7c3719524d43f1801b6bdb5264a39b6e7aa3cfee51b443ef5f36b5a737ca7be38c870f03402b1e57
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSus2TAAoJEFpvPKfnPDWzn94IAJ+9Kq7BlbWDzUGLU+hjoB9Y
-46+EcnzevkQwI3sEG/Tq0ChurMZJl4Ma6fpkngq8v+AM2cf3cYu9B52LyNUrNbzZ
-CtqqlVztybOyxA1p9ESFdd7v74Qb55HtoCQJklliXGln6xCH7pf/rPDdQgCp4hMm
-su4psVEx/9y6HsRWMGmSPGsLrOdpWqNpvEf7xOH2oygkQAtfDiBo67BtUBzgV6b2
-LA3NNtki/5mSyRUbax2VQybJVXgG1nFJNLh1fpfuGkbxL9K+20dwZ4wN1JVIbwEu
-Ufsvl1J6EpP8XA/p1uu9+ieIx7MGK6nMk9FpdwMSPqUFXzhBiLe8C/kpQRI2cqA=
-=moVa
+iQIcBAEBCAAGBQJSvGPkAAoJEPiazRVxLXTFdBEP/0Uj9MUeOZhK0L4H8noNifw+
+moI2ox/hoKbM8lJe/NJ57kBYdzms+xH0hMKuTjmI7rPPmQiymA2Ub0GrvWThy5Hb
+RYnsMPA97rn6LTxetDoGlnTFmt2EigB1IPeviZK5Y7Xxe/PoxlUf4FCvJQchSdSJ
+IjJCj3JORjhSfgbJ3ExZasw3GFDT3I2FOImwpdcJDYf2WbmzuQX75f/KS8O4nogp
+CPxP5Z0tSipU1A55GdpXbD4w0bVxqwt9x0YAxoXhV8/Pk5SIKthjrLF/+U2x5Sny
+84G7c1QSFRt7ibnHzuxCGtkDYer1qJ5voy+eV20Gt5G+qvTIq9riSZVy84a0ZHcX
+RX94OyTOz12Rzaq/XcV0JL5FSkHz1F9kZ6FNR7tq9DlUwcywA/LZQtuYcy5szu1e
+G17WO2Q7F+mSQSG70VAEAt/p104kjLchgCtkLwijJXQ0h08GrmoTag2ZudG9sNi6
+lF9E9URkiFZvjUoAnhRW2faJ2eMsd6QwBmrmtsfalQ6GCD0nh4Wn37s420SFAWYW
+S+U7vFTQ+INREjVqrnO8XFYgScXdZ1ID01jqCnPSTErCPp+qqmUEALd3VMPuu6uR
+fRgSRQSPfq3oGqSBVtX90pVQ52V4m/iKQoRA0mIT/Mw3Z24kU0EuTJdXsM+bUEhD
+aVd2TPa/MbzO8wSzDMgK
+=NxOD
 -----END PGP SIGNATURE-----
diff --git a/media-sound/umurmur/umurmur-0.2.13-r1.ebuild b/media-sound/umurmur/umurmur-0.2.13-r1.ebuild
index 560c453cb5f2..f29874fc8beb 100644
--- a/media-sound/umurmur/umurmur-0.2.13-r1.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.13-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2013/12/23 12:11:50 hasufell Exp $
+# $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 $
 
 EAPI=5
 
@@ -13,11 +13,12 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="polarssl"
 
 DEPEND=">=dev-libs/protobuf-c-0.14
 	dev-libs/libconfig
-	dev-libs/openssl:0"
+	polarssl? ( >=net-libs/polarssl-1.0.0 )
+	!polarssl? ( dev-libs/openssl:0 )"
 
 RDEPEND="${DEPEND}"
 
@@ -33,7 +34,13 @@ pkg_setup() {
 }
 
 src_configure() {
-	econf --with-ssl=openssl
+	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() {
@@ -64,4 +71,12 @@ src_install() {
 
 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.ebuild b/media-sound/umurmur/umurmur-0.2.13.ebuild
index ab58c17cb05f..cccd435b6fbd 100644
--- a/media-sound/umurmur/umurmur-0.2.13.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.13.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2013/11/22 15:11:55 hasufell Exp $
+# $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
 
@@ -13,11 +13,12 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
+IUSE="polarssl"
 
 DEPEND=">=dev-libs/protobuf-c-0.14
 	dev-libs/libconfig
-	dev-libs/openssl:0"
+	polarssl? ( >=net-libs/polarssl-1.0.0 )
+	!polarssl? ( dev-libs/openssl:0 )"
 
 RDEPEND="${DEPEND}"
 
@@ -33,10 +34,18 @@ pkg_setup() {
 }
 
 src_configure() {
-	econf --with-ssl=openssl
+	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
@@ -45,21 +54,28 @@ src_install() {
 	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.
-	local confdir="/etc/umurmur"
-	dodir ${confdir}
-	fperms 0750 ${confdir}
-	fowners root:murmur ${confdir}
-
-	insinto ${confdir}
-	doins "${FILESDIR}"/umurmur.conf
-	fperms 0640 ${confdir}/umurmur.conf
+	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
 }