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

From:	Thomas Deutschmann <whissi@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/
Date:	Sat, 04 Nov 2017 20:31:29
Message-Id:	`1509827472.76c5a69340c4ed448a16724fa070a60b07aad874.whissi@gentoo`

1

commit:     76c5a69340c4ed448a16724fa070a60b07aad874

2

Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>

3

AuthorDate: Sat Nov  4 20:30:32 2017 +0000

4

Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>

5

CommitDate: Sat Nov  4 20:31:12 2017 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76c5a693

7

8

media-video/rtmpdump: Drop polarssl support

9

10

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

11

Closes: https://bugs.gentoo.org/618360

12

13

Package-Manager: Portage-2.3.13, Repoman-2.3.4

14

15

 media-video/rtmpdump/metadata.xml                     |  1 -

16

 media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild | 11 ++++-------

17

 media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild    | 11 ++++-------

18

 media-video/rtmpdump/rtmpdump-9999.ebuild             | 11 ++++-------

19

 4 files changed, 12 insertions(+), 22 deletions(-)

20

21

diff --git a/media-video/rtmpdump/metadata.xml b/media-video/rtmpdump/metadata.xml

22

index 1abcb135fb3..724b1cb49d6 100644

23

--- a/media-video/rtmpdump/metadata.xml

24

+++ b/media-video/rtmpdump/metadata.xml

25

@@ -7,6 +7,5 @@

26

 </maintainer>

27

 <use>

28

 	<flag name="gnutls">Use GnuTLS library instead of the default OpenSSL</flag>

29

-	<flag name="polarssl">Use PolarSSL library instead of the default OpenSSL</flag>

30

 </use>

31

 </pkgmetadata>

32

33

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild

34

index 13ae3a45a58..5ab69865de6 100644

35

--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild

36

+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild

37

@@ -13,19 +13,18 @@ SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"

38

 LICENSE="GPL-2 LGPL-2.1"

39

 SLOT="0"

40

 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"

41

-IUSE="gnutls polarssl ssl libressl"

42

+IUSE="gnutls ssl libressl"

43

44

 DEPEND="ssl? (

45

 		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )

46

-		polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) )

47

-		!gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) )

48

+		!gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) )

49

 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]

50

)"

51

 RDEPEND="${DEPEND}"

52

53

 pkg_setup() {

54

-	if ! use ssl && { use gnutls || use polarssl; }; then

55

-		ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."

56

+	if ! use ssl && use gnutls ; then

57

+		ewarn "USE='gnutls' is ignored without USE='ssl'."

58

 		ewarn "Please review the local USE flags for this package."

59

fi

60

}

61

@@ -54,8 +53,6 @@ multilib_src_compile() {

62

 	if use ssl ; then

63

 		if use gnutls ;	then

64

 			crypto="GNUTLS"

65

-		elif use polarssl ; then

66

-			crypto="POLARSSL"

67

 		else

68

 			crypto="OPENSSL"

69

fi

70

71

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild

72

index 89a24d3c787..eec4bbc9a07 100644

73

--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild

74

+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild

75

@@ -13,19 +13,18 @@ SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"

76

 LICENSE="GPL-2 LGPL-2.1"

77

 SLOT="0"

78

 KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"

79

-IUSE="gnutls polarssl ssl libressl"

80

+IUSE="gnutls ssl libressl"

81

82

 DEPEND="ssl? (

83

 		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )

84

-		polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) )

85

-		!gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) )

86

+		!gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) )

87

 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]

88

)"

89

 RDEPEND="${DEPEND}"

90

91

 pkg_setup() {

92

-	if ! use ssl && { use gnutls || use polarssl; }; then

93

-		ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."

94

+	if ! use ssl && use gnutls ; then

95

+		ewarn "USE='gnutls' is ignored without USE='ssl'."

96

 		ewarn "Please review the local USE flags for this package."

97

fi

98

}

99

@@ -54,8 +53,6 @@ multilib_src_compile() {

100

 	if use ssl ; then

101

 		if use gnutls ;	then

102

 			crypto="GNUTLS"

103

-		elif use polarssl ; then

104

-			crypto="POLARSSL"

105

 		else

106

 			crypto="OPENSSL"

107

fi

108

109

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild

110

index 4d69e6e3a3c..ccd765a7d62 100644

111

--- a/media-video/rtmpdump/rtmpdump-9999.ebuild

112

+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild

113

@@ -13,19 +13,18 @@ EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"

114

 LICENSE="GPL-2 LGPL-2.1"

115

 SLOT="0"

116

 KEYWORDS=""

117

-IUSE="gnutls polarssl ssl libressl"

118

+IUSE="gnutls ssl libressl"

119

120

 DEPEND="ssl? (

121

 		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )

122

-		polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) )

123

-		!gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) )

124

+		!gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) )

125

 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]

126

)"

127

 RDEPEND="${DEPEND}"

128

129

 pkg_setup() {

130

-	if ! use ssl && { use gnutls || use polarssl; }; then

131

-		ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."

132

+	if ! use ssl && use gnutls ; then

133

+		ewarn "USE='gnutls' is ignored without USE='ssl'."

134

 		ewarn "Please review the local USE flags for this package."

135

fi

136

}

137

