From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 199941396D9 for ; Sat, 4 Nov 2017 20:31:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31DDAE0EA8; Sat, 4 Nov 2017 20:31:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 03A18E0EA8 for ; Sat, 4 Nov 2017 20:31:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 754FD341731 for ; Sat, 4 Nov 2017 20:31:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 385A09501 for ; Sat, 4 Nov 2017 20:31:20 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1509827472.76c5a69340c4ed448a16724fa070a60b07aad874.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/rtmpdump/metadata.xml media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild media-video/rtmpdump/rtmpdump-9999.ebuild X-VCS-Directories: media-video/rtmpdump/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 76c5a69340c4ed448a16724fa070a60b07aad874 X-VCS-Branch: master Date: Sat, 4 Nov 2017 20:31:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b845fe0c-e1f8-4ad7-82b0-bed21c07240c X-Archives-Hash: 698e078ee4be86ed1e76bfc1ae5902ea commit: 76c5a69340c4ed448a16724fa070a60b07aad874 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Nov 4 20:30:32 2017 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Nov 4 20:31:12 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76c5a693 media-video/rtmpdump: Drop polarssl support Closes: https://github.com/gentoo/gentoo/pull/4895 Closes: https://bugs.gentoo.org/618360 Package-Manager: Portage-2.3.13, Repoman-2.3.4 media-video/rtmpdump/metadata.xml | 1 - media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild | 11 ++++------- media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild | 11 ++++------- media-video/rtmpdump/rtmpdump-9999.ebuild | 11 ++++------- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/media-video/rtmpdump/metadata.xml b/media-video/rtmpdump/metadata.xml index 1abcb135fb3..724b1cb49d6 100644 --- a/media-video/rtmpdump/metadata.xml +++ b/media-video/rtmpdump/metadata.xml @@ -7,6 +7,5 @@ Use GnuTLS library instead of the default OpenSSL - Use PolarSSL library instead of the default OpenSSL diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild index 13ae3a45a58..5ab69865de6 100644 --- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild +++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild @@ -13,19 +13,18 @@ SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="gnutls polarssl ssl libressl" +IUSE="gnutls ssl libressl" DEPEND="ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] ) - polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) ) - !gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) ) + !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" RDEPEND="${DEPEND}" pkg_setup() { - if ! use ssl && { use gnutls || use polarssl; }; then - ewarn "USE='gnutls polarssl' are ignored without USE='ssl'." + if ! use ssl && use gnutls ; then + ewarn "USE='gnutls' is ignored without USE='ssl'." ewarn "Please review the local USE flags for this package." fi } @@ -54,8 +53,6 @@ multilib_src_compile() { if use ssl ; then if use gnutls ; then crypto="GNUTLS" - elif use polarssl ; then - crypto="POLARSSL" else crypto="OPENSSL" fi diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild index 89a24d3c787..eec4bbc9a07 100644 --- a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild +++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild @@ -13,19 +13,18 @@ SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="gnutls polarssl ssl libressl" +IUSE="gnutls ssl libressl" DEPEND="ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] ) - polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) ) - !gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) ) + !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" RDEPEND="${DEPEND}" pkg_setup() { - if ! use ssl && { use gnutls || use polarssl; }; then - ewarn "USE='gnutls polarssl' are ignored without USE='ssl'." + if ! use ssl && use gnutls ; then + ewarn "USE='gnutls' is ignored without USE='ssl'." ewarn "Please review the local USE flags for this package." fi } @@ -54,8 +53,6 @@ multilib_src_compile() { if use ssl ; then if use gnutls ; then crypto="GNUTLS" - elif use polarssl ; then - crypto="POLARSSL" else crypto="OPENSSL" fi diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild index 4d69e6e3a3c..ccd765a7d62 100644 --- a/media-video/rtmpdump/rtmpdump-9999.ebuild +++ b/media-video/rtmpdump/rtmpdump-9999.ebuild @@ -13,19 +13,18 @@ EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git" LICENSE="GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="" -IUSE="gnutls polarssl ssl libressl" +IUSE="gnutls ssl libressl" DEPEND="ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] ) - polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) ) - !gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) ) + !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" RDEPEND="${DEPEND}" pkg_setup() { - if ! use ssl && { use gnutls || use polarssl; }; then - ewarn "USE='gnutls polarssl' are ignored without USE='ssl'." + if ! use ssl && use gnutls ; then + ewarn "USE='gnutls' is ignored without USE='ssl'." ewarn "Please review the local USE flags for this package." fi } @@ -48,8 +47,6 @@ multilib_src_compile() { if use ssl ; then if use gnutls ; then crypto="GNUTLS" - elif use polarssl ; then - crypto="POLARSSL" else crypto="OPENSSL" fi