commit: 2fb96fedbf564bffd90f68a886e40a919769f753 Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com> AuthorDate: Tue Feb 1 02:53:20 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Feb 18 02:42:21 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fb96fed
gnome-extra/cinnamon-session: Fix doc install location Closes: https://bugs.gentoo.org/831773 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com> Signed-off-by: Sam James <sam <AT> gentoo.org> .../cinnamon-session/cinnamon-session-5.0.1.ebuild | 18 +++++++++++++++++- .../cinnamon-session/cinnamon-session-5.2.0.ebuild | 18 +++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/gnome-extra/cinnamon-session/cinnamon-session-5.0.1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-5.0.1.ebuild index b35ae9b0339a..119f516fc728 100644 --- a/gnome-extra/cinnamon-session/cinnamon-session-5.0.1.ebuild +++ b/gnome-extra/cinnamon-session/cinnamon-session-5.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -66,6 +66,22 @@ src_configure() { meson_src_configure } +src_install() { + # A bit icky. Let the docs be installed in the wrong dir, then + # install them to the correct dir. + local dbus_doc_dir="${ED}/usr/share/doc/cinnamon-session/dbus" + use doc && local HTML_DOCS=( "$dbus_doc_dir" ) + + meson_src_install + + # Clean-up the incorrectly installed docs. + # Fail if unhandled (new) files are encountered. + if use doc; then + rm -r "$dbus_doc_dir" || die + rm -d "${ED}/usr/share/doc/cinnamon-session" || die + fi +} + pkg_postinst() { xdg_icon_cache_update gnome2_schemas_update diff --git a/gnome-extra/cinnamon-session/cinnamon-session-5.2.0.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-5.2.0.ebuild index 002c659ae87b..c89d9864b142 100644 --- a/gnome-extra/cinnamon-session/cinnamon-session-5.2.0.ebuild +++ b/gnome-extra/cinnamon-session/cinnamon-session-5.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -65,6 +65,22 @@ src_configure() { meson_src_configure } +src_install() { + # A bit icky. Let the docs be installed in the wrong dir, then + # install them to the correct dir. + local dbus_doc_dir="${ED}/usr/share/doc/cinnamon-session/dbus" + use doc && local HTML_DOCS=( "$dbus_doc_dir" ) + + meson_src_install + + # Clean-up the incorrectly installed docs. + # Fail if unhandled (new) files are encountered. + if use doc; then + rm -r "$dbus_doc_dir" || die + rm -d "${ED}/usr/share/doc/cinnamon-session" || die + fi +} + pkg_postinst() { xdg_icon_cache_update gnome2_schemas_update
