From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 22 Oct 2018 11:09:47 +0100
Subject: gentoo resync : 22.10.2018

---
 dev-lang/ferite/Manifest                |  2 +-
 dev-lang/ferite/ferite-1.1.17-r1.ebuild | 29 +++++++++++++++++------------
 2 files changed, 18 insertions(+), 13 deletions(-)

(limited to 'dev-lang/ferite')

diff --git a/dev-lang/ferite/Manifest b/dev-lang/ferite/Manifest
index 932c5d38bd7e..1839a7b8c5b1 100644
--- a/dev-lang/ferite/Manifest
+++ b/dev-lang/ferite/Manifest
@@ -1,4 +1,4 @@
 AUX ferite-pcre.patch 1356 BLAKE2B f2c3669e33d12dce6e00d22b5884f0770021eb77297997bd94e777b114f8ae24f7ed23b10d7c877a7bffb61fe9ff0e126bd717ea8c8a8fb8186da89178ba4926 SHA512 e867c4b2fc993963bdf17d992d3dd007f636c85b0c13388480cec0f0ff70b6596274c19cd46b0e3ee11064f607b381f7f76888819ef6fb3bdd0804b07b5087fc
 DIST ferite-1.1.17.tar.gz 2174774 BLAKE2B 5e55ed4101bc5a9c031afef0d9bfcafdc0c498c4ddc712eb17e3059ebd55b925e6b0343113853b946a31a428e5f71c17a2365e629447bb504453b6a7d61358d8 SHA512 475983b865fba492661e59b7470b7e46889f29ed8ba829b112354963fafcbed6ab4d4677579337c1c4ed730c6fe02897743f56edae335ceda6277da975d1098f
-EBUILD ferite-1.1.17-r1.ebuild 2419 BLAKE2B fb80ad9d2c8a3686334bd5d1c1f589965358e48c6d76e915082df64f3b72104bac37ad01c4fee9fca5203e79227b52119a61521b4f1d4b027541cb12bcbe3214 SHA512 bf2c5f4bda036da71a796a15d4b5a2f035fcf90a81800bc3241b55b86b52a6bdba659bff62a257c75e4d8a9499c1c8cae40523623db32299649b56b7de0bef7a
+EBUILD ferite-1.1.17-r1.ebuild 2467 BLAKE2B c3610f42a663bca0d35c6234ba0e04c9d6894b46fe06fe43db55ae56b01e1b3dca9fdd915dcc8486fe19b42bb8993ea0f2efe0645abf71a0f865f5e8bd855dd3 SHA512 5bfb72482bea359601365f8d6c0d1fc453f457376478b1231f07bbc67c8f3dfb76fc01a17f628b83a3288a1fffee43229d9e535be4ea2abfd681337fc8aa0460
 MISC metadata.xml 243 BLAKE2B fc4ef3433d84176432ef31abd4960ce0e2dcd4979228bf565712a1e574451b34689a8fff3dab4142e3997f084729bba1bc3d2c38d6ddf10d95a11e0b4412e03a SHA512 e3315331fae1a640778867a807694dc624ac88e4dbae2546780534a629d65d054cc6e376245fd31432d663775121cf07d74b2f1cd65d9d2d9cf9137d6598897a
diff --git a/dev-lang/ferite/ferite-1.1.17-r1.ebuild b/dev-lang/ferite/ferite-1.1.17-r1.ebuild
index 37886bbe0a6e..8b06ab09a724 100644
--- a/dev-lang/ferite/ferite-1.1.17-r1.ebuild
+++ b/dev-lang/ferite/ferite-1.1.17-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit autotools eutils multilib
+EAPI=7
+inherit autotools
 
 DESCRIPTION="A clean, lightweight, object oriented scripting language"
 HOMEPAGE="http://www.ferite.org/"
@@ -14,13 +13,17 @@ SLOT="1"
 KEYWORDS="~alpha amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-DEPEND="
-	>=dev-libs/libpcre-5
-	dev-libs/libxml2"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	dev-libs/boehm-gc[threads]
+	>=dev-libs/libpcre-5:3
+	dev-libs/libxml2:2
+"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/ferite-pcre.patch
+	default
+
+	eapply "${FILESDIR}"/ferite-pcre.patch
 
 	# use docsdir variable, install to DESTDIR
 	sed \
@@ -70,9 +73,11 @@ src_configure() {
 src_install() {
 	cp tools/doc/feritedoc "${T}" || die
 	sed -i -e '/^prefix/s:prefix:${T}:g' "${T}"/feritedoc || die
-	sed -i -e '/^$prefix/s:$prefix/bin/ferite:'"${ED}"'usr/bin/ferite:' "${T}"/feritedoc || die
+	sed -i -e '/^$prefix/s:$prefix/bin/ferite:'"${ED}"'/usr/bin/ferite:' "${T}"/feritedoc || die
 	sed -i -e 's:$library_path $library_path:${S}/tools/doc ${S}/tools/doc:' "${T}"/feritedoc || die
-	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${ED}usr/lib"
+
+	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${ED}/usr/lib"
 	emake DESTDIR="${D}" LIBDIR="${EPREFIX}"/usr/$(get_libdir) install
-	prune_libtool_files
+
+	find "${D}" -name '*.la' -delete || die
 }
-- 
cgit v1.2.3