commit: d9481e2f78e386eebc2378d4f565782a011ad70c
parent efbf775ecc45ab3013341edf13463689faac1116
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Wed, 13 Jul 2022 10:17:07 +0200
net-libs/webkit-gtk: ~2.37.1, gtk-doc to gi-docgen
Diffstat:
4 files changed, 13 insertions(+), 30 deletions(-)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
DIST webkitgtk-2.36.4.tar.xz 26598964 BLAKE2B 7c79c394bca756b09324afae013775404f62543ed093314ebb82a10dbbc2c7a22277792349a0d24fd95077c770627d24ab73183ba4a97d168556f991d7a6a682 SHA512 c5365c682ba4e8e6ad891638b5a82e74e38fa0867ce6c8e4e08a9dc15b862a6d3edc096a049e0711306972d6162d79fe90a0e76d8b395001798005e4488467f2
+DIST webkitgtk-2.37.1.tar.xz 32930172 BLAKE2B 79a85d4769dad02080c0906dd4af6cc26374fc097d4352516d6f2c1e2577ced8be7b6c877a437fbc7618fafbc9c8d123f93d855ebb4445621b9657e512e20fa3 SHA512 29935eed5e901780d6be02a7f1072f10e61ad96cecdc3495a71dc8ca00573fa9c485c909fcba928d818df6b901a265a077238ce5fa0cfcc657bdb991867facd8
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.37.1-r100.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.37.1-r100.ebuild
@@ -17,13 +17,14 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
LICENSE="LGPL-2+ BSD"
SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-IUSE="aqua +avif debug +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify +seccomp spell systemd test wayland +X"
+IUSE="aqua +avif debug doc +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k +jumbo-build lcms libnotify +seccomp spell systemd test wayland +X"
# gstreamer with opengl/gles2 needs egl
REQUIRED_USE="
gles2-only? ( egl )
gstreamer? ( egl )
wayland? ( egl )
+ doc? ( introspection )
|| ( aqua wayland X )
"
@@ -106,7 +107,6 @@ BDEPEND="
${PYTHON_DEPS}
${RUBY_DEPS}
dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.10
>=dev-util/gperf-3.0.1
>=sys-devel/bison-2.4.3
|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
@@ -118,7 +118,7 @@ BDEPEND="
virtual/perl-Carp
virtual/perl-JSON-PP
- gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+ doc? ( dev-util/gi-docgen )
geolocation? ( dev-util/gdbus-codegen )
>=dev-util/cmake-3.10
@@ -162,12 +162,6 @@ src_configure() {
CMAKE_BUILD_TYPE="Debug"
fi
- # gtk-doc fails to generate docs when ld.lld is used, force binutils
- if use gtk-doc; then
- export CC_LD="ld"
- export LD="ld"
- fi
-
# Respect CC, otherwise fails on prefix #395875
tc-export CC
@@ -241,7 +235,7 @@ src_configure() {
# Source/cmake/OptionsGTK.cmake
-DENABLE_GLES2=$(usex gles2-only)
- -DENABLE_GTKDOC=$(usex gtk-doc)
+ -DENABLE_DOCUMENTATION=$(usex doc)
-DENABLE_INTROSPECTION=$(usex introspection)
-DENABLE_JOURNALD_LOG=$(usex systemd)
-DENABLE_QUARTZ_TARGET=$(usex aqua)
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.37.1-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.37.1-r200.ebuild
@@ -17,13 +17,14 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
LICENSE="LGPL-2+ BSD"
SLOT="5.0/0" # soname version of libwebkit2gtk-5.0
-IUSE="aqua +avif debug +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify +seccomp spell systemd test wayland +X"
+IUSE="aqua +avif debug doc +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k +jumbo-build lcms libnotify +seccomp spell systemd test wayland +X"
# gstreamer with opengl/gles2 needs egl
REQUIRED_USE="
gles2-only? ( egl )
gstreamer? ( egl )
wayland? ( egl )
+ doc? ( introspection )
|| ( aqua wayland X )
"
@@ -106,7 +107,6 @@ BDEPEND="
${PYTHON_DEPS}
${RUBY_DEPS}
dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.10
>=dev-util/gperf-3.0.1
>=sys-devel/bison-2.4.3
|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
@@ -118,7 +118,7 @@ BDEPEND="
virtual/perl-Carp
virtual/perl-JSON-PP
- gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+ doc? ( dev-util/gi-docgen )
geolocation? ( dev-util/gdbus-codegen )
>=dev-util/cmake-3.10
@@ -162,12 +162,6 @@ src_configure() {
CMAKE_BUILD_TYPE="Debug"
fi
- # gtk-doc fails to generate docs when ld.lld is used, force binutils
- if use gtk-doc; then
- export CC_LD="ld"
- export LD="ld"
- fi
-
# Respect CC, otherwise fails on prefix #395875
tc-export CC
@@ -241,7 +235,7 @@ src_configure() {
# Source/cmake/OptionsGTK.cmake
-DENABLE_GLES2=$(usex gles2-only)
- -DENABLE_GTKDOC=$(usex gtk-doc)
+ -DENABLE_DOCUMENTATION=$(usex doc)
-DENABLE_INTROSPECTION=$(usex introspection)
-DENABLE_JOURNALD_LOG=$(usex systemd)
-DENABLE_QUARTZ_TARGET=$(usex aqua)
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.37.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.37.1.ebuild
@@ -17,13 +17,14 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
LICENSE="LGPL-2+ BSD"
SLOT="4/37" # soname version of libwebkit2gtk-4.0
-IUSE="aqua +avif debug +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify +seccomp spell systemd test wayland +X"
+IUSE="aqua +avif debug doc +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k +jumbo-build lcms libnotify +seccomp spell systemd test wayland +X"
# gstreamer with opengl/gles2 needs egl
REQUIRED_USE="
gles2-only? ( egl )
gstreamer? ( egl )
wayland? ( egl )
+ doc? ( introspection )
|| ( aqua wayland X )
"
@@ -106,7 +107,6 @@ BDEPEND="
${PYTHON_DEPS}
${RUBY_DEPS}
dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.10
>=dev-util/gperf-3.0.1
>=sys-devel/bison-2.4.3
|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
@@ -118,7 +118,7 @@ BDEPEND="
virtual/perl-Carp
virtual/perl-JSON-PP
- gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+ doc? ( dev-util/gi-docgen )
geolocation? ( dev-util/gdbus-codegen )
>=dev-util/cmake-3.10
@@ -162,12 +162,6 @@ src_configure() {
CMAKE_BUILD_TYPE="Debug"
fi
- # gtk-doc fails to generate docs when ld.lld is used, force binutils
- if use gtk-doc; then
- export CC_LD="ld"
- export LD="ld"
- fi
-
# Respect CC, otherwise fails on prefix #395875
tc-export CC
@@ -241,7 +235,7 @@ src_configure() {
# Source/cmake/OptionsGTK.cmake
-DENABLE_GLES2=$(usex gles2-only)
- -DENABLE_GTKDOC=$(usex gtk-doc)
+ -DENABLE_DOCUMENTATION=$(usex doc)
-DENABLE_INTROSPECTION=$(usex introspection)
-DENABLE_JOURNALD_LOG=$(usex systemd)
-DENABLE_QUARTZ_TARGET=$(usex aqua)
