[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh2/ - gentoo-commits

From:	David Seifert <soap@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh2/
Date:	Sat, 27 Apr 2019 20:29:01
Message-Id:	`1556396872.354f82013dd455c6629fa35b1193464f45afeffb.soap@gentoo`

1

commit:     354f82013dd455c6629fa35b1193464f45afeffb

2

Author:     David Seifert <soap <AT> gentoo <DOT> org>

3

AuthorDate: Sat Apr 27 16:35:04 2019 +0000

4

Commit:     David Seifert <soap <AT> gentoo <DOT> org>

5

CommitDate: Sat Apr 27 20:27:52 2019 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=354f8201

7

8

net-libs/libssh2: [QA] Fix USE=libressl semantics

9

10

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

11

Package-Manager: Portage-2.3.64, Repoman-2.3.12

12

Signed-off-by: David Seifert <soap <AT> gentoo.org>

13

14

 net-libs/libssh2/libssh2-1.8.0-r2.ebuild | 16 +++++++++-------

15

 net-libs/libssh2/libssh2-1.8.2.ebuild    | 14 ++++++++------

16

 net-libs/libssh2/libssh2-9999.ebuild     | 14 ++++++++------

17

 3 files changed, 25 insertions(+), 19 deletions(-)

18

19

diff --git a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild

20

index bdab253bbee..7eb5156df2c 100644

21

--- a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild

22

+++ b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild

23

@@ -1,4 +1,4 @@

24

-# Copyright 1999-2018 Gentoo Authors

25

+# Copyright 1999-2019 Gentoo Authors

26

 # Distributed under the terms of the GNU General Public License v2

27

28

 EAPI=6

29

@@ -12,16 +12,18 @@ LICENSE="BSD"

30

 SLOT="0"

31

 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"

32

 IUSE="gcrypt libressl mbedtls zlib"

33

-REQUIRED_USE="

34

-	?? ( gcrypt libressl mbedtls )

35

-"

36

+REQUIRED_USE="?? ( gcrypt mbedtls )"

37

 RESTRICT="test"

38

39

 RDEPEND="

40

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

41

 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )

42

-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )

43

-	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )

44

+	!gcrypt? (

45

+		mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )

46

+		!mbedtls? (

47

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

48

+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )

49

+		)

50

+	)

51

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

52

"

53

 DEPEND="

54

55

diff --git a/net-libs/libssh2/libssh2-1.8.2.ebuild b/net-libs/libssh2/libssh2-1.8.2.ebuild

56

index 75e39f52b68..7eb5156df2c 100644

57

--- a/net-libs/libssh2/libssh2-1.8.2.ebuild

58

+++ b/net-libs/libssh2/libssh2-1.8.2.ebuild

59

@@ -12,16 +12,18 @@ LICENSE="BSD"

60

 SLOT="0"

61

 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"

62

 IUSE="gcrypt libressl mbedtls zlib"

63

-REQUIRED_USE="

64

-	?? ( gcrypt libressl mbedtls )

65

-"

66

+REQUIRED_USE="?? ( gcrypt mbedtls )"

67

 RESTRICT="test"

68

69

 RDEPEND="

70

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

71

 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )

72

-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )

73

-	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )

74

+	!gcrypt? (

75

+		mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )

76

+		!mbedtls? (

77

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

78

+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )

79

+		)

80

+	)

81

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

82

"

83

 DEPEND="

84

85

diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild

86

index 456ca920385..d1797b7dcfa 100644

87

--- a/net-libs/libssh2/libssh2-9999.ebuild

88

+++ b/net-libs/libssh2/libssh2-9999.ebuild

89

@@ -12,16 +12,18 @@ LICENSE="BSD"

90

 SLOT="0"

91

 KEYWORDS=""

92

 IUSE="gcrypt libressl mbedtls zlib"

93

-REQUIRED_USE="

94

-	?? ( gcrypt libressl mbedtls )

95

-"

96

+REQUIRED_USE="?? ( gcrypt mbedtls )"

97

 RESTRICT="test"

98

99

 RDEPEND="

100

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

101

 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )

102

-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )

103

-	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )

104

