1 |
commit: 265a0a147477469b2f6b24deb7d0f3e37e2db2ae |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 15 18:40:53 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 15 18:41:20 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=265a0a14 |
7 |
|
8 |
net-fs/netatalk: pass correct tracker-pkgconfig-version |
9 |
|
10 |
At least since 1.0, the pkgconfig version is always 1.0 or 2.0, without |
11 |
the minor version affecting it (as that's semantically backwards |
12 |
compatible). |
13 |
As we don't have any 0.x anymore, change it to pass the found tracker |
14 |
major version with .0 suffixed. This should fix the option. |
15 |
Before the fix it seems it just fails to find tracker non-fatally and |
16 |
disabled tracker usage despite USE=tracker being used. |
17 |
|
18 |
Bug: https://bugs.gentoo.org/672308 |
19 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
20 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
21 |
|
22 |
net-fs/netatalk/netatalk-3.1.10.ebuild | 6 +++--- |
23 |
net-fs/netatalk/netatalk-3.1.12.ebuild | 2 +- |
24 |
2 files changed, 4 insertions(+), 4 deletions(-) |
25 |
|
26 |
diff --git a/net-fs/netatalk/netatalk-3.1.10.ebuild b/net-fs/netatalk/netatalk-3.1.10.ebuild |
27 |
index 39d75a27f41..60690c4d7c8 100644 |
28 |
--- a/net-fs/netatalk/netatalk-3.1.10.ebuild |
29 |
+++ b/net-fs/netatalk/netatalk-3.1.10.ebuild |
30 |
@@ -1,4 +1,4 @@ |
31 |
-# Copyright 1999-2016 Gentoo Foundation |
32 |
+# Copyright 1999-2019 Gentoo Authors |
33 |
# Distributed under the terms of the GNU General Public License v2 |
34 |
|
35 |
EAPI=5 |
36 |
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 ) |
37 |
|
38 |
AUTOTOOLS_AUTORECONF=yes |
39 |
|
40 |
-inherit autotools-utils flag-o-matic multilib pam python-r1 systemd versionator |
41 |
+inherit autotools-utils eapi7-ver flag-o-matic multilib pam python-r1 systemd versionator |
42 |
|
43 |
DESCRIPTION="Open Source AFP server" |
44 |
HOMEPAGE="http://netatalk.sourceforge.net/" |
45 |
@@ -98,7 +98,7 @@ src_configure() { |
46 |
$(use_with ssl ssl-dir) |
47 |
$(use_with tracker) |
48 |
$(use_with tracker dbus-daemon "${EPREFIX}/usr/bin/dbus-daemon") |
49 |
- $(use_with tracker tracker-pkgconfig-version $(get_version_component_range 1-2 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g'))) |
50 |
+ $(use_with tracker tracker-pkgconfig-version $(ver_cut 1 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g')).0) |
51 |
--enable-overwrite |
52 |
--disable-krb4-uam |
53 |
--disable-afs |
54 |
|
55 |
diff --git a/net-fs/netatalk/netatalk-3.1.12.ebuild b/net-fs/netatalk/netatalk-3.1.12.ebuild |
56 |
index 026d6442f0e..1d6ee17df24 100644 |
57 |
--- a/net-fs/netatalk/netatalk-3.1.12.ebuild |
58 |
+++ b/net-fs/netatalk/netatalk-3.1.12.ebuild |
59 |
@@ -99,7 +99,7 @@ src_configure() { |
60 |
$(use_with ssl ssl-dir) |
61 |
$(use_with tracker) |
62 |
$(use_with tracker dbus-daemon "${EPREFIX}/usr/bin/dbus-daemon") |
63 |
- $(use_with tracker tracker-pkgconfig-version $(ver_cut 1-2 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g'))) |
64 |
+ $(use_with tracker tracker-pkgconfig-version $(ver_cut 1 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g')).0) |
65 |
--enable-overwrite |
66 |
--disable-krb4-uam |
67 |
--disable-afs |