Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-themes/gtk-engines-candido/files/, x11-themes/gtk-engines-candido/
Date: Tue, 24 Dec 2019 11:53:46
Message-Id: 1577188394.e4a995a79fbb6d5bbb2279e358f385975ddf7cd8.soap@gentoo
1 commit: e4a995a79fbb6d5bbb2279e358f385975ddf7cd8
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 24 11:53:14 2019 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 24 11:53:14 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4a995a7
7
8 x11-themes/gtk-engines-candido: Port to EAPI 7
9
10 Package-Manager: Portage-2.3.82, Repoman-2.3.20
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 .../gtk-engines-candido-0.9.1-glib-2.31.patch | 4 ++--
14 .../gtk-engines-candido-0.9.1.ebuild | 24 ++++++++++++----------
15 2 files changed, 15 insertions(+), 13 deletions(-)
16
17 diff --git a/x11-themes/gtk-engines-candido/files/gtk-engines-candido-0.9.1-glib-2.31.patch b/x11-themes/gtk-engines-candido/files/gtk-engines-candido-0.9.1-glib-2.31.patch
18 index d8f7e3e70ff..68094d31b99 100644
19 --- a/x11-themes/gtk-engines-candido/files/gtk-engines-candido-0.9.1-glib-2.31.patch
20 +++ b/x11-themes/gtk-engines-candido/files/gtk-engines-candido-0.9.1-glib-2.31.patch
21 @@ -1,7 +1,7 @@
22 http://bugs.gentoo.org/412731
23
24 ---- src/animation.c
25 -+++ src/animation.c
26 +--- a/src/animation.c
27 ++++ b/src/animation.c
28 @@ -7,7 +7,7 @@
29 #include "animation.h"
30
31
32 diff --git a/x11-themes/gtk-engines-candido/gtk-engines-candido-0.9.1.ebuild b/x11-themes/gtk-engines-candido/gtk-engines-candido-0.9.1.ebuild
33 index 74f512f15e4..90d89b19f4f 100644
34 --- a/x11-themes/gtk-engines-candido/gtk-engines-candido-0.9.1.ebuild
35 +++ b/x11-themes/gtk-engines-candido/gtk-engines-candido-0.9.1.ebuild
36 @@ -1,8 +1,9 @@
37 -# Copyright 1999-2017 Gentoo Foundation
38 +# Copyright 1999-2019 Gentoo Authors
39 # Distributed under the terms of the GNU General Public License v2
40
41 -EAPI=4
42 -inherit autotools eutils
43 +EAPI=7
44 +
45 +inherit autotools
46
47 MY_P="candido-engine-${PV}"
48
49 @@ -13,18 +14,17 @@ SRC_URI="mirror://sourceforge/candido.berlios/${MY_P}.tar.bz2"
50 LICENSE="GPL-2"
51 SLOT="0"
52 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
53 -IUSE=""
54
55 -RDEPEND=">=x11-libs/gtk+-2.8:2"
56 -DEPEND="${RDEPEND}
57 - virtual/pkgconfig"
58 +RDEPEND="x11-libs/gtk+:2"
59 +DEPEND="${RDEPEND}"
60 +BDEPEND="virtual/pkgconfig"
61
62 -S=${WORKDIR}/${MY_P}
63 +S="${WORKDIR}/${MY_P}"
64
65 -DOCS="AUTHORS ChangeLog CREDITS NEWS README"
66 +PATCHES=( "${FILESDIR}"/${P}-glib-2.31.patch )
67
68 src_prepare() {
69 - epatch "${FILESDIR}"/${P}-glib-2.31.patch
70 + default
71 eautoreconf # required for interix
72 }
73
74 @@ -34,5 +34,7 @@ src_configure() {
75
76 src_install() {
77 default
78 - find "${ED}" -name '*.la' -exec rm -f {} +
79 +
80 + # no static archives
81 + find "${D}" -name '*.la' -delete || die
82 }