From b413d09eee4ee1cbbb8c77c370f8fafb17fe5693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matt=C3=A9o=20Rossillol=E2=80=91=E2=80=91Laruelle?= Date: Tue, 6 Aug 2024 10:50:54 +0200 Subject: [PATCH] dev-util/shellspec: revbump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This revision fix the lib directory used. Signed-off-by: Mattéo Rossillol‑‑Laruelle --- ...pec-0.28.1.ebuild => shellspec-0.28.1-r1.ebuild} | 13 +++++++------ dev-util/shellspec/shellspec-9999.ebuild | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) rename dev-util/shellspec/{shellspec-0.28.1.ebuild => shellspec-0.28.1-r1.ebuild} (82%) diff --git a/dev-util/shellspec/shellspec-0.28.1.ebuild b/dev-util/shellspec/shellspec-0.28.1-r1.ebuild similarity index 82% rename from dev-util/shellspec/shellspec-0.28.1.ebuild rename to dev-util/shellspec/shellspec-0.28.1-r1.ebuild index aeeb16f9ff..8cab3a2a45 100644 --- a/dev-util/shellspec/shellspec-0.28.1.ebuild +++ b/dev-util/shellspec/shellspec-0.28.1-r1.ebuild @@ -14,12 +14,12 @@ else KEYWORDS="~amd64" fi -LICENSE="MIT-with-advertising" +LICENSE="MIT" SLOT="0" IUSE="doc examples test" -RESTRICT="binchecks strip !test? ( test )" +RESTRICT="!test? ( test )" -DEPEND=" +RDEPEND=" || ( >=app-shells/bash-2.03 >=app-shells/dash-0.5.4 @@ -33,8 +33,7 @@ DEPEND=" ) " -BDEPEND="test? ( ${DEPEND} )" -RDEPEND="${DEPEND}" +BDEPEND="test? ( ${RDEPEND} )" DOCS=( CHANGELOG.md @@ -44,6 +43,8 @@ DOCS=( src_prepare() { default + + sed -i "s/lib/$(get_libdir)/" stub/shellspec || die sed -i "s/LICENSE//g" Makefile || die } @@ -59,5 +60,5 @@ src_install() { use doc && dodoc -r docs use examples && dodoc -r examples - emake PREFIX="${ED}/usr" install + emake LIBDIR="${ED}/usr/$(get_libdir)" PREFIX="${ED}/usr" install } diff --git a/dev-util/shellspec/shellspec-9999.ebuild b/dev-util/shellspec/shellspec-9999.ebuild index aeeb16f9ff..8cab3a2a45 100644 --- a/dev-util/shellspec/shellspec-9999.ebuild +++ b/dev-util/shellspec/shellspec-9999.ebuild @@ -14,12 +14,12 @@ else KEYWORDS="~amd64" fi -LICENSE="MIT-with-advertising" +LICENSE="MIT" SLOT="0" IUSE="doc examples test" -RESTRICT="binchecks strip !test? ( test )" +RESTRICT="!test? ( test )" -DEPEND=" +RDEPEND=" || ( >=app-shells/bash-2.03 >=app-shells/dash-0.5.4 @@ -33,8 +33,7 @@ DEPEND=" ) " -BDEPEND="test? ( ${DEPEND} )" -RDEPEND="${DEPEND}" +BDEPEND="test? ( ${RDEPEND} )" DOCS=( CHANGELOG.md @@ -44,6 +43,8 @@ DOCS=( src_prepare() { default + + sed -i "s/lib/$(get_libdir)/" stub/shellspec || die sed -i "s/LICENSE//g" Makefile || die } @@ -59,5 +60,5 @@ src_install() { use doc && dodoc -r docs use examples && dodoc -r examples - emake PREFIX="${ED}/usr" install + emake LIBDIR="${ED}/usr/$(get_libdir)" PREFIX="${ED}/usr" install }