media-sound/umurmur: Revbumps to remove polarssl support (bug #618358).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

1 files changed, 7 insertions, 17 deletions

diff --git a/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild b/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
index b8464e0867d2..348df9a213b0 100644
--- a/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
@@ -11,17 +11,16 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gnutls libressl polarssl shm"
+KEYWORDS="amd64 ~arm x86"
+IUSE="gnutls libressl shm"
 
-# ssl-provider precendence: polarssl, gnutls, libressl
+# ssl-provider precendence: gnutls, libressl
 # and openssl if none specified
 DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
 	dev-libs/libconfig
-	polarssl? ( >=net-libs/polarssl-1.0.0 )
-	gnutls? ( !polarssl? ( >=net-libs/gnutls-3.0.0 ) )
-	libressl? ( !polarssl? ( !gnutls? ( dev-libs/libressl ) ) )
-	!gnutls? ( !polarssl? ( !libressl? ( dev-libs/openssl:0 ) ) )"
+	gnutls? ( >=net-libs/gnutls-3.0.0 )
+	libressl? ( !gnutls? ( dev-libs/libressl ) )
+	!gnutls? ( !libressl? ( dev-libs/openssl:0 ) )"
 
 RDEPEND="${DEPEND}"
 
@@ -32,7 +31,6 @@ DOC_CONTENTS="
 
 pkg_pretend() {
 	local ssl_provider=(  )
-	use polarssl && ssl_provider+=( polarssl )
 	use gnutls && ssl_provider+=( gnutls )
 	use libressl && ssl_provider+=( libressl )
 
@@ -56,7 +54,7 @@ src_configure() {
 	local myconf
 
 	econf \
-		--with-ssl=$(usev polarssl || usev gnutls || echo openssl) \
+		--with-ssl=$(usev gnutls || echo openssl) \
 		$(use_enable shm shmapi)
 }
 
@@ -88,12 +86,4 @@ 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 https://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
 }