glib glib-utils gdbus-codegen: only warn on doc failures
This is an intentional deviation from Gentoo upstream because
in CrOS document generation is flaky so we convert the errors
into warnings.
BUG=b/200325608,b/200325807
TEST=Presubmit
RELEASE_NOTE=None
cos-patch: security-moderate
Change-Id: If3c0f5dec436e556921d31117d6ae3f2e0bfbc67
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-overlay/+/3129460
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Commit-Queue: Manoj Gupta <manojgupta@chromium.org>
Tested-by: Manoj Gupta <manojgupta@chromium.org>
Reviewed-on: https://cos-review.googlesource.com/c/third_party/overlays/chromiumos-overlay/+/22674
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Main-Branch-Verified: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Meena Shanmugam <meenashanmugam@google.com>
diff --git a/dev-libs/glib/glib-2.68.3-r1.ebuild b/dev-libs/glib/glib-2.68.3-r2.ebuild
similarity index 95%
rename from dev-libs/glib/glib-2.68.3-r1.ebuild
rename to dev-libs/glib/glib-2.68.3-r2.ebuild
index 53a84fb..03f963d 100644
--- a/dev-libs/glib/glib-2.68.3-r1.ebuild
+++ b/dev-libs/glib/glib-2.68.3-r2.ebuild
@@ -204,7 +204,7 @@
multilib_src_install_all() {
if use doc ; then
- einstalldocs
+ einstalldocs || ewarn "Failed to install docs"
fi
# These are installed by dev-util/glib-utils
@@ -213,11 +213,11 @@
rm "${ED}/usr/bin/glib-mkenums" || die
rm "${ED}/usr/bin/gtester-report" || die
use doc && (
- rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
- rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
- rm "${ED}/usr/share/man/man1/gtester-report.1" || die
+ rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || ewarn "Failed to remove glib-genmarshal.1"
+ rm "${ED}/usr/share/man/man1/glib-mkenums.1" || ewarn "Failed to remove glib-mkenums.1"
+ rm "${ED}/usr/share/man/man1/gtester-report.1" || ewarn "Failed to remove gtester-report.1"
# gdbus-codegen manpage installed by dev-util/gdbus-codegen
- rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
+ rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || ewarn "Failed to remove gdbus-codegen.1"
)
}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.68.3-r1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.68.3-r1.ebuild
new file mode 120000
index 0000000..e6dffe8
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.68.3-r1.ebuild
@@ -0,0 +1 @@
+gdbus-codegen-2.68.3.ebuild
\ No newline at end of file
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild
index 54e5e8b..826a631 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild
@@ -53,7 +53,7 @@
--stringparam man.copyright.section.enabled 0 \
-o "${2}" \
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
- "${1}" || die "manpage generation failed"
+ "${1}" || ewarn "manpage generation failed"
}
src_compile() {
diff --git a/dev-util/glib-utils/glib-utils-2.68.3-r1.ebuild b/dev-util/glib-utils/glib-utils-2.68.3-r1.ebuild
new file mode 120000
index 0000000..400e706
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.68.3-r1.ebuild
@@ -0,0 +1 @@
+glib-utils-2.68.3.ebuild
\ No newline at end of file
diff --git a/dev-util/glib-utils/glib-utils-2.68.3.ebuild b/dev-util/glib-utils/glib-utils-2.68.3.ebuild
index 19db913..03b0ab5 100644
--- a/dev-util/glib-utils/glib-utils-2.68.3.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.68.3.ebuild
@@ -39,7 +39,7 @@
--stringparam man.copyright.section.enabled 0 \
-o "${2}" \
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
- "${1}" || die "manpage generation failed"
+ "${1}" || ewarn "manpage generation failed"
}
src_compile() {