@@ -48,8 +47,6 @@ multilib_src_compile() {

138

 	if use ssl ; then

139

 		if use gnutls ; then

140

 			crypto="GNUTLS"

141

-		elif use polarssl ; then

142

-			crypto="POLARSSL"

143

 		else

144

 			crypto="OPENSSL"

145

fi

1	commit: 76c5a69340c4ed448a16724fa070a60b07aad874
2	Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3	AuthorDate: Sat Nov 4 20:30:32 2017 +0000
4	Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5	CommitDate: Sat Nov 4 20:31:12 2017 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76c5a693
7
8	media-video/rtmpdump: Drop polarssl support
9
10	Closes: https://github.com/gentoo/gentoo/pull/4895
11	Closes: https://bugs.gentoo.org/618360
12
13	Package-Manager: Portage-2.3.13, Repoman-2.3.4
14
15	media-video/rtmpdump/metadata.xml \| 1 -
16	media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild \| 11 ++++-------
17	media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild \| 11 ++++-------
18	media-video/rtmpdump/rtmpdump-9999.ebuild \| 11 ++++-------
19	4 files changed, 12 insertions(+), 22 deletions(-)
20
21	diff --git a/media-video/rtmpdump/metadata.xml b/media-video/rtmpdump/metadata.xml
22	index 1abcb135fb3..724b1cb49d6 100644
23	--- a/media-video/rtmpdump/metadata.xml
24	+++ b/media-video/rtmpdump/metadata.xml
25	@@ -7,6 +7,5 @@
26	</maintainer>
27	<use>
28	<flag name="gnutls">Use GnuTLS library instead of the default OpenSSL</flag>
29	- <flag name="polarssl">Use PolarSSL library instead of the default OpenSSL</flag>
30	</use>
31	</pkgmetadata>
32
33	diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
34	index 13ae3a45a58..5ab69865de6 100644
35	--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
36	+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
37	@@ -13,19 +13,18 @@ SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
38	LICENSE="GPL-2 LGPL-2.1"
39	SLOT="0"
40	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
41	-IUSE="gnutls polarssl ssl libressl"
42	+IUSE="gnutls ssl libressl"
43
44	DEPEND="ssl? (
45	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
46	- polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) )
47	- !gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) )
48	+ !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) )
49	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
50	)"
51	RDEPEND="${DEPEND}"
52
53	pkg_setup() {
54	- if ! use ssl && { use gnutls \|\| use polarssl; }; then
55	- ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."
56	+ if ! use ssl && use gnutls ; then
57	+ ewarn "USE='gnutls' is ignored without USE='ssl'."
58	ewarn "Please review the local USE flags for this package."
59	fi
60	}
61	@@ -54,8 +53,6 @@ multilib_src_compile() {
62	if use ssl ; then
63	if use gnutls ; then
64	crypto="GNUTLS"
65	- elif use polarssl ; then
66	- crypto="POLARSSL"
67	else
68	crypto="OPENSSL"
69	fi
70
71	diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
72	index 89a24d3c787..eec4bbc9a07 100644
73	--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
74	+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
75	@@ -13,19 +13,18 @@ SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
76	LICENSE="GPL-2 LGPL-2.1"
77	SLOT="0"
78	KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
79	-IUSE="gnutls polarssl ssl libressl"
80	+IUSE="gnutls ssl libressl"
81
82	DEPEND="ssl? (
83	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
84	- polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) )
85	- !gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) )
86	+ !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) )
87	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
88	)"
89	RDEPEND="${DEPEND}"
90
91	pkg_setup() {
92	- if ! use ssl && { use gnutls \|\| use polarssl; }; then
93	- ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."
94	+ if ! use ssl && use gnutls ; then
95	+ ewarn "USE='gnutls' is ignored without USE='ssl'."
96	ewarn "Please review the local USE flags for this package."
97	fi
98	}
99	@@ -54,8 +53,6 @@ multilib_src_compile() {
100	if use ssl ; then
101	if use gnutls ; then
102	crypto="GNUTLS"
103	- elif use polarssl ; then
104	- crypto="POLARSSL"
105	else
106	crypto="OPENSSL"
107	fi
108
109	diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
110	index 4d69e6e3a3c..ccd765a7d62 100644
111	--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
112	+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
113	@@ -13,19 +13,18 @@ EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
114	LICENSE="GPL-2 LGPL-2.1"
115	SLOT="0"
116	KEYWORDS=""
117	-IUSE="gnutls polarssl ssl libressl"
118	+IUSE="gnutls ssl libressl"
119
120	DEPEND="ssl? (
121	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
122	- polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) )
123	- !gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) )
124	+ !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) )
125	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
126	)"
127	RDEPEND="${DEPEND}"
128
129	pkg_setup() {
130	- if ! use ssl && { use gnutls \|\| use polarssl; }; then
131	- ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."
132	+ if ! use ssl && use gnutls ; then
133	+ ewarn "USE='gnutls' is ignored without USE='ssl'."
134	ewarn "Please review the local USE flags for this package."
135	fi
136	}
137	@@ -48,8 +47,6 @@ multilib_src_compile() {
138	if use ssl ; then
139	if use gnutls ; then
140	crypto="GNUTLS"
141	- elif use polarssl ; then
142	- crypto="POLARSSL"
143	else
144	crypto="OPENSSL"
145	fi

Gentoo Archives: gentoo-commits