1 |
[2019-06-28 12:13:23+0200] Michał Górny: |
2 |
> On Fri, 2019-06-28 at 12:09 +0200, Haelwenn (lanodan) Monnier wrote: |
3 |
> > [2019-06-28 10:31:51+0200] Michał Górny: |
4 |
> > > On Fri, 2019-06-28 at 08:48 +0200, Haelwenn (lanodan) Monnier wrote: |
5 |
> > > > Closes: https://bugs.gentoo.org/show_bug.cgi?id=687746 |
6 |
> > > > Signed-off-by: Haelwenn (lanodan) Monnier <contact@×××××××××.me> |
7 |
> > > > --- |
8 |
> > > > ...sff-host-1.2.0.ebuild => passff-host-1.2.0-r1.ebuild} | 9 ++++++++- |
9 |
> > > > 1 file changed, 8 insertions(+), 1 deletion(-) |
10 |
> > > > rename www-plugins/passff-host/{passff-host-1.2.0.ebuild => passff-host-1.2.0-r1.ebuild} (84%) |
11 |
> > > > |
12 |
> > > > diff --git a/www-plugins/passff-host/passff-host-1.2.0.ebuild b/www-plugins/passff-host/passff-host-1.2.0-r1.ebuild |
13 |
> > > > similarity index 84% |
14 |
> > > > rename from www-plugins/passff-host/passff-host-1.2.0.ebuild |
15 |
> > > > rename to www-plugins/passff-host/passff-host-1.2.0-r1.ebuild |
16 |
> > > > index f42fb96ba19..75bebf643b8 100644 |
17 |
> > > > --- a/www-plugins/passff-host/passff-host-1.2.0.ebuild |
18 |
> > > > +++ b/www-plugins/passff-host/passff-host-1.2.0-r1.ebuild |
19 |
> > > > @@ -1,52 +1,59 @@ |
20 |
> > > > # Copyright 2018-2019 Gentoo Authors |
21 |
> > > > # Distributed under the terms of the GNU General Public License v2 |
22 |
> > > > |
23 |
> > > > EAPI=7 |
24 |
> > > > |
25 |
> > > > PYTHON_COMPAT=( python3_5 python3_6 python3_7 ) |
26 |
> > > > |
27 |
> > > > inherit python-single-r1 |
28 |
> > > > |
29 |
> > > > DESCRIPTION="Host app for the PassFF WebExtension" |
30 |
> > > > HOMEPAGE="https://github.com/passff/passff-host" |
31 |
> > > > |
32 |
> > > > SRC_URI=" |
33 |
> > > > https://github.com/passff/passff-host/releases/download/${PV}/passff.py -> ${P}.py |
34 |
> > > > https://github.com/passff/passff-host/releases/download/${PV}/passff.json -> ${P}.json |
35 |
> > > > " |
36 |
> > > > |
37 |
> > > > LICENSE="GPL-2" |
38 |
> > > > SLOT="0" |
39 |
> > > > KEYWORDS="~amd64 ~x86" |
40 |
> > > > IUSE="chrome chromium firefox vivaldi" |
41 |
> > > > REQUIRED_USE="|| ( chrome chromium firefox vivaldi )" |
42 |
> > > > |
43 |
> > > > S="${WORKDIR}" |
44 |
> > > > |
45 |
> > > > src_unpack() { |
46 |
> > > > cp "${DISTDIR}/${P}.json" . || die |
47 |
> > > > cp "${DISTDIR}/${P}.py" . || die |
48 |
> > > > } |
49 |
> > > > |
50 |
> > > > src_prepare() { |
51 |
> > > > default |
52 |
> > > > python_fix_shebang "${P}.py" |
53 |
> > > > } |
54 |
> > > > |
55 |
> > > > src_install() { |
56 |
> > > > local target_dirs=() |
57 |
> > > > |
58 |
> > > > use chrome && target_dirs+=( "/etc/opt/chrome/native-messaging-hosts" ) |
59 |
> > > > use chromium && target_dirs+=( "/etc/chromium/native-messaging-hosts" ) |
60 |
> > > > - use firefox && target_dirs+=( "/usr/$(get_libdir)/mozilla/native-messaging-hosts" ) |
61 |
> > > > + if use firefox; then |
62 |
> > > > + target_dirs+=( "/usr/$(get_libdir)/mozilla/native-messaging-hosts" ) |
63 |
> > > > + |
64 |
> > > > + # firefox-bin compatibility |
65 |
> > > > + if [[ "$(get_libdir)" != "lib" ]]; then |
66 |
> > > > + target_dirs+=( "/usr/lib/mozilla/native-messaging-hosts" ) |
67 |
> > > > + fi |
68 |
> > > > + fi |
69 |
> > > |
70 |
> > > Wouldn't this break the migration? I think this will cause unsymlink- |
71 |
> > > lib to detect collision if this package is installed before the switch. |
72 |
> > |
73 |
> > Ah, yes it does, tried on a fresh chroot and I get this message when |
74 |
> > running `unsymlink-lib --analyze`: |
75 |
> > |
76 |
> > One or more files are both in /usr/lib/ and /usr/lib64/, making the conversion impossible. |
77 |
> > |
78 |
> > mozilla/native-messaging-hosts/passff.json |
79 |
> > mozilla/native-messaging-hosts/passff.py |
80 |
> > |
81 |
> > --- |
82 |
> > |
83 |
> > So do you have any recommendation for fixing this issue as it needs to |
84 |
> > be in both /usr/$(get_libdir) for www-client/firefox with |
85 |
> > SYMLINK_LIB=no and /usr/lib for www-client/firefox-bin. |
86 |
> |
87 |
> I think some packages solve this by checking SYMLINK_LIB value |
88 |
> explicitly. |
89 |
|
90 |
I would have preferred avoiding that because it would basically need a |
91 |
manual rebuild after the migration because it doesn't goes in |
92 |
/{usr/,}lib32 at all. |
93 |
|
94 |
So I guess I'll pass the bug to firefox-bin maintainers. |
95 |
|
96 |
> > Otherwise I guess I would file a bug report referencing |
97 |
> > https://bugs.gentoo.org/show_bug.cgi?id=687746 to get firefox-bin |
98 |
> > fixed instead or assign the maintainers to the bug. |
99 |
> > |
100 |
> > > > use vivaldi && target_dirs+=( "/etc/vivaldi/native-messaging-hosts" ) |
101 |
> > > > |
102 |
> > > > for target_dir in "${target_dirs[@]}"; do |
103 |
> > > > sed "s;PLACEHOLDER;${target_dir}/passff.py;g" "${P}.json" > "passff.json" || die |
104 |
> > > > |
105 |
> > > > insinto "${target_dir}" |
106 |
> > > > doins passff.json |
107 |
> > > > exeinto "${target_dir}" |
108 |
> > > > newexe "${P}.py" passff.py |
109 |
> > > > done |
110 |
> > > > } |
111 |
> > > |
112 |
> > > -- |
113 |
> > > Best regards, |
114 |
> > > Michał Górny |
115 |
> |
116 |
> -- |
117 |
> Best regards, |
118 |
> Michał Górny |