From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 45A1D15808C for ; Fri, 18 Feb 2022 02:44:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 710E02BC012; Fri, 18 Feb 2022 02:44:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F20AF2BC016 for ; Fri, 18 Feb 2022 02:44:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6BBAA34346B for ; Fri, 18 Feb 2022 02:44:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9431B2FD for ; Fri, 18 Feb 2022 02:44:30 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1645152141.2fb96fedbf564bffd90f68a886e40a919769f753.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-session/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-extra/cinnamon-session/cinnamon-session-5.0.1.ebuild gnome-extra/cinnamon-session/cinnamon-session-5.2.0.ebuild X-VCS-Directories: gnome-extra/cinnamon-session/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2fb96fedbf564bffd90f68a886e40a919769f753 X-VCS-Branch: master Date: Fri, 18 Feb 2022 02:44:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d7fb30e3-904b-45a5-81d2-e142fa31e6b2 X-Archives-Hash: 89503d8b2b876061ce626afd03a7a011 commit: 2fb96fedbf564bffd90f68a886e40a919769f753 Author: Matthew S. Turnbull bluefang-logic com> AuthorDate: Tue Feb 1 02:53:20 2022 +0000 Commit: Sam James gentoo 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 bluefang-logic.com> Signed-off-by: Sam James 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