commit:     fee47c72ba7b42e6615e6f0664b30b9faa100a5c
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 20 22:11:21 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 22:21:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fee47c72

www-client/vivaldi-snapshot: Properly handle deprecated appdata dir

Instead of just deleting it.

Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2110.3.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2110.3.ebuild 
b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2110.3.ebuild
index d6fc7f5a6fa..6a8463950f6 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2110.3.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2110.3.ebuild
@@ -152,6 +152,9 @@ src_prepare() {
 
        gunzip usr/share/doc/${PF}/changelog.gz || die
 
+       # The appdata directory is deprecated.
+       mv usr/share/{appdata,metainfo}/ || die
+
        rm \
                _gpgbuilder \
                etc/cron.daily/${PN} \
@@ -181,7 +184,6 @@ src_prepare() {
 }
 
 src_install() {
-       rm -r usr/share/appdata || die
        mv * "${D}" || die
        dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
 

Reply via email to