Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-themes/gtk-engines/
Date: Tue, 30 Aug 2022 17:50:58
Message-Id: 1661881846.950bf698ab11f50350c27de6927903041b75b81b.sam@gentoo
1 commit: 950bf698ab11f50350c27de6927903041b75b81b
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 30 08:37:21 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 30 17:50:46 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=950bf698
7
8 x11-themes/gtk-engines: remove multilib from lua dep
9
10 Closes: https://github.com/gentoo/gentoo/pull/27067
11 Closes: https://github.com/gentoo/gentoo/pull/27071
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 ...ines-2.20.2-r100.ebuild => gtk-engines-2.20.2-r101.ebuild} | 11 +++--------
16 1 file changed, 3 insertions(+), 8 deletions(-)
17
18 diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2-r101.ebuild
19 similarity index 91%
20 rename from x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild
21 rename to x11-themes/gtk-engines/gtk-engines-2.20.2-r101.ebuild
22 index 42e426543bad..e5b881dd8425 100644
23 --- a/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild
24 +++ b/x11-themes/gtk-engines/gtk-engines-2.20.2-r101.ebuild
25 @@ -17,14 +17,13 @@ LICENSE="LGPL-2.1"
26 SLOT="2"
27 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
28 IUSE="accessibility lua"
29 -
30 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
31
32 # Lua dependency uses lua_gen_impl_dep() because LUA_REQ_USE doesn't seem
33 # to play nicely with MULTILIB_USEDEP.
34 RDEPEND="
35 >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
36 - lua? ( $(lua_gen_impl_dep "${MULTILIB_USEDEP}") )
37 + lua? ( ${LUA_DEPS} )
38 "
39 DEPEND="${RDEPEND}"
40 BDEPEND="
41 @@ -58,8 +57,8 @@ src_prepare() {
42 multilib_src_configure() {
43 local confopts=(
44 --enable-animation
45 - $(use_enable lua)
46 - $(use_with lua system-lua)
47 + $(multilib_native_use_enable lua)
48 + $(multilib_native_use_with lua system-lua)
49 )
50 ECONF_SOURCE=${S} gnome2_src_configure "${confopts[@]}"
51 }
52 @@ -67,7 +66,3 @@ multilib_src_configure() {
53 multilib_src_install() {
54 gnome2_src_install
55 }
56 -
57 -multilib_src_install_all() {
58 - einstalldocs
59 -}