Attachment #889507 for bug #926166




SLOT="0/beta"
KEYWORDS="~amd64 ~arm64"
IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
IUSE="+X ${IUSE_SYSTEM_LIBS} accessibility bindist cups debug ffmpeg-chromium glib gtk gtk4 +hangouts headless kerberos libcxx +lto +official pax-kernel pgo +proprietary-codecs pulseaudio"
IUSE+=" qt5 qt6 +screencast selinux +system-toolchain +vaapi +wayland +widevine"
RESTRICT="!bindist? ( bindist )"

REQUIRED_USE="
	accessibility? ( glib )
	!headless? ( || ( X wayland ) )
	pgo? ( X !wayland )
	screencast? ( glib wayland )
	!system-toolchain? ( libcxx )
	ffmpeg-chromium? ( bindist proprietary-codecs )
"

	sys-libs/zlib:=
	x11-libs/libdrm:=
	!headless? (
		glib? ( dev-libs/glib:2 )
		>=media-libs/alsa-lib-1.0.19:=
		pulseaudio? ( media-libs/libpulse:= )
		sys-apps/pciutils:=

	sys-libs/zlib:=[minizip]
	!headless? (
		X? ( ${COMMON_X_DEPEND} )
		accessibility? ( >=app-accessibility/at-spi2-core-2.46.0:2 )
		media-libs/mesa:=[X?,wayland?]
		cups? ( >=net-print/cups-1.3.11:= )
		virtual/udev
		gtk? (
			x11-libs/cairo:=
			x11-libs/gdk-pixbuf:2
			x11-libs/pango:=
		)
		gtk4? (
			x11-libs/cairo:=
			x11-libs/gdk-pixbuf:2
			x11-libs/pango:=
		)
		qt5? (
			dev-qt/qtcore:5
			dev-qt/qtwidgets:5

"
RDEPEND="${COMMON_DEPEND}
	!headless? (
		gtk? ( x11-libs/gtk+:3[X?,wayland?] )
		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
			gui-libs/gtk:4[X?,wayland?]
		)
		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
		qt6? ( dev-qt/qtbase:6[gui,X?,wayland?] )
	)

"
DEPEND="${COMMON_DEPEND}
	!headless? (
		gtk? ( x11-libs/gtk+:3[X?,wayland?] )
		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
		qt6? ( dev-qt/qtbase:6[gui,X?,wayland?] )
		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
	)
"


	fi

	if use headless; then
		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "glib" "gtk" "gtk4" "qt5" "qt6" "vaapi" "wayland")
		for myiuse in ${headless_unused_flags[@]}; do
			use ${myiuse} && ewarn "Ignoring USE=${myiuse}, USE=headless is set."
		done

		"${FILESDIR}/chromium-117-system-zstd.patch"
		"${FILESDIR}/chromium-124-libwebp-shim-sharpyuv.patch"
		"${FILESDIR}/chromium-124-separate-qt56.patch"
		"${FILESDIR}/chromium-124-optional-glib_gio_gtk_atk.patch"
	)

	if use system-toolchain; then

		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
	fi

	# Allows distributions to link pulseaudio directly (DT_NEEDED) instead of

	if use headless; then
		myconf_gn+=" ozone_platform=\"headless\""
		myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
		myconf_gn+=" use_glib=false use_gio=false use_atk=false"
		myconf_gn+=" use_pangocairo=false use_alsa=false"
		myconf_gn+=" use_libpci=false use_udev=false"
		myconf_gn+=" enable_print_preview=false"

		myconf_gn+=" use_system_libdrm=true"
		myconf_gn+=" use_system_minigbm=true"
		myconf_gn+=" use_xkbcommon=true"
		myconf_gn+=" use_glib=$(usex glib true false)"
		myconf_gn+=" use_gio=$(usex glib true false)"
		myconf_gn+=" use_atk=$(usex accessibility true false)"
		if use gtk || use gtk4; then
			myconf_gn+=" use_gtk=true"
			myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
		else
			myconf_gn+=" use_gtk=false"
			myconf_gn+=" use_pangocairo=false"
		fi
		if use qt5 || use qt6; then
			local cbuild_libdir=$(get_libdir)
			if tc-is-cross-compiler; then

Return to bug 926166

Lines 90-103 LICENSE="BSD" Link Here

