From add278b9601ff9e4af091c91c851ee46a185be8f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 10 Sep 2024 12:30:41 +0100 Subject: gentoo auto-resync : 10:09:2024 - 12:30:41 --- sci-geosciences/Manifest.gz | Bin 11591 -> 11596 bytes sci-geosciences/bt747/Manifest | 3 +- sci-geosciences/bt747/bt747-2.1.7-r3.ebuild | 64 --------------- sci-geosciences/bt747/bt747-2.1.7-r4.ebuild | 90 +++++++++++++++++++++ .../bt747/files/bt747-2.1.7-source-target.patch | 33 ++++++++ 5 files changed, 125 insertions(+), 65 deletions(-) delete mode 100644 sci-geosciences/bt747/bt747-2.1.7-r3.ebuild create mode 100644 sci-geosciences/bt747/bt747-2.1.7-r4.ebuild create mode 100644 sci-geosciences/bt747/files/bt747-2.1.7-source-target.patch (limited to 'sci-geosciences') diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz index f70d297927cf..745fad75e830 100644 Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ diff --git a/sci-geosciences/bt747/Manifest b/sci-geosciences/bt747/Manifest index 81e43f3ccaa8..b1859086aece 100644 --- a/sci-geosciences/bt747/Manifest +++ b/sci-geosciences/bt747/Manifest @@ -1,5 +1,6 @@ +AUX bt747-2.1.7-source-target.patch 1978 BLAKE2B 723a9946b1213ceb4b8a3e7d70726b3faef31e444b25ffee240dd394e74d1de6c64de093a8f75d820cf8306bb81c03c03da2846a6f101a5ba2ca22e72ad7d53f SHA512 bb14e15ecd406f4f0ce8f58641835a0b8a2f86e99737e5665ebbf23e57e19ecfc34d37a88151eb7d4da6663216e4fbd3cfbbf9880ae1d8aec358c2783f2a470c AUX jchart2d-3.2.patch 490 BLAKE2B c676f77a4d7db06a61b445c85ad551aa1510820599e43e8d98d9803788f829da80485e2e3dfdd0e20c4a57c48acc8a5d2fbad7564930cd849c4adc3c1d615669 SHA512 75f9d1d9cc3cd5c6ce4f99dc6c68b97f4566fd5841d04f5d21fcc44294a8bb6c8046599180564ed9d0e6760bc1bf16a44ae817b07952303fcbd6c1b3ef774641 DIST BT747_2.1.7_full.zip 9649645 BLAKE2B ec714f90395875c26679ace3ea732effff977dcdf3f7003f6282cd3ac87935956b5fc829a60e98acd8533d7b6fc482bc9c7ee9348f3972b5cf59db5476009730 SHA512 362533ccbf6b9252d6d7e09497a75038b0776e76a2c2f73f05e2abc0c521d0a640d0ae9e7d5d40da1d14850838a2924f17622d91535e90b900a5ae97b66f6b3d DIST bt747.gif 5903 BLAKE2B ae5516dc716ab147b261ea43c0bbb480ae8ab6f3523147fb9fe980e5c53142ac0021448eee3fc7958467a3cd1a38d989f7894112e5a2d5361300e8644b96df00 SHA512 55c3bbc9ec5fe12261b2604980c7b5d4416afa3ec73f7834c62d3ebbdf4580b247c1feb2ac112f876e7110a8aabe652da39d2181f01661435ba465671a631252 -EBUILD bt747-2.1.7-r3.ebuild 1718 BLAKE2B 3f5eb51923e2ff52bd1a0624cb221b87cca9e4d46e3815565ff1af5d6e3313062359f3df2989417e4cc704a4bb07dee960b2ed81ba7897cf380cf0ab2dd747ca SHA512 ebfe30ec6d3c35a71074895173e42c06fad6ccf7288236c135578049bcfd87e3f2c917f9922e4abf9a8d0d360943d564a6992fe95d65c1ca0d3a572e30843cf0 +EBUILD bt747-2.1.7-r4.ebuild 2448 BLAKE2B 55ca1faffcbe57ffa2d8dc50554f24c007293ad014083e59f638d3c13fd957d1bd45110f2597063d1c7fdd27ee097c89e2004ec3b18cae75994ad0c5b2ed5a7e SHA512 3f311602190800fb803a5840e2f44990024db3801cdde0d240d33a8b83e2cc8e518972ac061b78a9252885005a4b0cbd3c3f75bfa77ee6ee2532100461d7450e MISC metadata.xml 939 BLAKE2B 09e8faea8d375dc63be360cf1d28db08e511a4a76b024b4902decd7065e11661b6b2ab35fde78aa2e118cf8c5d83661c8911aae24bed4578150529bc81d180e0 SHA512 fdf33fb97c25281d4409578979dad4f0549a225df9ab1f2bddda1a30d90b7004b0963a2649ff37a3475d3b5b29f80bb99603b0a96a2852c171a75186d3a6ba59 diff --git a/sci-geosciences/bt747/bt747-2.1.7-r3.ebuild b/sci-geosciences/bt747/bt747-2.1.7-r3.ebuild deleted file mode 100644 index 124e05d65111..000000000000 --- a/sci-geosciences/bt747/bt747-2.1.7-r3.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop java-pkg-2 java-ant-2 - -DESCRIPTION="MTK GPS Datalogger Device Control" -HOMEPAGE="https://www.bt747.org" -SRC_URI="https://downloads.sourceforge.net/project/bt747/Development/BT747_${PV}_full.zip - https://www.bt747.org/icon/bt747_128x128.gif -> ${PN}.gif" -S="${WORKDIR}" - -LICENSE="GPL-3" -SLOT="1" -KEYWORDS="~amd64" - -BDEPEND="app-arch/unzip:0" -CDEPEND=" - dev-java/commons-imaging:0 - dev-java/jcalendar:1.2 - dev-java/jchart2d:0 - dev-java/jopt-simple:0 - >=dev-java/rxtx-2.2_pre2:2 - dev-java/swing-layout:1 - dev-java/swingx:1.6 - dev-java/swingx-ws:bt747 -" -RDEPEND="${CDEPEND} - dev-libs/glib:2[dbus] - >=virtual/jre-1.8:* -" -DEPEND="${CDEPEND} - >=virtual/jdk-1.8:* -" - -EANT_BUILD_TARGET="dist.j2se" -EANT_EXTRA_ARGS="-Dskip.proguard=yes -Dsvn=true -Dsvnversion=true -Dbuild.current.revision=Gentoo" -EANT_GENTOO_CLASSPATH="commons-imaging,jcalendar-1.2,jchart2d,jopt-simple,rxtx-2,swing-layout-1,swingx-1.6,swingx-ws-bt747" -JAVA_ANT_REWRITE_CLASSPATH="yes" - -src_prepare() { - java-pkg-2_src_prepare - # Fix for newer jchart2d. - eapply "${FILESDIR}/jchart2d-3.2.patch" - - # Remove all the bundled stuff. - rm -rv dist/ lib/ || die - - # GraphicsUtilities moved in later SwingX versions. - sed -i "s:org\.jdesktop\.swingx\.graphics\.GraphicsUtilities:org.jdesktop.swingx.util.GraphicsUtilities:g" \ - src_j2se/net/sf/bt747/j2se/app/list/FileListCellRenderer.java || die -} - -src_install() { - dodoc {ChangeLog,README}.txt - - java-pkg_dojar dist/*.jar - java-pkg_dolauncher ${PN} --main bt747.j2se_view.BT747Main \ - --java-args="-Xmx192m" - - doicon "${DISTDIR}/${PN}.gif" - make_desktop_entry ${PN} BT747 bt747.gif -} diff --git a/sci-geosciences/bt747/bt747-2.1.7-r4.ebuild b/sci-geosciences/bt747/bt747-2.1.7-r4.ebuild new file mode 100644 index 000000000000..b5b2ecc0515f --- /dev/null +++ b/sci-geosciences/bt747/bt747-2.1.7-r4.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop java-pkg-2 + +DESCRIPTION="MTK GPS Datalogger Device Control" +HOMEPAGE="https://www.bt747.org" +SRC_URI="https://downloads.sourceforge.net/project/bt747/Development/BT747_${PV}_full.zip + https://www.bt747.org/icon/bt747_128x128.gif -> ${PN}.gif" +S="${WORKDIR}" + +LICENSE="GPL-3" +SLOT="1" +KEYWORDS="~amd64" + +BDEPEND="app-arch/unzip:0 + >=dev-java/ant-1.10.14-r3:0" +CDEPEND=" + dev-java/commons-imaging:0 + dev-java/jcalendar:1.2 + dev-java/jchart2d:0 + dev-java/jopt-simple:0 + >=dev-java/rxtx-2.2_pre2:2 + dev-java/swing-layout:1 + dev-java/swingx:1.6 + dev-java/swingx-ws:bt747 +" + +# Java 11 because of compile error with 1.8 +# /var/tmp/portage/sci-geosciences/bt747-2.1.7-r3/work/build.xml:1478: +# java.lang.NoSuchMethodError: java.nio.CharBuffer.flip()Ljava/nio/CharBuffer; +DEPEND="${CDEPEND} + >=virtual/jdk-11:* +" +RDEPEND="${CDEPEND} + dev-libs/glib:2[dbus] + >=virtual/jre-1.8:* +" + +DOCS=( ChangeLog.txt ) +PATCHES=( + "${FILESDIR}/bt747-2.1.7-source-target.patch" + # Fix for newer jchart2d. + "${FILESDIR}/jchart2d-3.2.patch" +) + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + + # Remove all the bundled stuff. + rm -rv dist/ lib/ || die + + # GraphicsUtilities moved in later SwingX versions. + sed -i "s:org\.jdesktop\.swingx\.graphics\.GraphicsUtilities:org.jdesktop.swingx.util.GraphicsUtilities:g" \ + src_j2se/net/sf/bt747/j2se/app/list/FileListCellRenderer.java || die + + # EANT_EXTRA_ARGS="-Dskip.proguard=yes -Dsvn=true -Dsvnversion=true -Dbuild.current.revision=Gentoo" + cat > build.properties <<-EOF || die + skip.proguard=yes + svn=true + svnversion=true + build.current.revision=Gentoo + ant.build.javac.source=$(java-pkg_get-source) + ant.build.javac.target=$(java-pkg_get-target) + jcalendar.jar=$(java-pkg_getjars jcalendar-1.2) + jchart.jar=$(java-pkg_getjars jchart2d) + jopt-simple.jar=$(java-pkg_getjars jopt-simple) + rxtxcomm.jar=$(java-pkg_getjars rxtx-2) + sanselan.jar=$(java-pkg_getjars commons-imaging) + swing-layout.jar=$(java-pkg_getjars swing-layout-1) + swingx.jar=$(java-pkg_getjars swingx-1.6) + swingx-ws.jar=$(java-pkg_getjars swingx-ws-bt747) + EOF +} + +src_compile() { + eant dist.j2se +} + +src_install() { + java-pkg_dojar dist/*.jar + java-pkg_dolauncher ${PN} --main bt747.j2se_view.BT747Main \ + --java-args="-Xmx192m" + + doicon "${DISTDIR}/${PN}.gif" + make_desktop_entry ${PN} BT747 bt747.gif +} diff --git a/sci-geosciences/bt747/files/bt747-2.1.7-source-target.patch b/sci-geosciences/bt747/files/bt747-2.1.7-source-target.patch new file mode 100644 index 000000000000..aa9c46751371 --- /dev/null +++ b/sci-geosciences/bt747/files/bt747-2.1.7-source-target.patch @@ -0,0 +1,33 @@ +Hardcoded javac options prevent configuration. +In order to allow using -Dant.build.javac.source +and -Dant.build.javac.target we remove them. + +--- a/build.xml ++++ b/build.xml +@@ -411,7 +411,7 @@ + + + +- ++ + + + +@@ -442,7 +442,7 @@ + + + +- ++ + + + +@@ -971,7 +971,7 @@ + + + +- ++ + + + -- cgit v1.2.3