commit: f6ee8374ed488f3621b2193345c0039cd73d06e9 Author: Israel Hernandez <israel.a.hernandez <AT> gmail <DOT> com> AuthorDate: Sat Jul 8 18:23:30 2023 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Sun Jul 9 18:58:21 2023 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=f6ee8374
sci-biology/imagej: Add unstable git versions Signed-off-by: IAHMCOL <IAHMCOL <AT> thejabberwocky.net> Co-authored-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> Closes: https://github.com/gentoo/sci/pull/1198 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> sci-biology/imagej/imagej-1.53t.ebuild | 2 + .../{imagej-1.53t.ebuild => imagej-1.54d.ebuild} | 50 ++++++++++++++++------ .../{imagej-1.53t.ebuild => imagej-9999.ebuild} | 50 ++++++++++++++++------ sci-biology/imagej/metadata.xml | 3 ++ 4 files changed, 79 insertions(+), 26 deletions(-) diff --git a/sci-biology/imagej/imagej-1.53t.ebuild b/sci-biology/imagej/imagej-1.53t.ebuild index d2959e18c..952eff08b 100644 --- a/sci-biology/imagej/imagej-1.53t.ebuild +++ b/sci-biology/imagej/imagej-1.53t.ebuild @@ -31,6 +31,8 @@ RDEPEND=" " DEPEND="${RDEPEND} >=virtual/jdk-1.7:* +" +BDEPEND=" dev-java/ant-core app-arch/unzip " diff --git a/sci-biology/imagej/imagej-1.53t.ebuild b/sci-biology/imagej/imagej-1.54d.ebuild similarity index 82% copy from sci-biology/imagej/imagej-1.53t.ebuild copy to sci-biology/imagej/imagej-1.54d.ebuild index d2959e18c..33a10b0e4 100644 --- a/sci-biology/imagej/imagej-1.53t.ebuild +++ b/sci-biology/imagej/imagej-1.54d.ebuild @@ -6,22 +6,36 @@ EAPI=8 inherit java-pkg-2 java-ant-2 desktop MY_PN="ij" -MY_PV=${PV//.} -IJ_PV=${MY_PV::-1} +IJ_PV="153" #plugins not currently available under 154 DESCRIPTION="Image Processing and Analysis in Java" -HOMEPAGE="https://imagej.nih.gov/ij/"; -SRC_URI="https://imagej.nih.gov/ij/download/src/${MY_PN}${MY_PV}-src.zip +HOMEPAGE=" + https://imagej.nih.gov/ij/ + https://github.com/imagej +" + +SRC_URI=" https://imagej.nih.gov/ij/images/ImageJ.png plugins? ( https://wsr.imagej.net/distros/cross-platform/${MY_PN}${IJ_PV}.zip )" # plugins are under a different licenses and can be installed into user's $IJ_HOME/plugins -# plugins? ( http://rsb.info.nih.gov/ij/download/zips/${MY_PN}${IJ_PV}.zip )" -LICENSE="public-domain" # http://imagej.net/disclaimer.html -SLOT="0" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/imagej/ImageJ"; + IJ_S="${S}/ImageJ" +else + SRC_URI+=" + https://github.com/imagej/ImageJ/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz + " + S="${WORKDIR}/ImageJ-${PV}" + IJ_S="${WORKDIR}/ImageJ" + KEYWORDS="~amd64" +fi + +LICENSE="public-domain" -KEYWORDS="~amd64" +SLOT="0" IUSE="doc plugins debug" @@ -29,18 +43,26 @@ RDEPEND=" >=virtual/jre-1.7:* dev-java/java-config " -DEPEND="${RDEPEND} + +DEPEND=" + ${RDEPEND} >=virtual/jdk-1.7:* +" + +BDEPEND=" dev-java/ant-core app-arch/unzip " -S="${WORKDIR}/source" -IJ_S=${WORKDIR}/ImageJ - src_prepare() { cp "${DISTDIR}"/ImageJ.png "${WORKDIR}/${PN}.png" || die + if [[ ${PV} == 9999 ]]; then + if use plugins ; then + unpack "${MY_PN}${IJ_PV}.zip" + fi + fi + if ! use debug ; then sed -i 's: debug="on">: debug="off">:' "${S}"/build.xml || die fi @@ -56,9 +78,11 @@ src_compile() { # Max memory usage depends on available memory and CPU type MEM=$(grep MemTotal /proc/meminfo | cut -d':' -f2 | grep -o [0-9]*) IJ_MAX_MEM=$(expr ${MEM} / 1024) + if use x86 && $IJ_MAX_MEM -gt 2048 ; then - IJ_MAX_MEM=2048 + IJ_MAX_MEM=2048 fi + # build finished, generate startup wrapper cat <<EOF > "${T}/${PN}" #!${EPREFIX}/bin/bash diff --git a/sci-biology/imagej/imagej-1.53t.ebuild b/sci-biology/imagej/imagej-9999.ebuild similarity index 82% copy from sci-biology/imagej/imagej-1.53t.ebuild copy to sci-biology/imagej/imagej-9999.ebuild index d2959e18c..33a10b0e4 100644 --- a/sci-biology/imagej/imagej-1.53t.ebuild +++ b/sci-biology/imagej/imagej-9999.ebuild @@ -6,22 +6,36 @@ EAPI=8 inherit java-pkg-2 java-ant-2 desktop MY_PN="ij" -MY_PV=${PV//.} -IJ_PV=${MY_PV::-1} +IJ_PV="153" #plugins not currently available under 154 DESCRIPTION="Image Processing and Analysis in Java" -HOMEPAGE="https://imagej.nih.gov/ij/"; -SRC_URI="https://imagej.nih.gov/ij/download/src/${MY_PN}${MY_PV}-src.zip +HOMEPAGE=" + https://imagej.nih.gov/ij/ + https://github.com/imagej +" + +SRC_URI=" https://imagej.nih.gov/ij/images/ImageJ.png plugins? ( https://wsr.imagej.net/distros/cross-platform/${MY_PN}${IJ_PV}.zip )" # plugins are under a different licenses and can be installed into user's $IJ_HOME/plugins -# plugins? ( http://rsb.info.nih.gov/ij/download/zips/${MY_PN}${IJ_PV}.zip )" -LICENSE="public-domain" # http://imagej.net/disclaimer.html -SLOT="0" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/imagej/ImageJ"; + IJ_S="${S}/ImageJ" +else + SRC_URI+=" + https://github.com/imagej/ImageJ/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz + " + S="${WORKDIR}/ImageJ-${PV}" + IJ_S="${WORKDIR}/ImageJ" + KEYWORDS="~amd64" +fi + +LICENSE="public-domain" -KEYWORDS="~amd64" +SLOT="0" IUSE="doc plugins debug" @@ -29,18 +43,26 @@ RDEPEND=" >=virtual/jre-1.7:* dev-java/java-config " -DEPEND="${RDEPEND} + +DEPEND=" + ${RDEPEND} >=virtual/jdk-1.7:* +" + +BDEPEND=" dev-java/ant-core app-arch/unzip " -S="${WORKDIR}/source" -IJ_S=${WORKDIR}/ImageJ - src_prepare() { cp "${DISTDIR}"/ImageJ.png "${WORKDIR}/${PN}.png" || die + if [[ ${PV} == 9999 ]]; then + if use plugins ; then + unpack "${MY_PN}${IJ_PV}.zip" + fi + fi + if ! use debug ; then sed -i 's: debug="on">: debug="off">:' "${S}"/build.xml || die fi @@ -56,9 +78,11 @@ src_compile() { # Max memory usage depends on available memory and CPU type MEM=$(grep MemTotal /proc/meminfo | cut -d':' -f2 | grep -o [0-9]*) IJ_MAX_MEM=$(expr ${MEM} / 1024) + if use x86 && $IJ_MAX_MEM -gt 2048 ; then - IJ_MAX_MEM=2048 + IJ_MAX_MEM=2048 fi + # build finished, generate startup wrapper cat <<EOF > "${T}/${PN}" #!${EPREFIX}/bin/bash diff --git a/sci-biology/imagej/metadata.xml b/sci-biology/imagej/metadata.xml index ca2867d8c..8b8ebd7d9 100644 --- a/sci-biology/imagej/metadata.xml +++ b/sci-biology/imagej/metadata.xml @@ -12,4 +12,7 @@ <use> <flag name="plugins">Install additional plugins</flag> </use> + <upstream> + <remote-id type="github">imagej/ImageJ</remote-id> + </upstream> </pkgmetadata>