(-)a/www-client/chromium/chromium-124.0.6367.29.ebuild (-15 / +31 lines)
90	SLOT="0/beta"	90	SLOT="0/beta"
91	KEYWORDS="~amd64 ~arm64"	91	KEYWORDS="~amd64 ~arm64"
92	IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"	92	IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
93	IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos libcxx +lto +official pax-kernel pgo +proprietary-codecs pulseaudio"	93	IUSE="+X ${IUSE_SYSTEM_LIBS} accessibility bindist cups debug ffmpeg-chromium glib gtk gtk4 +hangouts headless kerberos libcxx +lto +official pax-kernel pgo +proprietary-codecs pulseaudio"
94	IUSE+=" qt5 qt6 +screencast selinux +system-toolchain +vaapi +wayland +widevine"	94	IUSE+=" qt5 qt6 +screencast selinux +system-toolchain +vaapi +wayland +widevine"
95	RESTRICT="!bindist? ( bindist )"	95	RESTRICT="!bindist? ( bindist )"
96		96
97	REQUIRED_USE="	97	REQUIRED_USE="
		98	accessibility? ( glib )
98	!headless? ( \|\| ( X wayland ) )	99	!headless? ( \|\| ( X wayland ) )
99	pgo? ( X !wayland )	100	pgo? ( X !wayland )
100	screencast? ( wayland )	101	screencast? ( glib wayland )
101	!system-toolchain? ( libcxx )	102	!system-toolchain? ( libcxx )
102	ffmpeg-chromium? ( bindist proprietary-codecs )	103	ffmpeg-chromium? ( bindist proprietary-codecs )
103	"	104	"
Lines 132-138 COMMON_SNAPSHOT_DEPEND=" Link Here
132	sys-libs/zlib:=	133	sys-libs/zlib:=
133	x11-libs/libdrm:=	134	x11-libs/libdrm:=
134	!headless? (	135	!headless? (
135	dev-libs/glib:2	136	glib? ( dev-libs/glib:2 )
136	>=media-libs/alsa-lib-1.0.19:=	137	>=media-libs/alsa-lib-1.0.19:=
137	pulseaudio? ( media-libs/libpulse:= )	138	pulseaudio? ( media-libs/libpulse:= )
138	sys-apps/pciutils:=	139	sys-apps/pciutils:=
Lines 162-174 COMMON_DEPEND=" Link Here
162	sys-libs/zlib:=[minizip]	163	sys-libs/zlib:=[minizip]
163	!headless? (	164	!headless? (
164	X? ( ${COMMON_X_DEPEND} )	165	X? ( ${COMMON_X_DEPEND} )
165	>=app-accessibility/at-spi2-core-2.46.0:2	166	accessibility? ( >=app-accessibility/at-spi2-core-2.46.0:2 )
166	media-libs/mesa:=[X?,wayland?]	167	media-libs/mesa:=[X?,wayland?]
167	cups? ( >=net-print/cups-1.3.11:= )	168	cups? ( >=net-print/cups-1.3.11:= )
168	virtual/udev	169	virtual/udev
169	x11-libs/cairo:=	170	gtk? (
170	x11-libs/gdk-pixbuf:2	171	x11-libs/cairo:=
171	x11-libs/pango:=	172	x11-libs/gdk-pixbuf:2
		173	x11-libs/pango:=
		174	)
		175	gtk4? (
		176	x11-libs/cairo:=
		177	x11-libs/gdk-pixbuf:2
		178	x11-libs/pango:=
		179	)
172	qt5? (	180	qt5? (
173	dev-qt/qtcore:5	181	dev-qt/qtcore:5
174	dev-qt/qtwidgets:5	182	dev-qt/qtwidgets:5
Lines 178-187 COMMON_DEPEND=" Link Here
178	"	186	"
179	RDEPEND="${COMMON_DEPEND}	187	RDEPEND="${COMMON_DEPEND}
180	!headless? (	188	!headless? (
181	\|\| (	189	gtk? ( x11-libs/gtk+:3[X?,wayland?] )
182	x11-libs/gtk+:3[X?,wayland?]	190	gtk4? ( gui-libs/gtk:4[X?,wayland?] )
183	gui-libs/gtk:4[X?,wayland?]
184	)
185	qt5? ( dev-qt/qtgui:5[X?,wayland?] )	191	qt5? ( dev-qt/qtgui:5[X?,wayland?] )
186	qt6? ( dev-qt/qtbase:6[gui,X?,wayland?] )	192	qt6? ( dev-qt/qtbase:6[gui,X?,wayland?] )
187	)	193	)
Lines 194-203 RDEPEND="${COMMON_DEPEND} Link Here
194	"	200	"
195	DEPEND="${COMMON_DEPEND}	201	DEPEND="${COMMON_DEPEND}
196	!headless? (	202	!headless? (
		203	gtk? ( x11-libs/gtk+:3[X?,wayland?] )
197	gtk4? ( gui-libs/gtk:4[X?,wayland?] )	204	gtk4? ( gui-libs/gtk:4[X?,wayland?] )
198	qt5? ( dev-qt/qtgui:5[X?,wayland?] )	205	qt5? ( dev-qt/qtgui:5[X?,wayland?] )
199	qt6? ( dev-qt/qtbase:6[gui,X?,wayland?] )	206	qt6? ( dev-qt/qtbase:6[gui,X?,wayland?] )
200	!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
201	)	207	)
202	"	208	"
203		209
Lines 363-369 pkg_pretend() { Link Here
363	fi	369	fi
364		370
365	if use headless; then	371	if use headless; then
366	local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "qt6" "vaapi" "wayland")	372	local headless_unused_flags=("cups" "kerberos" "pulseaudio" "glib" "gtk" "gtk4" "qt5" "qt6" "vaapi" "wayland")
367	for myiuse in ${headless_unused_flags[@]}; do	373	for myiuse in ${headless_unused_flags[@]}; do
368	use ${myiuse} && ewarn "Ignoring USE=${myiuse}, USE=headless is set."	374	use ${myiuse} && ewarn "Ignoring USE=${myiuse}, USE=headless is set."
369	done	375	done
Lines 430-435 src_prepare() { Link Here
430	"${FILESDIR}/chromium-117-system-zstd.patch"	436	"${FILESDIR}/chromium-117-system-zstd.patch"
431	"${FILESDIR}/chromium-124-libwebp-shim-sharpyuv.patch"	437	"${FILESDIR}/chromium-124-libwebp-shim-sharpyuv.patch"
432	"${FILESDIR}/chromium-124-separate-qt56.patch"	438	"${FILESDIR}/chromium-124-separate-qt56.patch"
		439	"${FILESDIR}/chromium-124-optional-glib_gio_gtk_atk.patch"
433	)	440	)
434		441
435	if use system-toolchain; then	442	if use system-toolchain; then
Lines 941-947 chromium_configure() { Link Here
941	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"	948	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
942	myconf_gn+=" use_vaapi=$(usex vaapi true false)"	949	myconf_gn+=" use_vaapi=$(usex vaapi true false)"
943	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"	950	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
944	myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
945	fi	951	fi
946		952
947	# Allows distributions to link pulseaudio directly (DT_NEEDED) instead of	953	# Allows distributions to link pulseaudio directly (DT_NEEDED) instead of
Lines 1087-1093 chromium_configure() { Link Here
1087	if use headless; then	1093	if use headless; then
1088	myconf_gn+=" ozone_platform=\"headless\""	1094	myconf_gn+=" ozone_platform=\"headless\""
1089	myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"	1095	myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
1090	myconf_gn+=" use_glib=false use_gio=false"	1096	myconf_gn+=" use_glib=false use_gio=false use_atk=false"
1091	myconf_gn+=" use_pangocairo=false use_alsa=false"	1097	myconf_gn+=" use_pangocairo=false use_alsa=false"
1092	myconf_gn+=" use_libpci=false use_udev=false"	1098	myconf_gn+=" use_libpci=false use_udev=false"
1093	myconf_gn+=" enable_print_preview=false"	1099	myconf_gn+=" enable_print_preview=false"
Lines 1096-1101 chromium_configure() { Link Here
1096	myconf_gn+=" use_system_libdrm=true"	1102	myconf_gn+=" use_system_libdrm=true"
1097	myconf_gn+=" use_system_minigbm=true"	1103	myconf_gn+=" use_system_minigbm=true"
1098	myconf_gn+=" use_xkbcommon=true"	1104	myconf_gn+=" use_xkbcommon=true"
		1105	myconf_gn+=" use_glib=$(usex glib true false)"
		1106	myconf_gn+=" use_gio=$(usex glib true false)"
		1107	myconf_gn+=" use_atk=$(usex accessibility true false)"
		1108	if use gtk \|\| use gtk4; then
		1109	myconf_gn+=" use_gtk=true"
		1110	myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
		1111	else
		1112	myconf_gn+=" use_gtk=false"
		1113	myconf_gn+=" use_pangocairo=false"
		1114	fi
1099	if use qt5 \|\| use qt6; then	1115	if use qt5 \|\| use qt6; then
1100	local cbuild_libdir=$(get_libdir)	1116	local cbuild_libdir=$(get_libdir)
1101	if tc-is-cross-compiler; then	1117	if tc-is-cross-compiler; then