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

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

3 files changed, 53 insertions, 17 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/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
 }