[gentoo-commits] repo/gentoo:master commit in: app-shells/sash/

[gentoo-commits] repo/gentoo:master commit in: app-shells/sash/

[Aaron Bauman]

commit:     db87ce464ab36dd3ab2f5643ad51d6378f242425
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 00:33:14 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 00:33:31 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db87ce46

app-shells/sash: port to EAPI 7

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 app-shells/sash/sash-3.8.ebuild | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app-shells/sash/sash-3.8.ebuild b/app-shells/sash/sash-3.8.ebuild
index 6c2ee580ce0..e584cdbcd92 100644
--- a/app-shells/sash/sash-3.8.ebuild
+++ b/app-shells/sash/sash-3.8.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="A small (static) UNIX Shell"
-HOMEPAGE="http://www.canb.auug.org.au/~dbell/"
-SRC_URI="http://www.canb.auug.org.au/~dbell/programs/${P}.tar.gz"
+HOMEPAGE="https://www.canb.auug.org.au/~dbell/"
+SRC_URI="https://www.canb.auug.org.au/~dbell/programs/${P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
@@ -20,7 +20,7 @@ DEPEND="
 RDEPEND="!static? ( ${DEPEND} )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/sash-3.7-builtin.patch
+	eapply "${FILESDIR}"/sash-3.7-builtin.patch
 
 	sed \
 		-e "s:-O3:${CFLAGS}:" \
@@ -29,6 +29,7 @@ src_prepare() {
 	sed \
 		-e 's:linux/ext2_fs.h:ext2fs/ext2_fs.h:g' \
 		-i cmd_chattr.c || die
+	eapply_user
 }
 
 src_compile() {
@@ -38,7 +39,6 @@ src_compile() {
 }
 
 src_install() {
-	into /
 	dobin sash
 	doman sash.1
 	dodoc README

[gentoo-commits] repo/gentoo:master commit in: app-shells/sash/

[Ulrich Müller]

commit:     4c46c9042b45f17a472a0ac9054ea8afafec3a46
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 18 11:44:19 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 18 11:50:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c46c904

app-shells/sash: Fix LICENSE.

Closes: https://bugs.gentoo.org/702474
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-shells/sash/sash-3.8.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-shells/sash/sash-3.8.ebuild b/app-shells/sash/sash-3.8.ebuild
index e584cdbcd92..34f0ebd3d9c 100644
--- a/app-shells/sash/sash-3.8.ebuild
+++ b/app-shells/sash/sash-3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="A small (static) UNIX Shell"
 HOMEPAGE="https://www.canb.auug.org.au/~dbell/"
 SRC_URI="https://www.canb.auug.org.au/~dbell/programs/${P}.tar.gz"
 
-LICENSE="freedist"
+LICENSE="sash"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="static"

[gentoo-commits] repo/gentoo:master commit in: app-shells/sash/

[Ben Kohler]

commit:     35588d4610bdaadcd0628fef910c97c910fcdd88
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 24 13:02:33 2020 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Mar 24 13:31:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35588d46

app-shells/sash: fix bad sed delimiter

Closes: https://bugs.gentoo.org/710708
Package-Manager: Portage-2.3.95, Repoman-2.3.21
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 app-shells/sash/sash-3.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/sash/sash-3.8.ebuild b/app-shells/sash/sash-3.8.ebuild
index c927bf54bed..c9e88e0c3df 100644
--- a/app-shells/sash/sash-3.8.ebuild
+++ b/app-shells/sash/sash-3.8.ebuild
@@ -23,7 +23,7 @@ src_prepare() {
 	eapply "${FILESDIR}"/sash-3.7-builtin.patch
 
 	sed \
-		-e "s:-O3:${CFLAGS}:" \
+		-e "s|-O3|${CFLAGS}|" \
 		-e '/strip/d' \
 		-i Makefile || die
 	sed \