summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2014-12-18 13:36:50 +0000
committerMichael Palimaka <kensington@gentoo.org>2014-12-18 13:36:50 +0000
commitea1762d5beaac2f862ca78c49f28c564a56f51bc (patch)
treed9f400b38883a107bc6268f56c9d9329ab207ec8 /media-video
parentShould work with 2.4 too as explained at bug #532804 (diff)
downloadgentoo-2-ea1762d5beaac2f862ca78c49f28c564a56f51bc.tar.gz
gentoo-2-ea1762d5beaac2f862ca78c49f28c564a56f51bc.tar.bz2
gentoo-2-ea1762d5beaac2f862ca78c49f28c564a56f51bc.zip
Don't try to reference USE flag that doesn't exist.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/vlc/ChangeLog6
-rw-r--r--media-video/vlc/vlc-2.1.2.ebuild4
-rw-r--r--media-video/vlc/vlc-2.1.4.ebuild4
-rw-r--r--media-video/vlc/vlc-2.1.5.ebuild4
4 files changed, 8 insertions, 10 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 7a90a5ac10e5..d5da665d9d03 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/vlc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.921 2014/12/15 05:50:48 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.922 2014/12/18 13:36:50 kensington Exp $
+
+ 18 Dec 2014; Michael Palimaka <kensington@gentoo.org> vlc-2.1.2.ebuild,
+ vlc-2.1.4.ebuild, vlc-2.1.5.ebuild:
+ Don't try to reference USE flag that doesn't exist.
15 Dec 2014; Yixun Lan <dlan@gentoo.org> vlc-2.1.2.ebuild, vlc-2.1.4.ebuild,
vlc-2.1.5.ebuild, vlc-2.1.9999.ebuild, vlc-2.2.9999.ebuild, vlc-9999.ebuild:
diff --git a/media-video/vlc/vlc-2.1.2.ebuild b/media-video/vlc/vlc-2.1.2.ebuild
index bed46887facf..ba0fea2ef758 100644
--- a/media-video/vlc/vlc-2.1.2.ebuild
+++ b/media-video/vlc/vlc-2.1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild,v 1.17 2014/12/15 05:50:48 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild,v 1.18 2014/12/18 13:36:50 kensington Exp $
EAPI="5"
@@ -251,8 +251,6 @@ src_prepare() {
# Setting QT_SELECT environment variable will enforce correct binaries.
if use qt4; then
export QT_SELECT=qt4
- elif use qt5; then
- export QT_SELECT=qt5
fi
}
diff --git a/media-video/vlc/vlc-2.1.4.ebuild b/media-video/vlc/vlc-2.1.4.ebuild
index 4bd13b8a6905..63ca76cc95df 100644
--- a/media-video/vlc/vlc-2.1.4.ebuild
+++ b/media-video/vlc/vlc-2.1.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild,v 1.12 2014/12/15 05:50:48 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild,v 1.13 2014/12/18 13:36:50 kensington Exp $
EAPI="5"
@@ -252,8 +252,6 @@ src_prepare() {
# Setting QT_SELECT environment variable will enforce correct binaries.
if use qt4; then
export QT_SELECT=qt4
- elif use qt5; then
- export QT_SELECT=qt5
fi
}
diff --git a/media-video/vlc/vlc-2.1.5.ebuild b/media-video/vlc/vlc-2.1.5.ebuild
index c7dd0f7b8b19..a29c011841ee 100644
--- a/media-video/vlc/vlc-2.1.5.ebuild
+++ b/media-video/vlc/vlc-2.1.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild,v 1.5 2014/12/15 05:50:48 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild,v 1.6 2014/12/18 13:36:50 kensington Exp $
EAPI="5"
@@ -255,8 +255,6 @@ src_prepare() {
# Setting QT_SELECT environment variable will enforce correct binaries.
if use qt4; then
export QT_SELECT=qt4
- elif use qt5; then
- export QT_SELECT=qt5
fi
}