Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: lxde-base/lxpanel/
Date: Tue, 27 Mar 2018 00:57:53
Message-Id: 1522112244.ab2079189ff72033d46d55349add649ffb2db6de.bman@gentoo
1 commit: ab2079189ff72033d46d55349add649ffb2db6de
2 Author: charIes17 <charles17 <AT> arcor <DOT> de>
3 AuthorDate: Mon Jan 15 06:43:34 2018 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 27 00:57:24 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab207918
7
8 lxde-base/lxpanel: RDEPEND x11-libs/gdk-pixbuf[X]
9
10 Closes: https://bugs.gentoo.org/614086
11 Also adds locale handling to 0.9.3-r1
12 Closes: https://github.com/gentoo/gentoo/pull/6864
13
14 ...xpanel-0.9.3.ebuild => lxpanel-0.9.3-r1.ebuild} | 23 +++++++++++++++++-----
15 lxde-base/lxpanel/lxpanel-0.9.3.ebuild | 2 +-
16 2 files changed, 19 insertions(+), 6 deletions(-)
17
18 diff --git a/lxde-base/lxpanel/lxpanel-0.9.3.ebuild b/lxde-base/lxpanel/lxpanel-0.9.3-r1.ebuild
19 similarity index 70%
20 copy from lxde-base/lxpanel/lxpanel-0.9.3.ebuild
21 copy to lxde-base/lxpanel/lxpanel-0.9.3-r1.ebuild
22 index 2c22a239d32..246d9549e28 100644
23 --- a/lxde-base/lxpanel/lxpanel-0.9.3.ebuild
24 +++ b/lxde-base/lxpanel/lxpanel-0.9.3-r1.ebuild
25 @@ -1,17 +1,23 @@
26 -# Copyright 1999-2017 Gentoo Foundation
27 +# Copyright 1999-2018 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29
30 -EAPI="6"
31 +EAPI=6
32
33 -inherit readme.gentoo-r1
34 +PLOCALES="af ar be bg bn_IN bn ca cs da de el en_GB es et eu fa fi fo fr frp
35 +gl he hr hu id is it ja kk km ko lg lt lv ml ms nb nl nn pa pl ps pt_BR pt ro
36 +ru sk sl sr@latin sr sv te th tr tt_RU ug uk ur_PK ur vi zh_CN zh_HK zh_TW"
37 +
38 +PLOCALE_BACKUP="en_GB"
39 +
40 +inherit l10n readme.gentoo-r1
41
42 DESCRIPTION="Lightweight X11 desktop panel for LXDE"
43 HOMEPAGE="https://wiki.lxde.org/en/LXPanel"
44 SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
45
46 LICENSE="GPL-2"
47 -KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
48 SLOT="0"
49 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
50 IUSE="+alsa wifi"
51
52 RDEPEND="dev-libs/keybinder:0=
53 @@ -21,7 +27,7 @@ RDEPEND="dev-libs/keybinder:0=
54 x11-libs/libXmu
55 x11-libs/libXpm
56 x11-libs/cairo
57 - x11-libs/gdk-pixbuf
58 + x11-libs/gdk-pixbuf[X]
59 x11-libs/libX11
60 lxde-base/lxmenu-data
61 lxde-base/menu-cache
62 @@ -35,6 +41,13 @@ DOC_CONTENTS="If you have problems with broken icons shown in the main panel,
63 you will have to configure panel settings via its menu.
64 This will not be an issue with first time installations."
65
66 +src_prepare() {
67 + default
68 +
69 + export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
70 + l10n_get_locales > po/LINGUAS || die
71 +}
72 +
73 src_configure() {
74 local plugins="netstatus,volume,cpu,deskno,batt, \
75 kbled,xkb,thermal,cpufreq,monitors"
76
77 diff --git a/lxde-base/lxpanel/lxpanel-0.9.3.ebuild b/lxde-base/lxpanel/lxpanel-0.9.3.ebuild
78 index 2c22a239d32..0f628687d4d 100644
79 --- a/lxde-base/lxpanel/lxpanel-0.9.3.ebuild
80 +++ b/lxde-base/lxpanel/lxpanel-0.9.3.ebuild
81 @@ -1,4 +1,4 @@
82 -# Copyright 1999-2017 Gentoo Foundation
83 +# Copyright 1999-2018 Gentoo Foundation
84 # Distributed under the terms of the GNU General Public License v2
85
86 EAPI="6"