[gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2020-06-10 13:11 Craig Andrews
  0 siblings, 0 replies; 43+ messages in thread
From: Craig Andrews @ 2020-06-10 13:11 UTC (permalink / raw
  To: gentoo-commits

commit:     b8d1ccba79828e40ab4a38cd6cad8dc120f55028
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 10 13:10:21 2020 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Wed Jun 10 13:10:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8d1ccba

media-video/rtmpdump: add static-libs USE flag

Closes: https://bugs.gentoo.org/727796
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild | 6 ++++--
 media-video/rtmpdump/rtmpdump-9999.ebuild             | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
index 5f6a9cd3cb0..09a4ebf6598 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
 # the library is LGPL-2.1, the command is GPL-2
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="gnutls ssl libressl"
+IUSE="gnutls ssl static-libs libressl"
 
 DEPEND="ssl? (
 		gnutls? (
@@ -98,4 +98,6 @@ multilib_src_install() {
 	fi
 	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir='$(prefix)/share/man' \
 		CRYPTO="${crypto}" install
+	find "${D}" -name '*.la' -delete || die
+	use static-libs || find "${D}" -name '*.a' -delete || die
 }

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index aef12b6aa94..df14880ddc1 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
 # the library is LGPL-2.1, the command is GPL-2
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="gnutls ssl libressl"
+IUSE="gnutls ssl static-libs libressl"
 
 DEPEND="ssl? (
 		gnutls? (
@@ -98,4 +98,6 @@ multilib_src_install() {
 	fi
 	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir='$(prefix)/share/man' \
 		CRYPTO="${crypto}" install
+	find "${D}" -name '*.la' -delete || die
+	use static-libs || find "${D}" -name '*.a' -delete || die
 }


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2024-03-15 16:24 Craig Andrews
  0 siblings, 0 replies; 43+ messages in thread
From: Craig Andrews @ 2024-03-15 16:24 UTC (permalink / raw
  To: gentoo-commits

commit:     690454fe2f8d3ca80b413154a518c7abf52390d1
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 15 16:23:59 2024 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Fri Mar 15 16:24:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=690454fe

media-video/rtmpdump: remove patch applied upstream

See: https://git.ffmpeg.org/gitweb/rtmpdump.git/commit/ee5456b5374c12f66e47f56b4e83e9557c62ebfe

Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 media-video/rtmpdump/rtmpdump-9999.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index 8e564b4e273a..1cd90598896a 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -58,7 +58,6 @@ src_prepare() {
 		-e 's:OPT:OPTS:' \
 		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
 		|| die "failed to fix Makefile"
-	use ssl && use !gnutls && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
 	default
 	multilib_copy_sources
 }


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2022-05-13 12:19 WANG Xuerui
  0 siblings, 0 replies; 43+ messages in thread
From: WANG Xuerui @ 2022-05-13 12:19 UTC (permalink / raw
  To: gentoo-commits

commit:     38bdd41eb201ee33b92a372949954950a26ef204
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 11:32:47 2022 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Fri May 13 12:18:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38bdd41e

media-video/rtmpdump: keyword 2.4_p20210219 for ~loong

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild
index 58193c77d1ee..8632f208c91f 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild
@@ -35,7 +35,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/f1b83c10d8beb43fcc70a6e88cf4325499f25857.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-f1b83c1"
 fi


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2022-05-13 12:19 WANG Xuerui
  0 siblings, 0 replies; 43+ messages in thread
From: WANG Xuerui @ 2022-05-13 12:19 UTC (permalink / raw
  To: gentoo-commits

commit:     22edf57b7b25acddafd5208ab02d60417cbb0b1b
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 11:32:51 2022 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Fri May 13 12:18:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22edf57b

media-video/rtmpdump: forward ~loong

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 media-video/rtmpdump/rtmpdump-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index edd05e9dc2dd..8e564b4e273a 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -34,7 +34,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/f1b83c10d8beb43fcc70a6e88cf4325499f25857.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-f1b83c1"
 fi


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2021-07-01 11:02 Marek Szuba
  0 siblings, 0 replies; 43+ messages in thread
From: Marek Szuba @ 2021-07-01 11:02 UTC (permalink / raw
  To: gentoo-commits

commit:     d8cb46c5a94004ee5f5142185463c1c7aab251e2
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  1 10:57:12 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Jul  1 11:02:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8cb46c5

media-video/rtmpdump: keyword 2.4_p20190330 for ~riscv

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild | 2 +-
 media-video/rtmpdump/rtmpdump-9999.ebuild          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild
index 839b25613c0..77b53638292 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild
@@ -33,7 +33,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="http://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/c5f04a58fc2aeea6296ca7c44ee4734c18401aa3.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-c5f04a5"
 fi

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index fcab996e0c0..77b53638292 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -18,7 +18,7 @@ DEPEND="ssl? (
 			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
 			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
 		)
-		!gnutls? (  dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		!gnutls? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
@@ -33,7 +33,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="http://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/c5f04a58fc2aeea6296ca7c44ee4734c18401aa3.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-c5f04a5"
 fi
@@ -57,7 +57,7 @@ src_prepare() {
 		-e 's:OPT:OPTS:' \
 		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
 		|| die "failed to fix Makefile"
-	use ssl && use !gnutls  && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
+	use ssl && use !gnutls && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
 	default
 	multilib_copy_sources
 }


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2021-05-03 17:09 Mikle Kolyada
  0 siblings, 0 replies; 43+ messages in thread
From: Mikle Kolyada @ 2021-05-03 17:09 UTC (permalink / raw
  To: gentoo-commits

commit:     aec7c06085e2e9e4171d0c8ec67880df2f6be3d1
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon May  3 17:04:56 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon May  3 17:09:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec7c060

media-video/rtmpdump: remove libressl leftovers

Thanks to Juippis for heads up

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 media-video/rtmpdump/rtmpdump-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index aa36f44a08c..fcab996e0c0 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -57,7 +57,7 @@ src_prepare() {
 		-e 's:OPT:OPTS:' \
 		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
 		|| die "failed to fix Makefile"
-	use ssl && use !gnutls && use !libressl && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
+	use ssl && use !gnutls  && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
 	default
 	multilib_copy_sources
 }


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2021-05-03  9:32 Mikle Kolyada
  0 siblings, 0 replies; 43+ messages in thread
From: Mikle Kolyada @ 2021-05-03  9:32 UTC (permalink / raw
  To: gentoo-commits

commit:     706f72721fadd5f6ae8a7e158d56146decca61fe
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon May  3 09:31:54 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon May  3 09:31:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=706f7272

media-video/rtmpdump: remove blank line

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 media-video/rtmpdump/rtmpdump-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index 8e1443f8b83..aa36f44a08c 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -13,7 +13,6 @@ LICENSE="LGPL-2.1 tools? ( GPL-2 )"
 SLOT="0"
 IUSE="gnutls ssl static-libs +tools"
 
-
 DEPEND="ssl? (
 		gnutls? (
 			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2021-05-03  9:31 Mikle Kolyada
  0 siblings, 0 replies; 43+ messages in thread
From: Mikle Kolyada @ 2021-05-03  9:31 UTC (permalink / raw
  To: gentoo-commits

commit:     6bbce6f9596f93c4ea32fc5d1e03c6c15c0a1069
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon May  3 09:30:40 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon May  3 09:30:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bbce6f9

media-video/rtmpdump: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild |  9 ++++-----
 media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild    | 15 ++++-----------
 media-video/rtmpdump/rtmpdump-9999.ebuild             | 12 +++---------
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
index a3b8a59caac..fb6e6d60d9f 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
 # the library is LGPL-2.1, the command is GPL-2
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="gnutls ssl static-libs libressl"
+IUSE="gnutls ssl static-libs"
 
 DEPEND="ssl? (
 		gnutls? (
@@ -19,8 +19,7 @@ DEPEND="ssl? (
 			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
 		)
 		!gnutls? (
-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 		)
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
@@ -67,7 +66,7 @@ src_prepare() {
 		-e 's:OPT:OPTS:' \
 		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
 		|| die "failed to fix Makefile"
-	use ssl && use !gnutls && use !libressl && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
+	use ssl && use !gnutls && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
 	default
 	multilib_copy_sources
 }

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild
index c5698f9c7a3..839b25613c0 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,17 +11,14 @@ HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
 # the library is LGPL-2.1, the command is GPL-2
 LICENSE="LGPL-2.1 tools? ( GPL-2 )"
 SLOT="0"
-IUSE="gnutls ssl static-libs +tools libressl"
-
-REQUIRED_USE="?? ( gnutls libressl )"
+IUSE="gnutls ssl static-libs +tools"
 
 DEPEND="ssl? (
 		gnutls? (
 			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
 			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
 		)
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-		!gnutls? ( !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) )
+		!gnutls? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
@@ -47,10 +44,6 @@ pkg_setup() {
 			ewarn "USE='gnutls' is ignored without USE='ssl'."
 			ewarn "Please review the local USE flags for this package."
 		fi
-		if use libressl; then
-			ewarn "USE='libressl' is ignored without USE='ssl'."
-			ewarn "Please review the local USE flags for this package."
-		fi
 	fi
 }
 
@@ -64,7 +57,7 @@ src_prepare() {
 		-e 's:OPT:OPTS:' \
 		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
 		|| die "failed to fix Makefile"
-	use ssl && use !gnutls && use !libressl && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
+	use ssl && use !gnutls && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
 	default
 	multilib_copy_sources
 }

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index c5698f9c7a3..8e1443f8b83 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,17 +11,15 @@ HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
 # the library is LGPL-2.1, the command is GPL-2
 LICENSE="LGPL-2.1 tools? ( GPL-2 )"
 SLOT="0"
-IUSE="gnutls ssl static-libs +tools libressl"
+IUSE="gnutls ssl static-libs +tools"
 
-REQUIRED_USE="?? ( gnutls libressl )"
 
 DEPEND="ssl? (
 		gnutls? (
 			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
 			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
 		)
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-		!gnutls? ( !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) )
+		!gnutls? (  dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
@@ -47,10 +45,6 @@ pkg_setup() {
 			ewarn "USE='gnutls' is ignored without USE='ssl'."
 			ewarn "Please review the local USE flags for this package."
 		fi
-		if use libressl; then
-			ewarn "USE='libressl' is ignored without USE='ssl'."
-			ewarn "Please review the local USE flags for this package."
-		fi
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2021-05-01 18:24 Sam James
  0 siblings, 0 replies; 43+ messages in thread
From: Sam James @ 2021-05-01 18:24 UTC (permalink / raw
  To: gentoo-commits

commit:     3cb6588e99e018ff3b6b45a899bb22eb012583f7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May  1 18:19:53 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May  1 18:24:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cb6588e

media-video/rtmpdump: drop redundant USE=libressl in metadata.xml

It was/is a global USE flag anyway and these
didn't add anything.

Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.3
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/rtmpdump/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-video/rtmpdump/metadata.xml b/media-video/rtmpdump/metadata.xml
index 77d74434352..0aab57cd9ea 100644
--- a/media-video/rtmpdump/metadata.xml
+++ b/media-video/rtmpdump/metadata.xml
@@ -14,7 +14,6 @@
     <use>
        <flag name="ssl">Enable Cryptographic features</flag>
        <flag name="gnutls">Use GnuTLS instead of OpenSSL for Cryptography</flag>
-       <flag name="libressl">Use LibreSSL instead of OpenSSL for Cryptography</flag>
        <flag name="tools">Enable installation of various binary tools in addition to librtmp library</flag>
     </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2020-08-13 20:50 Craig Andrews
  0 siblings, 0 replies; 43+ messages in thread
From: Craig Andrews @ 2020-08-13 20:50 UTC (permalink / raw
  To: gentoo-commits

commit:     70fedb745cb43cbcf5b14b23da7ffe046333ca43
Author:     Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru>
AuthorDate: Mon Aug  3 15:20:54 2020 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 20:50:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70fedb74

media-video/rtmpdump: Updated, added USE flags to build lib only Updated to the latest patch Minor ebuild files improvements Added use flags descriptions to metadata.xml

Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru>
Closes: https://github.com/gentoo/gentoo/pull/16975
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 media-video/rtmpdump/Manifest                      |  1 +
 media-video/rtmpdump/metadata.xml                  |  7 ++++
 ...p-9999.ebuild => rtmpdump-2.4_p20190330.ebuild} | 47 ++++++++++------------
 media-video/rtmpdump/rtmpdump-9999.ebuild          | 47 ++++++++++------------
 4 files changed, 50 insertions(+), 52 deletions(-)

diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index 9a19ee5b2cb..544f56a9396 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -1 +1,2 @@
 DIST rtmpdump-2.4_p20161210.tar.gz 142837 BLAKE2B 412a7c3b21738db643042e51e03b11e115ae1d68214e644374e8c10f3b2ab3f659ce1af884135d0e89f2e0ba44ebdf41937bc0f02d875c463ca711d9ae95698c SHA512 76617f02c13d7e8e3a7cf2734c6174e56fb321a881c9e4869bf6393786b193e0c01a8c530ecbf0679cc888c523af5712f2dcb2031fbd09729b7ddeebc3a4b133
+DIST rtmpdump-2.4_p20190330.tar.gz 143037 BLAKE2B ab0edbca444fc71034a1c6386f304d8f49f92075f6d4ca87992a7b9c4b4058f84333011e86cf38470f7b1dbf5e69f27e8b1fe34267104191c447342a03c18e3c SHA512 5357d01b51d3ec8c3c584c4e5aa9720a4c04b86573bc6cb7d724d660937b04b6dd35338b17721d6521fde2627e83763ed3b7c010f959bd72573016f3c47480b0

diff --git a/media-video/rtmpdump/metadata.xml b/media-video/rtmpdump/metadata.xml
index b36893c1b2a..77d74434352 100644
--- a/media-video/rtmpdump/metadata.xml
+++ b/media-video/rtmpdump/metadata.xml
@@ -9,5 +9,12 @@
     rtmpdump is a toolkit for RTMP streams.
     All forms of RTMP are supported, including
     rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://.
+    Includes librtmp library.
   </longdescription>
+    <use>
+       <flag name="ssl">Enable Cryptographic features</flag>
+       <flag name="gnutls">Use GnuTLS instead of OpenSSL for Cryptography</flag>
+       <flag name="libressl">Use LibreSSL instead of OpenSSL for Cryptography</flag>
+       <flag name="tools">Enable installation of various binary tools in addition to librtmp library</flag>
+    </use>
 </pkgmetadata>

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild
similarity index 66%
copy from media-video/rtmpdump/rtmpdump-9999.ebuild
copy to media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild
index 4e6b50ef0fc..c5698f9c7a3 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild
@@ -5,23 +5,23 @@ EAPI="7"
 
 inherit multilib toolchain-funcs multilib-minimal flag-o-matic
 
-DESCRIPTION="RTMP client intended to stream audio or video flash content"
+DESCRIPTION="RTMP client, librtmp library intended to stream audio or video flash content"
 HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
 
 # the library is LGPL-2.1, the command is GPL-2
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="LGPL-2.1 tools? ( GPL-2 )"
 SLOT="0"
-IUSE="gnutls ssl static-libs libressl"
+IUSE="gnutls ssl static-libs +tools libressl"
+
+REQUIRED_USE="?? ( gnutls libressl )"
 
 DEPEND="ssl? (
 		gnutls? (
 			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
 			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
 		)
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-		)
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+		!gnutls? ( !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) )
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
@@ -37,23 +37,20 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+	SRC_URI="http://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/c5f04a58fc2aeea6296ca7c44ee4734c18401aa3.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-c5f04a5"
 fi
 
 pkg_setup() {
-	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
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]] ; then
-		git-r3_src_unpack
-	else
-		mkdir -p "${S}" || die "Can't create source directory"
-		cd "${S}" || die
-		unpack ${A}
+	if ! use ssl; then
+		if use gnutls; then
+			ewarn "USE='gnutls' is ignored without USE='ssl'."
+			ewarn "Please review the local USE flags for this package."
+		fi
+		if use libressl; then
+			ewarn "USE='libressl' is ignored without USE='ssl'."
+			ewarn "Please review the local USE flags for this package."
+		fi
 	fi
 }
 
@@ -80,9 +77,7 @@ multilib_src_compile() {
 			crypto="OPENSSL"
 		fi
 	fi
-	#fix multilib-script support. Bug #327449
-	sed -i "/^libdir/s:lib$:$(get_libdir):" librtmp/Makefile || die
-	if ! multilib_is_native_abi; then
+	if ! multilib_is_native_abi || ! use tools ; then
 		cd librtmp || die
 	fi
 	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
@@ -91,13 +86,13 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	mkdir -p "${ED}"/usr/$(get_libdir) || die
-	if multilib_is_native_abi; then
+	if multilib_is_native_abi && use tools ; then
 		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
 	else
 		cd librtmp || die
 	fi
 	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir='$(prefix)/share/man' \
-		CRYPTO="${crypto}" install
+		CRYPTO="${crypto}" libdir="${EPREFIX}/usr/$(get_libdir)" install
 	find "${D}" -name '*.la' -delete || die
 	use static-libs || find "${D}" -name '*.a' -delete || die
 }

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index 4e6b50ef0fc..c5698f9c7a3 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -5,23 +5,23 @@ EAPI="7"
 
 inherit multilib toolchain-funcs multilib-minimal flag-o-matic
 
-DESCRIPTION="RTMP client intended to stream audio or video flash content"
+DESCRIPTION="RTMP client, librtmp library intended to stream audio or video flash content"
 HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
 
 # the library is LGPL-2.1, the command is GPL-2
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="LGPL-2.1 tools? ( GPL-2 )"
 SLOT="0"
-IUSE="gnutls ssl static-libs libressl"
+IUSE="gnutls ssl static-libs +tools libressl"
+
+REQUIRED_USE="?? ( gnutls libressl )"
 
 DEPEND="ssl? (
 		gnutls? (
 			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
 			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
 		)
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-		)
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+		!gnutls? ( !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) )
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
@@ -37,23 +37,20 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+	SRC_URI="http://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/c5f04a58fc2aeea6296ca7c44ee4734c18401aa3.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-c5f04a5"
 fi
 
 pkg_setup() {
-	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
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]] ; then
-		git-r3_src_unpack
-	else
-		mkdir -p "${S}" || die "Can't create source directory"
-		cd "${S}" || die
-		unpack ${A}
+	if ! use ssl; then
+		if use gnutls; then
+			ewarn "USE='gnutls' is ignored without USE='ssl'."
+			ewarn "Please review the local USE flags for this package."
+		fi
+		if use libressl; then
+			ewarn "USE='libressl' is ignored without USE='ssl'."
+			ewarn "Please review the local USE flags for this package."
+		fi
 	fi
 }
 
@@ -80,9 +77,7 @@ multilib_src_compile() {
 			crypto="OPENSSL"
 		fi
 	fi
-	#fix multilib-script support. Bug #327449
-	sed -i "/^libdir/s:lib$:$(get_libdir):" librtmp/Makefile || die
-	if ! multilib_is_native_abi; then
+	if ! multilib_is_native_abi || ! use tools ; then
 		cd librtmp || die
 	fi
 	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
@@ -91,13 +86,13 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	mkdir -p "${ED}"/usr/$(get_libdir) || die
-	if multilib_is_native_abi; then
+	if multilib_is_native_abi && use tools ; then
 		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
 	else
 		cd librtmp || die
 	fi
 	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir='$(prefix)/share/man' \
-		CRYPTO="${crypto}" install
+		CRYPTO="${crypto}" libdir="${EPREFIX}/usr/$(get_libdir)" install
 	find "${D}" -name '*.la' -delete || die
 	use static-libs || find "${D}" -name '*.a' -delete || die
 }


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2020-06-23 15:22 Craig Andrews
  0 siblings, 0 replies; 43+ messages in thread
From: Craig Andrews @ 2020-06-23 15:22 UTC (permalink / raw
  To: gentoo-commits

commit:     696930fe2d511bab765019d8a22178143b5b3c69
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 23 15:18:41 2020 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Tue Jun 23 15:21:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=696930fe

media-video/rtmpdump: Don't call ar directly

Closes: https://bugs.gentoo.org/721028
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild | 2 +-
 media-video/rtmpdump/rtmpdump-9999.ebuild             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
index 09a4ebf6598..a3b8a59caac 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
@@ -85,7 +85,7 @@ multilib_src_compile() {
 	if ! multilib_is_native_abi; then
 		cd librtmp || die
 	fi
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
 		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
 }
 

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index df14880ddc1..4e6b50ef0fc 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -85,7 +85,7 @@ multilib_src_compile() {
 	if ! multilib_is_native_abi; then
 		cd librtmp || die
 	fi
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
 		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
 }
 


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2019-10-10 20:30 Andreas Sturmlechner
  0 siblings, 0 replies; 43+ messages in thread
From: Andreas Sturmlechner @ 2019-10-10 20:30 UTC (permalink / raw
  To: gentoo-commits

commit:     692868f01a08c708ea688200c6b47293cf416fef
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 10 20:29:28 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 10 20:29:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=692868f0

media-video/rtmpdump: Drop duplicate KEYWORDS line

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild | 1 -
 media-video/rtmpdump/rtmpdump-9999.ebuild             | 1 -
 2 files changed, 2 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
index 2bf9f5d0cef..33cd1378379 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
@@ -32,7 +32,6 @@ PATCHES=(
 )
 
 if [[ ${PV} == *9999 ]] ; then
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 	SRC_URI=""
 	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 	inherit git-r3

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index d4e9a79c5e1..43679f994c5 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -32,7 +32,6 @@ PATCHES=(
 )
 
 if [[ ${PV} == *9999 ]] ; then
-	KEYWORDS=""
 	SRC_URI=""
 	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 	inherit git-r3


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2019-07-22 14:43 Craig Andrews
  0 siblings, 0 replies; 43+ messages in thread
From: Craig Andrews @ 2019-07-22 14:43 UTC (permalink / raw
  To: gentoo-commits

commit:     9f9307bfe64af9aecb5ce42e32e1b7b44c999d20
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 14:42:34 2019 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Mon Jul 22 14:43:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f9307bf

media-video/rtmpdump: directly depend on dev-libs/nettle:0=

Closes: https://bugs.gentoo.org/690422
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild | 7 +++++--
 media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild | 7 +++++--
 media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild | 5 ++++-
 media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild    | 7 +++++--
 media-video/rtmpdump/rtmpdump-9999.ebuild             | 5 ++++-
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
index ba1b98b2b9e..baadc800af8 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,10 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
 IUSE="gnutls ssl libressl"
 
 DEPEND="ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
+		gnutls? (
+			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+		)
 		!gnutls? (
 			!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
 			libressl? ( dev-libs/libressl )

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild
index 8a45c29d0d0..6c6bbb4ef98 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,10 @@ SLOT="0"
 IUSE="gnutls ssl libressl"
 
 DEPEND="ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
+		gnutls? (
+			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+		)
 		!gnutls? (
 			!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
 			libressl? ( dev-libs/libressl )

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
index 597b6842efc..2bf9f5d0cef 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
@@ -14,7 +14,10 @@ SLOT="0"
 IUSE="gnutls ssl libressl"
 
 DEPEND="ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
+		gnutls? (
+			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+		)
 		!gnutls? (
 			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
 			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
index bb95a41dd31..d7c99b0d7dc 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,10 @@ KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64
 IUSE="gnutls ssl libressl"
 
 DEPEND="ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
+		gnutls? (
+			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+		)
 		!gnutls? (
 			!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
 			libressl? ( dev-libs/libressl )

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index 42acf5134f9..d4e9a79c5e1 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -14,7 +14,10 @@ SLOT="0"
 IUSE="gnutls ssl libressl"
 
 DEPEND="ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
+		gnutls? (
+			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+		)
 		!gnutls? (
 			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
 			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2019-05-15 15:27 Mikle Kolyada
  0 siblings, 0 replies; 43+ messages in thread
From: Mikle Kolyada @ 2019-05-15 15:27 UTC (permalink / raw
  To: gentoo-commits

commit:     41c53c39fdc9115ea477694e997d9a89f3916a39
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 15:26:50 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed May 15 15:26:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41c53c39

media-video/rtmpdump: arm stable wrt bug #684614

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="arm"

 media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
index 374af6708cb..597b6842efc 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
@@ -29,12 +29,12 @@ PATCHES=(
 )
 
 if [[ ${PV} == *9999 ]] ; then
-	KEYWORDS="amd64 arm64 ppc ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 	SRC_URI=""
 	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64 ~arm arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 fi
 


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2019-05-13  0:38 Thomas Deutschmann
  0 siblings, 0 replies; 43+ messages in thread
From: Thomas Deutschmann @ 2019-05-13  0:38 UTC (permalink / raw
  To: gentoo-commits

commit:     f1ca7cbf5ae43a9ea78e6c5d61642240084e6e4e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 00:26:45 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon May 13 00:37:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1ca7cbf

media-video/rtmpdump: x86 stable (bug #684614)

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
index 4b64ffb70ec..374af6708cb 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
@@ -29,12 +29,12 @@ PATCHES=(
 )
 
 if [[ ${PV} == *9999 ]] ; then
-	KEYWORDS="amd64 arm64 ppc ppc64"
+	KEYWORDS="amd64 arm64 ppc ppc64 x86"
 	SRC_URI=""
 	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64 ~arm arm64 hppa ~mips ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 fi
 


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2019-05-06 17:13 Sergei Trofimovich
  0 siblings, 0 replies; 43+ messages in thread
From: Sergei Trofimovich @ 2019-05-06 17:13 UTC (permalink / raw
  To: gentoo-commits

commit:     2712d9f08a2eb1f18aaee31539ed21e0071f708f
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Mon May  6 16:33:38 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon May  6 17:13:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2712d9f0

media-video/rtmpdump: stable 2.4_p20161210-r3 for hppa, bug #684614

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
index 90f06ea321a..4b64ffb70ec 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
@@ -34,7 +34,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 hppa ~mips ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 fi
 


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2019-05-03 15:28 Aaron Bauman
  0 siblings, 0 replies; 43+ messages in thread
From: Aaron Bauman @ 2019-05-03 15:28 UTC (permalink / raw
  To: gentoo-commits

commit:     dc6ef8fddada3d7e598dc45c1309af93ae0212ab
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Fri May  3 15:21:02 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri May  3 15:27:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc6ef8fd

media-video/rtmpdump: arm64 stable (bug #684614)

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
index 1df829d3bf5..90f06ea321a 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
@@ -29,12 +29,12 @@ PATCHES=(
 )
 
 if [[ ${PV} == *9999 ]] ; then
-	KEYWORDS="amd64 ppc ppc64"
+	KEYWORDS="amd64 arm64 ppc ppc64"
 	SRC_URI=""
 	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 fi
 


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2019-04-30  9:59 Mikle Kolyada
  0 siblings, 0 replies; 43+ messages in thread
From: Mikle Kolyada @ 2019-04-30  9:59 UTC (permalink / raw
  To: gentoo-commits

commit:     10eea7027f9221577ab239ab2a692ca0bcbe55c1
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 30 09:59:33 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 09:59:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10eea702

media-video/rtmpdump: amd64 stable wrt bug #684614

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
index 5b605c5e830..1df829d3bf5 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
@@ -29,12 +29,12 @@ PATCHES=(
 )
 
 if [[ ${PV} == *9999 ]] ; then
-	KEYWORDS="ppc ppc64"
+	KEYWORDS="amd64 ppc ppc64"
 	SRC_URI=""
 	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 fi
 


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2019-04-29 20:11 Sergei Trofimovich
  0 siblings, 0 replies; 43+ messages in thread
From: Sergei Trofimovich @ 2019-04-29 20:11 UTC (permalink / raw
  To: gentoo-commits

commit:     49746d0b8dbba58b881796ba74d6e12598efb243
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 20:10:42 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 20:10:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49746d0b

media-video/rtmpdump: stable 2.4_p20161210-r3 for ppc64, bug #684614

Package-Manager: Portage-2.3.65, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
index 36fa7d61f84..5b605c5e830 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
@@ -29,12 +29,12 @@ PATCHES=(
 )
 
 if [[ ${PV} == *9999 ]] ; then
-	KEYWORDS="ppc"
+	KEYWORDS="ppc ppc64"
 	SRC_URI=""
 	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 fi
 


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2019-04-29 20:09 Sergei Trofimovich
  0 siblings, 0 replies; 43+ messages in thread
From: Sergei Trofimovich @ 2019-04-29 20:09 UTC (permalink / raw
  To: gentoo-commits

commit:     8f1089eacbc34d9c46516697c176b03261990a75
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 20:09:04 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 20:09:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f1089ea

media-video/rtmpdump: stable 2.4_p20161210-r3 for ppc, bug #684614

Package-Manager: Portage-2.3.65, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
index 42acf5134f9..36fa7d61f84 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
@@ -29,12 +29,12 @@ PATCHES=(
 )
 
 if [[ ${PV} == *9999 ]] ; then
-	KEYWORDS=""
+	KEYWORDS="ppc"
 	SRC_URI=""
 	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 fi
 


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2019-02-15 20:57 Mike Gilbert
  0 siblings, 0 replies; 43+ messages in thread
From: Mike Gilbert @ 2019-02-15 20:57 UTC (permalink / raw
  To: gentoo-commits

commit:     e5c07ebd6b75318018746ce3d1843e8f668d59fc
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 15 20:56:44 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Feb 15 20:56:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5c07ebd

media-video/rtmpdump: remove .flv files from git

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 media-video/rtmpdump/MBS_2018-12-07-13_16.flv | 0
 media-video/rtmpdump/OBC_2018-11-02-14_04.flv | 0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/media-video/rtmpdump/MBS_2018-12-07-13_16.flv b/media-video/rtmpdump/MBS_2018-12-07-13_16.flv
deleted file mode 100644
index e69de29bb2d..00000000000

diff --git a/media-video/rtmpdump/OBC_2018-11-02-14_04.flv b/media-video/rtmpdump/OBC_2018-11-02-14_04.flv
deleted file mode 100644
index e69de29bb2d..00000000000


^ permalink raw reply	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2018-10-27  2:42 Craig Andrews
  0 siblings, 0 replies; 43+ messages in thread
From: Craig Andrews @ 2018-10-27  2:42 UTC (permalink / raw
  To: gentoo-commits

commit:     ab606cec475a4b1fea8a9793ef6ed81b83b919f5
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 02:42:07 2018 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 02:42:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab606cec

media-video/rtmpdump: Don't apply openssl 1.1 patch with USE=libressl

That patch causes compilation errors when used with libressl

Closes: https://bugs.gentoo.org/669708
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild | 2 +-
 media-video/rtmpdump/rtmpdump-9999.ebuild             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild
index 8bfb1dd533d..8a45c29d0d0 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild
@@ -24,7 +24,6 @@ DEPEND="ssl? (
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-openssl-1.1.patch"
 	"${FILESDIR}/${PN}-swf_vertification_type_2.patch"
 	"${FILESDIR}/${PN}-swf_vertification_type_2_part_2.patch"
 )
@@ -66,6 +65,7 @@ src_prepare() {
 		-e 's:OPT:OPTS:' \
 		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
 		|| die "failed to fix Makefile"
+	use ssl && use !gnutls && use !libressl && eapply "${FILESDIR}/${PN}-openssl-1.1.patch"
 	default
 	multilib_copy_sources
 }

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index 8bfb1dd533d..8a45c29d0d0 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -24,7 +24,6 @@ DEPEND="ssl? (
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-openssl-1.1.patch"
 	"${FILESDIR}/${PN}-swf_vertification_type_2.patch"
 	"${FILESDIR}/${PN}-swf_vertification_type_2_part_2.patch"
 )
@@ -66,6 +65,7 @@ src_prepare() {
 		-e 's:OPT:OPTS:' \
 		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
 		|| die "failed to fix Makefile"
+	use ssl && use !gnutls && use !libressl && eapply "${FILESDIR}/${PN}-openssl-1.1.patch"
 	default
 	multilib_copy_sources
 }


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2018-10-26 19:48 Craig Andrews
  0 siblings, 0 replies; 43+ messages in thread
From: Craig Andrews @ 2018-10-26 19:48 UTC (permalink / raw
  To: gentoo-commits

commit:     d663d7014993a68c867eeea2bb956207ba45da93
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 26 19:48:21 2018 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Fri Oct 26 19:48:21 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d663d701

media-video/rtmpdump: take maintainership

Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-video/rtmpdump/metadata.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/media-video/rtmpdump/metadata.xml b/media-video/rtmpdump/metadata.xml
index 6f49eba8f49..b36893c1b2a 100644
--- a/media-video/rtmpdump/metadata.xml
+++ b/media-video/rtmpdump/metadata.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>candrews@gentoo.org</email>
+    <name>Craig Andrews</name>
+  </maintainer>
+  <longdescription>
+    rtmpdump is a toolkit for RTMP streams.
+    All forms of RTMP are supported, including
+    rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://.
+  </longdescription>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2018-03-26 19:18 Aaron Bauman
  0 siblings, 0 replies; 43+ messages in thread
From: Aaron Bauman @ 2018-03-26 19:18 UTC (permalink / raw
  To: gentoo-commits

commit:     235e096ba28183239b1fc3a77eb2019f8180c077
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Mar 21 20:17:36 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 19:15:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=235e096b

media-video/rtmpdump: remove use flag description which exists already globally

Closes: https://github.com/gentoo/gentoo/pull/7542

 media-video/rtmpdump/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/media-video/rtmpdump/metadata.xml b/media-video/rtmpdump/metadata.xml
index 724b1cb49d6..2028cee3c38 100644
--- a/media-video/rtmpdump/metadata.xml
+++ b/media-video/rtmpdump/metadata.xml
@@ -5,7 +5,4 @@
 <email>hwoarang@gentoo.org</email>
 <name>Markos Chandras</name>
 </maintainer>
-<use>
-	<flag name="gnutls">Use GnuTLS library instead of the default OpenSSL</flag>
-</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2018-03-26 19:18 Aaron Bauman
  0 siblings, 0 replies; 43+ messages in thread
From: Aaron Bauman @ 2018-03-26 19:18 UTC (permalink / raw
  To: gentoo-commits

commit:     b06626677ad315e5cb2c9aa1cdb572bd13924e61
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Mar 21 20:20:13 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 19:15:28 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0662667

media-video/rtmpdump: use HTTPS, improve ebuild readability

 media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild | 9 ++++++---
 media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild    | 9 ++++++---
 media-video/rtmpdump/rtmpdump-9999.ebuild             | 9 ++++++---
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
index 5ab69865de6..ba1b98b2b9e 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,7 +6,7 @@ EAPI="6"
 inherit multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="RTMP client intended to stream audio or video flash content"
-HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
+HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
 SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 
 # the library is LGPL-2.1, the command is GPL-2
@@ -17,7 +17,10 @@ IUSE="gnutls ssl libressl"
 
 DEPEND="ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
-		!gnutls? ( !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}"

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
index eec4bbc9a07..bb95a41dd31 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,7 +6,7 @@ EAPI="6"
 inherit multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="RTMP client intended to stream audio or video flash content"
-HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
+HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
 SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 
 # the library is LGPL-2.1, the command is GPL-2
@@ -17,7 +17,10 @@ IUSE="gnutls ssl libressl"
 
 DEPEND="ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
-		!gnutls? ( !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}"

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index ccd765a7d62..83fe157d7a3 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,7 +6,7 @@ EAPI="6"
 inherit git-r3 multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="RTMP client intended to stream audio or video flash content"
-HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
+HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
 EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 
 # the library is LGPL-2.1, the command is GPL-2
@@ -17,7 +17,10 @@ IUSE="gnutls ssl libressl"
 
 DEPEND="ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
-		!gnutls? ( !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}"


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2017-11-04 20:31 Thomas Deutschmann
  0 siblings, 0 replies; 43+ messages in thread
From: Thomas Deutschmann @ 2017-11-04 20:31 UTC (permalink / raw
  To: gentoo-commits

commit:     76c5a69340c4ed448a16724fa070a60b07aad874
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  4 20:30:32 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> 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 @@
 </maintainer>
 <use>
 	<flag name="gnutls">Use GnuTLS library instead of the default OpenSSL</flag>
-	<flag name="polarssl">Use PolarSSL library instead of the default OpenSSL</flag>
 </use>
 </pkgmetadata>

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


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2017-09-07 13:12 Craig Andrews
  0 siblings, 0 replies; 43+ messages in thread
From: Craig Andrews @ 2017-09-07 13:12 UTC (permalink / raw
  To: gentoo-commits

commit:     0d2965565f12ac195e01d82b84680fb2995f76bd
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  5 15:40:00 2017 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Thu Sep  7 13:12:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d296556

media-video/rtmpdump: use https in SRC_URI/EGIT_REPO_URI

Package-Manager: Portage-2.3.8, Repoman-2.3.3

Closes #5622

 media-video/rtmpdump/rtmpdump-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index 80f3d75437d..4d69e6e3a3c 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -7,7 +7,7 @@ inherit git-r3 multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="RTMP client intended to stream audio or video flash content"
 HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
-EGIT_REPO_URI="git://git.ffmpeg.org/rtmpdump"
+EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 
 # the library is LGPL-2.1, the command is GPL-2
 LICENSE="GPL-2 LGPL-2.1"


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2017-08-24  7:11 Benda XU
  0 siblings, 0 replies; 43+ messages in thread
From: Benda XU @ 2017-08-24  7:11 UTC (permalink / raw
  To: gentoo-commits

commit:     072832ee7e42b6939b2374827b4b22679e8fe0e3
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 24 07:11:23 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Aug 24 07:11:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072832ee

media-video/rtmpdump: fix librtmp pkg-config paths for Prefix.

  Bump -9999 to EAPI 6 and git-r3 as a side effect.

Bug: 616202

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 ...9999.ebuild => rtmpdump-2.4_p20161210-r1.ebuild} | 21 ++++++++++++++-------
 media-video/rtmpdump/rtmpdump-9999.ebuild           |  9 +++++----
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
similarity index 79%
copy from media-video/rtmpdump/rtmpdump-9999.ebuild
copy to media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
index b4c247a6697..13ae3a45a58 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI="6"
 
-inherit git-2 multilib toolchain-funcs multilib-minimal flag-o-matic
+inherit multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="RTMP client intended to stream audio or video flash content"
 HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
-EGIT_REPO_URI="git://git.ffmpeg.org/rtmpdump"
+SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 
 # the library is LGPL-2.1, the command is GPL-2
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="gnutls polarssl ssl libressl"
 
 DEPEND="ssl? (
@@ -30,6 +30,12 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	mkdir -p "${S}" || die "Can't create source directory"
+	cd "${S}" || die
+	unpack ${A}
+}
+
 src_prepare() {
 	# fix #571106 by restoring pre-GCC5 inline semantics
 	append-cflags -std=gnu89
@@ -40,12 +46,13 @@ src_prepare() {
 		-e 's:OPT:OPTS:' \
 		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
 		|| die "failed to fix Makefile"
+	eapply_user
 	multilib_copy_sources
 }
 
 multilib_src_compile() {
 	if use ssl ; then
-		if use gnutls ; then
+		if use gnutls ;	then
 			crypto="GNUTLS"
 		elif use polarssl ; then
 			crypto="POLARSSL"
@@ -69,6 +76,6 @@ multilib_src_install() {
 	else
 		cd librtmp || die
 	fi
-	emake DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" \
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir='$(prefix)/share/man' \
 		CRYPTO="${crypto}" install
 }

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index b4c247a6697..80f3d75437d 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI="6"
 
-inherit git-2 multilib toolchain-funcs multilib-minimal flag-o-matic
+inherit git-r3 multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="RTMP client intended to stream audio or video flash content"
 HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
@@ -40,6 +40,7 @@ src_prepare() {
 		-e 's:OPT:OPTS:' \
 		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
 		|| die "failed to fix Makefile"
+	eapply_user
 	multilib_copy_sources
 }
 
@@ -69,6 +70,6 @@ multilib_src_install() {
 	else
 		cd librtmp || die
 	fi
-	emake DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" \
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir='$(prefix)/share/man' \
 		CRYPTO="${crypto}" install
 }


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2017-07-16  1:09 Aaron Bauman
  0 siblings, 0 replies; 43+ messages in thread
From: Aaron Bauman @ 2017-07-16  1:09 UTC (permalink / raw
  To: gentoo-commits

commit:     324bda1dff7d708a325e44ac55db0e685887a1fb
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 16 01:09:23 2017 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Jul 16 01:09:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=324bda1d

media-video/rtmpdump: drop vulnerable wrt sec bug #570242

 media-video/rtmpdump/Manifest                      |  1 -
 media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild | 80 ----------------------
 2 files changed, 81 deletions(-)

diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index 35146f804b0..d1ee8b0858f 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -1,2 +1 @@
-DIST rtmpdump-2.4_p20131018.tar.gz 142707 SHA256 57164e0c12f7cbff8e40b1e66cf6b889086387324851a115b427b8d2b3fff267 SHA512 78c2da880ece43af1d4257a14a22d95e9f1b9f474d85f97e879d9cfd2232c5a7f1c1a41fbb1af7e047700214a993eb33965dba41573389d5eebefd3f01a780fc WHIRLPOOL 80a8e9ed9eeca4ddab8c44ae6e937f0d271311e8f5ce74bb0b49fff69edc4bd302f257366f33cceb8ae089fabdd7ff2533937a833e79fcb575e3cf43c592327a
 DIST rtmpdump-2.4_p20161210.tar.gz 142837 SHA256 d6da3b683f1045f02d94a81b0c583318dba021f69bdab970c5d5d73e8c38860f SHA512 76617f02c13d7e8e3a7cf2734c6174e56fb321a881c9e4869bf6393786b193e0c01a8c530ecbf0679cc888c523af5712f2dcb2031fbd09729b7ddeebc3a4b133 WHIRLPOOL 06fd296825c06339dd9210d626f503ab8f7bc929fa363106a166882bff3e7531ce11636dd716c1259558301c258c190a7f6e550fd39dae51dea809526b566d8d

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
deleted file mode 100644
index 73e21b765d0..00000000000
--- a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit multilib toolchain-funcs multilib-minimal flag-o-matic
-
-DESCRIPTION="RTMP client intended to stream audio or video flash content"
-HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-# the library is LGPL-2.1, the command is GPL-2
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="gnutls polarssl 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 ) ) )
-		>=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'."
-		ewarn "Please review the local USE flags for this package."
-	fi
-}
-
-src_unpack() {
-	mkdir -p "${S}" || die "Can't create source directory"
-	cd "${S}" || die
-	unpack ${A}
-}
-
-src_prepare() {
-	# fix #571106 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-	# fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
-	sed -i 's/\$(MAKEFLAGS)//g' Makefile \
-		|| die "failed to fix Makefile"
-	sed -i -e 's:OPT=:&-fPIC :' \
-		-e 's:OPT:OPTS:' \
-		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
-		|| die "failed to fix Makefile"
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	if use ssl ; then
-		if use gnutls ;	then
-			crypto="GNUTLS"
-		elif use polarssl ; then
-			crypto="POLARSSL"
-		else
-			crypto="OPENSSL"
-		fi
-	fi
-	#fix multilib-script support. Bug #327449
-	sed -i "/^libdir/s:lib$:$(get_libdir):" librtmp/Makefile || die
-	if ! multilib_is_native_abi; then
-		cd librtmp || die
-	fi
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
-		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
-}
-
-multilib_src_install() {
-	mkdir -p "${ED}"/usr/$(get_libdir) || die
-	if multilib_is_native_abi; then
-		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
-	else
-		cd librtmp || die
-	fi
-	emake DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" \
-	CRYPTO="${crypto}" install
-}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2017-06-18 11:56 Alexis Ballier
  0 siblings, 0 replies; 43+ messages in thread
From: Alexis Ballier @ 2017-06-18 11:56 UTC (permalink / raw
  To: gentoo-commits

commit:     f9976ab9011963270ebbe959404dd1f8eb0a86f2
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 10:57:04 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 11:44:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9976ab9

media-video/rtmpdump: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
index dd892627d0d..89a24d3c787 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 # the library is LGPL-2.1, the command is GPL-2
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="gnutls polarssl ssl libressl"
 
 DEPEND="ssl? (


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2017-04-01 12:15 Michael Weber
  0 siblings, 0 replies; 43+ messages in thread
From: Michael Weber @ 2017-04-01 12:15 UTC (permalink / raw
  To: gentoo-commits

commit:     2c8bc33e57a4e7a2236305ef039066633585ee57
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  1 11:57:28 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat Apr  1 12:14:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c8bc33e

media-video/rtmpdump: arm stable (ffmpeg).

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --include-arches="arm"

 media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
index ce972abb3c8..dd892627d0d 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 # the library is LGPL-2.1, the command is GPL-2
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="gnutls polarssl ssl libressl"
 
 DEPEND="ssl? (


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2017-01-15 20:49 Jeroen Roovers
  0 siblings, 0 replies; 43+ messages in thread
From: Jeroen Roovers @ 2017-01-15 20:49 UTC (permalink / raw
  To: gentoo-commits

commit:     fcda2abf00eab217fd8a2854ab49b512d7f361de
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 20:49:15 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 20:49:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcda2abf

media-video/rtmpdump: Stable for HPPA (bug #570242).

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches

 media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
index 4daa883..c351336 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 # the library is LGPL-2.1, the command is GPL-2
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="gnutls polarssl ssl libressl"
 
 DEPEND="ssl? (


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2016-12-13 11:30 Agostino Sarubbo
  0 siblings, 0 replies; 43+ messages in thread
From: Agostino Sarubbo @ 2016-12-13 11:30 UTC (permalink / raw
  To: gentoo-commits

commit:     00ac62cd400b9c51ba78b95d853f9c9cb4be1a8f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 13 11:28:19 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Dec 13 11:28:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00ac62cd

media-video/rtmpdump: x86 stable wrt bug #570242

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
index 22341a9..724b6cd 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 # the library is LGPL-2.1, the command is GPL-2
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="gnutls polarssl ssl libressl"
 
 DEPEND="ssl? (


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2016-12-13 11:05 Agostino Sarubbo
  0 siblings, 0 replies; 43+ messages in thread
From: Agostino Sarubbo @ 2016-12-13 11:05 UTC (permalink / raw
  To: gentoo-commits

commit:     44384a2e158df5386de292c511d7db324fae7e88
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 13 11:02:07 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Dec 13 11:02:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44384a2e

media-video/rtmpdump: amd64 stable wrt bug #570242

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
index c4dda6d..22341a9 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 # the library is LGPL-2.1, the command is GPL-2
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="gnutls polarssl ssl libressl"
 
 DEPEND="ssl? (


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2016-12-10 19:37 Markos Chandras
  0 siblings, 0 replies; 43+ messages in thread
From: Markos Chandras @ 2016-12-10 19:37 UTC (permalink / raw
  To: gentoo-commits

commit:     5c1cf197a277cde111fc0cf87a1e4d5c9ff94d13
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 19:32:51 2016 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 19:37:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c1cf197

media-video/rtmpdump: Version bump

Add new snapshot

Gentoo-Bug: 570242

Package-Manager: portage-2.3.3

 media-video/rtmpdump/Manifest                      |  1 +
 media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild | 82 ++++++++++++++++++++++
 2 files changed, 83 insertions(+)

diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index b4b21a6..35146f8 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -1 +1,2 @@
 DIST rtmpdump-2.4_p20131018.tar.gz 142707 SHA256 57164e0c12f7cbff8e40b1e66cf6b889086387324851a115b427b8d2b3fff267 SHA512 78c2da880ece43af1d4257a14a22d95e9f1b9f474d85f97e879d9cfd2232c5a7f1c1a41fbb1af7e047700214a993eb33965dba41573389d5eebefd3f01a780fc WHIRLPOOL 80a8e9ed9eeca4ddab8c44ae6e937f0d271311e8f5ce74bb0b49fff69edc4bd302f257366f33cceb8ae089fabdd7ff2533937a833e79fcb575e3cf43c592327a
+DIST rtmpdump-2.4_p20161210.tar.gz 142837 SHA256 d6da3b683f1045f02d94a81b0c583318dba021f69bdab970c5d5d73e8c38860f SHA512 76617f02c13d7e8e3a7cf2734c6174e56fb321a881c9e4869bf6393786b193e0c01a8c530ecbf0679cc888c523af5712f2dcb2031fbd09729b7ddeebc3a4b133 WHIRLPOOL 06fd296825c06339dd9210d626f503ab8f7bc929fa363106a166882bff3e7531ce11636dd716c1259558301c258c190a7f6e550fd39dae51dea809526b566d8d

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
new file mode 100644
index 00000000..c4dda6d
--- /dev/null
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit multilib toolchain-funcs multilib-minimal flag-o-matic
+
+DESCRIPTION="RTMP client intended to stream audio or video flash content"
+HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
+SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+
+# the library is LGPL-2.1, the command is GPL-2
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="gnutls polarssl 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 ) ) )
+		>=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'."
+		ewarn "Please review the local USE flags for this package."
+	fi
+}
+
+src_unpack() {
+	mkdir -p "${S}" || die "Can't create source directory"
+	cd "${S}" || die
+	unpack ${A}
+}
+
+src_prepare() {
+	# fix #571106 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+	# fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
+	sed -i 's/\$(MAKEFLAGS)//g' Makefile \
+		|| die "failed to fix Makefile"
+	sed -i -e 's:OPT=:&-fPIC :' \
+		-e 's:OPT:OPTS:' \
+		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
+		|| die "failed to fix Makefile"
+	multilib_copy_sources
+	eapply_user
+}
+
+multilib_src_compile() {
+	if use ssl ; then
+		if use gnutls ;	then
+			crypto="GNUTLS"
+		elif use polarssl ; then
+			crypto="POLARSSL"
+		else
+			crypto="OPENSSL"
+		fi
+	fi
+	#fix multilib-script support. Bug #327449
+	sed -i "/^libdir/s:lib$:$(get_libdir):" librtmp/Makefile || die
+	if ! multilib_is_native_abi; then
+		cd librtmp || die
+	fi
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
+		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
+}
+
+multilib_src_install() {
+	mkdir -p "${ED}"/usr/$(get_libdir) || die
+	if multilib_is_native_abi; then
+		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
+	else
+		cd librtmp || die
+	fi
+	emake DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" \
+	CRYPTO="${crypto}" install
+}


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2016-09-14 16:33 Alexis Ballier
  0 siblings, 0 replies; 43+ messages in thread
From: Alexis Ballier @ 2016-09-14 16:33 UTC (permalink / raw
  To: gentoo-commits

commit:     3f281c144612ca4fc999df6877a22a39b482f051
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 16:32:52 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 16:32:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f281c14

media-video/rtmpdump: add missing inherit

Package-Manager: portage-2.3.0

 media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild | 2 +-
 media-video/rtmpdump/rtmpdump-9999.ebuild          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
index d6fcc11..fd5cf4e 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit multilib toolchain-funcs multilib-minimal
+inherit multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="RTMP client intended to stream audio or video flash content"
 HOMEPAGE="http://rtmpdump.mplayerhq.hu/"

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index c9348c0..54b1193 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit git-2 multilib toolchain-funcs multilib-minimal
+inherit git-2 multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="RTMP client intended to stream audio or video flash content"
 HOMEPAGE="http://rtmpdump.mplayerhq.hu/"


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2016-09-14 16:33 Alexis Ballier
  0 siblings, 0 replies; 43+ messages in thread
From: Alexis Ballier @ 2016-09-14 16:33 UTC (permalink / raw
  To: gentoo-commits

commit:     4ff8903a00af9928ea908f89d063f2e07e423adf
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 16:30:18 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 16:30:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ff8903a

Revert "media-video/rtmpdump: Move to EAPI6 and git-r3."

It doesnt even build...

This reverts commit 3252a86b2afff788707c84c540504cca87ac8630.

 .../rtmpdump/rtmpdump-2.4_p20131018-r1.ebuild      | 79 ----------------------
 media-video/rtmpdump/rtmpdump-9999.ebuild          | 13 ++--
 2 files changed, 5 insertions(+), 87 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20131018-r1.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20131018-r1.ebuild
deleted file mode 100644
index 5a9d6d3..00000000
--- a/media-video/rtmpdump/rtmpdump-2.4_p20131018-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-inherit multilib toolchain-funcs multilib-minimal
-
-DESCRIPTION="RTMP client intended to stream audio or video flash content"
-HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-# the library is LGPL-2.1, the command is GPL-2
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-fbsd ~amd64-linux ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-linux"
-IUSE="gnutls polarssl 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:0[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl:0 ) ) )
-		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	)"
-RDEPEND="${DEPEND}"
-
-DOCS=( README ChangeLog )
-HTML_DOCS=( rtmpdump.1.html rtmpgw.8.html )
-
-pkg_setup() {
-	if ! use ssl && { use gnutls || use polarssl; }; then
-		ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."
-		ewarn "Please review the local USE flags for this package."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# fix #571106 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-	# fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
-	sed -i 's/\$(MAKEFLAGS)//g' Makefile \
-		|| die "failed to fix Makefile"
-	sed -i -e 's:OPT=:&-fPIC :' \
-		-e 's:OPT:OPTS:' \
-		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
-		|| die "failed to fix Makefile"
-	multilib_copy_sources
-
-	if use ssl ; then
-		if use gnutls ;	then
-			crypto="GNUTLS"
-		elif use polarssl ; then
-			crypto="POLARSSL"
-		else
-			crypto="OPENSSL"
-		fi
-	fi
-}
-
-multilib_src_compile() {
-	#fix multilib-script support. Bug #327449
-	sed -i "/^libdir/s:lib$:$(get_libdir):" librtmp/Makefile || die
-	if ! multilib_is_native_abi; then
-		cd librtmp || die
-	fi
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
-		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
-}
-
-multilib_src_install() {
-	mkdir -p "${ED}"/usr/$(get_libdir) || die
-	if ! multilib_is_native_abi; then
-		cd librtmp || die
-	fi
-	emake DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" \
-	CRYPTO="${crypto}" install
-}

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index 4c568c3..c9348c0 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="6"
+EAPI="4"
 
-inherit git-r3 multilib toolchain-funcs multilib-minimal
+inherit git-2 multilib toolchain-funcs multilib-minimal
 
 DESCRIPTION="RTMP client intended to stream audio or video flash content"
 HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
@@ -24,9 +24,6 @@ DEPEND="ssl? (
 	)"
 RDEPEND="${DEPEND}"
 
-DOCS=( README ChangeLog )
-HTML_DOCS=( rtmpdump.1.html rtmpgw.8.html )
-
 pkg_setup() {
 	if ! use ssl && { use gnutls || use polarssl; }; then
 		ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."
@@ -35,8 +32,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default
-
 	# fix #571106 by restoring pre-GCC5 inline semantics
 	append-cflags -std=gnu89
 	# fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
@@ -70,7 +65,9 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	mkdir -p "${ED}"/usr/$(get_libdir) || die
-	if ! multilib_is_native_abi; then
+	if multilib_is_native_abi; then
+		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
+	else
 		cd librtmp || die
 	fi
 	emake DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" \


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2016-09-14 11:16 Patrice Clement
  0 siblings, 0 replies; 43+ messages in thread
From: Patrice Clement @ 2016-09-14 11:16 UTC (permalink / raw
  To: gentoo-commits

commit:     8dcbb3489e26e2f265bebe0af24463f77defbc3c
Author:     Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh>
AuthorDate: Sat Sep  3 22:15:01 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 11:15:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dcbb348

media-video/rtmpdump: Shrink DESCRIPTION.

repoman says: DESCRIPTION is 84 characters (max 80).

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/2210

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild | 2 +-
 media-video/rtmpdump/rtmpdump-9999.ebuild          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
index 254ab5c..d6fcc11 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 
 inherit multilib toolchain-funcs multilib-minimal
 
-DESCRIPTION="Open source command-line RTMP client intended to stream audio or video flash content"
+DESCRIPTION="RTMP client intended to stream audio or video flash content"
 HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
 SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index 87c1cf3..c9348c0 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 
 inherit git-2 multilib toolchain-funcs multilib-minimal
 
-DESCRIPTION="Open source command-line RTMP client intended to stream audio or video flash content"
+DESCRIPTION="RTMP client intended to stream audio or video flash content"
 HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
 EGIT_REPO_URI="git://git.ffmpeg.org/rtmpdump"
 


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2016-09-14 11:16 Patrice Clement
  0 siblings, 0 replies; 43+ messages in thread
From: Patrice Clement @ 2016-09-14 11:16 UTC (permalink / raw
  To: gentoo-commits

commit:     3252a86b2afff788707c84c540504cca87ac8630
Author:     Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh>
AuthorDate: Sat Sep  3 22:18:53 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 11:15:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3252a86b

media-video/rtmpdump: Move to EAPI6 and git-r3.

Specify dev-libs/openssl and dev-libs/libressl SLOT.

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/2210

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 ...999.ebuild => rtmpdump-2.4_p20131018-r1.ebuild} | 28 ++++++++++++----------
 media-video/rtmpdump/rtmpdump-9999.ebuild          | 13 ++++++----
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20131018-r1.ebuild
similarity index 80%
copy from media-video/rtmpdump/rtmpdump-9999.ebuild
copy to media-video/rtmpdump/rtmpdump-2.4_p20131018-r1.ebuild
index c9348c0..5a9d6d3 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20131018-r1.ebuild
@@ -2,28 +2,31 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="6"
 
-inherit git-2 multilib toolchain-funcs multilib-minimal
+inherit multilib toolchain-funcs multilib-minimal
 
 DESCRIPTION="RTMP client intended to stream audio or video flash content"
 HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
-EGIT_REPO_URI="git://git.ffmpeg.org/rtmpdump"
+SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 
 # the library is LGPL-2.1, the command is GPL-2
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~amd64-fbsd ~amd64-linux ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-linux"
 IUSE="gnutls polarssl 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? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl:0 ) ) )
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
 
+DOCS=( README ChangeLog )
+HTML_DOCS=( rtmpdump.1.html rtmpgw.8.html )
+
 pkg_setup() {
 	if ! use ssl && { use gnutls || use polarssl; }; then
 		ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."
@@ -32,6 +35,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	# fix #571106 by restoring pre-GCC5 inline semantics
 	append-cflags -std=gnu89
 	# fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
@@ -42,11 +47,9 @@ src_prepare() {
 		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
 		|| die "failed to fix Makefile"
 	multilib_copy_sources
-}
 
-multilib_src_compile() {
 	if use ssl ; then
-		if use gnutls ; then
+		if use gnutls ;	then
 			crypto="GNUTLS"
 		elif use polarssl ; then
 			crypto="POLARSSL"
@@ -54,6 +57,9 @@ multilib_src_compile() {
 			crypto="OPENSSL"
 		fi
 	fi
+}
+
+multilib_src_compile() {
 	#fix multilib-script support. Bug #327449
 	sed -i "/^libdir/s:lib$:$(get_libdir):" librtmp/Makefile || die
 	if ! multilib_is_native_abi; then
@@ -65,11 +71,9 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	mkdir -p "${ED}"/usr/$(get_libdir) || die
-	if multilib_is_native_abi; then
-		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
-	else
+	if ! multilib_is_native_abi; then
 		cd librtmp || die
 	fi
 	emake DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" \
-		CRYPTO="${crypto}" install
+	CRYPTO="${crypto}" install
 }

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index c9348c0..4c568c3 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="6"
 
-inherit git-2 multilib toolchain-funcs multilib-minimal
+inherit git-r3 multilib toolchain-funcs multilib-minimal
 
 DESCRIPTION="RTMP client intended to stream audio or video flash content"
 HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
@@ -24,6 +24,9 @@ DEPEND="ssl? (
 	)"
 RDEPEND="${DEPEND}"
 
+DOCS=( README ChangeLog )
+HTML_DOCS=( rtmpdump.1.html rtmpgw.8.html )
+
 pkg_setup() {
 	if ! use ssl && { use gnutls || use polarssl; }; then
 		ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."
@@ -32,6 +35,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	# fix #571106 by restoring pre-GCC5 inline semantics
 	append-cflags -std=gnu89
 	# fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
@@ -65,9 +70,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	mkdir -p "${ED}"/usr/$(get_libdir) || die
-	if multilib_is_native_abi; then
-		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
-	else
+	if ! multilib_is_native_abi; then
 		cd librtmp || die
 	fi
 	emake DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" \


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2016-06-16  7:01 Patrice Clement
  0 siblings, 0 replies; 43+ messages in thread
From: Patrice Clement @ 2016-06-16  7:01 UTC (permalink / raw
  To: gentoo-commits

commit:     ef71138791d15731c7cf6d7319cc9ad343bac6dc
Author:     Craig Andrews <candrews <AT> integralblue <DOT> com>
AuthorDate: Thu Jun  9 17:29:59 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 06:33:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef711387

media-video/rtmpdump: Depend on net-libs/gnutls when USE=gnutls is on.

Gentoo-Bug: https://bugs.gentoo.org/498840

Package-Manager: portage-2.3.0_rc1
Closes: https://github.com/gentoo/gentoo/pull/1634

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild | 2 +-
 media-video/rtmpdump/rtmpdump-9999.ebuild          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
index b0191ae..254ab5c 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
 IUSE="gnutls polarssl ssl libressl"
 
 DEPEND="ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+		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 ) ) )
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index de3ef6a..87c1cf3 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -17,7 +17,7 @@ KEYWORDS=""
 IUSE="gnutls polarssl ssl libressl"
 
 DEPEND="ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+		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 ) ) )
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2016-06-11  8:13 Michał Górny
  0 siblings, 0 replies; 43+ messages in thread
From: Michał Górny @ 2016-06-11  8:13 UTC (permalink / raw
  To: gentoo-commits

commit:     c8b9bb96e2635f97d4d0063fd39b4ee794e3104c
Author:     Craig Andrews <candrews <AT> integralblue <DOT> com>
AuthorDate: Thu Jun  9 17:37:22 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 11 08:12:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8b9bb96

media-video/rtmpdump: add -std=gnu89 to CFLAGS to restore pre-GCC5 semantics

Bug: https://bugs.gentoo.org/571106
Pull-Request: https://github.com/gentoo/gentoo/pull/1644
Package-Manager: portage-2.3.0_rc1

 media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild | 2 ++
 media-video/rtmpdump/rtmpdump-9999.ebuild          | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
index 5e9d26c..b0191ae 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
@@ -38,6 +38,8 @@ src_unpack() {
 }
 
 src_prepare() {
+	# fix #571106 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
 	# fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
 	sed -i 's/\$(MAKEFLAGS)//g' Makefile \
 		|| die "failed to fix Makefile"

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index 25d5e75..de3ef6a 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -32,6 +32,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# fix #571106 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
 	# fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
 	sed -i 's/\$(MAKEFLAGS)//g' Makefile \
 		|| die "failed to fix Makefile"


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2016-05-30 12:50 Lars Wendler
  0 siblings, 0 replies; 43+ messages in thread
From: Lars Wendler @ 2016-05-30 12:50 UTC (permalink / raw
  To: gentoo-commits

commit:     0291d475ba94dccc0a85b905e1b2f87a0364f85f
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 12:49:52 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon May 30 12:50:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0291d475

media-video/rtmpdump: Fixed broken sed command (bug #584498).

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild | 2 +-
 media-video/rtmpdump/rtmpdump-9999.ebuild          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
index 6d20b3c..5e9d26c 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
@@ -59,7 +59,7 @@ multilib_src_compile() {
 		fi
 	fi
 	#fix multilib-script support. Bug #327449
-	sed -i "/^libdir/s:lib$:$(get_libdir)$:" librtmp/Makefile || die
+	sed -i "/^libdir/s:lib$:$(get_libdir):" librtmp/Makefile || die
 	if ! multilib_is_native_abi; then
 		cd librtmp || die
 	fi

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index c8bc9ac..25d5e75 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -53,7 +53,7 @@ multilib_src_compile() {
 		fi
 	fi
 	#fix multilib-script support. Bug #327449
-	sed -i "/^libdir/s:lib$:$(get_libdir)$:" librtmp/Makefile || die
+	sed -i "/^libdir/s:lib$:$(get_libdir):" librtmp/Makefile || die
 	if ! multilib_is_native_abi; then
 		cd librtmp || die
 	fi


^ permalink raw reply related	[flat|nested] 43+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
@ 2016-05-14  8:49 Michał Górny
  0 siblings, 0 replies; 43+ messages in thread
From: Michał Górny @ 2016-05-14  8:49 UTC (permalink / raw
  To: gentoo-commits

commit:     a2eb8005fccf405ee7a88affe31bf62b4ccaec7e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 08:41:57 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 14 08:49:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2eb8005

media-video/rtmpdump: DESTTREE -> /usr, #582984

 media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild | 6 +++---
 media-video/rtmpdump/rtmpdump-9999.ebuild          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
index d89eaa0..6d20b3c 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -68,12 +68,12 @@ multilib_src_compile() {
 }
 
 multilib_src_install() {
-	mkdir -p "${ED}"/${DESTTREE}/$(get_libdir) || die
+	mkdir -p "${ED}"/usr/$(get_libdir) || die
 	if multilib_is_native_abi; then
 		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
 	else
 		cd librtmp || die
 	fi
-	emake DESTDIR="${ED}" prefix="${DESTTREE}" mandir="${DESTTREE}/share/man" \
+	emake DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" \
 	CRYPTO="${crypto}" install
 }

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index 399c535..c8bc9ac 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -62,12 +62,12 @@ multilib_src_compile() {
 }
 
 multilib_src_install() {
-	mkdir -p "${ED}"/${DESTTREE}/$(get_libdir) || die
+	mkdir -p "${ED}"/usr/$(get_libdir) || die
 	if multilib_is_native_abi; then
 		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
 	else
 		cd librtmp || die
 	fi
-	emake DESTDIR="${ED}" prefix="${DESTTREE}" mandir="${DESTTREE}/share/man" \
+	emake DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" \
 		CRYPTO="${crypto}" install
 }


^ permalink raw reply related	[flat|nested] 43+ messages in thread

end of thread, other threads:[~2024-03-15 16:24 UTC | newest]

Thread overview: 43+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-10 13:11 [gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/ Craig Andrews
  -- strict thread matches above, loose matches on Subject: below --
2024-03-15 16:24 Craig Andrews
2022-05-13 12:19 WANG Xuerui
2022-05-13 12:19 WANG Xuerui
2021-07-01 11:02 Marek Szuba
2021-05-03 17:09 Mikle Kolyada
2021-05-03  9:32 Mikle Kolyada
2021-05-03  9:31 Mikle Kolyada
2021-05-01 18:24 Sam James
2020-08-13 20:50 Craig Andrews
2020-06-23 15:22 Craig Andrews
2019-10-10 20:30 Andreas Sturmlechner
2019-07-22 14:43 Craig Andrews
2019-05-15 15:27 Mikle Kolyada
2019-05-13  0:38 Thomas Deutschmann
2019-05-06 17:13 Sergei Trofimovich
2019-05-03 15:28 Aaron Bauman
2019-04-30  9:59 Mikle Kolyada
2019-04-29 20:11 Sergei Trofimovich
2019-04-29 20:09 Sergei Trofimovich
2019-02-15 20:57 Mike Gilbert
2018-10-27  2:42 Craig Andrews
2018-10-26 19:48 Craig Andrews
2018-03-26 19:18 Aaron Bauman
2018-03-26 19:18 Aaron Bauman
2017-11-04 20:31 Thomas Deutschmann
2017-09-07 13:12 Craig Andrews
2017-08-24  7:11 Benda XU
2017-07-16  1:09 Aaron Bauman
2017-06-18 11:56 Alexis Ballier
2017-04-01 12:15 Michael Weber
2017-01-15 20:49 Jeroen Roovers
2016-12-13 11:30 Agostino Sarubbo
2016-12-13 11:05 Agostino Sarubbo
2016-12-10 19:37 Markos Chandras
2016-09-14 16:33 Alexis Ballier
2016-09-14 16:33 Alexis Ballier
2016-09-14 11:16 Patrice Clement
2016-09-14 11:16 Patrice Clement
2016-06-16  7:01 Patrice Clement
2016-06-11  8:13 Michał Górny
2016-05-30 12:50 Lars Wendler
2016-05-14  8:49 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox