summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2017-01-07 12:41:12 -0500
committerMike Gilbert <floppym@gentoo.org>2017-01-07 12:41:25 -0500
commit8c88f0cf22a0d8915df6d06f59b020cbfc671e2e (patch)
treecad596edbf1762ddbbea1d23830d954a6410bd1d /www-client
parentwww-client/google-chrome-beta: automated update (56.0.2924.51) (diff)
downloadgentoo-8c88f0cf22a0d8915df6d06f59b020cbfc671e2e.tar.gz
gentoo-8c88f0cf22a0d8915df6d06f59b020cbfc671e2e.tar.bz2
gentoo-8c88f0cf22a0d8915df6d06f59b020cbfc671e2e.zip
www-client/chromium: rename gnome USE flag to gconf
Bug: https://bugs.gentoo.org/576712 Package-Manager: Portage-2.3.3_p19, Repoman-2.3.1_p12
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/chromium-57.0.2970.0.ebuild12
-rw-r--r--www-client/chromium/metadata.xml1
2 files changed, 6 insertions, 7 deletions
diff --git a/www-client/chromium/chromium-57.0.2970.0.ebuild b/www-client/chromium/chromium-57.0.2970.0.ebuild
index 544178e63002..5c95a45be5d9 100644
--- a/www-client/chromium/chromium-57.0.2970.0.ebuild
+++ b/www-client/chromium/chromium-57.0.2970.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="component-build cups gnome gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +tcmalloc widevine"
+IUSE="component-build cups gconf gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +tcmalloc widevine"
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
# Native Client binaries are compiled with different set of flags, bug #452066.
@@ -41,7 +41,7 @@ COMMON_DEPEND="
dev-libs/nspr:=
>=dev-libs/nss-3.14.3:=
>=dev-libs/re2-0.2016.05.01:=
- gnome? ( >=gnome-base/gconf-2.24.0:= )
+ gconf? ( >=gnome-base/gconf-2.24.0:= )
gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
>=media-libs/alsa-lib-1.0.19:=
media-libs/fontconfig:=
@@ -373,7 +373,7 @@ src_configure() {
myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
myconf_gn+=" enable_widevine=$(usex widevine true false)"
myconf_gn+=" use_cups=$(usex cups true false)"
- myconf_gn+=" use_gconf=$(usex gnome true false)"
+ myconf_gn+=" use_gconf=$(usex gconf true false)"
myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
myconf_gn+=" use_gtk3=$(usex gtk3 true false)"
myconf_gn+=" use_kerberos=$(usex kerberos true false)"
@@ -610,10 +610,8 @@ src_install() {
sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
# Install GNOME default application entry (bug #303100).
- if use gnome; then
- insinto /usr/share/gnome-control-center/default-apps
- newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
- fi
+ insinto /usr/share/gnome-control-center/default-apps
+ newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
readme.gentoo_create_doc
}
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index cbab844193a6..c2a73f874cc3 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -8,6 +8,7 @@
<longdescription>Chromium is the open-source web browser project behind Google Chrome</longdescription>
<use>
<flag name="component-build">Split build into more shared libraries to speed up linking. Mostly intended for debugging and development, NOT RECOMMENDED for general use.</flag>
+ <flag name="gconf">Enable support for GConf to retrieve system settings</flag>
<flag name="gn">Use GN (generate ninja) instead of GYP for building</flag>
<flag name="gtk3">Use gtk3 instead of gtk2</flag>
<flag name="hangouts">Enable support for Google Hangouts features such as screen sharing</flag>