From 50ca4579669dac5459ee428970e9f358ae41c498 Mon Sep 17 00:00:00 2001 From: Kent Fredric Date: Tue, 6 Aug 2019 17:50:13 +1200 Subject: dev-java/boot-bin: Add missing shebang re bug #682984 Add a shebang to the boot bootup script so it works for users who have a native shell other than bash. -r1 bump necessary as if you already had it installed, it was possibly broken. Closes: https://bugs.gentoo.org/682984 Package-Manager: Portage-2.3.66, Repoman-2.3.16 Signed-off-by: Kent Fredric --- dev-java/boot-bin/boot-bin-2.7.1-r1.ebuild | 71 ++++++++++++++++++++++++++++++ dev-java/boot-bin/boot-bin-2.7.1.ebuild | 71 ------------------------------ dev-java/boot-bin/files/boot | 1 + 3 files changed, 72 insertions(+), 71 deletions(-) create mode 100644 dev-java/boot-bin/boot-bin-2.7.1-r1.ebuild delete mode 100644 dev-java/boot-bin/boot-bin-2.7.1.ebuild (limited to 'dev-java') diff --git a/dev-java/boot-bin/boot-bin-2.7.1-r1.ebuild b/dev-java/boot-bin/boot-bin-2.7.1-r1.ebuild new file mode 100644 index 000000000000..53777ba1edb0 --- /dev/null +++ b/dev-java/boot-bin/boot-bin-2.7.1-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit java-pkg-2 + +MY_PN="${PN%-bin}" +MY_PNV="${MY_PN}-${PV}" +GITHUB_USER="boot-clj" + +DESCRIPTION="Build tooling for Clojure" +HOMEPAGE="https://boot-clj.com/" +SRC_URI=" + https://github.com/${GITHUB_USER}/${MY_PN}/releases/download/${PV}/${MY_PN}.jar -> ${MY_PNV}.jar + https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/README.md -> ${MY_PNV}-README.md + https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/CHANGES.md -> ${MY_PNV}-CHANGES.md +" +LICENSE="EPL-1.0" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND=">=virtual/jre-1.7" +DEPEND=">=virtual/jdk-1.7" + +RESTRICT="test" + +src_unpack() { + mkdir -p "${S}" || die "Can't mkdir ${S}" + cd "${S}" || die "Can't enter ${S}" + for file in ${A}; do + einfo "Copying ${file}" + cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}" + done +} + +src_prepare() { + einfo "Copying boot shell-script" + cp "${FILESDIR}/boot" "${S}/" || die "Can't copy boot" + + for file in "README.md" "CHANGES.md"; do + einfo "Renaming ${MY_PNV}-${file} to ${file}" + mv "${S}/${MY_PNV}-${file}" "${S}/${file}" || die "Can't rename ${MY_PNV}-${file} to ${file}" + done + + java-pkg_init_paths_ + + sed -i "s|@@JAVA_PKG_SHAREPATH@@|${JAVA_PKG_SHAREPATH}|g" "${S}/boot" || die "Can't patch JAVA_PKG_SHAREPATH path in boot" + sed -i "s|@@JAVA_PKG_JARDEST@@|${JAVA_PKG_JARDEST}|g" "${S}/boot" || die "Can't patch JAVA_PKG_JARDEST path in boot" + sed -i "s|@@PN@@|${PN}|g" "${S}/boot" || die "Can't patch PN in boot" + + default +} + +src_compile() { :; } + +src_install() { + dobin "${S}/boot" + dodoc "${S}/README.md" + dodoc "${S}/CHANGES.md" + + java-pkg_newjar "${S}/${MY_PNV}.jar" +} + +pkg_postinst() { + einfo "This package will still download a whole lot of its own runtime" + einfo "dependencies the first time you run it." + einfo "" + einfo "This currently can't be helped and is expected behaviour for a" + einfo "java based development toolkit" +} diff --git a/dev-java/boot-bin/boot-bin-2.7.1.ebuild b/dev-java/boot-bin/boot-bin-2.7.1.ebuild deleted file mode 100644 index 8e700cc2e66e..000000000000 --- a/dev-java/boot-bin/boot-bin-2.7.1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2019 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit java-pkg-2 - -MY_PN="${PN%-bin}" -MY_PNV="${MY_PN}-${PV}" -GITHUB_USER="boot-clj" - -DESCRIPTION="Build tooling for Clojure" -HOMEPAGE="https://boot-clj.com/" -SRC_URI=" - https://github.com/${GITHUB_USER}/${MY_PN}/releases/download/${PV}/${MY_PN}.jar -> ${MY_PNV}.jar - https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/README.md -> ${MY_PNV}-README.md - https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/CHANGES.md -> ${MY_PNV}-CHANGES.md -" -LICENSE="EPL-1.0" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=">=virtual/jre-1.7" -DEPEND=">=virtual/jdk-1.7" - -RESTRICT="test" - -src_unpack() { - mkdir -p "${S}" || die "Can't mkdir ${S}" - cd "${S}" || die "Can't enter ${S}" - for file in ${A}; do - einfo "Copying ${file}" - cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}" - done -} - -src_prepare() { - einfo "Copying boot shell-script" - cp "${FILESDIR}/boot" "${S}/" || die "Can't copy boot" - - for file in "README.md" "CHANGES.md"; do - einfo "Renaming ${MY_PNV}-${file} to ${file}" - mv "${S}/${MY_PNV}-${file}" "${S}/${file}" || die "Can't rename ${MY_PNV}-${file} to ${file}" - done - - java-pkg_init_paths_ - - sed -i "s|@@JAVA_PKG_SHAREPATH@@|${JAVA_PKG_SHAREPATH}|g" "${S}/boot" || die "Can't patch JAVA_PKG_SHAREPATH path in boot" - sed -i "s|@@JAVA_PKG_JARDEST@@|${JAVA_PKG_JARDEST}|g" "${S}/boot" || die "Can't patch JAVA_PKG_JARDEST path in boot" - sed -i "s|@@PN@@|${PN}|g" "${S}/boot" || die "Can't patch PN in boot" - - default -} - -src_compile() { :; } - -src_install() { - dobin "${S}/boot" - dodoc "${S}/README.md" - dodoc "${S}/CHANGES.md" - - java-pkg_newjar "${S}/${MY_PNV}.jar" -} - -pkg_postinst() { - einfo "This package will still download a whole lot of its own runtime" - einfo "dependencies the first time you run it." - einfo "" - einfo "This currently can't be helped and is expected behaviour for a" - einfo "java based development toolkit" -} diff --git a/dev-java/boot-bin/files/boot b/dev-java/boot-bin/files/boot index acd8e404c28c..8d53ebd338a8 100644 --- a/dev-java/boot-bin/files/boot +++ b/dev-java/boot-bin/files/boot @@ -1,3 +1,4 @@ +#!/bin/bash source @@JAVA_PKG_SHAREPATH@@/package.env jarpath="@@JAVA_PKG_JARDEST@@/@@PN@@.jar" declare -a "options=($BOOT_JVM_OPTIONS)" -- cgit v1.2.3-65-gdbad