Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/
Date: Thu, 27 Jul 2017 19:56:55
Message-Id: 1501185383.3714524cf95bef229338dd937b7875eb18384b7b.floppym@gentoo
1 commit: 3714524cf95bef229338dd937b7875eb18384b7b
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 27 19:46:03 2017 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 27 19:56:23 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3714524c
7
8 www-client/chromium: drop support for gtk2
9
10 Bug: https://bugs.gentoo.org/625718
11 Bug: https://bugs.gentoo.org/626376
12 Package-Manager: Portage-2.3.6_p23, Repoman-2.3.3_p1
13
14 www-client/chromium/chromium-60.0.3112.78.ebuild | 7 +++----
15 www-client/chromium/chromium-61.0.3159.5.ebuild | 7 +++----
16 2 files changed, 6 insertions(+), 8 deletions(-)
17
18 diff --git a/www-client/chromium/chromium-60.0.3112.78.ebuild b/www-client/chromium/chromium-60.0.3112.78.ebuild
19 index a89dd6df1ae..88f7fd88405 100644
20 --- a/www-client/chromium/chromium-60.0.3112.78.ebuild
21 +++ b/www-client/chromium/chromium-60.0.3112.78.ebuild
22 @@ -17,7 +17,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
23 LICENSE="BSD"
24 SLOT="0"
25 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
26 -IUSE="component-build cups gnome-keyring +gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-libvpx +tcmalloc widevine"
27 +IUSE="component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-libvpx +tcmalloc widevine"
28 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
29
30 # Native Client binaries are compiled with different set of flags, bug #452066.
31 @@ -54,6 +54,7 @@ COMMON_DEPEND="
32 virtual/udev
33 x11-libs/cairo:=
34 x11-libs/gdk-pixbuf:2
35 + x11-libs/gtk+:3
36 x11-libs/libX11:=
37 x11-libs/libXcomposite:=
38 x11-libs/libXcursor:=
39 @@ -79,8 +80,6 @@ RDEPEND="${COMMON_DEPEND}
40 x11-misc/xdg-utils
41 virtual/opengl
42 virtual/ttf-fonts
43 - !gtk3? ( x11-libs/gtk+:2 )
44 - gtk3? ( x11-libs/gtk+:3 )
45 selinux? ( sec-policy/selinux-chromium )
46 tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
47 widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
48 @@ -402,7 +401,7 @@ src_configure() {
49 myconf_gn+=" use_cups=$(usex cups true false)"
50 myconf_gn+=" use_gconf=false"
51 myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
52 - myconf_gn+=" use_gtk3=$(usex gtk3 true false)"
53 + myconf_gn+=" use_gtk3=true"
54 myconf_gn+=" use_kerberos=$(usex kerberos true false)"
55 myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
56
57
58 diff --git a/www-client/chromium/chromium-61.0.3159.5.ebuild b/www-client/chromium/chromium-61.0.3159.5.ebuild
59 index 6cb8b9c4dfb..8dd11ad4641 100644
60 --- a/www-client/chromium/chromium-61.0.3159.5.ebuild
61 +++ b/www-client/chromium/chromium-61.0.3159.5.ebuild
62 @@ -17,7 +17,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
63 LICENSE="BSD"
64 SLOT="0"
65 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
66 -IUSE="component-build cups gnome-keyring +gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
67 +IUSE="component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
68 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
69
70 # Native Client binaries are compiled with different set of flags, bug #452066.
71 @@ -54,6 +54,7 @@ COMMON_DEPEND="
72 virtual/udev
73 x11-libs/cairo:=
74 x11-libs/gdk-pixbuf:2
75 + x11-libs/gtk+:3
76 x11-libs/libX11:=
77 x11-libs/libXcomposite:=
78 x11-libs/libXcursor:=
79 @@ -79,8 +80,6 @@ RDEPEND="${COMMON_DEPEND}
80 x11-misc/xdg-utils
81 virtual/opengl
82 virtual/ttf-fonts
83 - !gtk3? ( x11-libs/gtk+:2 )
84 - gtk3? ( x11-libs/gtk+:3 )
85 selinux? ( sec-policy/selinux-chromium )
86 tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
87 widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
88 @@ -410,7 +409,7 @@ src_configure() {
89 myconf_gn+=" use_cups=$(usex cups true false)"
90 myconf_gn+=" use_gconf=false"
91 myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
92 - myconf_gn+=" use_gtk3=$(usex gtk3 true false)"
93 + myconf_gn+=" use_gtk3=true"
94 myconf_gn+=" use_kerberos=$(usex kerberos true false)"
95 myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"