From ae8f5e6a82b24994c6529a275fbc317a6474600c Mon Sep 17 00:00:00 2001 From: Israel Hernandez Date: Tue, 19 Dec 2023 08:02:53 -0800 Subject: [PATCH 1/2] sci-biology/imagej: bump version imagej sources and plugins * ImageJ version bump 1.53t to 1.54g from NIH sources * plugins version bump 153 to 154 Signed-off-by: IAHMCOL --- sci-biology/imagej/Manifest | 4 ++-- .../imagej/{imagej-1.53t.ebuild => imagej-1.54g.ebuild} | 2 -- sci-biology/imagej/imagej-1.54h.ebuild | 4 ++-- sci-biology/imagej/imagej-9999.ebuild | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-) rename sci-biology/imagej/{imagej-1.53t.ebuild => imagej-1.54g.ebuild} (94%) diff --git a/sci-biology/imagej/Manifest b/sci-biology/imagej/Manifest index 633cdbb7e0c..d10ab405487 100644 --- a/sci-biology/imagej/Manifest +++ b/sci-biology/imagej/Manifest @@ -1,4 +1,4 @@ DIST ImageJ.png 13012 BLAKE2B b42ee855e6214b275cbdcc722f6c7b095fe83de477a151714c4afec8e23abe12b2d0bf62ae81a4f9c4ccefc9245a9e144085b844ee3f92121a88f7d27106acf5 SHA512 60c2ff73bcfc668931c59b0dfb299723a369b741601bdd591a407302e30fc58c6c626525b3f08b955a5dab37729d3f704db689317b42a94e7a3ccbfb72abc9b3 -DIST ij153.zip 6503763 BLAKE2B 7b3b30b55fe844e110f3e85eab7790376fc2d62300312c0b9037726758fcbfd5c4a6072842aa09e6ed08a2d593c2b1966d985de5972d801cf01638b41134325e SHA512 788003b35f7c3dd6f9bcda298637a3de78d745de8dd685cf88d8cc6ae22e142b07620c1e47a182d1e87178d68d591e381813f40cedc59f08d21af317065d7de0 -DIST ij153t-src.zip 1549329 BLAKE2B 7e43b759b96c8683be2175348a88080cdd4f038153a937717ebb0f480f9c8fb83d15184f8bf25060dc395ac3b13fd57f905621e680e481ad7dfdc090bbefb323 SHA512 861ecba6a20835566ec4038ffa30211308d37c41cecdfb97ea33d963c0ac2f1dbec0679c014335f89df24317334aeb30350dd09ee5f0fa33990f5355dd2fd06f +DIST ij154.zip 6677151 BLAKE2B acd99e95c8123461710e3565a31121e475ac9bd1bb993649dc9569c1e17a055e6e0aad9a3fa482b4a021f39cd3467e779529a1512be557a370277c6091fa7b08 SHA512 92c9f13335e9d2cc111bf08851a6fb747d1d1eac8f3088563f42669e225cff6fd2ffbfd4ea474e7baaa266656c4a433107a3264539f9744412aa6400094cb2c9 +DIST ij154g-src.zip 1617820 BLAKE2B 771e3417af9adbf37eaa9addfc065265862ea6865dfa0bd394a9f03e4f8221c206f5715896b98a7ec4a4b262be70d16058bd2a2d6357914e39e0b1679b91998c SHA512 3ae97899fd2f3eef28caf5c7a628106eff8462713efa6a9aeee9d2d392a952f88055c0e0de1913a96a3962647110d83d301ebbbbf4ce24aac0b6a0ae5ed21067 DIST imagej-1.54h.gh.tar.gz 5822723 BLAKE2B a293a4b3c2f5f998822c61e67586124491c0b902c5c91538d7ab7eb7d84f6f8ce79759eaa5f4e5de60731566923cc4b837277539c9522c2efe7bc079c6c13455 SHA512 6061fad8c11b26cdf7537f945abc26f9e4a10f34ed151701f6f89e794028be646dc8013437605c6889073acf803ea6784457f47e3cd645c54265fef24bfeb615 diff --git a/sci-biology/imagej/imagej-1.53t.ebuild b/sci-biology/imagej/imagej-1.54g.ebuild similarity index 94% rename from sci-biology/imagej/imagej-1.53t.ebuild rename to sci-biology/imagej/imagej-1.54g.ebuild index 952eff08b53..4bf6db8d943 100644 --- a/sci-biology/imagej/imagej-1.53t.ebuild +++ b/sci-biology/imagej/imagej-1.54g.ebuild @@ -15,8 +15,6 @@ HOMEPAGE="https://imagej.nih.gov/ij/" SRC_URI="https://imagej.nih.gov/ij/download/src/${MY_PN}${MY_PV}-src.zip 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" diff --git a/sci-biology/imagej/imagej-1.54h.ebuild b/sci-biology/imagej/imagej-1.54h.ebuild index 33a10b0e4bd..0252d66130e 100644 --- a/sci-biology/imagej/imagej-1.54h.ebuild +++ b/sci-biology/imagej/imagej-1.54h.ebuild @@ -6,7 +6,7 @@ EAPI=8 inherit java-pkg-2 java-ant-2 desktop MY_PN="ij" -IJ_PV="153" #plugins not currently available under 154 +IJ_PV="154" #plugins now available for 154 DESCRIPTION="Image Processing and Analysis in Java" @@ -59,7 +59,7 @@ src_prepare() { if [[ ${PV} == 9999 ]]; then if use plugins ; then - unpack "${MY_PN}${IJ_PV}.zip" + unpack "${MY_PN}${IJ_PV}.zip" fi fi diff --git a/sci-biology/imagej/imagej-9999.ebuild b/sci-biology/imagej/imagej-9999.ebuild index 33a10b0e4bd..0252d66130e 100644 --- a/sci-biology/imagej/imagej-9999.ebuild +++ b/sci-biology/imagej/imagej-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 inherit java-pkg-2 java-ant-2 desktop MY_PN="ij" -IJ_PV="153" #plugins not currently available under 154 +IJ_PV="154" #plugins now available for 154 DESCRIPTION="Image Processing and Analysis in Java" @@ -59,7 +59,7 @@ src_prepare() { if [[ ${PV} == 9999 ]]; then if use plugins ; then - unpack "${MY_PN}${IJ_PV}.zip" + unpack "${MY_PN}${IJ_PV}.zip" fi fi From bf5e74c0442698cf7feb2cddccd1d57eca91612c Mon Sep 17 00:00:00 2001 From: Israel Hernandez Date: Tue, 19 Dec 2023 11:32:27 -0800 Subject: [PATCH 2/2] sci-biology/imagej: drop 1.54g Signed-off-by: IAHMCOL --- sci-biology/imagej/Manifest | 1 - sci-biology/imagej/imagej-1.54g.ebuild | 120 ------------------------- 2 files changed, 121 deletions(-) delete mode 100644 sci-biology/imagej/imagej-1.54g.ebuild diff --git a/sci-biology/imagej/Manifest b/sci-biology/imagej/Manifest index d10ab405487..4c5068f0ae9 100644 --- a/sci-biology/imagej/Manifest +++ b/sci-biology/imagej/Manifest @@ -1,4 +1,3 @@ DIST ImageJ.png 13012 BLAKE2B b42ee855e6214b275cbdcc722f6c7b095fe83de477a151714c4afec8e23abe12b2d0bf62ae81a4f9c4ccefc9245a9e144085b844ee3f92121a88f7d27106acf5 SHA512 60c2ff73bcfc668931c59b0dfb299723a369b741601bdd591a407302e30fc58c6c626525b3f08b955a5dab37729d3f704db689317b42a94e7a3ccbfb72abc9b3 DIST ij154.zip 6677151 BLAKE2B acd99e95c8123461710e3565a31121e475ac9bd1bb993649dc9569c1e17a055e6e0aad9a3fa482b4a021f39cd3467e779529a1512be557a370277c6091fa7b08 SHA512 92c9f13335e9d2cc111bf08851a6fb747d1d1eac8f3088563f42669e225cff6fd2ffbfd4ea474e7baaa266656c4a433107a3264539f9744412aa6400094cb2c9 -DIST ij154g-src.zip 1617820 BLAKE2B 771e3417af9adbf37eaa9addfc065265862ea6865dfa0bd394a9f03e4f8221c206f5715896b98a7ec4a4b262be70d16058bd2a2d6357914e39e0b1679b91998c SHA512 3ae97899fd2f3eef28caf5c7a628106eff8462713efa6a9aeee9d2d392a952f88055c0e0de1913a96a3962647110d83d301ebbbbf4ce24aac0b6a0ae5ed21067 DIST imagej-1.54h.gh.tar.gz 5822723 BLAKE2B a293a4b3c2f5f998822c61e67586124491c0b902c5c91538d7ab7eb7d84f6f8ce79759eaa5f4e5de60731566923cc4b837277539c9522c2efe7bc079c6c13455 SHA512 6061fad8c11b26cdf7537f945abc26f9e4a10f34ed151701f6f89e794028be646dc8013437605c6889073acf803ea6784457f47e3cd645c54265fef24bfeb615 diff --git a/sci-biology/imagej/imagej-1.54g.ebuild b/sci-biology/imagej/imagej-1.54g.ebuild deleted file mode 100644 index 4bf6db8d943..00000000000 --- a/sci-biology/imagej/imagej-1.54g.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit java-pkg-2 java-ant-2 desktop - -MY_PN="ij" -MY_PV=${PV//.} -IJ_PV=${MY_PV::-1} - -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 - https://imagej.nih.gov/ij/images/ImageJ.png - plugins? ( https://wsr.imagej.net/distros/cross-platform/${MY_PN}${IJ_PV}.zip )" - -LICENSE="public-domain" # http://imagej.net/disclaimer.html -SLOT="0" - -KEYWORDS="~amd64" - -IUSE="doc plugins debug" - -RDEPEND=" - >=virtual/jre-1.7:* - dev-java/java-config -" -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 ! use debug ; then - sed -i 's: debug="on">: debug="off">:' "${S}"/build.xml || die - fi - default -} - -src_compile() { - local antflags="build" - use doc && antflags="${antflags} javadocs" - - ant ${antflags} || die "ant build failed" - - # 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 - fi - # build finished, generate startup wrapper - cat < "${T}/${PN}" -#!${EPREFIX}/bin/bash -IJ_LIB=${EPREFIX}/usr/share/${PN}/lib -if !([ "\${IJ_HOME}" ]) ; then - IJ_HOME=\${HOME}/.imagej -fi -if [ -d \${IJ_HOME}/plugins ] ; then - IJ_PLG=\${IJ_HOME} -else - IJ_PLG=${EPREFIX}/usr/share/${PN}/lib -fi -if !([ "\$IJ_MEM" ]) ; then - IJ_MEM=${IJ_MAX_MEM} -fi -if !([ "\$IJ_CP" ]) ; then - IJ_CP=\$(java-config -p imagej):\$(java-config -O)/lib/tools.jar -else - IJ_CP=\$(java-config -p imagej):\$(java-config -O)/lib/tools.jar:\${IJ_CP} -fi -\$(java-config --java) \\ - -Xmx\${IJ_MEM}m -Dswing.aatext=true \\ - -Dawt.useSystemAAFontSettings=on\\ - -cp \${IJ_CP} \\ - -Duser.home=\${IJ_HOME} \\ - -Dplugins.dir=\${IJ_PLG} \\ - ij.ImageJ "\$@" -EOF -} - -src_install() { - java-pkg_dojar *.jar - dobin "${T}/${PN}" - - if use plugins ; then - cp -R "${IJ_S}"/plugins "${ED}"/usr/share/"${PN}"/lib/ - cp -R "${IJ_S}"/macros "${ED}"/usr/share/"${PN}"/lib/ - fi - - use doc && java-pkg_dohtml -r "${WORKDIR}"/api - - insinto /usr/share/pixmaps - doins "${WORKDIR}/${PN}".png - make_desktop_entry "${PN}" ImageJ "${PN}" Graphics -} - -pkg_postinst() { - einfo "" - einfo "You can configure the path of a folder, which contains \"plugins\" directory and IJ_Prefs.txt," - einfo "by setting the environmental variable, \$IJ_HOME." - einfo "Default setting is \$IJ_HOME=\${HOME}/.imagej, i.e. \${HOME}/.imagej/plugins and \${HOME}/.imagej/IJ_Prefs.txt." - einfo "" - einfo "You can also configure the memory size by setting the environmental variable, \$IJ_MEM," - einfo "and the class path by setting the environmental variable, \$IJ_CP." - einfo "" - einfo "If you want to use much more plugins, please see http://rsb.info.nih.gov/ij/plugins/index.html" - einfo "and add *.class files to \$IJ_HOME/plugins folder" - einfo "" -}