Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ferite/
Date: Sat, 13 Oct 2018 17:36:08
Message-Id: 1539452097.fa62b01ee52d5fbc8706355c14aad90bfbde868a.pacho@gentoo
1 commit: fa62b01ee52d5fbc8706355c14aad90bfbde868a
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 13 16:58:12 2018 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 13 17:34:57 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa62b01e
7
8 dev-lang/ferite: Fix deps (#574436)
9
10 Closes: https://bugs.gentoo.org/574436
11 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
12 Package-Manager: Portage-2.3.51, Repoman-2.3.11
13
14 dev-lang/ferite/ferite-1.1.17-r1.ebuild | 29 +++++++++++++++++------------
15 1 file changed, 17 insertions(+), 12 deletions(-)
16
17 diff --git a/dev-lang/ferite/ferite-1.1.17-r1.ebuild b/dev-lang/ferite/ferite-1.1.17-r1.ebuild
18 index 37886bbe0a6..8b06ab09a72 100644
19 --- a/dev-lang/ferite/ferite-1.1.17-r1.ebuild
20 +++ b/dev-lang/ferite/ferite-1.1.17-r1.ebuild
21 @@ -1,9 +1,8 @@
22 -# Copyright 1999-2013 Gentoo Foundation
23 +# Copyright 1999-2018 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 -EAPI=4
27 -
28 -inherit autotools eutils multilib
29 +EAPI=7
30 +inherit autotools
31
32 DESCRIPTION="A clean, lightweight, object oriented scripting language"
33 HOMEPAGE="http://www.ferite.org/"
34 @@ -14,13 +13,17 @@ SLOT="1"
35 KEYWORDS="~alpha amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
36 IUSE=""
37
38 -DEPEND="
39 - >=dev-libs/libpcre-5
40 - dev-libs/libxml2"
41 -RDEPEND="${DEPEND}"
42 +RDEPEND="
43 + dev-libs/boehm-gc[threads]
44 + >=dev-libs/libpcre-5:3
45 + dev-libs/libxml2:2
46 +"
47 +DEPEND="${RDEPEND}"
48
49 src_prepare() {
50 - epatch "${FILESDIR}"/ferite-pcre.patch
51 + default
52 +
53 + eapply "${FILESDIR}"/ferite-pcre.patch
54
55 # use docsdir variable, install to DESTDIR
56 sed \
57 @@ -70,9 +73,11 @@ src_configure() {
58 src_install() {
59 cp tools/doc/feritedoc "${T}" || die
60 sed -i -e '/^prefix/s:prefix:${T}:g' "${T}"/feritedoc || die
61 - sed -i -e '/^$prefix/s:$prefix/bin/ferite:'"${ED}"'usr/bin/ferite:' "${T}"/feritedoc || die
62 + sed -i -e '/^$prefix/s:$prefix/bin/ferite:'"${ED}"'/usr/bin/ferite:' "${T}"/feritedoc || die
63 sed -i -e 's:$library_path $library_path:${S}/tools/doc ${S}/tools/doc:' "${T}"/feritedoc || die
64 - export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${ED}usr/lib"
65 +
66 + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${ED}/usr/lib"
67 emake DESTDIR="${D}" LIBDIR="${EPREFIX}"/usr/$(get_libdir) install
68 - prune_libtool_files
69 +
70 + find "${D}" -name '*.la' -delete || die
71 }