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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9B76A138334 for ; Sun, 14 Oct 2018 18:13:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5025DE084A; Sun, 14 Oct 2018 18:13:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 18F78E084A for ; Sun, 14 Oct 2018 18:13:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EEE4B335C8C for ; Sun, 14 Oct 2018 18:13:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 257153F1 for ; Sun, 14 Oct 2018 18:13:52 +0000 (UTC) From: "Sobhan Mohammadpour" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sobhan Mohammadpour" Message-ID: <1539540824.ba1b3ed9a747832b702937ea65230f7ed76a8e78.sobhan@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/nautilus/nautilus-3.26.4-r1.ebuild gnome-base/nautilus/nautilus-3.26.4.ebuild X-VCS-Directories: gnome-base/nautilus/ X-VCS-Committer: sobhan X-VCS-Committer-Name: Sobhan Mohammadpour X-VCS-Revision: ba1b3ed9a747832b702937ea65230f7ed76a8e78 X-VCS-Branch: master Date: Sun, 14 Oct 2018 18:13:52 +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-Archives-Salt: 4e48bde9-14fd-4c92-ae55-363c5d5261ce X-Archives-Hash: 433eb942b6350e1cf9818826d176a26d commit: ba1b3ed9a747832b702937ea65230f7ed76a8e78 Author: Sobhan Mohammadpour gentoo org> AuthorDate: Sun Oct 14 18:13:44 2018 +0000 Commit: Sobhan Mohammadpour gentoo org> CommitDate: Sun Oct 14 18:13:44 2018 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=ba1b3ed9 gnome-base/nautilus: remove gnome eclass from 3.26 & minor bug fixes Package-Manager: Portage-2.3.51, Repoman-2.3.11 Manifest-Sign-Key: 0x7DF238CF0AA182E1 ...lus-3.26.4.ebuild => nautilus-3.26.4-r1.ebuild} | 38 ++++++++++++++-------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/gnome-base/nautilus/nautilus-3.26.4.ebuild b/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild similarity index 79% rename from gnome-base/nautilus/nautilus-3.26.4.ebuild rename to gnome-base/nautilus/nautilus-3.26.4-r1.ebuild index de179978..8c82d5fe 100644 --- a/gnome-base/nautilus/nautilus-3.26.4.ebuild +++ b/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 GNOME2_LA_PUNT="yes" # Needed with USE 'sendto' -inherit gnome-meson readme.gentoo-r1 virtualx +inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg DESCRIPTION="A file manager for the GNOME desktop" HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus" @@ -70,21 +70,23 @@ src_prepare() { To activate the previewer, select a file and press space; to close the previewer, press space again." fi - gnome-meson_src_prepare + xdg_src_prepare } src_configure() { # FIXME no doc useflag?? - gnome-meson_src_configure \ - -Denable-desktop=true \ - -Denable-profiling=false \ - -Dtracker=$(usex tracker auto disabled) \ - $(meson_use doc enable-gtk-doc) \ - $(meson_use exif enable-exif) \ - $(meson_use packagekit enable-packagekit) \ - $(meson_use sendto nst-extension) \ - $(meson_use selinux enable-selinux) \ + local emesonargs=( + "-Denable-desktop=true" + "-Denable-profiling=false" + "-Dtracker=$(usex tracker auto disabled)" + $(meson_use doc enable-gtk-doc) + $(meson_use exif enable-exif) + $(meson_use packagekit enable-packagekit) + $(meson_use sendto enable-nst-extension) + $(meson_use selinux enable-selinux) $(meson_use xmp enable-xmp) + ) + meson_src_configure } src_test() { @@ -93,11 +95,13 @@ src_test() { src_install() { use previewer && readme.gentoo_create_doc - gnome-meson_src_install + meson_src_install } pkg_postinst() { - gnome-meson_pkg_postinst + xdg_pkg_postinst + gnome2_icon_cache_update + gnome2_schemas_update if use previewer; then readme.gentoo_print_elog @@ -105,3 +109,9 @@ pkg_postinst() { elog "To preview media files, emerge nautilus with USE=previewer" fi } + +pkg_postrm() { + gnome2_icon_cache_update + xdg_pkg_postrm + gnome2_schemas_update +}