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

From:	Amy Winston <amynka@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/
Date:	Mon, 25 Jul 2016 20:32:48
Message-Id:	`1469478651.bbd3998a90dd8d83c26639a1b3e42b83826f7059.amynka@gentoo`

1

commit:     bbd3998a90dd8d83c26639a1b3e42b83826f7059

2

Author:     Amy Winston <amynka <AT> gentoo <DOT> org>

3

AuthorDate: Mon Jul 25 20:30:51 2016 +0000

4

Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>

5

CommitDate: Mon Jul 25 20:30:51 2016 +0000

6

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

7

8

media-video/vlc: fix compiler type check

9

10

Package-Manager: portage-2.2.28

11

12

 media-video/vlc/vlc-2.2.1-r1.ebuild | 8 ++++----

13

 media-video/vlc/vlc-2.2.4.ebuild    | 8 ++++----

14

 media-video/vlc/vlc-2.2.9999.ebuild | 8 ++++----

15

 media-video/vlc/vlc-9999.ebuild     | 8 ++++----

16

 4 files changed, 16 insertions(+), 16 deletions(-)

17

18

diff --git a/media-video/vlc/vlc-2.2.1-r1.ebuild b/media-video/vlc/vlc-2.2.1-r1.ebuild

19

index b2dbdf0..119a824 100644

20

--- a/media-video/vlc/vlc-2.2.1-r1.ebuild

21

+++ b/media-video/vlc/vlc-2.2.1-r1.ebuild

22

@@ -15,7 +15,7 @@ if [ "${PV%9999}" != "${PV}" ] ; then

23

fi

24

fi

25

26

-inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM}

27

+inherit eutils multilib autotools toolchain-funcs flag-o-matic versionator virtualx ${SCM}

28

29

 MY_PV="${PV/_/-}"

30

 MY_PV="${MY_PV/-beta/-test}"

31

@@ -213,8 +213,8 @@ REQUIRED_USE="

32

 S="${WORKDIR}/${MY_P}"

33

34

 pkg_setup() {

35

-	if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then

36

-		if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then

37

+	if [[ "${MERGE_TYPE}" != "binary" ]] && tc-is-gcc ; then

38

+		if ! version_is_at_least 4.5 $(gcc-version) ; then

39

 			die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."

40

fi

41

fi

42

@@ -236,7 +236,7 @@ src_prepare() {

43

 	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]

44

#

45

 	# https://gcc.gnu.org/c99status.html

46

-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then

47

+	if tc-is-gcc ; then

48

 		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die

49

fi

50

51

52

diff --git a/media-video/vlc/vlc-2.2.4.ebuild b/media-video/vlc/vlc-2.2.4.ebuild

53

index e874b8c..1ae2aa5 100644

54

--- a/media-video/vlc/vlc-2.2.4.ebuild

55

+++ b/media-video/vlc/vlc-2.2.4.ebuild

56

@@ -15,7 +15,7 @@ if [ "${PV%9999}" != "${PV}" ] ; then

57

fi

58

fi

59

60

-inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM}

61

+inherit eutils multilib autotools toolchain-funcs flag-o-matic versionator virtualx ${SCM}

62

63

 MY_PV="${PV/_/-}"

64

 MY_PV="${MY_PV/-beta/-test}"

65