+	!gcrypt? (

105

+		mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )

106

+		!mbedtls? (

107

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

108

+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )

109

+		)

110

+	)

111

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

112

"

113

 DEPEND="

1	commit: 354f82013dd455c6629fa35b1193464f45afeffb
2	Author: David Seifert <soap <AT> gentoo <DOT> org>
3	AuthorDate: Sat Apr 27 16:35:04 2019 +0000
4	Commit: David Seifert <soap <AT> gentoo <DOT> org>
5	CommitDate: Sat Apr 27 20:27:52 2019 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=354f8201
7
8	net-libs/libssh2: [QA] Fix USE=libressl semantics
9
10	Closes: https://bugs.gentoo.org/684000
11	Package-Manager: Portage-2.3.64, Repoman-2.3.12
12	Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14	net-libs/libssh2/libssh2-1.8.0-r2.ebuild \| 16 +++++++++-------
15	net-libs/libssh2/libssh2-1.8.2.ebuild \| 14 ++++++++------
16	net-libs/libssh2/libssh2-9999.ebuild \| 14 ++++++++------
17	3 files changed, 25 insertions(+), 19 deletions(-)
18
19	diff --git a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
20	index bdab253bbee..7eb5156df2c 100644
21	--- a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
22	+++ b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
23	@@ -1,4 +1,4 @@
24	-# Copyright 1999-2018 Gentoo Authors
25	+# Copyright 1999-2019 Gentoo Authors
26	# Distributed under the terms of the GNU General Public License v2
27
28	EAPI=6
29	@@ -12,16 +12,18 @@ LICENSE="BSD"
30	SLOT="0"
31	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
32	IUSE="gcrypt libressl mbedtls zlib"
33	-REQUIRED_USE="
34	- ?? ( gcrypt libressl mbedtls )
35	-"
36	+REQUIRED_USE="?? ( gcrypt mbedtls )"
37	RESTRICT="test"
38
39	RDEPEND="
40	- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
41	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
42	- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
43	- mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
44	+ !gcrypt? (
45	+ mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
46	+ !mbedtls? (
47	+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
48	+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
49	+ )
50	+ )
51	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
52	"
53	DEPEND="
54
55	diff --git a/net-libs/libssh2/libssh2-1.8.2.ebuild b/net-libs/libssh2/libssh2-1.8.2.ebuild
56	index 75e39f52b68..7eb5156df2c 100644
57	--- a/net-libs/libssh2/libssh2-1.8.2.ebuild
58	+++ b/net-libs/libssh2/libssh2-1.8.2.ebuild
59	@@ -12,16 +12,18 @@ LICENSE="BSD"
60	SLOT="0"
61	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
62	IUSE="gcrypt libressl mbedtls zlib"
63	-REQUIRED_USE="
64	- ?? ( gcrypt libressl mbedtls )
65	-"
66	+REQUIRED_USE="?? ( gcrypt mbedtls )"
67	RESTRICT="test"
68
69	RDEPEND="
70	- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
71	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
72	- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
73	- mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
74	+ !gcrypt? (
75	+ mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
76	+ !mbedtls? (
77	+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
78	+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
79	+ )
80	+ )
81	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
82	"
83	DEPEND="
84
85	diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild
86	index 456ca920385..d1797b7dcfa 100644
87	--- a/net-libs/libssh2/libssh2-9999.ebuild
88	+++ b/net-libs/libssh2/libssh2-9999.ebuild
89	@@ -12,16 +12,18 @@ LICENSE="BSD"
90	SLOT="0"
91	KEYWORDS=""
92	IUSE="gcrypt libressl mbedtls zlib"
93	-REQUIRED_USE="
94	- ?? ( gcrypt libressl mbedtls )
95	-"
96	+REQUIRED_USE="?? ( gcrypt mbedtls )"
97	RESTRICT="test"
98
99	RDEPEND="
100	- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
101	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
102	- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
103	- mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
104	+ !gcrypt? (
105	+ mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
106	+ !mbedtls? (
107	+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
108	+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
109	+ )
110	+ )
111	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
112	"
113	DEPEND="

Gentoo Archives: gentoo-commits