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

[Georgy Yakovlev]

commit:     a6a678d0098db1fcd40a1d27cc8f571ff8001cfa
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat May 23 18:44:07 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat May 23 18:44:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6a678d0

app-shells/loksh: bump to 6.7.1

upstream fixed https://github.com/dimkr/loksh/issues/16

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 app-shells/loksh/Manifest           |  3 +--
 app-shells/loksh/loksh-6.7.1.ebuild | 28 ++++++++++++++++++++++++++++
 app-shells/loksh/loksh-6.7.ebuild   | 30 ------------------------------
 3 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/app-shells/loksh/Manifest b/app-shells/loksh/Manifest
index db8eb720939..a8941253b99 100644
--- a/app-shells/loksh/Manifest
+++ b/app-shells/loksh/Manifest
@@ -1,3 +1,2 @@
 DIST loksh-6.6.tar.gz 251931 BLAKE2B 8671b2a7b5f4d8247c8572a925a078a7bbf7e6f0ae11b9198798c66def35c5bdb5c3b39e5c37e0dcbc068a1757e6cdcb667088640c6c9a556c64a9a4c0582102 SHA512 7f5188b3f0af3167f1c5847043689a35f22d5075cee2ec4ce3ebd324a59233e89db1c864dc62a05ad036ddd541ee89c680fa82e22b85cd2c82ad32c5ebad51be
-DIST loksh-6.7.tar.gz 240036 BLAKE2B 6bbfb4784287405bbc06be36d2c0d8a46d68968be751cf29207089d1fffe444f4fd3deb7be381cce7f5a9e97666b9e62de0d28bc82807d700a351adb51e2294d SHA512 b2f7976697dd3c672c0540e21a1e3a541c7809f397fd539ed4eafc3314987cfec985076bcd9f49f5eed9148eecdb66337fc82233204062ae5c760a84beb79c53
-DIST lolibc-6.7.tar.gz 18265 BLAKE2B 7a7bbbb91924ad2e0a9a617c3ada6a075262c006f492276b1f9a4d2e82e2987344d9bd64bb4e018543dac154a1349dd9db16a1f0c76f66f63e1ce7d7cae49631 SHA512 f9e6d0ef88c44ed093fa7e9389f7995314d2c5583c27f68cf896c2feb7fb5b048764c8498c535a370e9d075c847345e8e3b883ce14b96897228d4957c95d37b8
+DIST loksh-6.7.1.tar.xz 209448 BLAKE2B 812ebeae15a6a5db12439d58a58a2d0c85b324db5b0918a55e76e125c02ee94a0a773fba49b183f7b2bf6af35b0be6e5c3b976cc2761651cbbdacf9f85e3fdf7 SHA512 c8ffe19e6bd1b1ae60432729a94539503961230fa9392dbcc79999f7b402c83a51ba644c8fc2706cff071195de641ec4e0e1b550d823cad949b37fbdf0ab572b

diff --git a/app-shells/loksh/loksh-6.7.1.ebuild b/app-shells/loksh/loksh-6.7.1.ebuild
new file mode 100644
index 00000000000..690826159b8
--- /dev/null
+++ b/app-shells/loksh/loksh-6.7.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Linux port of OpenBSD's ksh"
+HOMEPAGE="https://github.com/dimkr/loksh"
+SRC_URI="https://github.com/dimkr/${PN}/releases/download/${PV}/src.tar.xz -> ${P}.tar.xz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="sys-libs/ncurses:0="
+
+RDEPEND="
+	${DEPEND}
+	!app-shells/ksh
+"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+	sed -i "/install_dir/s@loksh@${PF}@" meson.build || die
+}

diff --git a/app-shells/loksh/loksh-6.7.ebuild b/app-shells/loksh/loksh-6.7.ebuild
deleted file mode 100644
index bf63f3ecf32..00000000000
--- a/app-shells/loksh/loksh-6.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-# https://github.com/dimkr/loksh/issues/16
-LOLIBC_COMMIT="f6bbd5bae97e58d0be6ea9fbbe5131853d5b0b70"
-
-DESCRIPTION="Linux port of OpenBSD's ksh"
-HOMEPAGE="https://github.com/dimkr/loksh"
-SRC_URI="https://github.com/dimkr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/dimkr/lolibc/archive/${LOLIBC_COMMIT}.tar.gz -> lolibc-${PV}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-DEPEND="sys-libs/ncurses:0="
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${DEPEND}
-	!app-shells/ksh"
-
-src_prepare() {
-	default
-	rmdir "${S}/subprojects/lolibc" || die
-	mv -v "${WORKDIR}/lolibc-${LOLIBC_COMMIT}" "${S}/subprojects/lolibc" || die
-	sed -i "/install_dir/s@loksh@${PF}@" meson.build || die
-}