[gentoo-commits] repo/gentoo:master commit in: app-text/expander/

[gentoo-commits] repo/gentoo:master commit in: app-text/expander/

[Ulrich Müller]

commit:     46869219130a65b026804e49e69b14dda6e84c03
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 20:45:16 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 20:46:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46869219

app-text/expander: [QA] Create relative rather than absolute symlinks.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../expander/{expander-2.0.5-r1.ebuild => expander-2.0.5-r2.ebuild}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/expander/expander-2.0.5-r1.ebuild b/app-text/expander/expander-2.0.5-r2.ebuild
similarity index 91%
rename from app-text/expander/expander-2.0.5-r1.ebuild
rename to app-text/expander/expander-2.0.5-r2.ebuild
index 6f6904bc6d2..1c4a5c12ffb 100644
--- a/app-text/expander/expander-2.0.5-r1.ebuild
+++ b/app-text/expander/expander-2.0.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -27,7 +27,7 @@ src_compile() {
 src_install() {
 	cd src
 	dobin expander boxcomment align_columns align_comments where_is
-	dosym /usr/bin/boxcomment /usr/bin/unboxcomment
+	dosym boxcomment /usr/bin/unboxcomment
 
 	insinto /usr/share/${P}
 	doins "${S}"/service

[gentoo-commits] repo/gentoo:master commit in: app-text/expander/

[David Seifert]

commit:     fc7e885bf5412e5fd096290b92dd7006a4b36521
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 21 21:50:50 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jan 21 21:50:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc7e885b

app-text/expander: Port to EAPI 7

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-text/expander/expander-2.0.5-r2.ebuild | 32 ++++++++++--------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/app-text/expander/expander-2.0.5-r2.ebuild b/app-text/expander/expander-2.0.5-r2.ebuild
index 1c4a5c12ffb..c1ddd2ee423 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() {

[gentoo-commits] repo/gentoo:master commit in: app-text/expander/

[David Seifert]

commit:     6f487c47cee7f2d24398a3f0d125edb994b26e80
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 23:16:58 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 23:16:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f487c47

app-text/expander: quote $(tc-*) calls

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-text/expander/expander-2.0.5-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/expander/expander-2.0.5-r2.ebuild b/app-text/expander/expander-2.0.5-r2.ebuild
index c1ddd2ee423e..6684a72038d5 100644
--- a/app-text/expander/expander-2.0.5-r2.ebuild
+++ b/app-text/expander/expander-2.0.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}"
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_compile() {
-	emake -C src CC=$(tc-getCC)
+	emake -C src CC="$(tc-getCC)"
 }
 
 src_install() {