From 4fe228ee9aa3b9b825d54ace549a5517e153e8bd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 9 Jun 2024 00:08:14 +0100 Subject: gentoo auto-resync : 09:06:2024 - 00:08:13 --- dev-util/Manifest.gz | Bin 65457 -> 65450 bytes dev-util/aruba/Manifest | 2 +- dev-util/aruba/aruba-2.2.0.ebuild | 2 +- dev-util/codeblocks/Manifest | 6 +- dev-util/codeblocks/codeblocks-20.03_p13518.ebuild | 125 ++++++++ dev-util/codeblocks/codeblocks-9999.ebuild | 14 +- ...13518_FortranProject-r378-autotools-build.patch | 340 +++++++++++++++++++++ dev-util/cppcheck/Manifest | 2 +- dev-util/cppcheck/cppcheck-2.13.0.ebuild | 2 +- dev-util/diffoscope/Manifest | 2 + dev-util/diffoscope/diffoscope-271.ebuild | 131 ++++++++ dev-util/gprof2dot/Manifest | 2 + dev-util/gprof2dot/gprof2dot-2024.6.6.ebuild | 20 ++ dev-util/librnp/Manifest | 1 - dev-util/librnp/librnp-0.17.1.ebuild | 85 ------ dev-util/rbtools/Manifest | 3 + .../files/rbtools-5.0-importlib-resources.patch | 14 + dev-util/rbtools/rbtools-5.0.ebuild | 57 ++++ dev-util/tree-sitter-cli/Manifest | 2 +- .../tree-sitter-cli/tree-sitter-cli-0.22.5.ebuild | 2 +- dev-util/ydiff/Manifest | 2 + dev-util/ydiff/ydiff-1.3.ebuild | 28 ++ 22 files changed, 748 insertions(+), 94 deletions(-) create mode 100644 dev-util/codeblocks/codeblocks-20.03_p13518.ebuild create mode 100644 dev-util/codeblocks/files/codeblocks-20.03_p13518_FortranProject-r378-autotools-build.patch create mode 100644 dev-util/diffoscope/diffoscope-271.ebuild create mode 100644 dev-util/gprof2dot/gprof2dot-2024.6.6.ebuild delete mode 100644 dev-util/librnp/librnp-0.17.1.ebuild create mode 100644 dev-util/rbtools/files/rbtools-5.0-importlib-resources.patch create mode 100644 dev-util/rbtools/rbtools-5.0.ebuild create mode 100644 dev-util/ydiff/ydiff-1.3.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index 73557831f04e..7b5730a6ccaf 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest index 7fa2a19f07dd..9e7171a7ec34 100644 --- a/dev-util/aruba/Manifest +++ b/dev-util/aruba/Manifest @@ -3,5 +3,5 @@ DIST aruba-2.1.0.tar.gz 130073 BLAKE2B 534bc67cbc4b5871a1bc6e37170586b3a5829e70d DIST aruba-2.2.0.tar.gz 130616 BLAKE2B f2f359d5ba79232e575a240e6d278b936f17d532d01e58f840f537a4d1e6a3663c04b24636aa20fda64ac3eccd4111c61d2f18e26e8c18cef35c7eeaaf7d797b SHA512 e4802dd915062b61e0a536d31294165310ce80aca3e4560f59bb23fcb3e01ea73a547d3f5738d3590c33175fb55268fa69512fe8f33f7cea6b83070e26b7cfee EBUILD aruba-0.6.2-r3.ebuild 1051 BLAKE2B 74adb785f62d6ca6379a782b93de3634bbde652e593eb897954b613a529d4389a022a9345fd0606b6c2762675c78e215231bdc5cf31fe40f9628ea2eb2ced212 SHA512 b6fee287b335d67a3b90f422bacf2977f622cfb77a35373c94fa7a25a75bebb9a0a348c9a98c05a5a331efa09a8456883a0ad0cfabe94ef1dd73e1338d71a75c EBUILD aruba-2.1.0.ebuild 2248 BLAKE2B f1ae5aed5b5b558b4f00851516277cef0f8fa7468f2217d3c4ef3d15e1fa0585a313811a43550579a1ca3cd4e5027bad713f29bbf8693646910024373b96a44f SHA512 a0bbf2a14dffe700fea2d18ccc810a2a55da23ec03cfcaaacea8b57fb9ddf131eca5ecaefa058a4d0b2f21d9a51eea3fe72e0f7e343c2e95171831456b7d9030 -EBUILD aruba-2.2.0.ebuild 2220 BLAKE2B 0109b33e9c591c0d538c4953473867f6a3d02ff9b43b9526e784831f93003874f405a37176f51a4f56021d9287b34db80495e2d7ea155407292399a4cc75df59 SHA512 86d0000553fd86a0cd2f4772ecff4e0b49ef1b54b17092944ee82adcb58f619baeae061a038c904d10cbb593c2c9b90b7a53b0393a3743f27897a4508b43c851 +EBUILD aruba-2.2.0.ebuild 2219 BLAKE2B 74cc59405f90f9999758ed6f77d7ed9e0a2424d06e65f51a8a2b839c640a55324e4999e5d46d54a59783b8d8c1376382e795e3ef9e888094c7496e0b68db79fa SHA512 d5b5f3e33d98f65abcd19d33ebb2033516ec68dc58e2010febf1b413a383c6fc14e958c6b534ce969933d7f5ef780f3536660ff537922f115f280e36d1566267 MISC metadata.xml 297 BLAKE2B 013e79bd25020910ff023586ed3e1349ee1dcbf195b73c230133775c2fe031794f91fd7e54d4df43bfc61de716f452492f2b7af3ba7dbf7e04cf4a47ac16a00d SHA512 c57a4e881304d3bdc2001d4f221ec7d4789223fa36b104271ec9a2439e7730ccbfd349b16209ac6a59fe782618b14423cf3b7b345ef2a7d4944a535eaed75c9a diff --git a/dev-util/aruba/aruba-2.2.0.ebuild b/dev-util/aruba/aruba-2.2.0.ebuild index c0484a4f124e..007ad644fdfa 100644 --- a/dev-util/aruba/aruba-2.2.0.ebuild +++ b/dev-util/aruba/aruba-2.2.0.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/aruba/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="test" DEPEND="${DEPEND} test? ( app-alternatives/bc )" diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest index 4d21eae3bfee..b89b558a979d 100644 --- a/dev-util/codeblocks/Manifest +++ b/dev-util/codeblocks/Manifest @@ -1,13 +1,17 @@ AUX codeblocks-20.03-env.patch 1365 BLAKE2B 550b86319823c8453000d0a3a5e1c9a0845bbf08464d04b0055c98d72a055e966e0a30606e3496a00da829686129faf263f4f5edb36843dd5f1d882a4b87a2ce SHA512 c20b11f463517386b95ae1a2f1acc5fe75e15f1976ac004934d8b7a6441f40d5d58ba86292ff6713c0b71a6abe9c1d99554f8928b6aedc9c6452f0aa80ea894d AUX codeblocks-20.03_Scintilla_fix_buffer_over-read_with_absolute_reference.patch 902 BLAKE2B 57dd173c91ac7d9c2a5a6c5aeb480e7f48ce7ead98333ab4bdfb51be18c65471bb5cdd8dfe5f20bf098e383bda21aaffc2b7a4a9e08b04423fa04000e1f8df69 SHA512 ef99d2adf255c76a0bde4545fefd6058964f94eb51a5459c52fefd233502b2669270b065a87e543a00e71e4c630cf58ecec33e1f190d8d9e1a2ed87cacafb473 AUX codeblocks-20.03_fix_DoxyBlocks_startup_segfault.patch 1886 BLAKE2B dcf643fcc53f18b3e7635ccad22b98f69974c081b1af6cdc22901bd7b5ce76920f02084c2b1caa386aa018a5002c42fb1947b76c329ba1acd3559d24c6d61ce8 SHA512 c3d8e30cdfc091d881d268f384e74d45c1402a0b52a1e09814e950791c0d8bb8c0a23c34241419aba039926f275117cffd9a079b126bdec1a4ad82511fb88d7d +AUX codeblocks-20.03_p13518_FortranProject-r378-autotools-build.patch 16568 BLAKE2B faa888e1a7886277e55825886cf434368707b100b3b55a3c1708c80d54f5ff4543087aa01c8978dbeb5ef89ea58e3c8de27e86efc632188d68cff8a2e98316a4 SHA512 3d65053258623c7018108e68c09e823797f1ba6e0a882140d88c5cce15a1ea6ff2138aaf038a9b454bb6d18b7fac3f47824a38a8f24c341e6ba7758cd9d399f0 AUX codeblocks-9999-nodebug.diff 539 BLAKE2B e205eb643be1e0a9103c77b632c10c36fd86a65866460583dbc8b4324fc5893f726b09b19ebdaea2cd38710148ec0815d8dd1d2055461421874256b5e8502e8f SHA512 f63c1d81b119d6278804b48240651e09d7d0595cf44fce6ae8a9bc4a4bbdddea7a9f4a7d7d000fb9c98aeec2c680d07bd9eb4694238fc10f5d38c8a807f8d9b2 DIST codeblocks-20.03-codecompletion-symbolbrowser-update.tar.xz 52572 BLAKE2B 4752a84f5471f68f2c1044df6c6c3c25dd61f03e916bfcff1d091fe66aec8911cd02c7d824431dd307267d00af209cfd0b614528fe091a2d3c4bccbc688e83ef SHA512 acd79ffeed03023ac5e33fd685942f5593d0f7bc488b1d53e6c502618b980d565b1f2bc479da4de869ad2e839e263ddbff2a8847ef39b822aab69b87d5cd01a8 DIST codeblocks-20.03-fortran-update-v1.7.tar.xz 12092 BLAKE2B df59ca9e00765f39f64d889ed22af61db8c2bb5f217dbda64d325327be8ef1ce318bc0b2538dd19ee911d84fccb6693f6e287f4d084e8243b34777f464ba5e61 SHA512 aec8062bbf0cd524b683ba9f2f6befec0bfb9f9b1f8ea61ffb679cf449f4ece20502f4fda101ab559151616fc7d7826e308a6468634502930f09ea3a8590c359 DIST codeblocks-20.03-fortran-update-v1.8.tar.xz 43672 BLAKE2B c30f64a7211debd72ee0274067f7443c71ce25e348bfb1474a6dbd1cb86b330537ceb56e96eebdd02f88a93dc0526fb7bced678be799bc8d2437c00f5effd1e8 SHA512 0651d1abb08bfd9eb42f9eca0b9b4c702180b31fac2c08240d2447940c9b21601c3baadc3933ac4080e49c834aaacad716375aa4a40c06d336f000e0d59f962a DIST codeblocks-20.03-fortran.tar.xz 15828 BLAKE2B 3ad1be0ecdc61759edcbb12065a0d8065e5c4571bfdd99bcf6ad8cbda82f64def8ad7121770fe780c1837d06d58edb0209d2ab3b966ecd133c5d46f79c0cbb4e SHA512 06a9a87e560914ae49895843321c26581409e9213265d20476c9c4a8ad2dd9ff63cffdb416e7494bd74ce4a11578f11ef387dd851b1394a50baade8491caaa17 DIST codeblocks-20.03.tar.xz 11799264 BLAKE2B cdaca38e26e0f1bf12e774cf737e0b6647f070d07f0ca5bec97926528a3511ecb8b3306fb6af473729384a5fe22d4870db8ca988895d619a1e7e2a1d9de2a41f SHA512 f97c1a02d31f0be4dc08b1f19b57bd0d3cba375ab5f33ab91b2a2df7817018f5b3e3063ed07199a3970644f1caa7c7e511db2034c73264f5f4963046d65b0097 +DIST codeblocks-20.03_p13518.tar.bz2 19779652 BLAKE2B cc445516ce92918dfac67b250e17a4d1f3aa0f86b58dfd701c723b1e4436bbcd7366754d64f75907680de65ce340d38b54c9bd48b31dc7078625186855d6b29a SHA512 2cdf52b04931f8ee788071579eed03b1737e05d890ec7bb9ed3458de770b86507cc276604740f9ea2b7928983a703eb4e4a8a97637e0dc267c9e8e49866f0430 +DIST fortranproject_r378.tar.bz2 603873 BLAKE2B ed1fe94c591ec8ce1e5a844b3fa789f1bbecfade19a4ac1c3d17098da704b271be2e13d680e43050116d7117d40e117fa50d75ab5cc3ddd7223f46e1c2a162cd SHA512 fb4645f81b087d22e5735a33aded806595f96ccd1c2d32123a919c48de260ce2e1d96551fae0b65663902bc198a8f4ab158233b8755693df38315ea688cbaf92 EBUILD codeblocks-20.03-r6.ebuild 2384 BLAKE2B 1b96645476dce1f0f041061b9bb2568b10694bf0495dd12baa6f33eafc8247dc63e3ad3d49ec4f99754fc42e57fc01483757ff9cb2a6cd319f7474f324f62ada SHA512 fc20a3f793f60c30ded884489b22f70bd893c02ebea6a73aa261b5d3a2f472983c9e21258f5912260cdda92f4bf0fb1f5a8a970983c0306681eca06ff41631c9 EBUILD codeblocks-20.03-r7.ebuild 2688 BLAKE2B e44af7aadb4b0e4d164a14b5ef5604adba4669299f107758d3dc0973015cfd6a3e5bf4c6f95bd44383f650dde843a907786b9d615a80848e17d59cf36919b394 SHA512 4b7cce9da51c0665b787345e5871949cf5d29667aeb71691ca9e5446bead55f1d4b9215523e4af51bf2d5a30cf16c95595f9a593503a74be8d4ce2889d32b9af -EBUILD codeblocks-9999.ebuild 1695 BLAKE2B 0b245e75366b1d38d55c74a40df4e82238c214aab59dbad28cdae6bfcbd07e1ad53af3112cd7ef349ddd9235e40c6e346b2c156237505ea49d20b45227e8a887 SHA512 68368d3b5f06a6fe02067817752f08378228cc25ab5d81dba1fd84c7c6f0f351a861f1fe240e5109fd649b53346fef88cc567d4e9f3303c9d3ee780b6461ba6f +EBUILD codeblocks-20.03_p13518.ebuild 2758 BLAKE2B 91e8a35ab77b48d647c31c8922fccec55846ef780ddfdccc52a2f0885deae3aad9ff69b72cb0cebf49591e54471f82d1fe938baef236c926e7979773ea6189be SHA512 68ebedbffcd9af7e8db7866e669a39ac2517a4aa64c4d130ef0ce0597b2c27503495da264ee8e5dcbee84ba3ae5d3cb3159a63b191bc755008a4722f8e3bff0e +EBUILD codeblocks-9999.ebuild 1860 BLAKE2B e1ded5ce257291f21032c56f468fa1236221efb9c13f8465e83fe296e3a9c3188a9ec341c7d5e3c8bd9e93f6bc62cfeca731148abb760253756c67dca1471886 SHA512 a00e0ba169d075298dd10366b3e27c1d61156f3f6437375f759c1709f37adcd2592263f81c317878169a3cd873efdfbbc0f0f57901413c2f61164adb704c7443 MISC metadata.xml 845 BLAKE2B f7b882b01dd425c6eb56c164a95e7e635ba59591ec1839a9b925496e4c40bf03497ec4134eb38b47f9eb54b765773890896ba243b5936cf7bc3b71f7e7ce41d4 SHA512 ae0650c5218f8e18422926bb11daa9cc89804221b9958963da484464668e99f6049ef099fc6a63f3a0800fa15238ecf0607da0a495c42d5029a94ed15ef4c985 diff --git a/dev-util/codeblocks/codeblocks-20.03_p13518.ebuild b/dev-util/codeblocks/codeblocks-20.03_p13518.ebuild new file mode 100644 index 000000000000..7267802cf9c9 --- /dev/null +++ b/dev-util/codeblocks/codeblocks-20.03_p13518.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.2-gtk3" + +inherit autotools flag-o-matic multiprocessing wxwidgets xdg + +REV=13518 +REV_DATE="2024-05-05 20:30:28" +FP_NAME=fortranproject +FP_REV=378 + +DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE" +HOMEPAGE="https://codeblocks.org/" + +# svn export --ignore-externals https://svn.code.sf.net/p/codeblocks/code/trunk@${REV} codeblocks-20.03_p${REV} +# tar -cjf codeblocks-20.03_p${REV}.tar.bz2 codeblocks-20.03_p${REV} +# +# svn export https://svn.code.sf.net/p/fortranproject/code/trunk@${FP_REV} fortranproject_r${FP_REV} +# tar -cjf fortranproject_r${FP_REV}.tar.bz2 fortranproject_r${FP_REV} +SRC_URI=" + https://github.com/band-a-prend/gentoo-overlay/releases/download/${PN}-20.03_p${REV}/${PN}-20.03_p${REV}.tar.bz2 + https://github.com/band-a-prend/gentoo-overlay/releases/download/${PN}-20.03_p${REV}/${FP_NAME}_r${FP_REV}.tar.bz2 +" + +LICENSE="GPL-3" +SLOT="0" + +IUSE="fortran contrib debug" + +BDEPEND="virtual/pkgconfig" + +RDEPEND=" + app-arch/zip + dev-libs/glib:2 + >=dev-libs/tinyxml-2.6.2-r3 + >=dev-util/astyle-3.1-r2:0/3.1 + x11-libs/gtk+:3 + x11-libs/wxGTK:${WX_GTK_VER}[X] + contrib? ( + app-admin/gamin + app-arch/bzip2 + app-text/hunspell:= + dev-libs/boost:= + dev-libs/libgamin + media-libs/fontconfig + sys-libs/zlib + ) +" + +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" + +PATCHES=( + "${FILESDIR}/${PN}-9999-nodebug.diff" + "${FILESDIR}/${P}_FortranProject-r378-autotools-build.patch" +) + +src_unpack() { + default + mv -T "${WORKDIR}/${FP_NAME}_r${FP_REV}" "${S}"/src/plugins/contrib/FortranProject || die +} + +src_prepare() { + default + + # Let's make the autorevision work. + echo "m4_define([SVN_REV], ${REV})" > revision.m4 + echo "m4_define([SVN_DATE], ${REV_DATE})" >> revision.m4 + + eautoreconf +} + +src_configure() { + # Bug 858338 + append-flags -fno-strict-aliasing + + setup-wxwidgets + + # USE="contrib -fortran" setup: + use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject) + # USE="contrib fortran" setup: + use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all) + # USE="-contrib fortran" setup: + use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject) + + local myeconfargs=( + --disable-pch + --disable-static + $(use_with contrib boost-libdir "${ESYSROOT}/usr/$(get_libdir)") + $(use_enable debug) + ${CONF_WITH_LST} + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + if use contrib; then + if (( $(get_makeopts_jobs) > 8 )); then + emake -j8 # Bug 930819 + else + emake + fi + else + emake + fi +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die +} + +pkg_postinst() { + xdg_pkg_postinst +} + +pkg_postrm() { + xdg_pkg_postrm +} diff --git a/dev-util/codeblocks/codeblocks-9999.ebuild b/dev-util/codeblocks/codeblocks-9999.ebuild index 531794a90f95..25b3ef48c800 100644 --- a/dev-util/codeblocks/codeblocks-9999.ebuild +++ b/dev-util/codeblocks/codeblocks-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 WX_GTK_VER="3.2-gtk3" -inherit autotools flag-o-matic subversion wxwidgets xdg +inherit autotools flag-o-matic multiprocessing subversion wxwidgets xdg DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE" HOMEPAGE="https://codeblocks.org/" @@ -69,6 +69,18 @@ src_configure() { econf "${myeconfargs[@]}" } +src_compile() { + if use contrib; then + if (( $(get_makeopts_jobs) > 8 )); then + emake -j8 # Bug 930819 + else + emake + fi + else + emake + fi +} + src_install() { default find "${ED}" -type f -name '*.la' -delete || die diff --git a/dev-util/codeblocks/files/codeblocks-20.03_p13518_FortranProject-r378-autotools-build.patch b/dev-util/codeblocks/files/codeblocks-20.03_p13518_FortranProject-r378-autotools-build.patch new file mode 100644 index 000000000000..3b8dd49efd7d --- /dev/null +++ b/dev-util/codeblocks/files/codeblocks-20.03_p13518_FortranProject-r378-autotools-build.patch @@ -0,0 +1,340 @@ +diff -Naur a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -506,6 +506,29 @@ + src/plugins/contrib/EditorTweaks/Makefile + src/plugins/contrib/envvars/Makefile + src/plugins/contrib/FileManager/Makefile ++ src/plugins/contrib/FortranProject/Makefile ++ src/plugins/contrib/FortranProject/images/Makefile ++ src/plugins/contrib/FortranProject/images/16x16/Makefile ++ src/plugins/contrib/FortranProject/images/20x20/Makefile ++ src/plugins/contrib/FortranProject/images/24x24/Makefile ++ src/plugins/contrib/FortranProject/images/28x28/Makefile ++ src/plugins/contrib/FortranProject/images/32x32/Makefile ++ src/plugins/contrib/FortranProject/images/40x40/Makefile ++ src/plugins/contrib/FortranProject/images/48x48/Makefile ++ src/plugins/contrib/FortranProject/images/56x56/Makefile ++ src/plugins/contrib/FortranProject/images/64x64/Makefile ++ src/plugins/contrib/FortranProject/images/svg/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/16x16/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/20x20/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/24x24/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/28x28/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/32x32/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/40x40/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/48x48/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/56x56/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/64x64/Makefile ++ src/plugins/contrib/FortranProject/images/fortranproject/svg/Makefile + src/plugins/contrib/headerfixup/Makefile + src/plugins/contrib/help_plugin/Makefile + src/plugins/contrib/help_plugin/bzip2/Makefile +diff -Naur a/m4/acinclude.m4 b/m4/acinclude.m4 +--- a/m4/acinclude.m4 ++++ b/m4/acinclude.m4 +@@ -364,6 +364,7 @@ + AM_CONDITIONAL([BUILD_EDITORTWEAKS], [false]) + AM_CONDITIONAL([BUILD_ENVVARS], [false]) + AM_CONDITIONAL([BUILD_FILEMANAGER], [false]) ++ AM_CONDITIONAL([BUILD_FORTRANPROJECT], [false]) + AM_CONDITIONAL([BUILD_HEADERFIXUP], [false]) + AM_CONDITIONAL([BUILD_HELP], [false]) + AM_CONDITIONAL([BUILD_KEYBINDER], [false]) +@@ -408,6 +409,7 @@ + AM_CONDITIONAL([BUILD_EDITORTWEAKS], [true]) + AM_CONDITIONAL([BUILD_ENVVARS], [true]) + AM_CONDITIONAL([BUILD_FILEMANAGER], [true]) ++ AM_CONDITIONAL([BUILD_FORTRANPROJECT], [true]) + AM_CONDITIONAL([BUILD_HEADERFIXUP], [true]) + AM_CONDITIONAL([BUILD_HELP], [true]) + AM_CONDITIONAL([BUILD_KEYBINDER], [true]) +@@ -450,7 +452,7 @@ + [ compiles none of the contrib-plugins ] + [ Plugin names are: AutoVersioning, BrowseTracker, byogames, Cccc, CppCheck, cbkoders, codesnippets, ] + [ codestat, copystrings, Cscope, DoxyBlocks, dragscroll, EditorConfig, EditorTweaks, envvars, exporter, ] +- [ FileManager, headerfixup, help, hexeditor, incsearch, keybinder, libfinder, MouseSap, ] ++ [ FileManager, FortranProject, headerfixup, help, hexeditor, incsearch, keybinder, libfinder, MouseSap, ] + [ NassiShneiderman, ProjectOptionsManipulator, profiler, regex, ReopenEditor, rndgen, clangd_client, smartindent, spellchecker, ] + [ symtab, ThreadSearch, ToolsPlus, Valgrind, wxcontrib, wxsmith, wxsmithcontrib, wxsmithaui ], + plugins="$withval", plugins="none") +@@ -504,6 +506,9 @@ + FileManager) + AM_CONDITIONAL([BUILD_FILEMANAGER], [true]) + ;; ++ FortranProject) ++ AM_CONDITIONAL([BUILD_FORTRANPROJECT], [true]) ++ ;; + headerfixup) + AM_CONDITIONAL([BUILD_HEADERFIXUP], [true]) + ;; +@@ -627,6 +632,9 @@ + -FileManager) + AM_CONDITIONAL([BUILD_FILEMANAGER], [false]) + ;; ++ -FortranProject) ++ AM_CONDITIONAL([BUILD_FORTRANPROJECT], [false]) ++ ;; + -headerfixup) + AM_CONDITIONAL([BUILD_HEADERFIXUP], [false]) + ;; +@@ -735,6 +743,7 @@ + AC_SUBST(BUILD_EDITORTWEAKS) + AC_SUBST(BUILD_ENVVARS) + AC_SUBST(BUILD_FILEMANAGER) ++AC_SUBST(BUILD_FORTRANPROJECT) + AC_SUBST(BUILD_HEADERFIXUP) + AC_SUBST(BUILD_HELP) + AC_SUBST(BUILD_HEXEDITOR) +diff -Naur a/src/plugins/contrib/FortranProject/Makefile.am b/src/plugins/contrib/FortranProject/Makefile.am +--- a/src/plugins/contrib/FortranProject/Makefile.am ++++ b/src/plugins/contrib/FortranProject/Makefile.am +@@ -1,16 +1,18 @@ + SUBDIRS = images + +-ACLOCAL_AMFLAGS = --install -I m4 +- + AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + +-cb_plugin_lib_LTLIBRARIES = libFortranProject.la ++pluginlibdir = $(pkglibdir)/plugins ++ ++pluginlib_LTLIBRARIES = libFortranProject.la + +-libFortranProject_la_LDFLAGS = -shared -no-undefined -avoid-version ++libFortranProject_la_LDFLAGS = @MODULE_SHARED_LDFLAGS@ -version-info 0:1:0 -no-undefined -avoid-version + +-libFortranProject_la_LIBADD = $(WX_LIBS) ++libFortranProject_la_LIBADD = ../../../sdk/libcodeblocks.la \ ++ $(WX_LIBS) \ ++ $(CB_TINYXML_LIBS) + + libFortranProject_la_SOURCES = adddirparserthread.cpp \ + autoinsert.cpp \ +@@ -139,12 +141,9 @@ + images/fortranproject/64x64/*.png \ + images/fortranproject/svg/*.svg + +-cb_plugin_data_DATA = FortranProject.zip +- +-CLEANFILES = $(cb_plugin_data_DATA) ++pkgdata_DATA = FortranProject.zip + +-uninstall-hook: +- -rmdir ${cb_plugin_datadir}images/fortranproject ++CLEANFILES = $(pkgdata_DATA) + + FortranProject.zip: manifest.xml + PWD=`pwd` cd $(srcdir) && zip -j9 $(PWD)/FortranProject.zip manifest.xml resources/*.xrc > /dev/null +diff -Naur a/src/plugins/contrib/FortranProject/images/16x16/Makefile.am b/src/plugins/contrib/FortranProject/images/16x16/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/16x16/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/16x16/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/16x16 ++pkgdatadir = $(datadir)/@PACKAGE@/images/16x16 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/20x20/Makefile.am b/src/plugins/contrib/FortranProject/images/20x20/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/20x20/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/20x20/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/20x20 ++pkgdatadir = $(datadir)/@PACKAGE@/images/20x20 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/24x24/Makefile.am b/src/plugins/contrib/FortranProject/images/24x24/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/24x24/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/24x24/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/24x24 ++pkgdatadir = $(datadir)/@PACKAGE@/images/24x24 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/28x28/Makefile.am b/src/plugins/contrib/FortranProject/images/28x28/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/28x28/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/28x28/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/28x28 ++pkgdatadir = $(datadir)/@PACKAGE@/images/28x28 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/32x32/Makefile.am b/src/plugins/contrib/FortranProject/images/32x32/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/32x32/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/32x32/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/32x32 ++pkgdatadir = $(datadir)/@PACKAGE@/images/32x32 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/40x40/Makefile.am b/src/plugins/contrib/FortranProject/images/40x40/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/40x40/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/40x40/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/40x40 ++pkgdatadir = $(datadir)/@PACKAGE@/images/40x40 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/48x48/Makefile.am b/src/plugins/contrib/FortranProject/images/48x48/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/48x48/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/48x48/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/48x48 ++pkgdatadir = $(datadir)/@PACKAGE@/images/48x48 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/56x56/Makefile.am b/src/plugins/contrib/FortranProject/images/56x56/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/56x56/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/56x56/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/56x56 ++pkgdatadir = $(datadir)/@PACKAGE@/images/56x56 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/64x64/Makefile.am b/src/plugins/contrib/FortranProject/images/64x64/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/64x64/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/64x64/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/64x64 ++pkgdatadir = $(datadir)/@PACKAGE@/images/64x64 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/Makefile.am b/src/plugins/contrib/FortranProject/images/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/Makefile.am +@@ -1,4 +1,3 @@ + SUBDIRS = 16x16 20x20 24x24 28x28 32x32 40x40 48x48 56x56 64x64 fortranproject svg + +-pkgdatadir = $(cb_plugin_datadir)/images +- ++pkgdatadir = $(datadir)/@PACKAGE@/images +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/16x16/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/16x16/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/16x16/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/16x16/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/16x16 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/16x16 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/20x20/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/20x20/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/20x20/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/20x20/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/20x20 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/20x20 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/24x24/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/24x24/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/24x24/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/24x24/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/24x24 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/24x24 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/28x28/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/28x28/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/28x28/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/28x28/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/28x28 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/28x28 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/32x32/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/32x32/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/32x32/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/32x32/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/32x32 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/32x32 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/40x40/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/40x40/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/40x40/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/40x40/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/40x40 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/40x40 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/48x48/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/48x48/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/48x48/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/48x48/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/48x48 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/48x48 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/56x56/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/56x56/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/56x56/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/56x56/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/56x56 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/56x56 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/64x64/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/64x64/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/64x64/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/64x64/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/64x64 ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/64x64 + + dist_pkgdata_DATA = $(srcdir)/*.png +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/Makefile.am +@@ -1,5 +1,5 @@ + SUBDIRS = 16x16 20x20 24x24 28x28 32x32 40x40 48x48 56x56 64x64 svg + +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject + + dist_pkgdata_DATA = $(srcdir)/*.f90 $(srcdir)/*.py $(srcdir)/*.dem +diff -Naur a/src/plugins/contrib/FortranProject/images/fortranproject/svg/Makefile.am b/src/plugins/contrib/FortranProject/images/fortranproject/svg/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/fortranproject/svg/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/fortranproject/svg/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/fortranproject/svg ++pkgdatadir = $(datadir)/@PACKAGE@/images/fortranproject/svg + + dist_pkgdata_DATA = $(srcdir)/*.svg +diff -Naur a/src/plugins/contrib/FortranProject/images/svg/Makefile.am b/src/plugins/contrib/FortranProject/images/svg/Makefile.am +--- a/src/plugins/contrib/FortranProject/images/svg/Makefile.am ++++ b/src/plugins/contrib/FortranProject/images/svg/Makefile.am +@@ -1,3 +1,3 @@ +-pkgdatadir = $(cb_plugin_datadir)/images/svg ++pkgdatadir = $(datadir)/@PACKAGE@/images/svg + + dist_pkgdata_DATA = $(srcdir)/*.svg +diff -Naur a/src/plugins/contrib/Makefile.am b/src/plugins/contrib/Makefile.am +--- a/src/plugins/contrib/Makefile.am ++++ b/src/plugins/contrib/Makefile.am +@@ -54,6 +54,10 @@ + MAYBE_FILEMANAGER=FileManager appdata + endif + ++if BUILD_FORTRANPROJECT ++MAYBE_FORTRANPROJECT=FortranProject appdata ++endif ++ + if BUILD_HELP + MAYBE_HELP=help_plugin appdata + endif +@@ -178,6 +182,7 @@ + $(MAYBE_EDITORTWEAKS) \ + $(MAYBE_ENVVARS) \ + $(MAYBE_FILEMANAGER) \ ++ $(MAYBE_FORTRANPROJECT) \ + $(MAYBE_HEADERFIXUP) \ + $(MAYBE_HELP) \ + $(MAYBE_HEXEDITOR) \ +@@ -222,6 +227,7 @@ + EditorTweaks \ + envvars \ + FileManager \ ++ FortranProject \ + headerfixup \ + help_plugin \ + HexEditor \ diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest index a1be05176c70..21a33a07db7c 100644 --- a/dev-util/cppcheck/Manifest +++ b/dev-util/cppcheck/Manifest @@ -1,5 +1,5 @@ DIST cppcheck-2.13.0.tar.gz 3643744 BLAKE2B 942391bdc2ad009e1bf9f691835c268b33ae0a7c84ff68a1ea7985abbc65fc7ea6e319111ed6a968f4f93f3b682ce46447ba1e3b1fccd96535497f3fd190b913 SHA512 35f266cd247860aa0a0d84862faf4561f4efea096e641a01ebc3b1e4cea14c91c75773344da5bd3d48101c11ee7841b46f24419a9583e65bd242d0219a1ca418 DIST cppcheck-2.9.tar.gz 3916529 BLAKE2B 5d75328e1fcd389376630502ad7427d3473392a9467e8731e6cd7c2c6349efccc05eddd7eca4cb361930661d2383a8d316e33bd3609b9333a710153d199e326d SHA512 69204a7ceac087470201482894e6422b99d0849f08641e80b2e341c9d164a1d2095e3a08a1fba2e9fa681783d07fe7277b30ea0cc0bf582431b5d13ab2f58c1f -EBUILD cppcheck-2.13.0.ebuild 3117 BLAKE2B ee434a36fe54db164f39a46c0db74ab3be8fe1ac0619e7c1164cae8095a2a88fa42cfa4a136b48a717ce0f52253c9ffa06555ad3eaa0daaaad81e648ee31b728 SHA512 25b698c0f27198f44f8dfdf5861d24ec7ed1613594ab067d9246ff3728aa93b74bcfeca436ef26bac34f0ebc0eeebad6bbea4405fca6245501b6e68e218d3ec4 +EBUILD cppcheck-2.13.0.ebuild 3116 BLAKE2B 01e4306a7beaed2c73dc553557e1db4c9ee37876b9df6b58b09d349e7b195e996ac8969e88f930d18807154e982627e4d35d952ab71095661aeb28c85698b95d SHA512 6cd5253508da734b7f93d0af760710674a0eb5f90dab7759c877fe34bde027f9aba812e7e790d3fda1825fa2da48448c82f478989ba2f29319ab2bca6f5e8dd1 EBUILD cppcheck-2.9.ebuild 2369 BLAKE2B 909101f8491d35342282c8334e7a3e31fc8a13dd30ad8a46acbe469b2735842c7856c444bfb47950f15f62e353be9e724ba08eeec039ab58713d3832d161c83d SHA512 71152b0282b8628b4ba25110c90072b09d75c9828408688af0d025ebe111de0a28e29659bb6d95e5982badff5de5501bab1d4263635ccee9763e11a1c73889f0 MISC metadata.xml 519 BLAKE2B 8f520238cfead1bbf8f534fcfb733805de6c657379d6eb02e5e823d5cdb4716fa5fd2b3aae63009601d06e79f82519c159c86d234e59f0966568ceb3ad58f5fb SHA512 d4472b2285c72f3fb891678374c73f0204556d247ac56489484739b4cfaece956974189653feb81d58d8418cb9563378ce3f040d093238f1a2dd27216c8a361c diff --git a/dev-util/cppcheck/cppcheck-2.13.0.ebuild b/dev-util/cppcheck/cppcheck-2.13.0.ebuild index c8ff44651195..71c678e92cc5 100644 --- a/dev-util/cppcheck/cppcheck-2.13.0.ebuild +++ b/dev-util/cppcheck/cppcheck-2.13.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz -> ${ LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86" IUSE="charts gui qt6 htmlreport pcre test threads" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest index 376f98310b4b..27522a8e4570 100644 --- a/dev-util/diffoscope/Manifest +++ b/dev-util/diffoscope/Manifest @@ -1,6 +1,8 @@ AUX diffoscope-268-7zip.patch 1571 BLAKE2B 5eb0f7459d165ae0b9e6288c4aaf561ca7280d52cb15c038af7d04027a7f1f6e66d8bdb30536d3139b8edc18b05e461c7b099c0214af8ce4eb851204c42c10a2 SHA512 b0e2dd9400cdff70adee61d17c11ca6e001dc553ee16fad9d9c3f77558f79013314509bc3d2264c986816198fca665742b4e87ec565af5002b62138291361e37 DIST diffoscope-266.tar.bz2 3148610 BLAKE2B 28090b8a1e2315f9df43d254d3dbd4ed8f6d4ba4d259c764f53b84137ac0b3dc97b51df56ba595eee950c54974e9b6109c423392d198e277d520f11559ecd78e SHA512 2eb7cbd333b6559ba0f66647184f1747cac52cca6304a27eefe914329797469d5fb9519abe92386d3785f4f2c779f8f5dd95ecc8f54f8b08fd4fc94746bf273d DIST diffoscope-268.tar.bz2 3151657 BLAKE2B 2133611135347a9babfb55972ef5d456cc274634facc07ea8dc2c214147507d223a6fd8cf24541c04fc19c3510c7548bdaa5549f5587c9d99de7b61e64bd2f7d SHA512 9a0f3c81e9beb171fdef8282ac3938a5534f894437f898ab1437cdeb30a12c7fb8a1a494479f46c41d65e78fe014b8c1e510a72d0673f3d0d769d71c4af12a5d +DIST diffoscope-271.tar.bz2 3155727 BLAKE2B fa4ee93158cf41215d071aa3caa1956325fdbb1e4f1a9e392485117cb58b8142ac7f326cd650e72440a2512a08aa2c6a7d9c64a0fa8bf9768c9f0d97a45d872e SHA512 f5688d82313f54a9b9db88c406cdd67f13aeb65a8aa844fa41a944f6beaa0b2189175c891ddaf3b345492141472ce0366fd22691c2c89fd9a3d8c0b8d62f476c EBUILD diffoscope-266.ebuild 3681 BLAKE2B c4f1f1661fd97e6b04eff67c1aae1db9893df9b5e91aa54aed8fedd4fa1ef7fa071f799c76377db3687f0c7b073be41eabac629118e38e063d8f29d8493e996c SHA512 0f24c5d7d22c8bbeae42d3cab7f7e25c347ac1f3d80320a92e22b33c3447b439a3794e443f939fa3861c82a2c0170b1ac2a6f98f20312a800147d03ce6a22dba EBUILD diffoscope-268.ebuild 4016 BLAKE2B 8f6bdd694fd5909f10034289ee750cddb698eedd27d322503d486ec484e74d15da97dcbe63015c5fd6a64f3793f97ba25251e5470024db0bbaf51b58d9e36178 SHA512 a17101dcd203b7a02123e141947a9ed7564ddb1e8d17b9e2f1331e585e850e7cb804fb23bc16e7e3702e26c281be2f47b848f464b59d9f773ffe9df5d1851805 +EBUILD diffoscope-271.ebuild 3972 BLAKE2B eab76e91965dc1c98be88b5289dabb5744106e174235dd8babcddfacf2888c68a1c03504c9cc6d86220c6502cf9febec4cda9ef0121192ae99d6ec22a68e8a34 SHA512 462fca98121b341ce7a934bb718b268621457099a9714cf3337e0016f7e723989fdb4774f510bea5d339a2c968c8b34915d7c3abda3d74c823ac07aef0455c4f MISC metadata.xml 2086 BLAKE2B b05c2c3c425a990f64aea25e9dda3e1afb410068d90e034d5d9df7c76363613d309f8bc57c70284f2e607a3e2096a0132724dddba8df487bda3046d8ed7aefa1 SHA512 8c86ddad7fda722956931d73a6f5dfa8e43c25623edb3b20bf3e68765b04ed4d20ba31b68315812978a9546b3c678597fd41132a4a6ad4658ba9fa5f79cfc90d diff --git a/dev-util/diffoscope/diffoscope-271.ebuild b/dev-util/diffoscope/diffoscope-271.ebuild new file mode 100644 index 000000000000..ea0ae53846a2 --- /dev/null +++ b/dev-util/diffoscope/diffoscope-271.ebuild @@ -0,0 +1,131 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="ncurses" +inherit distutils-r1 + +DESCRIPTION="Will try to get to the bottom of what makes files or directories different" +HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/" +# We could use pypi, but upstream provide distribution tarballs, so let's use those. +# TODO: verify-sig +SRC_URI="https://diffoscope.org/archive/${P}.tar.bz2" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86" +IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file +find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma +mono opendocument pascal pdf postscript R rpm sqlite squashfs +ssh tar test tcpdump zip zlib zstd" +RESTRICT="!test? ( test )" + +RDEPEND=" + || ( + dev-python/python-magic[${PYTHON_USEDEP}] + sys-apps/file[python,${PYTHON_USEDEP}] + ) + dev-python/libarchive-c[${PYTHON_USEDEP}] + dev-python/distro[${PYTHON_USEDEP}] + dev-python/tlsh[${PYTHON_USEDEP}] + acl? ( sys-apps/acl ) + binutils? ( sys-devel/binutils ) + bzip2? ( app-arch/bzip2 ) + libcaca? ( media-libs/libcaca ) + colord? ( x11-misc/colord ) + cpio? ( app-alternatives/cpio ) + diff? ( sys-apps/diffutils ) + docx? ( app-text/docx2txt ) + dtc? ( sys-apps/dtc ) + e2fsprogs? ( sys-fs/e2fsprogs ) + file? ( sys-apps/file ) + find? ( sys-apps/findutils ) + gettext? ( sys-devel/gettext ) + gif? ( media-libs/giflib ) + gpg? ( app-crypt/gnupg ) + haskell? ( dev-lang/ghc ) + hdf5? ( sci-libs/hdf5 ) + hex? ( app-editors/vim-core ) + imagemagick? ( media-gfx/imagemagick ) + iso? ( app-cdr/cdrtools ) + java? ( virtual/jdk ) + llvm? ( sys-devel/llvm ) + lzma? ( app-arch/xz-utils ) + mono? ( dev-lang/mono ) + opendocument? ( app-text/odt2txt ) + pascal? ( dev-lang/fpc ) + pdf? ( + app-text/pdftk + app-text/poppler + dev-python/pypdf[${PYTHON_USEDEP}] + ) + postscript? ( app-text/ghostscript-gpl ) + R? ( dev-lang/R ) + rpm? ( app-arch/rpm ) + sqlite? ( dev-db/sqlite:3 ) + squashfs? ( sys-fs/squashfs-tools ) + ssh? ( virtual/openssh ) + tar? ( app-arch/tar ) + tcpdump? ( net-analyzer/tcpdump ) + zip? ( app-arch/unzip ) + zlib? ( app-arch/gzip ) + zstd? ( app-arch/zstd ) +" + +# pull in optional tools for tests: +# img2txt: bug #797688 +# docx2txt: bug #797688 +BDEPEND=" + test? ( + app-arch/p7zip + app-text/docx2txt + app-text/html2text + media-libs/libcaca + virtual/imagemagick-tools[jpeg] + ) +" + +EPYTEST_DESELECT=( + # Test seems to use different tarball + tests/test_presenters.py::test_text_proper_indentation + + # Needs triage + tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found + tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode + tests/comparators/test_gif.py::test_has_visuals + + # img2txt based failures, bug #797688 + tests/comparators/test_ico_image.py::test_diff + tests/comparators/test_ico_image.py::test_diff_meta + tests/comparators/test_ico_image.py::test_diff_meta2 + tests/comparators/test_ico_image.py::test_has_visuals + tests/comparators/test_jpeg_image.py::test_diff + tests/comparators/test_jpeg_image.py::test_compare_non_existing + tests/comparators/test_jpeg_image.py::test_diff_meta + tests/comparators/test_jpeg_image.py::test_has_visuals + + # docx2txt based falures, bug #797688 + tests/comparators/test_docx.py::test_diff + + # Formatting + tests/test_source.py::test_code_is_black_clean + + # Fails on ZFS + tests/test_main.py::test_non_unicode_filename + + # Fails on (unreleased) LLVM 16 with minor difference + #tests/comparators/test_macho.py::test_llvm_diff + #tests/comparators/test_elf.py::test_libmix_differences + + # Fails with perl-5.40 + # https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/377 + tests/comparators/test_epub.py::test_differences + tests/comparators/test_zip.py::test_metadata + tests/comparators/test_zip.py::test_extra_fields + tests/comparators/test_zip.py::test_commented +) + +distutils_enable_tests pytest diff --git a/dev-util/gprof2dot/Manifest b/dev-util/gprof2dot/Manifest index 8899a7a47e4c..57aef7a57cac 100644 --- a/dev-util/gprof2dot/Manifest +++ b/dev-util/gprof2dot/Manifest @@ -1,6 +1,8 @@ DIST gprof2dot-2022.7.29.tar.gz 33948 BLAKE2B cc96bcf0cbce2159f6a03bb1b7d3b2e89212a2acdb948fbeb947b8664ed34123102792476d16d11b7b2bdb269aef9ce54a7224a355c5390fe6010e82bc2df189 SHA512 347e24c11f4ca3b5d6b50dfebb158f046e64aa302549b82949c5e089d081c741c9936272d45d378f3828d3d824ed632a98444e6aa3dc1a3b9b86abc27738bcb8 DIST gprof2dot-2024.6.5.tar.gz 36539 BLAKE2B ed1d2b9417004b30e6c345302e5d081386b593c5bdd606342854a627bbd1910d48dc9bd0263683f13b0df31b4beb0acb6de06760bc2ec97a32e27dc0bb99dd3a SHA512 b81f01ad1c31862894831881142ffc38f598feb201cced53adf11c485885e0f25843bdf86ac106a814dd537932293eba2163eb55efc2361ebf70e4561032ea3c +DIST gprof2dot-2024.6.6.tar.gz 36536 BLAKE2B 89e46b519f3b8a8ee4cf9e3490ee75dc2577db93da31ad23aa34e5af6fd1a1d186841dc7a9dd90a9291f454bc308f3a3e9875dc06d960a86d161346b5cc1cc8d SHA512 4943e7827461453a573a2d2f4b465acbf9f444de3dd2dad7dcc1addde607735c3ee2d162fbd9f6c46ece343befa8d7a35b502d18f499cdc06c3655bafaa1d80f EBUILD gprof2dot-2022.7.29-r1.ebuild 427 BLAKE2B fa7e23623beaed11bf1868493afd40e1e0f4839452667bacd1c2f4a6ca66fd5f084c5c76e38b3b0609d52720115aa3749f65b4edc5e49f42910c4bf976b60822 SHA512 9f35ba5b1366bf8d09149e7f55811034162b28b9c391d0ecf9758f7db53e507bf7ac0eaa8ff0000a960233b23b6b0d3e4e46a6ff37da871db882ffbafd219204 EBUILD gprof2dot-2022.7.29.ebuild 427 BLAKE2B e0dbdd4f535ff6c8dfd8f84d9a6cf88f7785dd91702414a810f17e2eb9834ab61e3bc6e1af2763c658ec6753ac1ae8977ff4271a7f37f02b3b1a310d8cede8a2 SHA512 1e141fe7b1cbdf6fcdb8f4aeefb3a5a8ff6dd7fd7dd4b1de35eb8df26a8bfb76272a02a4336e9480fdeac5be56c8ea54efc08a8daf915b92e0bf94c93edf8c7b EBUILD gprof2dot-2024.6.5.ebuild 427 BLAKE2B 0c766bc0b27d4c4f96e788c81bebd33d53c60543ac47923f9f20432f36a11f2ad8617354ec3a7de797eeee1f761da650bf7f711208ad21a056c3bfd45f90fbcb SHA512 7c44a5369631173c5de1ef7fe4037a5718897299b40981c3ccc52ea67bacbe95fb1622e0d984c567ecfd2c75afa84db288621779171f6e93a3a2baeacbe124d0 +EBUILD gprof2dot-2024.6.6.ebuild 427 BLAKE2B 0c766bc0b27d4c4f96e788c81bebd33d53c60543ac47923f9f20432f36a11f2ad8617354ec3a7de797eeee1f761da650bf7f711208ad21a056c3bfd45f90fbcb SHA512 7c44a5369631173c5de1ef7fe4037a5718897299b40981c3ccc52ea67bacbe95fb1622e0d984c567ecfd2c75afa84db288621779171f6e93a3a2baeacbe124d0 MISC metadata.xml 381 BLAKE2B 2931140d66e423ae23ad825406f02e390a90ca75ad8660aff8b76349074cf7c877754c72ec0295bbba625ffc1fe33b218f288ed49b1df823b4f7264741121122 SHA512 a2c8a71badb61131a7a75c827176801310da9f242407a347d7715bbe570cbc0baea93481f7a0074b8fa3f0a2c236bbd892ed7832a506f5312c28bc77a176e0cf diff --git a/dev-util/gprof2dot/gprof2dot-2024.6.6.ebuild b/dev-util/gprof2dot/gprof2dot-2024.6.6.ebuild new file mode 100644 index 000000000000..7c934ff49e65 --- /dev/null +++ b/dev-util/gprof2dot/gprof2dot-2024.6.6.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_REQ_USE='xml(+)' + +inherit distutils-r1 pypi + +DESCRIPTION="Converts profiling output to dot graphs" +HOMEPAGE=" + https://github.com/jrfonseca/gprof2dot/ + https://pypi.org/project/gprof2dot/ +" + +LICENSE="LGPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" diff --git a/dev-util/librnp/Manifest b/dev-util/librnp/Manifest index 1fcff337f092..7c01b75b937b 100644 --- a/dev-util/librnp/Manifest +++ b/dev-util/librnp/Manifest @@ -3,5 +3,4 @@ DIST librnp-0.17.0.tar.gz 2996461 BLAKE2B 9a6ea0452f067464ef52cef395c2969ba9912c DIST librnp-0.17.1.tar.gz 3515288 BLAKE2B 279cd5c669b469112066c4754a9a5a5c9fbe3ba225be4f85bc507aad9f29cfa166f90cb3dfe83ea8e29964fdfbbf926438fb36bb345da494ed7f70586fa8d7b6 SHA512 0224f79e4dd4b72ddd9c191218327da5485ed1d81321cc3a167cfeea68c00e47cec9151a4177e65e5560039345db3a52e41a093adfdf833f57e867bc559494a5 EBUILD librnp-0.17.0-r3.ebuild 1932 BLAKE2B 5ec8fe6ba0119f30f81201cff3dd4b669741b4bbdb3db65996bf1bb23e5267fb552a75edffa00e5d4e9b2f178ab50ad8c539c5d6532d8d041cba531484c20758 SHA512 f3b43221e5ce01ae2a64e4c418a04000b9c0d7ef5020f7ef50d2960d5ee95bde15298beed85e5015a5e383b36eece1120391b000513e68aaa8b2e3e92806f032 EBUILD librnp-0.17.1-r1.ebuild 1878 BLAKE2B 1f0d7ba0e07b9a13d7a219527eec09052fadeb6dbbe3169df861ea61463ff191fb1d6ce8d050ccd69e550a91c2f8a2514e677dbf58514946bc2e9828d32cc0b5 SHA512 8293c14787ca727da194601e0e52fdeda7160d862a08a7417b816147448c251af8b007e94bc552989b53878f1a793a58a3a2c51c6880dfee615b1879a8552569 -EBUILD librnp-0.17.1.ebuild 1876 BLAKE2B 78b362d2e54c3b01e949110b92a2548c2514a81eac89cd8930413021d42f907423645f15f4d97c9b0ed19a38032f7bb63745b29cd8541f9f9983253122e62af5 SHA512 8eff08a3e9024e4644a98ffce5b3c81308faeada41dea4da46f9ee54c4f1016b5a81d7e26b0548e950a92828c9a53969b84c9f2affe9a618fb8382c717d88bbc MISC metadata.xml 430 BLAKE2B 739d6cddc56f385ad2b1679f6b3d9ba567ce77ec536894ca3861ad7ad127fd60c395db49b31d89963df12c03d8cf69fc6f083f5d3361b790079952c1e76ccf03 SHA512 ad7b3e6332741e1f2eae9e158d5ca767f5985a8f5c86eb5f21b7ee0214b9c7fdd2e90beddf1a9287218edf35aff39bd7ff1a4f1d15eb10552ab664738f8d1959 diff --git a/dev-util/librnp/librnp-0.17.1.ebuild b/dev-util/librnp/librnp-0.17.1.ebuild deleted file mode 100644 index 30ef40bae3c2..000000000000 --- a/dev-util/librnp/librnp-0.17.1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake multiprocessing - -DESCRIPTION="High performance C++ OpenPGP library" -HOMEPAGE="https://www.rnpgp.org/ https://github.com/rnpgp/rnp" -SRC_URI="https://github.com/rnpgp/rnp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0 BSD BSD-2" -SLOT="0/0.16.1" -KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86" -IUSE="+botan man test" - -RDEPEND="app-arch/bzip2 - dev-libs/json-c:= - >=dev-libs/sexpp-0.8.7 - sys-libs/zlib - botan? ( dev-libs/botan:= ) - !botan? ( >=dev-libs/openssl-1.1.1:= )" -DEPEND="${RDEPEND} - test? ( dev-cpp/gtest )" -BDEPEND="man? ( dev-ruby/asciidoctor )" - -RESTRICT="!test? ( test )" -S="${WORKDIR}/${P/*lib/}" - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test on off) - - -DCRYPTO_BACKEND=$(usex botan botan openssl) - - -DDOWNLOAD_GTEST=off - - -DENABLE_COVERAGE=off - -DENABLE_DOC=$(usex man on off) - -DENABLE_FUZZERS=off - -DENABLE_SANITIZERS=off - - -DSYSTEM_LIBSEXPP=on - ) - - if use botan; then - local mycmakeargs+=( - -DENABLE_AEAD=on - -DENABLE_BLOWFISH=on - -DENABLE_BRAINPOOL=on - -DENABLE_CAST5=on - -DENABLE_IDEA=on - -DENABLE_RIPEMD160=on - -DENABLE_SM2=on - -DENABLE_TWOFISH=on - ) - - # OpenSSL support is still not as complete as botan. - # https://github.com/rnpgp/rnp/issues/1877 SM2, - # https://github.com/openssl/openssl/issues/2046 TWOFISH (won't be implemented). - else - local mycmakeargs+=( - -DENABLE_AEAD=on - -DENABLE_BLOWFISH=on - -DENABLE_BRAINPOOL=on - -DENABLE_CAST5=on - -DENABLE_IDEA=on - -DENABLE_RIPEMD160=on - -DENABLE_SM2=off - -DENABLE_TWOFISH=off - ) - fi - - cmake_src_configure -} - -src_test() { - cd "${BUILD_DIR}"/src/tests || die - ctest -j$(makeopts_jobs) -R .* --output-on-failure || die -} - -src_install() { - cmake_src_install - find "${D}" -name '*.a' -delete || die -} diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest index 7e5b8fd32448..79c616128c78 100644 --- a/dev-util/rbtools/Manifest +++ b/dev-util/rbtools/Manifest @@ -1,3 +1,6 @@ +AUX rbtools-5.0-importlib-resources.patch 425 BLAKE2B 6ea4e39cd033b468f8e3ecdef564e161299f539580890a5ba4930e5ceee7a339ecaf4c77f88d0b700019cfd1319369061262bef7301d2e84201d4af26e12a77c SHA512 44ebe3eced9f5fbee2ecfe891959d37e83699dd74677a4aef614de39ffc2aab69dbb79f0cf0df1921fd73cd70e61c89b9b1f326dbef72bb5f93aab71f118262d DIST rbtools-4.1.tar.gz 619541 BLAKE2B 9b1aeca4f139a0189affb873363dba8f6d13eb954d4872939c543f6d91c00b09b2452cc379d4d99450c05d3d44a1996e910ff512ba9849292a7b705ce01be654 SHA512 58aa58ce6c55d4d3be9f221c493c8a3c15537776ff4e28be1ea44c0441f1dd9877ac9145066fdceb90d392c75cf29ec80e7efd154b0a2f1893422b65a0189ea0 +DIST rbtools-5.0.tar.gz 649338 BLAKE2B c6a08004e7c8ba17936865e53b78e086ec74e8f5fee7ecc124750f3bf24b9b52ab8a26d1caa7010cdd2822463fcb27b8e5c5f757068924e22d3e59268166f7bf SHA512 7fbc5198fc89ee911a3cc487ead094d46213cfc4f85ab01cf22bd2a628559acdaaed138b430b08aa94ea25dec1179bf7c28349ac8226d632a6112ec83e2b57b7 EBUILD rbtools-4.1.ebuild 1421 BLAKE2B e3ad76841f38a456551bf7180645059c2dbd54be236eac0b4407b29936724d74e1bdac8197ab812e731eb5c09c49e92b0c7f83b5b96ed696f605fb4d1eb54a0c SHA512 c21b192ef90417f5e5726ae2158de614079a16a10275fd589b738788ed5f005cd0eeb33801435ada41b4932373ca04e10d62dfb8aa318ced52f39290c697c94a +EBUILD rbtools-5.0.ebuild 1537 BLAKE2B 594e197b4fc87c616d6f045d5d3028e65336f2bcb3105f6bd7c3bbade13d75e126ee685a512125dd6a412f337a1a29b917047e13193b343280940ecebafb3e0e SHA512 3cb89e3fbb36f4a63b0873d3ad5bdf02b19cf06853dc412c330dc0f8ce82061021b4ce67b97d6aa1665eafc87976cc3e11508a162e036e1693850c701afe64a5 MISC metadata.xml 310 BLAKE2B d4825072b11fd2f9cad88fd9f3e0670d42f997f2f49034539ea9cab13751e08d7f4153fc7534d4931baa55cab6a4bb1ae65f1790fce12d784dfab1eb747a344b SHA512 4b2b81003437f8f97af748509521ce7f946df9e0fcc4ffbabf4de5289b046eeee25d0e1acaf3604fa09995965728b7e4cd10233074ddc4e9bed54a68f26e6613 diff --git a/dev-util/rbtools/files/rbtools-5.0-importlib-resources.patch b/dev-util/rbtools/files/rbtools-5.0-importlib-resources.patch new file mode 100644 index 000000000000..fa23c587a77a --- /dev/null +++ b/dev-util/rbtools/files/rbtools-5.0-importlib-resources.patch @@ -0,0 +1,14 @@ +--- a/rbtools/commands/setup_completion.py 2024-06-06 10:51:45.000000000 +0200 ++++ b/rbtools/commands/setup_completion.py 2024-06-08 11:12:34.788309950 +0200 +@@ -6,7 +6,10 @@ + import sys + from typing import Optional + +-import importlib_resources ++try: ++ import importlib.resources as importlib_resources ++except ImportError: ++ import importlib_resources + + from rbtools.commands.base import BaseCommand, CommandError + diff --git a/dev-util/rbtools/rbtools-5.0.ebuild b/dev-util/rbtools/rbtools-5.0.ebuild new file mode 100644 index 000000000000..6a99f1af7e31 --- /dev/null +++ b/dev-util/rbtools/rbtools-5.0.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 + +DESCRIPTION="Command line tools for use with Review Board" +HOMEPAGE="https://www.reviewboard.org/" +SRC_URI="https://github.com/reviewboard/rbtools/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/rbtools-release-${PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=dev-python/certifi-2023.5.7[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + >=dev-python/housekeeping-1.1[${PYTHON_USEDEP}] + =dev-python/housekeeping-1*[${PYTHON_USEDEP}] + >=dev-python/packaging-21.3[${PYTHON_USEDEP}] + =dev-python/pydiffx-1.1*[${PYTHON_USEDEP}] + dev-python/texttable[${PYTHON_USEDEP}] + >=dev-python/typing-extensions-4.3.0[${PYTHON_USEDEP}] + dev-python/tqdm[${PYTHON_USEDEP}] + >=dev-python/importlib-metadata-5.0[${PYTHON_USEDEP}] +" +BDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + >=dev-python/kgb-6.1[${PYTHON_USEDEP}] + dev-python/pytest-env[${PYTHON_USEDEP}] + dev-vcs/git + dev-vcs/mercurial + ) +" + +PATCHES=( "${FILESDIR}/${P}-importlib-resources.patch" ) + +DOCS=( AUTHORS NEWS README.md ) + +distutils_enable_tests pytest + +src_prepare() { + default + + # Avoid tests requiring unpackaged test data + rm -f rbtools/clients/tests/test_scanning.py || die + + # Avoid repository specific tests to avoid dependencies on them + rm -f rbtools/clients/tests/test_{cvs,git,mercurial,svn}.py || die +} diff --git a/dev-util/tree-sitter-cli/Manifest b/dev-util/tree-sitter-cli/Manifest index 07cf7a774e8f..f620c55487fe 100644 --- a/dev-util/tree-sitter-cli/Manifest +++ b/dev-util/tree-sitter-cli/Manifest @@ -7,6 +7,6 @@ DIST tree-sitter-cli-0.22.4-crates.tar.gz 51254931 BLAKE2B 1cc056f503353ce594726 DIST tree-sitter-cli-0.22.6-crates.tar.xz 22184056 BLAKE2B f18cfafa9a767fb1b3408dd473d97b2d7a87c9c37a50fb108e164074641e656cc2ca322914f98d627209485cf7b14f92280a50a64cf5136f8375e5870d2b097f SHA512 a3e6eb6585d61c86e32de21c0422c2cd1f95c6116823f5a8ee291f6682658fb7afe5e1369eda4682d4e842d91531b56e6fadb99e4d575230f4c1d65a6b0778ca EBUILD tree-sitter-cli-0.22.2-r1.ebuild 941 BLAKE2B 083d1e90da8b718c64a095f314c63fd04b0eead49a2910c9dbfdc9fe97d02ed02bc0c2c496f105a09d62002abab498a934a6eea58699ac332c9fb2f91a287ba8 SHA512 e17e5aba1710fea46144749fbd2317b4e8c2c9785439cac272234612bdf634ac5db7e6a259b2b51b891140ef65650689dd6b65d9115fd69584c26bbd911ab651 EBUILD tree-sitter-cli-0.22.4-r1.ebuild 899 BLAKE2B 2ca614b84c2ac24af555512aa96cc9704f4330ec69324ea930f0509e8b14c664aeba4e93e90f60f14ce906b802ed26d31351d8a7eeab23df45635f083335e544 SHA512 4d70728d73ab197dadc096942483db7e4798f97bd1b0b70175dea18ec11f4652fb1d11afdb92ae2f5831e2fb116d9baf926a552af7e9cd7bcca74d64281af95b -EBUILD tree-sitter-cli-0.22.5.ebuild 903 BLAKE2B cb70c580d1e1df6c5660e1d9fd393f424b0e17135093a8569c544195778cac53896e52ac1c9d7d9a4aecd199e5d3f7e121f938b3123189c674678760f14782cf SHA512 6effefc08e1a3b0f00d4aa7a0100fa5da583ec3193309c7174d23d9d4ced26ae4f0a49c82943dbde4a98c18dc0991d1c07c9593c6d3232be621c0b53e7dfa843 +EBUILD tree-sitter-cli-0.22.5.ebuild 900 BLAKE2B e7ef5e9995e838b1f4a32d04113c75bf881486f88649cc17c6760b3f132b879493cab04025b91a3fd523c5316a7f922760b145bddc92dca0e046831c0d7d0306 SHA512 448e0e275386cf4c6eab01f8fc170fbb65161676c8d0aa32dd159dab02f39f4aef7463ddb2e10d6b256f49d43e5fabb59f8a0c73a7598e0f797f2aa9d18e53df EBUILD tree-sitter-cli-0.22.6.ebuild 916 BLAKE2B 28ac3fbf95af4d731ca58851b17f74c39c2f56de7ce630000a601b3bd91fd1838e8205511f2d7491f37b78ee31e00593c7c5ad80db1883d7858b616d03ed2ba4 SHA512 d133b4eedb0d04ed7000243a5bdbbd095af8b8eb0aeb945b849a5039954e19763474ddc858d5d82dbfb90c43faedc75d9994783fc2ea9a06dfc6623bc868637c MISC metadata.xml 678 BLAKE2B e000f4502ed07b8fffcbf05a9dcf0730407d70a00ddf289b8ffdd9e6d28df6481f7e6eec3416aa1278ad9602c098bde72bcaad4f7819c9554c39baf045555dc8 SHA512 37e64d773a4b01b34208b65be600e6f46c7633571d7ad39210b7957f41f31b296565304a4dc8a4ec0518489a89b1bf7a1b204111c4d428307b562e3f6d0575f8 diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.5.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.5.ebuild index 41b809340b75..2cde78e94590 100644 --- a/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.5.ebuild +++ b/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.5.ebuild @@ -21,7 +21,7 @@ LICENSE+=" Unicode-DFS-2016 " SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" # Test seems to require files (grammar definitions) that we don't have. RESTRICT="test" diff --git a/dev-util/ydiff/Manifest b/dev-util/ydiff/Manifest index 641072287178..05043635dcac 100644 --- a/dev-util/ydiff/Manifest +++ b/dev-util/ydiff/Manifest @@ -1,4 +1,6 @@ DIST ydiff-1.2.tar.gz 42808 BLAKE2B 927482c2ed9a96efc354178679b4ba50497289bc31107e8cdef3062a71d91268fa703620f1f4b0be03aebaf339eba5254f4b43c16403f1d7818b84b0c450defb SHA512 0eb2230b64f43e20f6dc2411296389dc99356ef626152dc7f234583f70678e64a07b764fd89635479e7ac4aa7e2490db6e76c744369eefef8ab6a5386db1a7b5 +DIST ydiff-1.3.tar.gz 74115 BLAKE2B 5cc0a4405148940772000e13a0f2d955c8fdbe63890cdd912b78a808dd231c7682de2fa81d5cf7ec7442dc47b2ae0fa5430dbd40ed39c636fdf43a288e8b41aa SHA512 ac9f4ce3383903275e0f71295009098aaca6a38449489bff70026a8090863b2f3b2c566908602c145473b72edf491d0ce2ce75802e397db2e04b10a158b35c99 EBUILD ydiff-1.2-r1.ebuild 599 BLAKE2B 8e7f6558fdd0db8fb96d2f2caff5d41b142dfd107110cb046e546d8a02d55e5e87c8e371b45f47ba7b0e4f46d2a72b556ea0317bfc12f97b6292b6b7843c4b16 SHA512 07f49ded5e0f84ad69e92ada1e7a86a1585c090dc78fdeb7b47c07abd74b77e80e5fb05b1e83136ec656214039e853fea8932a8383b09cd6860d3ee6c26e17e5 EBUILD ydiff-1.2-r2.ebuild 599 BLAKE2B 42dd7eac4abb2653d46697039f8218e31e3f3c78354ef6f5321e3d1a7a5473240f9a68d00bc4d39158657e80f887903e89130f6c85224861260444305f6f2c5c SHA512 093f67d1613bc2d99deb5aec71f0a88388d2d3c244b2f04ff26a81cf7c54d732af847f48193ad1a790df288bdd84a9867f56bc596c48239091c9821667d23f0f +EBUILD ydiff-1.3.ebuild 601 BLAKE2B f8f42ad1e0032bfbfe0e2e515780638724c4e56ca7b82d19d8a3730249e1fd9150603f7b38113fa5783b28a34266d3e1171aae8dec7fcfd56e2a52fe827b3c5f SHA512 c0a79fec302f2ffefe89910fcf55e122fdd7a5622a1cfd9dad441b786e4fba751cd319e49173e6077399be8b02d5964c9eaeed5db538225f57b1766ca387271b MISC metadata.xml 394 BLAKE2B 7333c46ff0d147ca8dc7eafd8e5f3eae67c7217467d45431585898948671df5e836995e89414fb95a9645f69c4f1d2020168a87b952115ce3b6225d89b46aa01 SHA512 781694fc99405f67446875b9fb40a306cd5223f1f27d1fff5f0bd2fe35aee1d6a518486999d06732e89fdc5759afdf0235615170718fea80ba0d69fc95f97fe7 diff --git a/dev-util/ydiff/ydiff-1.3.ebuild b/dev-util/ydiff/ydiff-1.3.ebuild new file mode 100644 index 000000000000..7259e05a9e68 --- /dev/null +++ b/dev-util/ydiff/ydiff-1.3.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 pypi + +DESCRIPTION="Colored, side-by-side diff terminal viewer (ex. cdiff)" +HOMEPAGE="https://github.com/ymattw/ydiff" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + +RDEPEND="sys-apps/less" + +DOCS=( CHANGES.rst README.rst ) + +RESTRICT="test" + +python_test() { + ${PYTHON} tests/test_ydiff.py || die "Unit tests failed." + + ./tests/regression.sh || die "Regression tests failed." +} -- cgit v1.2.3