commit: 65ffecb8853c686b6c979e71ac2fbf466b2f931a
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 10 12:00:55 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Apr 10 12:04:18 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65ffecb8
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 <AT> gentoo.org>
gnome-extra/nemo/{nemo-3.8.6.ebuild => nemo-3.8.6-r1.ebuild} | 9 +++------
gnome-extra/nemo/nemo-4.0.6.ebuild | 7 +------
2 files changed, 4 insertions(+), 12 deletions(-)
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 c4ae41b4537..4ddc41997b4 100644
--- 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 80cd39e0275..4aa693cf74b 100644
--- 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) \
