| 1 |
commit: 65ffecb8853c686b6c979e71ac2fbf466b2f931a |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 10 12:00:55 2019 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 10 12:04:18 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65ffecb8 |
| 7 |
|
| 8 |
gnome-extra/nemo-3.8: use tracker-2 |
| 9 |
|
| 10 |
I am trying to remove tracker-1 subslot from tree, so patch |
| 11 |
nemo-3.8 to support tracker-2 too, as I don't want to remove |
| 12 |
all of cinnamon 3.8 set just for that (and only removing 3.8 |
| 13 |
doesn't make sense). |
| 14 |
Remove bogus LA_PUNT and unnecessary src_prepare while here. |
| 15 |
|
| 16 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 17 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
| 18 |
|
| 19 |
gnome-extra/nemo/{nemo-3.8.6.ebuild => nemo-3.8.6-r1.ebuild} | 9 +++------ |
| 20 |
gnome-extra/nemo/nemo-4.0.6.ebuild | 7 +------ |
| 21 |
2 files changed, 4 insertions(+), 12 deletions(-) |
| 22 |
|
| 23 |
diff --git a/gnome-extra/nemo/nemo-3.8.6.ebuild b/gnome-extra/nemo/nemo-3.8.6-r1.ebuild |
| 24 |
similarity index 91% |
| 25 |
rename from gnome-extra/nemo/nemo-3.8.6.ebuild |
| 26 |
rename to gnome-extra/nemo/nemo-3.8.6-r1.ebuild |
| 27 |
index c4ae41b4537..4ddc41997b4 100644 |
| 28 |
--- a/gnome-extra/nemo/nemo-3.8.6.ebuild |
| 29 |
+++ b/gnome-extra/nemo/nemo-3.8.6-r1.ebuild |
| 30 |
@@ -2,8 +2,7 @@ |
| 31 |
# Distributed under the terms of the GNU General Public License v2 |
| 32 |
|
| 33 |
EAPI=6 |
| 34 |
-GNOME2_LA_PUNT="yes" |
| 35 |
-PYTHON_COMPAT=( python3_{4,5,6} ) |
| 36 |
+PYTHON_COMPAT=( python3_{5,6} ) |
| 37 |
|
| 38 |
inherit meson eutils gnome2 python-any-r1 virtualx |
| 39 |
|
| 40 |
@@ -34,7 +33,7 @@ COMMON_DEPEND=" |
| 41 |
|
| 42 |
exif? ( >=media-libs/libexif-0.6.20:= ) |
| 43 |
introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) |
| 44 |
- tracker? ( >=app-misc/tracker-0.12:0/100 ) |
| 45 |
+ tracker? ( >=app-misc/tracker-0.12:= ) |
| 46 |
xmp? ( >=media-libs/exempi-2.2.0:= ) |
| 47 |
selinux? ( sys-libs/libselinux ) |
| 48 |
" |
| 49 |
@@ -65,9 +64,7 @@ DEPEND="${COMMON_DEPEND} |
| 50 |
# For eautoreconf |
| 51 |
# gnome-base/gnome-common, dev-util/gtk-doc (not only -am!) |
| 52 |
|
| 53 |
-src_prepare() { |
| 54 |
- gnome2_src_prepare |
| 55 |
-} |
| 56 |
+PATCHES=( "${FILESDIR}"/tracker-2.patch ) # https://github.com/linuxmint/nemo/issues/2065 |
| 57 |
|
| 58 |
src_configure() { |
| 59 |
meson_src_configure \ |
| 60 |
|
| 61 |
diff --git a/gnome-extra/nemo/nemo-4.0.6.ebuild b/gnome-extra/nemo/nemo-4.0.6.ebuild |
| 62 |
index 80cd39e0275..4aa693cf74b 100644 |
| 63 |
--- a/gnome-extra/nemo/nemo-4.0.6.ebuild |
| 64 |
+++ b/gnome-extra/nemo/nemo-4.0.6.ebuild |
| 65 |
@@ -2,8 +2,7 @@ |
| 66 |
# Distributed under the terms of the GNU General Public License v2 |
| 67 |
|
| 68 |
EAPI=6 |
| 69 |
-GNOME2_LA_PUNT="yes" |
| 70 |
-PYTHON_COMPAT=( python3_{4,5,6} ) |
| 71 |
+PYTHON_COMPAT=( python3_{5,6} ) |
| 72 |
|
| 73 |
inherit meson eutils gnome2 python-any-r1 virtualx |
| 74 |
|
| 75 |
@@ -67,10 +66,6 @@ DEPEND="${COMMON_DEPEND} |
| 76 |
|
| 77 |
PATCHES=( "${FILESDIR}"/tracker-2.patch ) # https://github.com/linuxmint/nemo/issues/2065 |
| 78 |
|
| 79 |
-src_prepare() { |
| 80 |
- gnome2_src_prepare |
| 81 |
-} |
| 82 |
- |
| 83 |
src_configure() { |
| 84 |
meson_src_configure \ |
| 85 |
-Dexif=$(usex exif true false) \ |
Archives