Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gucharmap/
Date: Sat, 25 Sep 2021 23:25:05
Message-Id: 1632612263.f0aadfe9cbecb3c7555c6a63febab374d47ee2e8.sam@gentoo
1 commit: f0aadfe9cbecb3c7555c6a63febab374d47ee2e8
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 25 23:24:23 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 25 23:24:23 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0aadfe9
7
8 Revert "gnome-extra/gucharmap: reflect new data path of app-i18n/unicode-data"
9
10 This reverts commit 3538e7f797505382af591d9b6cc39866bfef6c65.
11
12 Bug: https://bugs.gentoo.org/814860
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 gnome-extra/gucharmap/gucharmap-13.0.8.ebuild | 11 +----------
16 1 file changed, 1 insertion(+), 10 deletions(-)
17
18 diff --git a/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild b/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
19 index 2ba14ea53a6..c5ddaa9831f 100644
20 --- a/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
21 +++ b/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
22 @@ -43,17 +43,8 @@ src_prepare() {
23 }
24
25 src_configure() {
26 - local unicodedir="${EPREFIX}"/usr/share/unicode
27 - local ucddir
28 -
29 - if has_verson '<app-i18n/unicode-data-14.0.0-r1'; then
30 - ucddir="${unicodedir}-data"
31 - else
32 - ucddir=${unicodedir}
33 - fi
34 -
35 local emesonargs=(
36 - -Ducd_path="${ucddir}"
37 + -Ducd_path="${EPREFIX}/usr/share/unicode-data"
38 $(meson_use debug dbg)
39 $(meson_use gtk-doc docs)
40 $(meson_use introspection gir)