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

[Amy Winston]

commit:     66d37ac24aa289a8a747f8cb1839ffe5c650735c
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 24 22:19:05 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 22:22:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66d37ac2

Revert "media-video/vlc: fix compiler type check"

This reverts commit d8bdcbc565535962f5579c4693784b1ee1547525.

 media-video/vlc/vlc-2.2.1-r1.ebuild | 4 ++--
 media-video/vlc/vlc-2.2.4.ebuild    | 4 ++--
 media-video/vlc/vlc-2.2.9999.ebuild | 4 ++--
 media-video/vlc/vlc-9999.ebuild     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/media-video/vlc/vlc-2.2.1-r1.ebuild 
b/media-video/vlc/vlc-2.2.1-r1.ebuild
index 76fe9c6..b2dbdf0 100644
--- a/media-video/vlc/vlc-2.2.1-r1.ebuild
+++ b/media-video/vlc/vlc-2.2.1-r1.ebuild
@@ -213,7 +213,7 @@ REQUIRED_USE="
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-       if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == "*gcc*" ]] ; then
+       if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then
                if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 
&& $(gcc-minor-version) < 5 ) ]] ; then
                        die "You need to have at least >=sys-devel/gcc-4.5 to 
build and/or have a working vlc, see bug #426754."
                fi
@@ -236,7 +236,7 @@ src_prepare() {
        # config.h:793: warning: ignoring #pragma STDC FP_CONTRACT 
[-Wunknown-pragmas]
        #
        # https://gcc.gnu.org/c99status.html
-       if [[ "$(tc-getCC)" == "*gcc*" ]] ; then
+       if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
                sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
        fi
 

diff --git a/media-video/vlc/vlc-2.2.4.ebuild b/media-video/vlc/vlc-2.2.4.ebuild
index 52dbe3e..e874b8c 100644
--- a/media-video/vlc/vlc-2.2.4.ebuild
+++ b/media-video/vlc/vlc-2.2.4.ebuild
@@ -239,7 +239,7 @@ PATCHES=(
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-       if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == "*gcc*" ]] ; then
+       if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then
                if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 
&& $(gcc-minor-version) < 5 ) ]] ; then
                        die "You need to have at least >=sys-devel/gcc-4.5 to 
build and/or have a working vlc, see bug #426754."
                fi
@@ -262,7 +262,7 @@ src_prepare() {
        # config.h:793: warning: ignoring #pragma STDC FP_CONTRACT 
[-Wunknown-pragmas]
        #
        # https://gcc.gnu.org/c99status.html
-       if [[ "$(tc-getCC)" == "*gcc*" ]] ; then
+       if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
                sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
        fi
 

diff --git a/media-video/vlc/vlc-2.2.9999.ebuild 
b/media-video/vlc/vlc-2.2.9999.ebuild
index 62cc010..2ca5caf 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -209,7 +209,7 @@ REQUIRED_USE="
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-       if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == "*gcc*" ]] ; then
+       if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then
                if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 
&& $(gcc-minor-version) < 5 ) ]] ; then
                        die "You need to have at least >=sys-devel/gcc-4.5 to 
build and/or have a working vlc, see bug #426754."
                fi
@@ -232,7 +232,7 @@ src_prepare() {
        # config.h:793: warning: ignoring #pragma STDC FP_CONTRACT 
[-Wunknown-pragmas]
        #
        # https://gcc.gnu.org/c99status.html
-       if [[ "$(tc-getCC)" == "*gcc*" ]] ; then
+       if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
                sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
        fi
 

diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 1b4e268..0ad4938 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -212,7 +212,7 @@ REQUIRED_USE="
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-       if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == "*gcc*" ]] ; then
+       if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then
                if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 
&& $(gcc-minor-version) < 5 ) ]] ; then
                        die "You need to have at least >=sys-devel/gcc-4.5 to 
build and/or have a working vlc, see bug #426754."
                fi
@@ -235,7 +235,7 @@ src_prepare() {
        # config.h:793: warning: ignoring #pragma STDC FP_CONTRACT 
[-Wunknown-pragmas]
        #
        # https://gcc.gnu.org/c99status.html
-       if [[ "$(tc-getCC)" == "*gcc*" ]] ; then
+       if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
                sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
        fi