@@ -239,8 +239,8 @@ PATCHES=(

66

 S="${WORKDIR}/${MY_P}"

67

68

 pkg_setup() {

69

-	if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then

70

-		if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then

71

+	if [[ "${MERGE_TYPE}" != "binary" ]] && tc-is-gcc ; then

72

+		if ! version_is_at_least 4.5 $(gcc-version) ; then

73

 			die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."

74

fi

75

fi

76

@@ -262,7 +262,7 @@ src_prepare() {

77

 	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]

78

#

79

 	# https://gcc.gnu.org/c99status.html

80

-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then

81

+	if tc-is-gcc ; then

82

 		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die

83

fi

84

85

86

diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild

87

index 2ca5caf..a68d243 100644

88

--- a/media-video/vlc/vlc-2.2.9999.ebuild

89

+++ b/media-video/vlc/vlc-2.2.9999.ebuild

90

@@ -15,7 +15,7 @@ if [ "${PV%9999}" != "${PV}" ] ; then

91

fi

92

fi

93

94

-inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM}

95

+inherit eutils multilib autotools toolchain-funcs flag-o-matic versionator virtualx ${SCM}

96

97

 MY_PV="${PV/_/-}"

98

 MY_PV="${MY_PV/-beta/-test}"

99

@@ -209,8 +209,8 @@ REQUIRED_USE="

100

 S="${WORKDIR}/${MY_P}"

101

102

 pkg_setup() {

103

-	if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then

104

-		if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then

105

+	if [[ "${MERGE_TYPE}" != "binary" ]] && tc-is-gcc ; then

106

+		if ! version_is_at_least 4.5 $(gcc-version) ; then

107

 			die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."

108

fi

109

fi

110

@@ -232,7 +232,7 @@ src_prepare() {

111

 	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]

112

#

113

 	# https://gcc.gnu.org/c99status.html

114

-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then

115

+	if tc-is-gcc ; then

116

 		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die

117

fi

118

119

120

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

121

index 0ad4938..ebcd381 100644

122

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

123

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

124

@@ -15,7 +15,7 @@ if [ "${PV%9999}" != "${PV}" ] ; then

125

fi

126

fi

127

128

-inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM}

129

+inherit eutils multilib autotools toolchain-funcs flag-o-matic versionator virtualx ${SCM}

130

131

 MY_PV="${PV/_/-}"

132

 MY_PV="${MY_PV/-beta/-test}"

133

@@ -212,8 +212,8 @@ REQUIRED_USE="

134

 S="${WORKDIR}/${MY_P}"

135

136

 pkg_setup() {

137

-	if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then

138

-		if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then

139

+	if [[ "${MERGE_TYPE}" != "binary" ]] && tc-is-gcc ; then

140

+		if ! version_is_at_least 4.5 $(gcc-version) ; then

141

 			die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."

142

fi

143

fi

144

@@ -235,7 +235,7 @@ src_prepare() {

145

 	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]

146

#

147

 	# https://gcc.gnu.org/c99status.html

148

-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then

149

+	if tc-is-gcc ; then

150

 		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die

151

fi

1	commit: bbd3998a90dd8d83c26639a1b3e42b83826f7059
2	Author: Amy Winston <amynka <AT> gentoo <DOT> org>
3	AuthorDate: Mon Jul 25 20:30:51 2016 +0000
4	Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
5	CommitDate: Mon Jul 25 20:30:51 2016 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbd3998a
7
8	media-video/vlc: fix compiler type check
9
10	Package-Manager: portage-2.2.28
11
12	media-video/vlc/vlc-2.2.1-r1.ebuild \| 8 ++++----
13	media-video/vlc/vlc-2.2.4.ebuild \| 8 ++++----
14	media-video/vlc/vlc-2.2.9999.ebuild \| 8 ++++----
15	media-video/vlc/vlc-9999.ebuild \| 8 ++++----
16	4 files changed, 16 insertions(+), 16 deletions(-)
17
18	diff --git a/media-video/vlc/vlc-2.2.1-r1.ebuild b/media-video/vlc/vlc-2.2.1-r1.ebuild
19	index b2dbdf0..119a824 100644
20	--- a/media-video/vlc/vlc-2.2.1-r1.ebuild
21	+++ b/media-video/vlc/vlc-2.2.1-r1.ebuild
22	@@ -15,7 +15,7 @@ if [ "${PV%9999}" != "${PV}" ] ; then
23	fi
24	fi
25
26	-inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM}
27	+inherit eutils multilib autotools toolchain-funcs flag-o-matic versionator virtualx ${SCM}
28
29	MY_PV="${PV/_/-}"
30	MY_PV="${MY_PV/-beta/-test}"
31	@@ -213,8 +213,8 @@ REQUIRED_USE="
32	S="${WORKDIR}/${MY_P}"
33
34	pkg_setup() {
35	- if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == "gcc" ]] ; then
36	- if [[ $(gcc-major-version) < 4 \|\| ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then
37	+ if [[ "${MERGE_TYPE}" != "binary" ]] && tc-is-gcc ; then
38	+ if ! version_is_at_least 4.5 $(gcc-version) ; then
39	die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
40	fi
41	fi
42	@@ -236,7 +236,7 @@ src_prepare() {
43	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
44	#
45	# https://gcc.gnu.org/c99status.html
46	- if [[ "$(tc-getCC)" == "gcc" ]] ; then
47	+ if tc-is-gcc ; then
48	sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac \|\| die
49	fi
50
51
52	diff --git a/media-video/vlc/vlc-2.2.4.ebuild b/media-video/vlc/vlc-2.2.4.ebuild
53	index e874b8c..1ae2aa5 100644
54	--- a/media-video/vlc/vlc-2.2.4.ebuild
55	+++ b/media-video/vlc/vlc-2.2.4.ebuild
56	@@ -15,7 +15,7 @@ if [ "${PV%9999}" != "${PV}" ] ; then
57	fi
58	fi
59
60	-inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM}
61	+inherit eutils multilib autotools toolchain-funcs flag-o-matic versionator virtualx ${SCM}
62
63	MY_PV="${PV/_/-}"
64	MY_PV="${MY_PV/-beta/-test}"
65	@@ -239,8 +239,8 @@ PATCHES=(
66	S="${WORKDIR}/${MY_P}"
67
68	pkg_setup() {
69	- if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == "gcc" ]] ; then
70	- if [[ $(gcc-major-version) < 4 \|\| ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then
71	+ if [[ "${MERGE_TYPE}" != "binary" ]] && tc-is-gcc ; then
72	+ if ! version_is_at_least 4.5 $(gcc-version) ; then
73	die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
74	fi
75	fi
76	@@ -262,7 +262,7 @@ src_prepare() {
77	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
78	#
79	# https://gcc.gnu.org/c99status.html
80	- if [[ "$(tc-getCC)" == "gcc" ]] ; then
81	+ if tc-is-gcc ; then
82	sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac \|\| die
83	fi
84
85
86	diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
87	index 2ca5caf..a68d243 100644
88	--- a/media-video/vlc/vlc-2.2.9999.ebuild
89	+++ b/media-video/vlc/vlc-2.2.9999.ebuild
90	@@ -15,7 +15,7 @@ if [ "${PV%9999}" != "${PV}" ] ; then
91	fi
92	fi
93
94	-inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM}
95	+inherit eutils multilib autotools toolchain-funcs flag-o-matic versionator virtualx ${SCM}
96
97	MY_PV="${PV/_/-}"
98	MY_PV="${MY_PV/-beta/-test}"
99	@@ -209,8 +209,8 @@ REQUIRED_USE="
100	S="${WORKDIR}/${MY_P}"
101
102	pkg_setup() {
103	- if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == "gcc" ]] ; then
104	- if [[ $(gcc-major-version) < 4 \|\| ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then
105	+ if [[ "${MERGE_TYPE}" != "binary" ]] && tc-is-gcc ; then
106	+ if ! version_is_at_least 4.5 $(gcc-version) ; then
107	die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
108	fi
109	fi
110	@@ -232,7 +232,7 @@ src_prepare() {
111	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
112	#
113	# https://gcc.gnu.org/c99status.html
114	- if [[ "$(tc-getCC)" == "gcc" ]] ; then
115	+ if tc-is-gcc ; then
116	sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac \|\| die
117	fi
118
119
120	diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
121	index 0ad4938..ebcd381 100644
122	--- a/media-video/vlc/vlc-9999.ebuild
123	+++ b/media-video/vlc/vlc-9999.ebuild
124	@@ -15,7 +15,7 @@ if [ "${PV%9999}" != "${PV}" ] ; then
125	fi
126	fi
127
128	-inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM}
129	+inherit eutils multilib autotools toolchain-funcs flag-o-matic versionator virtualx ${SCM}
130
131	MY_PV="${PV/_/-}"
132	MY_PV="${MY_PV/-beta/-test}"
133	@@ -212,8 +212,8 @@ REQUIRED_USE="
134	S="${WORKDIR}/${MY_P}"
135
136	pkg_setup() {
137	- if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == "gcc" ]] ; then
138	- if [[ $(gcc-major-version) < 4 \|\| ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then
139	+ if [[ "${MERGE_TYPE}" != "binary" ]] && tc-is-gcc ; then
140	+ if ! version_is_at_least 4.5 $(gcc-version) ; then
141	die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
142	fi
143	fi
144	@@ -235,7 +235,7 @@ src_prepare() {
145	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
146	#
147	# https://gcc.gnu.org/c99status.html
148	- if [[ "$(tc-getCC)" == "gcc" ]] ; then
149	+ if tc-is-gcc ; then
150	sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac \|\| die
151	fi

Gentoo Archives: gentoo-commits