gnome-extra/nemo-3.8: use tracker-2

I am trying to remove tracker-1 subslot from tree, so patch
nemo-3.8 to support tracker-2 too, as I don't want to remove
all of cinnamon 3.8 set just for that (and only removing 3.8
doesn't make sense).
Remove bogus LA_PUNT and unnecessary src_prepare while here.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio@gentoo.org>

diff --git a/gnome-extra/nemo/nemo-3.8.6.ebuild b/gnome-extra/nemo/nemo-3.8.6-r1.ebuild
similarity index 91%
rename from gnome-extra/nemo/nemo-3.8.6.ebuild
rename to gnome-extra/nemo/nemo-3.8.6-r1.ebuild
index c4ae41b45371a77606a60f170d0ef8ae19b03d8d..4ddc41997b435a99927b8f3d9b6fed32a3e60294 100644 (file)
--- a/gnome-extra/nemo/nemo-3.8.6.ebuild
+++ b/gnome-extra/nemo/nemo-3.8.6-r1.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit meson eutils gnome2 python-any-r1 virtualx
 
@@ -34,7 +33,7 @@ COMMON_DEPEND="
 
        exif? ( >=media-libs/libexif-0.6.20:= )
        introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-       tracker? ( >=app-misc/tracker-0.12:0/100 )
+       tracker? ( >=app-misc/tracker-0.12:= )
        xmp? ( >=media-libs/exempi-2.2.0:= )
        selinux? ( sys-libs/libselinux )
 "
@@ -65,9 +64,7 @@ DEPEND="${COMMON_DEPEND}
 # For eautoreconf
 #      gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
 
-src_prepare() {
-       gnome2_src_prepare
-}
+PATCHES=( "${FILESDIR}"/tracker-2.patch ) # https://github.com/linuxmint/nemo/issues/2065
 
 src_configure() {
        meson_src_configure \

diff --git a/gnome-extra/nemo/nemo-4.0.6.ebuild b/gnome-extra/nemo/nemo-4.0.6.ebuild
index 80cd39e0275d4ec1f6db72dc24fe6585158a43f9..4aa693cf74b40da695cd4c54b2c374746b913fa7 100644 (file)
--- a/gnome-extra/nemo/nemo-4.0.6.ebuild
+++ b/gnome-extra/nemo/nemo-4.0.6.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit meson eutils gnome2 python-any-r1 virtualx
 
@@ -67,10 +66,6 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=( "${FILESDIR}"/tracker-2.patch ) # https://github.com/linuxmint/nemo/issues/2065
 
-src_prepare() {
-       gnome2_src_prepare
-}
-
 src_configure() {
        meson_src_configure \
                -Dexif=$(usex exif true false) \