diff options
author | V3n3RiX <venerix@koprulu.sector> | 2025-01-18 06:41:56 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2025-01-18 06:41:56 +0000 |
commit | 5046e96fa41cb320765bdf30253b2a98c27fe94d (patch) | |
tree | 008f8b783fae6f3e251250214a372278cd973c53 /sci-libs | |
parent | 6d730aa8064fbab6cc54447b6ed0e60b99c13256 (diff) |
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/Manifest.gz | bin | 43351 -> 43359 bytes | |||
-rw-r--r-- | sci-libs/linux-gpib-modules/Manifest | 2 | ||||
-rw-r--r-- | sci-libs/linux-gpib-modules/files/linux-gpib-modules-9999-depmod.patch | 22 | ||||
-rw-r--r-- | sci-libs/linux-gpib-modules/linux-gpib-modules-9999.ebuild | 70 | ||||
-rw-r--r-- | sci-libs/linux-gpib/Manifest | 1 | ||||
-rw-r--r-- | sci-libs/linux-gpib/linux-gpib-9999.ebuild | 242 | ||||
-rw-r--r-- | sci-libs/ondselsolver/Manifest | 6 | ||||
-rw-r--r-- | sci-libs/ondselsolver/files/ondselsolver-1.0.1-properly-demangle-typenames.patch | 18 | ||||
-rw-r--r-- | sci-libs/ondselsolver/ondselsolver-1.0.1_p20241024.ebuild | 7 | ||||
-rw-r--r-- | sci-libs/ondselsolver/ondselsolver-1.0.1_p20241127-r1.ebuild (renamed from sci-libs/ondselsolver/ondselsolver-1.0.1_p20241127.ebuild) | 0 |
10 files changed, 363 insertions, 5 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex 0c7bec7500fb..bc44c7074b33 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest index 62912e4a1c49..7d7e09778eb4 100644 --- a/sci-libs/linux-gpib-modules/Manifest +++ b/sci-libs/linux-gpib-modules/Manifest @@ -1,7 +1,9 @@ AUX linux-gpib-modules-4.3.4-depmod.patch 744 BLAKE2B 6079d0523cafcd15e38a7e73e8a0d98e107220e6816bd7646c254044acaa1d39d19e983987dff70c249a67b7accbc74a836f8ddd9f39503cdd510edc2d6bdbc2 SHA512 417193e768b0b5bd41b053a86ebbab163a74662e7f2912c70ae76a873243fb218b24f0680699f9988d4e9097b8bbd8a23902d3f5652675f8a3dbb02915308f12 AUX linux-gpib-modules-4.3.4-kernel-6.4.patch 957 BLAKE2B 0acd630a4ba05dd168813b6b8641d189eb4a4dae57a3a6b558ca0ee0de97c4287ddc7fc756c9f1b3c90e4d378ffec8afe4af16c33b0bb4394b10fc726518fa14 SHA512 62d3b8add27b43b2419de1b49fdb2e10b03bb50f179558fa2bda0d2dee13c3e44b871713f6c695224478c5dfd0f461b53e4bd70a2576e467e74cf37877d4d9b5 +AUX linux-gpib-modules-9999-depmod.patch 684 BLAKE2B 7113fb2814a5a14deeda43a909a71904bd3dc8cf35e036f930c6aec2331f50066795e9d3cad17bef48a6128ab3e5f938606c594ae19d24523fcb5d1f29ef3b0a SHA512 8e4bdb3ac012d8fe79ab3cb4307c7efa7538db8f15e487b0c3c2cd49cfce36828d7013e8fa4ac258d2dcfd89f602681d61ea45e5ae34ba0b3bc0f93fbf4c2876 DIST linux-gpib-4.3.5.tar.gz 1462624 BLAKE2B fff30ed1a7abc18cd4317e8f8979ef4014a532baab8c014f9a2eaa3338a2e8e8b672214d3f2b3f44066be15f432861a3fe3d67652f6966e73e561d99ff1e1566 SHA512 018cc255922a6335f8d28418b0a0808c3a369506470d9c81432ac7183ae255217d938a419e10ba2b0c44205a9d901405ce00ad5bdd968db2721cedd83baa2f76 DIST linux-gpib-4.3.6.tar.gz 1433121 BLAKE2B 64e2b19106d0531df990b1338f82a71707e54f448d652f6379eb9cd71feb84637090ed8fdfb0264248aa6879d5b9a1dc50e75c21a2c22a31397120eea5903e98 SHA512 a8005c71bfddb854ecbe4df0a81530e44378150242508b10df58c61d039c6d329020407608e31f1ef360de0c83169e76b793c032256e732d229bfd2da4cbaa35 EBUILD linux-gpib-modules-4.3.5-r3.ebuild 1353 BLAKE2B 51698e92eb8d8b2259aba9eb67655cfe86d13e07375780c1695bb643537cb15990f55743698fa883352b093f1bda546a4c640d41663ae60ec3dd250d00cb0050 SHA512 3d580b9b7938c31666ccfd66efd44ce969c37c849519fc42033d87131eb5e5d3caebb9b0cdc4e2098519e46b45ef41a64408753e0b6a58627454a3e4e0e32efb EBUILD linux-gpib-modules-4.3.6.ebuild 1258 BLAKE2B 16af3bfb802a2d644e92ac1bd833bada06031a69c02f48915c74fa1a92d5a8e99e003f3658e15318f88d2a57b94d6a6f78a267d2616ff9794f74a3f85d89ff85 SHA512 c4b3edc833fa21489e89c288ef649b7c5edb96bcf5f23ce1b1e9358ca4ab08f6bbe42c62145112c0676e084338857e2bf1423be3e0125ce499ddb78d73e02cf3 +EBUILD linux-gpib-modules-9999.ebuild 1448 BLAKE2B a3de97a66bbcb5b0cc9857ebfd6d56f57e645cba1c8578b9510e12b821820292bc4261e846a92171d8b4d0bd38e5023f51072134b5614aac7e17b136531fb161 SHA512 be57147c941b5544e0b1542efd1e44ea9315ab792d349725a69184ae2e95f2a07a6539052bb8a3e86f873fd16726dd569f9b561ca5f8eb527dad55fa2b5a7cab MISC metadata.xml 481 BLAKE2B 5ee2924d1131f188c19c84bbfa8a3e2c6093387d15db5a0bc86ea14d4b0c0f36924df7525fb26f0b6660efe1a75f20e19afbd71270386795bd6af82bc5cd38f8 SHA512 dd41ed66cff7ad48e4a107f512e1121fb630f6487ef7872aeab219ff39d6cdb4b5dc14fa19c1b7931697c555702c2bd8bb8ec553b060c11581f02d8a46f76ef4 diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-9999-depmod.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-9999-depmod.patch new file mode 100644 index 000000000000..34ae11eea6c7 --- /dev/null +++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-9999-depmod.patch @@ -0,0 +1,22 @@ +Depmod fails here since we're still in DESTDIR and the actual target path may +not exist... + + +diff --git a/Makefile b/Makefile +index 356bba54..8f5b4b63 100644 +--- a/Makefile ++++ b/Makefile +@@ -27,13 +27,9 @@ clean: + M="$(GPIB_SRCDIR)/drivers/gpib" \ + GPIB_TOP_DIR=$(GPIB_SRCDIR) + +-#We run depmod explicitly because the depmod.sh script run +-#by modules_install fails on Debian due to it failing to find +-#the System.map file. + install: + $(MAKE) -C $(LINUX_SRCDIR) V=$(VERBOSE) modules_install\ + M="$(GPIB_SRCDIR)/drivers/gpib" \ + GPIB_TOP_DIR=$(GPIB_SRCDIR) \ + INSTALL_MOD_DIR=gpib +- /sbin/depmod -A + diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-9999.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-9999.ebuild new file mode 100644 index 000000000000..cf690543f994 --- /dev/null +++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-9999.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.code.sf.net/p/linux-gpib/git" + S="${WORKDIR}/${P}/linux-gpib-kernel" +else + SRC_URI="https://downloads.sourceforge.net/linux-gpib/linux-gpib-${PV}.tar.gz" + S="${WORKDIR}/linux-gpib-kernel-${PV}" + KEYWORDS="~amd64 ~arm ~x86" +fi + +DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware" +HOMEPAGE="https://linux-gpib.sourceforge.io/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="debug" + +RDEPEND=" + acct-group/gpib +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + # don't fix debian bugs if they break gentoo + "${FILESDIR}/${PN}-9999-depmod.patch" +) + +MODULES_KERNEL_MIN=2.6.8 + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + else + default + unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz" + fi +} + +src_configure() { + MODULES_MAKEARGS+=( LINUX_SRCDIR="${KV_OUT_DIR}" ) + use debug && MODULES_MAKEARGS+=( 'GPIB-DEBUG=1' ) +} + +src_compile() { + # The individual modules don't have separate targets so we can't use + # modlist here. + emake "${MODULES_MAKEARGS[@]}" +} + +src_install() { + emake \ + "${MODULES_MAKEARGS[@]}" \ + DESTDIR="${ED}" \ + INSTALL_MOD_PATH="${ED}" \ + docdir="${ED}/usr/share/doc/${PF}/html" \ + install + + modules_post_process + + dodoc AUTHORS README* NEWS + [[ ${PV} != 9999 ]] && dodoc ChangeLog + einstalldocs +} diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest index 24df964eb3dd..6cc8e7c3758e 100644 --- a/sci-libs/linux-gpib/Manifest +++ b/sci-libs/linux-gpib/Manifest @@ -2,4 +2,5 @@ AUX linux-gpib-4.3.0-perl.patch 546 BLAKE2B 9695c1a9f48a2a8bcb5f5998c40eb909e6b1 DIST gpib_firmware-2008-08-10.tar.gz 173004 BLAKE2B 05fcde09de5246b86004c263c733d64316511bdb0b84dfbd9b94cb78e2909c0d191ff21ee0d77e7f0947e9231bd4cd62d6348e8f9beefd6d201b473732ff23d2 SHA512 f2a0ee3316b75ac36ed88568e45ca4c69935a6d10783c65582003ab39686f2a69d3002901866065f4f5efa9fdd4c779e038d1d7ce24bba266a619c164d5ac10d DIST linux-gpib-4.3.6.tar.gz 1433121 BLAKE2B 64e2b19106d0531df990b1338f82a71707e54f448d652f6379eb9cd71feb84637090ed8fdfb0264248aa6879d5b9a1dc50e75c21a2c22a31397120eea5903e98 SHA512 a8005c71bfddb854ecbe4df0a81530e44378150242508b10df58c61d039c6d329020407608e31f1ef360de0c83169e76b793c032256e732d229bfd2da4cbaa35 EBUILD linux-gpib-4.3.6-r100.ebuild 5029 BLAKE2B 23cc0f14adb5db702da20076172422640b9e6f99115a27a0a17d8528fac14c69588e31202ca765ec8b237bbd27fa6110349f3bb3f2284459040f37c12988bf4e SHA512 e0eefdaeec929db676c26982bb884cd85e58b8a121f4f80c1ea202f65afeb9c173d71dbeadb86b4c5c4abd38ff680df4d4c79c3bca4088d501f6c538eab99769 +EBUILD linux-gpib-9999.ebuild 6001 BLAKE2B c0f6d7729d2b186941e61d9053ba4c8453702a6e1166cc12ffb42cc4411e716155bc40b18683f6964a06f3bf24106ab045da8005a67c8217b2e406cd7e640246 SHA512 7ed4b4355256432e40211bba430bc7e78aa65ff2e42fb05337dd8d96b020843f408c1bf431fdfa3e88e56d2eea4f9c11d74af0de2e3ca6d214ba96cc7a1f41ff MISC metadata.xml 548 BLAKE2B c976143b910efb6a8920f064f35fdac9cb325ff272aca8a7644511300f4dfe9232c280577a90eae225ca4f88bc2b4cd09d175d4190bc13513d89457f57c9bb52 SHA512 c611a420ab28d623b5b9167bd59c04c2fe27404a7fd85de72a555f99ef8bad4383702482ae808d4eb66014a9e63ca057aa7195748f9c230f0778fcbde07fb71f diff --git a/sci-libs/linux-gpib/linux-gpib-9999.ebuild b/sci-libs/linux-gpib/linux-gpib-9999.ebuild new file mode 100644 index 000000000000..25af503e2da7 --- /dev/null +++ b/sci-libs/linux-gpib/linux-gpib-9999.ebuild @@ -0,0 +1,242 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +GUILE_COMPAT=( 2-2 3-0 ) +PYTHON_COMPAT=( python3_{10..13} ) +DISTUTILS_EXT=1 +DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_PEP517=setuptools + +inherit readme.gentoo-r1 autotools distutils-r1 guile-single perl-functions udev + +# Check for latest firmware version on bump +FW_PV="2008-08-10" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.code.sf.net/p/linux-gpib/git" + S="${WORKDIR}/${P}/${PN}-user" +else + SRC_URI="https://downloads.sourceforge.net/linux-gpib/${P}.tar.gz" + S="${WORKDIR}/${PN}-user-${PV}" + KEYWORDS="~amd64 ~arm ~x86" +fi + +DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware" +HOMEPAGE="https://linux-gpib.sourceforge.io/" +SRC_URI+=" + firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-${FW_PV}.tar.gz ) +" + +LICENSE="GPL-2" +SLOT="0" +IUSE="pcmcia static guile perl php python tcl doc firmware" +REQUIRED_USE=" + guile? ( ${GUILE_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +COMMONDEPEND=" + sys-libs/readline:= + tcl? ( dev-lang/tcl:0= ) + guile? ( ${GUILE_DEPS} ) + perl? ( dev-lang/perl:= ) + php? ( dev-lang/php:= ) + firmware? ( sys-apps/fxload ) +" +RDEPEND="${COMMONDEPEND} + acct-group/gpib + ~sci-libs/linux-gpib-modules-${PV} + python? ( ${PYTHON_DEPS} ) +" +DEPEND="${COMMONDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( app-text/docbook-sgml-utils[jadetex] ) + python? ( ${DISTUTILS_DEPS} ${PYTHON_DEPS} ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.3.0-perl.patch +) + +pkg_setup() { + use guile && guile-single_pkg_setup + use perl && perl_set_version + use python && python_setup +} + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + else + default + unpack "${WORKDIR}/${P}/${PN}-user-${PV}.tar.gz" + fi +} + +src_prepare() { + default + + use guile && guile_bump_sources + + # We have to use --root instead of --prefix for setup.py. + # Otherwise the python files are not installed properly into site-packages. + sed -i -e \ + 's/--prefix=$(DESTDIR)$(prefix)/--root=$(DESTDIR)/g' \ + language/python/Makefile.am || die + + eautoreconf + + if use python; then + pushd language/python >/dev/null || die + distutils-r1_src_prepare + popd >/dev/null || die + fi +} + +src_configure() { + myeconfargs=( + $(use_enable static) + $(use_enable guile guile-binding) + $(use_enable perl perl-binding) + $(use_enable php php-binding) + $(use_enable python python-binding) + $(use_enable tcl tcl-binding) + $(use_enable doc documentation) + --disable-python-binding + ) + + econf "${myeconfargs[@]}" + + if use python; then + pushd language/python >/dev/null || die + distutils-r1_src_configure + popd >/dev/null || die + fi +} + +src_compile() { + default + if use python; then + pushd language/python >/dev/null || die + distutils-r1_src_compile + popd >/dev/null || die + fi +} + +src_install() { + # PYTHONDONTWRITEBYTECODE=0 is required, otherwise + # installation of the python files is skipped + FIRM_DIR="${EPREFIX}"/usr/share/usb + emake \ + DESTDIR="${ED}" \ + INSTALL_MOD_PATH="${ED}" \ + HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \ + UDEV_RULES_DIR="$(get_udevdir)"/rules.d \ + USB_FIRMWARE_DIR=${FIRM_DIR} \ + PYTHONDONTWRITEBYTECODE=0 \ + docdir="/usr/share/doc/${PF}/html" install + + use guile && guile_unstrip_ccache + + if use perl; then + einfo "Installing perl module" + cd "${S}"/language/perl || die + emake DESTDIR="${ED}" install + perl_fix_packlist + perl_delete_emptybsdir + cd "${S}" || die + fi + + if use python; then + pushd language/python >/dev/null || die + distutils-r1_src_install + popd >/dev/null || die + fi + + echo "KERNEL==\"gpib[0-9]*\", MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules || die + udev_dorules 99-gpib.rules + + dodoc AUTHORS README* NEWS + if [[ ${PV} == 9999 ]]; then + dodoc ../ChangeLog + else + dodoc doc/linux-gpib.pdf ChangeLog + fi + + insinto /etc + newins util/templates/gpib.conf gpib.conf + newins util/templates/gpib.conf gpib.conf.example + + if use pcmcia; then + insinto /etc/pcmcia + doins "${S}"/etc/pcmcia/* + fi + + # remove .la files + find "${ED}" -name '*.la' -delete || die + + DOC_CONTENTS=" +As the udev rules were changed and refactored in this release it is +necessary to remove any manually installed pre-4.3.0 gpib udev rules files +in /etc/udev/rules.d/. The files to remove are: +\n + 99-agilent_82357a.rules\n + 99-gpib-generic.rules\n + 99-ni_usb_gpib.rules\n +\n +You need to run the 'gpib_config' utility to setup the driver before +you can use it. In order to do it automatically you can add to your +start script something like this (supposing the appropriate driver +is loaded on the startup): +\n + gpib_config --minor 0 +\n +To give a user access to the computer's gpib board you will have to add +them to the group 'gpib' or, you could change the permissions on the device +files /dev/gpib[0-15] to something you like better, using 'chmod' +\n +Edit /etc/gpib.conf to match your interface board, and any devices you wish +to open via ibfind(). See the documentation in /usr/share/linux-gpib/html for +more information. +\n +" + + if use pcmcia; then + DOC_CONTENTS+=' +For PCMCIA cards:\n +All files needed for a PCMCIA board were copied to /etc/pcmcia. +You may wish to edit the options passed to the gpib_config call in the +/etc/pcmcia/linux-gpib-pcmcia script. +You may need to send a SIGHUP signal to the cardmgr daemon to force it +to reload the files in /etc/pcmcia \(alternatively you could use your +pcmcia init.d script to restart the cardmgr, or you could just reboot\). +The driver module will be loaded as needed by the cardmgr. + +' + fi + + if use firmware; then + DOC_CONTENTS+=' +For Agilent \(HP\) 82341C and 82341D cards: +The firmware for these boards is uploaded by passing the appropriate +firmware file from /usr/share/linux-gpib/hp_82341 directory to +gpib_config using the -I or --init-data command line option. Example:\n +gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin +' + fi + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/sci-libs/ondselsolver/Manifest b/sci-libs/ondselsolver/Manifest index 4548bc9bde14..15ada4061c23 100644 --- a/sci-libs/ondselsolver/Manifest +++ b/sci-libs/ondselsolver/Manifest @@ -1,8 +1,8 @@ AUX ondselsolver-1.0.1-include-cstdint-gcc15.patch 1841 BLAKE2B 03215002d913a23f64e051a44f97008ac1f4c633427608afc60d7dea878e3ad1addc64880c1b000b2525d58840f617fd7cfd7926cc8a854d6a94f5dca948f244 SHA512 26120839480f726c87a3bb6e5e5820bdcbc14aed8e1e559c06ef889fbc58fc68a54a69223cff28540415d6c89bb30ad854da88d554f536c33c23280bc699bc82 -AUX ondselsolver-1.0.1-properly-demangle-typenames.patch 4470 BLAKE2B 40eeab404f18b184fcc07aa31212e048c431abbbefbc79a02e5baef9049041c26b3897dc7de1f6f9467738bd9ddf4953fd04976df5b681e80b253eb7edc4cb4a SHA512 be579378d012a428affbaab56608923933efce08066eb44bb2bf12fc6c78eb48f624f012928d08bf400efb9766846dd64296cc9c64f1a224f86471a51590ab29 +AUX ondselsolver-1.0.1-properly-demangle-typenames.patch 5152 BLAKE2B cc12f930a005370a735a0dc9a9f5edf4ed3e75f7286d0c9762263ef2082e66e53d3d5091735dcf50e501ac446c31bec81b6a9d6e3277b535c422e8b82f75f74b SHA512 fbb4787b332eb5928c0b6e0c8068368b92f75984ce5bed35578f947b1861f0a652ff4e733a7f5f84d41585cd220eef94e447b62480f9f78bc869f359dbebf4cf AUX ondselsolver-1.0.1_p20241024-system-gtest.patch 690 BLAKE2B 2f79542081f864365dc985372c2512615fc60d248e7249e6f66e75ece093c66a257a1fb96174cb827b7919a64d85868cff180d0c5028f15364356a77870c0700 SHA512 f8c72c000664cd896ced30f1e5278e05a37534a5f614a87c42c6337b6eac321ec43615893d976754bf8cabd178d95492a0cadb2c0dd151e627f64e65702e37ff DIST ondselsolver-1.0.1_p20241024.tar.gz 4668075 BLAKE2B 82e13168b2f6d988e411613584d9bb943afd9df73716a467d2681658d530e71173abcb31e432075dce8ebc1f0276ecb2b7b837bf057fb68f654c972e2d77f5b5 SHA512 918542fca4bfcb952d6d9500a0f3721549810dd2cde9adfb352d9301e0e1bf0fe1100a301316f15a6dcd18e36d371c58ba4a41b8f8e0878a77db4cbf054a095a DIST ondselsolver-1.0.1_p20241127.tar.gz 4669048 BLAKE2B 6f6c4f9468b2474890b05ca394947aa91bc1780e1ef922bba40144a30c247db32d7a5de469ed27e426209013b07a137522bad9c220d9e1862f7e946696974b0b SHA512 3504a6ab379f2d9d943a1a6da8f79abffebd7fe45fd3258f0bfeb0a789d73a2b68714c10e77e48987514c8acb23800412c10daa0046ed82dab4a2aab569851ff -EBUILD ondselsolver-1.0.1_p20241024.ebuild 927 BLAKE2B 1a93522016f5835798f3ae6f5e1b4d6e683bad686660e40b2266659e6eab8558e24c0bd50a6d07bf3bb708b19a68df3a9d62ef5287d8a98e7c1f19eba9b1dbb6 SHA512 eafc06f0a67ec6f61c01abb1e6a1b9c1ff747fb0acbf87803f49470200718d71983275f6e907cbaf0b754cf20c22900ce0f636d6253609756ec05b7c4b8a2379 -EBUILD ondselsolver-1.0.1_p20241127.ebuild 802 BLAKE2B 70432e556014b09432f2a10ce81ae6ecff5f533fb135a729e6e376258d4342dd093d50682d5184afd0b0b63ad03c361ebb823b345d232a245a0eb6e931c2dc68 SHA512 c3280277ce85bb05f7ac0544fe53fa07ca455d38e8c0c9aedc62914dfe3141a890bee5f7341cacde6f7b0885bdcb08255f65ccf212c89a5137af12787a0bdef3 +EBUILD ondselsolver-1.0.1_p20241024.ebuild 983 BLAKE2B 77aefd0939f27eb0efe1ab503ff4f725304edfb71d4f32a146034c8495a6035f44964b40c9dcfe66075548a9e67a81e9fb7a01051cf9af80771a4b242a29369d SHA512 da2373621086de3c28cc0033bebab9a00dbb88353a53142776e1788afc34684c8021b0a859af8591ca9979aafe140a8b8141ec240f1a929094fc43bf79257e14 +EBUILD ondselsolver-1.0.1_p20241127-r1.ebuild 802 BLAKE2B 70432e556014b09432f2a10ce81ae6ecff5f533fb135a729e6e376258d4342dd093d50682d5184afd0b0b63ad03c361ebb823b345d232a245a0eb6e931c2dc68 SHA512 c3280277ce85bb05f7ac0544fe53fa07ca455d38e8c0c9aedc62914dfe3141a890bee5f7341cacde6f7b0885bdcb08255f65ccf212c89a5137af12787a0bdef3 MISC metadata.xml 482 BLAKE2B fdc93965db23730a66b0c65b574f5aa4cf61ddf9b245a5d6a5860b09b2b1c6e3306004e54c0aa238fd9c301e2c6b8842d37eabb5de43dacc96c40afd723eeef8 SHA512 9a83ee5dd0ba8769904e5516b5968c48ee9f59bcbbf615b91451a8c0e59ccf8871f7921691b62d3505b4c7f96c10228c0f5bff41158ddc432f73476330ba386d diff --git a/sci-libs/ondselsolver/files/ondselsolver-1.0.1-properly-demangle-typenames.patch b/sci-libs/ondselsolver/files/ondselsolver-1.0.1-properly-demangle-typenames.patch index 20c6533d73a9..7d536796d9f5 100644 --- a/sci-libs/ondselsolver/files/ondselsolver-1.0.1-properly-demangle-typenames.patch +++ b/sci-libs/ondselsolver/files/ondselsolver-1.0.1-properly-demangle-typenames.patch @@ -3,6 +3,12 @@ From: Paul Zander <negril.nx+gentoo@gmail.com> Date: Sun, 12 Jan 2025 19:22:48 +0100 Subject: [PATCH] properly demangle typenames +C++ class names are mangled. How these are mangled is implementation specific. +Using string offsets is naive and caused at minimum testfailures. + +For gcc and clang you can use cxxabi.h to get demangled name. +This initial patch uses this for linux only, so the gentoo build suceeeds. + Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> diff --git a/OndselSolver/ASMTItem.cpp b/OndselSolver/ASMTItem.cpp @@ -168,6 +174,18 @@ index 75bcbb6..4961964 100644 } std::shared_ptr<std::vector<Symsptr>> Symbolic::getTerms() +diff --git a/OndselSolver/CMakeLists.txt b/OndselSolver/CMakeLists.txt +index 6836e72..30d5bf4 100644 +--- a/OndselSolver/CMakeLists.txt ++++ b/OndselSolver/CMakeLists.txt +@@ -426,6 +426,7 @@ set(ONDSELSOLVER_HEADERS + CREATE.h + CylindricalJoint.h + CylSphJoint.h ++ Demangle.h + DiagonalMatrix.h + DifferenceOperator.h + DifferentiatedGeneralSpline.h -- 2.48.0 diff --git a/sci-libs/ondselsolver/ondselsolver-1.0.1_p20241024.ebuild b/sci-libs/ondselsolver/ondselsolver-1.0.1_p20241024.ebuild index 92cf9be4b96c..b58103dbe5e8 100644 --- a/sci-libs/ondselsolver/ondselsolver-1.0.1_p20241024.ebuild +++ b/sci-libs/ondselsolver/ondselsolver-1.0.1_p20241024.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,7 +31,10 @@ CMAKE_SKIP_TESTS=( OndselSolver.piston ) -PATCHES=( "${FILESDIR}/${P}-system-gtest.patch" ) +PATCHES=( + "${FILESDIR}/${P}-system-gtest.patch" + "${FILESDIR}/${PN}-1.0.1-include-cstdint-gcc15.patch" +) src_configure() { local mycmakeargs=( diff --git a/sci-libs/ondselsolver/ondselsolver-1.0.1_p20241127.ebuild b/sci-libs/ondselsolver/ondselsolver-1.0.1_p20241127-r1.ebuild index da2e1dccd90b..da2e1dccd90b 100644 --- a/sci-libs/ondselsolver/ondselsolver-1.0.1_p20241127.ebuild +++ b/sci-libs/ondselsolver/ondselsolver-1.0.1_p20241127-r1.ebuild |