From 580f05ea8f512d11e23e8da80177d27835cbdbbc Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 22 Jan 2020 18:41:30 +0000
Subject: gentoo resync : 22.02.2020

---
 app-text/expander/Manifest                 |  2 +-
 app-text/expander/expander-2.0.5-r2.ebuild | 32 ++++++++++--------------------
 2 files changed, 12 insertions(+), 22 deletions(-)

(limited to 'app-text/expander')

diff --git a/app-text/expander/Manifest b/app-text/expander/Manifest
index 6e1bf1b59299..4b78ee16274e 100644
--- a/app-text/expander/Manifest
+++ b/app-text/expander/Manifest
@@ -1,4 +1,4 @@
 AUX expander-2.0.5-gentoo.patch 1971 BLAKE2B 16459adb991e28472c569ef77bd4f688110e0d2a99970ed65e5332736a1a90a82afa6a04aaec38ba53b16b3303efbe8706324ffe1a37d6b00637550802d23960 SHA512 f81577c3ee11d2e13b59258a59e02a3ec26b265ee2206fde5585f75c21db015907835ade2db88a19ab1afd778a3a7d146d99d1dfb891237d04b2e6a052f49f57
 DIST nedit_expander_kit_2.05.tar.gz 92571 BLAKE2B 0b77640b87372003e873a9e9146aeec82220dfc86b4f6d57220807443c007b6f4f99da8da505d7b6d2f1350150698deed84c8cb710297c6d8646ed192d3ee04a SHA512 a9d5e97db95eec9f98d71360c6af5a6908f31f59221ac1f509ae4f661b0614610b9591b9e2f58bba1175a6b609407d720369ba99cecb5496133d889bf93788ee
-EBUILD expander-2.0.5-r2.ebuild 1094 BLAKE2B a9b380f0fa99cdd32c32423fcfb2fc7a0684e0b92093f39dfe0169093d4eb8ca672cf890841903ad128593a592ed0e4258155c6e984bf0cf6b83297de4970c5e SHA512 1c95a0838980dd94d03257eae7c3c405d3236e0af0b828860a1e9d428788d77beb0add8bbcb8cabed07e7839c164ff44137a189965cd42a0ca1c32fa0620ae01
+EBUILD expander-2.0.5-r2.ebuild 950 BLAKE2B 2e75ea39d52d7518fbb632422083e3f760f8bc5bd1a67a4476aef16c271128c9db793a55abe2999677f085ba236ece498e22fd7fdec526a02bcfa697ffc4d35c SHA512 f1e4f13b0e24ed43fe61eebb6cbd557c3bf369a8baf9a8aba4bb9b55c33052132722a31e9c2e0d94aee8c502ae4118d9aa803c9ce171786cdf4ed272df892b0a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/expander/expander-2.0.5-r2.ebuild b/app-text/expander/expander-2.0.5-r2.ebuild
index 1c4a5c12ffbd..c1ddd2ee423e 100644
--- a/app-text/expander/expander-2.0.5-r2.ebuild
+++ b/app-text/expander/expander-2.0.5-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Expander is a utility that acts as a filter for text editors"
 HOMEPAGE="http://www.nedit.org"
@@ -12,35 +12,25 @@ SRC_URI="ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_2.05.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
-IUSE=""
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_compile() {
 	emake -C src CC=$(tc-getCC)
 }
 
 src_install() {
-	cd src
-	dobin expander boxcomment align_columns align_comments where_is
+	dobin src/{expander,boxcomment,align_columns,align_comments,where_is}
 	dosym boxcomment /usr/bin/unboxcomment
 
-	insinto /usr/share/${P}
-	doins "${S}"/service
-	for x in defs macros misc templates ; do
-		insinto /usr/share/${P}/${x}
-		doins "${S}"/${x}/*
-	done
-
-	cd "${S}"/docs
-	doman *.1
+	einstalldocs
+	dodoc USAGE
+	doman docs/*.1
 
-	cd "${S}"
-	dodoc ChangeLog INSTALL README USAGE
+	insinto /usr/share/${P}
+	doins -r service defs macros misc templates
 }
 
 pkg_postinst() {
-- 
cgit v1.2.3