summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2014-11-05 23:18:07 +0000
committerIan Stakenvicius <axs@gentoo.org>2014-11-05 23:18:07 +0000
commit41cf04ad5f8f215b418a452567978321d60ab258 (patch)
treefa1e928b7e3e947cfbf282dbb10c437db465ea5a /eclass
parentInitial virtual for PyPy3. (diff)
downloadgentoo-2-41cf04ad5f8f215b418a452567978321d60ab258.tar.gz
gentoo-2-41cf04ad5f8f215b418a452567978321d60ab258.tar.bz2
gentoo-2-41cf04ad5f8f215b418a452567978321d60ab258.zip
Move IUSE=selinux to the eclass
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/mozconfig-v5.33.eclass9
2 files changed, 10 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index aa66f20465ae..14ad53e6c2d1 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1403 2014/11/05 23:03:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1404 2014/11/05 23:18:07 axs Exp $
+
+ 05 Nov 2014; Ian Stakenvicius <axs@gentoo.org> mozconfig-v5.33.eclass:
+ Move IUSE=selinux to the eclass
05 Nov 2014; Michał Górny <mgorny@gentoo.org> python-r1.eclass,
python-utils-r1.eclass, tests/python-utils-r1.sh:
diff --git a/eclass/mozconfig-v5.33.eclass b/eclass/mozconfig-v5.33.eclass
index 34cfe8b6991e..8703dfff4bd4 100644
--- a/eclass/mozconfig-v5.33.eclass
+++ b/eclass/mozconfig-v5.33.eclass
@@ -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/eclass/mozconfig-v5.33.eclass,v 1.2 2014/10/17 21:07:08 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v5.33.eclass,v 1.3 2014/11/05 23:18:07 axs Exp $
#
# @ECLASS: mozconfig-v5.33.eclass
# @MAINTAINER:
@@ -45,7 +45,7 @@ esac
# Set the variable to any value if the use flag should exist but not be default-enabled.
# use-flags common among all mozilla ebuilds
-IUSE="${IUSE} dbus debug gstreamer pulseaudio startup-notification system-cairo system-icu system-jpeg system-sqlite +system-libvpx"
+IUSE="${IUSE} dbus debug gstreamer pulseaudio selinux startup-notification system-cairo system-icu system-jpeg system-sqlite system-libvpx"
# some notes on deps:
# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14
@@ -88,7 +88,7 @@ RDEPEND=">=app-text/hunspell-1.2
system-icu? ( >=dev-libs/icu-51.1 )
system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
system-sqlite? ( >=dev-db/sqlite-3.8.5:3[secure-delete,debug=] )
- system-libvpx? ( =media-libs/libvpx-1.3.0* )
+ system-libvpx? ( =media-libs/libvpx-1.3.0*[postproc] )
"
if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
@@ -115,6 +115,9 @@ DEPEND="app-arch/zip
>=sys-devel/binutils-2.16.1
${RDEPEND}"
+RDEPEND+="
+ selinux? ( sec-policy/selinux-mozilla )"
+
# @FUNCTION: mozconfig_config
# @DESCRIPTION:
# Set common configure options for mozilla packages.