From 6d730aa8064fbab6cc54447b6ed0e60b99c13256 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 17 Jan 2025 06:41:55 +0000 Subject: gentoo auto-resync : 17:01:2025 - 06:41:55 --- dev-util/Manifest.gz | Bin 64983 -> 64979 bytes dev-util/cbindgen/Manifest | 3 + dev-util/cbindgen/cbindgen-0.28.0.ebuild | 100 +++++++ dev-util/gitlab-cli/Manifest | 9 - dev-util/gitlab-cli/gitlab-cli-1.44.1.ebuild | 32 --- dev-util/gitlab-cli/gitlab-cli-1.46.0.ebuild | 33 --- dev-util/gitlab-cli/gitlab-cli-1.48.0.ebuild | 33 --- dev-util/gnome-builder/Manifest | 5 +- .../files/44.2-fix-gtk-4.12.5-build.patch | 26 -- .../gnome-builder/gnome-builder-44.2-r1.ebuild | 288 --------------------- dev-util/gnome-builder/gnome-builder-47.2.ebuild | 273 +++++++++++++++++++ dev-util/imediff/Manifest | 6 + dev-util/imediff/files/1.1.2.1-python-3.patch | 157 +++++++++++ dev-util/imediff/imediff-1.1.2.1.ebuild | 40 +++ dev-util/imediff/imediff-3.3.1.ebuild | 35 +++ dev-util/imediff/metadata.xml | 9 + dev-util/imediff2/Manifest | 4 - dev-util/imediff2/files/1.1.2.1-python-3.patch | 157 ----------- dev-util/imediff2/imediff2-1.1.2.1.ebuild | 39 --- dev-util/imediff2/metadata.xml | 9 - dev-util/stressapptest/Manifest | 2 - .../stressapptest/stressapptest-1.0.9-r1.ebuild | 24 -- 22 files changed, 625 insertions(+), 659 deletions(-) create mode 100644 dev-util/cbindgen/cbindgen-0.28.0.ebuild delete mode 100644 dev-util/gitlab-cli/gitlab-cli-1.44.1.ebuild delete mode 100644 dev-util/gitlab-cli/gitlab-cli-1.46.0.ebuild delete mode 100644 dev-util/gitlab-cli/gitlab-cli-1.48.0.ebuild delete mode 100644 dev-util/gnome-builder/files/44.2-fix-gtk-4.12.5-build.patch delete mode 100644 dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild create mode 100644 dev-util/gnome-builder/gnome-builder-47.2.ebuild create mode 100644 dev-util/imediff/Manifest create mode 100644 dev-util/imediff/files/1.1.2.1-python-3.patch create mode 100644 dev-util/imediff/imediff-1.1.2.1.ebuild create mode 100644 dev-util/imediff/imediff-3.3.1.ebuild create mode 100644 dev-util/imediff/metadata.xml delete mode 100644 dev-util/imediff2/Manifest delete mode 100644 dev-util/imediff2/files/1.1.2.1-python-3.patch delete mode 100644 dev-util/imediff2/imediff2-1.1.2.1.ebuild delete mode 100644 dev-util/imediff2/metadata.xml delete mode 100644 dev-util/stressapptest/stressapptest-1.0.9-r1.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index 69bd13e300b9..6f784fcbe7cb 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest index e9b59249f57a..b71b84412b29 100644 --- a/dev-util/cbindgen/Manifest +++ b/dev-util/cbindgen/Manifest @@ -6,6 +6,7 @@ DIST anstyle-wincon-3.0.4.crate 12234 BLAKE2B 23294d6ed7715c55c8f796eb7b860450c5 DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635 DIST bitflags-2.6.0.crate 45357 BLAKE2B 3a368bd2eb58c095b7b4a46680cc2d90a28e24b2e37c854bbf8647c861c4b8fb37eca827599673c5c7df763048149dd82123d1ede1f8a0e58a6bc23c8250f7e6 SHA512 f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf DIST cbindgen-0.27.0.tar.gz 229354 BLAKE2B 9ebf8891ae7196ef5e3cc9edd2b4601b1e70408cadef4b110dc4ee3f0c403aef30553124ba8ab7806e086334ee8548bd747127cf8b6302f560ac10356a3782a3 SHA512 966f8a5503200dc5f0e478c6d8f8ec1d335daa7f22c0dfa1fa4a891c6785fd7720685174b768f756b2feccc44f4d34b39afdf2b38a1abc0d8f8050a0be0709ab +DIST cbindgen-0.28.0.tar.gz 237495 BLAKE2B b9e50d238debbb62ed9d09d707458d6e5cdcf9e8c15c11d0f507d37cdb672a9fc1196c6f9f8caecd14252ccf513752488bdca3ad232b7cd2200c5e71436940eb SHA512 d53ed0b867309b703a077729963f077c3c5d0a88c994e358fb1cfad68342c8ea604735ba2e71f35164968a46411202da3cd7d432938f07a24bef31144b4c806e DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff DIST clap-4.5.15.crate 56612 BLAKE2B f5f34a6d3e84731de7dc1b54d8576e8e9e573fa1381e9bbcba8e2b66f8cc693ce51c7a876c34705ed705de7a793bfd2f4922fb86f8764adb7a4dacd03af06ff7 SHA512 a0bd102065cb29eb565e65408ce5bf37e3404b7496959614d10ff2f9bb2e29c1abf8f5a3716aa85994a49bce4ac12d63586c8ec8187c0d3a6f696a4804fb446b DIST clap_builder-4.5.15.crate 163717 BLAKE2B 795fa9c6de6a3f4d9a1288c3340613c14b11a5346e314f5f486bee76346f5f88396e54d95d051bd84184a91bb1f2d3575f870fca56a4b9b590ea2d9939beb415 SHA512 52efd99bce20bb8ff2187c4cef8bc27bef6cdc52598f00b47639b797683f18c76a79a6ebf34d1d250621a49cab0e9ec9e7824d323516f1ed3fa721cfd34cd713 @@ -46,6 +47,7 @@ DIST serial_test_derive-2.0.0.crate 5638 BLAKE2B 72fcbc0a6903b0ac82af3334048eab8 DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679 DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c DIST syn-2.0.72.crate 267069 BLAKE2B b0b979f78937a10a6db45f96d5d93c595427a4e158d658a2186419d89b219a4a405ade488d88d9ebdbd605ce4b706aba7088ab39a77294f3cf9847bf032d8f91 SHA512 c3d26bf9787555bc6fd8bd789855d252e80ad28a413593e13bad174adf86087ff195a6b4227bdeb6d1a1c87b0af8e965d6f2d04b8d45e7383b6de49990b92e89 +DIST syn-2.0.85.crate 275231 BLAKE2B e7679e81bcef87920bc0ed707c997563844ffa1e9d470675ae6ec11d1e045e04ee2ad5744d423b8bc16def1c197ebecd874f468c1e12244838d1b4f34f9c1a30 SHA512 14b1402d2cd91456eb32dcffd494592eb3bd848ae22571f7ef0686493f91b82d23ba41428f9d31686fd24ea6ebca4b239b6c5099302a32014dffbc4ff9afeec1 DIST tempfile-3.12.0.crate 34423 BLAKE2B a8b84f54a54be636f5b69791ca567e8b692d6a8485ef37e5a8340d26b32b1b0f9f8e9fcd9a2da90ec2fbd39c281d364dfc5723d06892832edb79ea5cf45d069c SHA512 1a27513548060984be894e6f8fc215831e4b2054b2244c6188bee76c477c001f294c762f2f4a14488c58c04e5d1473806d589c7bba1eaa2cc02d97656709be66 DIST toml-0.8.19.crate 50974 BLAKE2B f68987353837b74421256fd9a76134bfbfe93887cfb25145b65b7e6b31ad2c3a3384829a06f50c771a2a0be0c5467c856cc631af69f586ea056c4f15af9e3b7c SHA512 16fdc58d14516e81badbe8c9a4506db75b559b377c9c4fecee79e76007b31a4abfc8c8868bf9159f79c6f7c0218f93bdcfb92b669b0917db7da42b51ec155751 DIST toml_datetime-0.6.8.crate 12028 BLAKE2B 62113366771f22b437b2ed0d3bb2489ae9078cb589cfad2ad2e92c81ddbda48f689e5a573366eea4f54c2b3cbc6b37eaa8b442b6d935b631a992de4917268757 SHA512 d38b98db3b2d4eebd3001d88e2135b6fdbae63b200f7e900c6bb9c121dd3f170e557332bd26f237312c1cbef61666716b0cf550c2d730f86fa7cd9eb5f64a16f @@ -66,4 +68,5 @@ DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cac DIST winnow-0.6.18.crate 163357 BLAKE2B 7a43eba294c43b187211c6eabc449775081f44405045ec4786c5f10290639e18d002e872f9db14caa94e26fd99079c7ce2f99e70dcb20d842c0886ac203d8ca8 SHA512 3a146d9dc8fe3fcc855f7766852cd69c49a28f9048d553d3952d7722d49216cb44652d98b15ae1ddee99b2bbc3caefb107a9b85c309242dac943deeca65a81dc DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2 EBUILD cbindgen-0.27.0-r1.ebuild 2056 BLAKE2B ac4a9d39020c3cb9b50bda081c48d3709f7d2f169f70cbc7cafc3101a8d9fc77b4e9e045d93bdf9192c99caa03146148baaea06d559dc64e2ec5ae99b07a13c9 SHA512 a1b39e43c2b58976ee14221700fb0ed5a5a836958e349e8b71bb398161192f6f5ab6023e560955467359ce18f72481d843e5501182a889375da7f27b80ebfe12 +EBUILD cbindgen-0.28.0.ebuild 2061 BLAKE2B 881a4e2baa966e7c06e5a37056a99161ba440cc71763cb4258792e6403dab85e8be6124886bf0611a3f55bfe9598f06887853519fca1dc38afb11fab28ff089e SHA512 39acdda8aef78a5643740eff3719d7974625d570d49a715b1797cfbb1a7005981fc225476dcd6e5c54f942234f383b09ef4269a6cacb1bc3a9e96c9b4afd1844 MISC metadata.xml 336 BLAKE2B e2c5a91f198a9d49aabefa764c9a15e132c94819daf2d6282bfa883b00bc2ff69b6a475ac7739f3546afeb169d69fadbaff28803d9969f9b74fe8fead3d1e4d0 SHA512 92bd73dc605d28ff19c4b74ba3c499054d75a11dfdc3a25d4de6fd016e4d6683659eaf0459a1ed5227af2d919b876508c6da32635776a0be1b4cdefbc7f8bd27 diff --git a/dev-util/cbindgen/cbindgen-0.28.0.ebuild b/dev-util/cbindgen/cbindgen-0.28.0.ebuild new file mode 100644 index 000000000000..16c3f7423c75 --- /dev/null +++ b/dev-util/cbindgen/cbindgen-0.28.0.ebuild @@ -0,0 +1,100 @@ +# Copyright 2022-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Autogenerated by pycargoebuild 0.10 + +EAPI=8 + +CRATES=" + anstream@0.6.15 + anstyle-parse@0.2.5 + anstyle-query@1.1.1 + anstyle-wincon@3.0.4 + anstyle@1.0.8 + autocfg@1.3.0 + bitflags@2.6.0 + cfg-if@1.0.0 + clap@4.5.15 + clap_builder@4.5.15 + clap_lex@0.7.2 + colorchoice@1.0.2 + dashmap@5.5.3 + diff@0.1.13 + equivalent@1.0.1 + errno@0.3.9 + fastrand@2.1.0 + hashbrown@0.14.5 + heck@0.4.1 + indexmap@2.3.0 + is_terminal_polyfill@1.70.1 + itoa@1.0.11 + lazy_static@1.5.0 + libc@0.2.155 + linux-raw-sys@0.4.14 + lock_api@0.4.12 + log@0.4.22 + memchr@2.7.4 + once_cell@1.19.0 + parking_lot@0.12.3 + parking_lot_core@0.9.10 + pretty_assertions@1.4.0 + proc-macro2@1.0.86 + quote@1.0.36 + redox_syscall@0.5.3 + rustix@0.38.34 + ryu@1.0.18 + scopeguard@1.2.0 + serde@1.0.205 + serde_derive@1.0.205 + serde_json@1.0.122 + serde_spanned@0.6.7 + serial_test@2.0.0 + serial_test_derive@2.0.0 + smallvec@1.13.2 + strsim@0.11.1 + syn@2.0.85 + tempfile@3.12.0 + toml@0.8.19 + toml_datetime@0.6.8 + toml_edit@0.22.20 + unicode-ident@1.0.12 + utf8parse@0.2.2 + windows-sys@0.52.0 + windows-sys@0.59.0 + windows-targets@0.52.6 + windows_aarch64_gnullvm@0.52.6 + windows_aarch64_msvc@0.52.6 + windows_i686_gnu@0.52.6 + windows_i686_gnullvm@0.52.6 + windows_i686_msvc@0.52.6 + windows_x86_64_gnu@0.52.6 + windows_x86_64_gnullvm@0.52.6 + windows_x86_64_msvc@0.52.6 + winnow@0.6.18 + yansi@0.5.1 +" + +inherit cargo + +DESCRIPTION="A tool for generating C bindings to Rust code" +HOMEPAGE="https://github.com/mozilla/cbindgen/" +SRC_URI="${CARGO_CRATE_URIS} + https://github.com/mozilla/cbindgen/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MPL-2.0" +# Dependent crate licenses +LICENSE+=" + MIT Unicode-DFS-2016 + || ( Apache-2.0 Boost-1.0 ) +" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="test" + +# Needs debugging enabled and lots of other problems. +# https://github.com/mozilla/cbindgen/issues?q=is%3Aissue+is%3Aopen+test +RESTRICT="test" + +BDEPEND="test? ( dev-build/cmake )" + +QA_FLAGS_IGNORED="usr/bin/cbindgen" diff --git a/dev-util/gitlab-cli/Manifest b/dev-util/gitlab-cli/Manifest index a46e8f602983..7eb896b430ce 100644 --- a/dev-util/gitlab-cli/Manifest +++ b/dev-util/gitlab-cli/Manifest @@ -1,13 +1,4 @@ -DIST gitlab-cli-1.44.1-deps.tar.xz 18136428 BLAKE2B 9fafde045efac7a00029170ee3b9fad61b2d4cf8facb61ae11c1b6e922f5a88627e5c9dc9d127e232c7ad635b2e7a58c65a29f26b5953d5b252580596ac72030 SHA512 aa5b97b361b18cbbb03abf33ee4249ea66e4374f2ca000dcd037758770b62b3fd45d9f2837b98cf2a6507fb509a1f5e1917456663159e0238d30d743a3ec2052 -DIST gitlab-cli-1.44.1.tar.bz2 16841236 BLAKE2B 3a9ab7b0ca02c6a4a0652a268364785a6514c7bda688137947f11add4688e30ea547fe211b92a2543b765b8a82dc9ac85a7e189697bdc51c39cf62e82eaef42f SHA512 8b4bc19f78054104ae4551efacade8c2a1e86cf538dba2b31a9e7127cd6a792b8bf00d788a93aa26ba3f9a03684db0dbf67968e66d6048168cec6a512d90b18c -DIST gitlab-cli-1.46.0-deps.tar.xz 21625028 BLAKE2B c4c5c38f505e0812e2ab5490d5064815fb6b8b2d65fe21016db886959b6dee2c5ed3e2abf51a00a40b70927a9d4562e4330075809e0c2d413652f5cc33ba4be2 SHA512 9a04a6ba82c8c00124b53adfefaf4b22dbd59d085823ed44e26d7a0436c359b2e966987258206030881373302627a40b800675efbf05ed4c3558f20830aabe94 -DIST gitlab-cli-1.46.0.tar.bz2 16845037 BLAKE2B b1bbfffb0968b5245fae91a7ba0c29f7c278de06006a79f8d5b9c64acb577b5cead2a3587eb770a35d5b0fd75fc9917c078918cb51541e677b739d38ec9510e3 SHA512 c6a1a854019f21cb172dba1ce01c8a4e94d6af7ada52c1bf182bb3444fcb8f7d593eb009a2c89c078f09f7abde57443a95d2a81aa11619ebecb75bfb5ace6ada -DIST gitlab-cli-1.48.0-deps.tar.xz 21543860 BLAKE2B 7193a39b845a2afc999100f5936a9a5e8565597b51c37c9717fd38ff4799fba53ba74eb4acf9d02cd6d7247270e794976e8c0e57949881a3183f692cd32dfb96 SHA512 15c294669b61288bf9f23c312b5d29e3fb53c6dd9b2bbc4877bbcb42ad8b06cac1cb5f8b4252749bebb774f5d374b63e9e7ee89e5fefd452a81e6082c0d7091f -DIST gitlab-cli-1.48.0.tar.bz2 16863481 BLAKE2B d7ffaca8b63772dc3394d7205044f2c43c8bb58b08f3e892bd4ab169c10151dd67337847b850b7e625b4d32bf674162851664cfb81af76bb9636432439758f12 SHA512 e59d31b6fb3ebbbe989c1198b9e33bc639a46d68fffa24b5df3c1b4fe8391a5c7a9fb84a7d9dcf1989d63375ef92d964e6474203be31a2fc82509959b28075a2 DIST gitlab-cli-1.51.0-deps.tar.xz 21574644 BLAKE2B ab3309e6e1bd413a306e3c1aec172b191cd223bee3b941e1e21811951311e477e8d4118f20a89a8ee9a898eaf30d7f5ce8fc30f4eadc7ac07d7a76fe86288361 SHA512 2628b65c1f1c4c9207eba14e3c36656a724bbce48ad371a264d361fe52499eb206b35ebd43eee25e80b896d40250643d3b69dc954b70ef30ff8227fc0658c845 DIST gitlab-cli-1.51.0.tar.bz2 16865378 BLAKE2B 65091d664ec3a2148c670407c5c92dd2b64d92662255b8ba6f3911d6eb79a55ee9e5c83da2b48615de6bb996aaa361b259b359230070198250d959e2b2060e0e SHA512 dc587d8574c924c2c69502bd6028b40533f662f1ec79f93ef42e78fca41c7cde7c30fd5cbf7cd99f8d3311802048d957553082df16368608815f637d9a362af9 -EBUILD gitlab-cli-1.44.1.ebuild 767 BLAKE2B 8c3e8b2f4c1617b017c6ef7c5ae268a4adf9942391e842c58cb33dab451d524c11c5f63e1a64395bb021779f2cde5522d0cba936bc636cee903ae8f49fa70847 SHA512 60dd05ce01c09c092ac7ad2a289603b10867d61566abc639958aee7d04a00a83a4f9bef4de8fd01bd3a942c2301d2cea4e19fc0dd3d7cef1248bca70838617c5 -EBUILD gitlab-cli-1.46.0.ebuild 797 BLAKE2B d83cf7f6f12935723e14c9ccff511be663df028e70feb7955d0d5770ddab849254732afa74058c062e810024b3b31f56b62da5660c6bb76886425bd43df847b4 SHA512 3d8acce055170ce3f26c8c928a320e3351948cd58f01b254e02c0f67609f273a48fe45a689f5d4c9dfeeebe2d2c2fdb44bd732dc78bb819da41ece3c7b320872 -EBUILD gitlab-cli-1.48.0.ebuild 797 BLAKE2B 19a389482d20e99b11112fa3600bf46f55f877dc3a8e3ccbea804beb8b007f238c9833f78f03d363254fe8b9741dd83e328c5012fca96ce3a1f9a073a41305e5 SHA512 599f0f44ff2ee9c76d2c63b2fe36ce4236f9c87218d9c9d52533839c602754acc69992e1c55b24b834cd694a03f790d841f3e894b4a56770a8d7c65bed253627 EBUILD gitlab-cli-1.51.0.ebuild 797 BLAKE2B d44ab2957159ed94d9b3183de26e650c81c2be5536a7cb6f1e9caa0fe81e3057d77f3bdb6937c1d5fc390f1c08f8b9a52f03a279ba3306dce06e980b6e14821c SHA512 843349cfd41bf2c75c1cba3df6bcca77f25d4f24b096e521d0b50cb097cc198fccee74ec66320d8416b9ec4bc47c62c0f787aa3c5e4b5310554aa5ec98cdf244 MISC metadata.xml 328 BLAKE2B c15cee65978853695fcc911a6beb02ac29f8e82d7a82417989e497a0c014a2c5c2c22503cf2c099600e0885399496d0e7ce3b3590c8b8cfa0f6ecc6a63988d46 SHA512 4df241882ef7e722711132110271b672ef49913a92e9d70972857968e7d12a8403f5b19b5079fd78f3f08fb4aab8e615b51a6073db2c460aa2ae3ec31d8e3a28 diff --git a/dev-util/gitlab-cli/gitlab-cli-1.44.1.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.44.1.ebuild deleted file mode 100644 index 206794345fdb..000000000000 --- a/dev-util/gitlab-cli/gitlab-cli-1.44.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit go-module -GIT_COMMIT=bd628d4c3a01800afb00ef8586dd29904340bb68/ - -DESCRIPTION="the official gitlab command line interface" -HOMEPAGE="https://gitlab.com/gitlab-org/cli" -SRC_URI="https://gitlab.com/gitlab-org/cli/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2" -SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -# tests communicate with gitlab.com and require a personal access token -RESTRICT="test" - -S="${WORKDIR}/cli-v${PV}-${GIT_COMMIT}" - -src_compile() { - emake \ - GLAB_VERSION=v${PV} \ - build manpage -} - -src_install() { - dobin bin/glab - dodoc README.md - doman share/man/man1/* -} diff --git a/dev-util/gitlab-cli/gitlab-cli-1.46.0.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.46.0.ebuild deleted file mode 100644 index 34441e2b6f86..000000000000 --- a/dev-util/gitlab-cli/gitlab-cli-1.46.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit go-module -GIT_COMMIT=16dc43a8f0ae5c8c5310891117efaadfaa5743aa - -DESCRIPTION="the official gitlab command line interface" -HOMEPAGE="https://gitlab.com/gitlab-org/cli" -SRC_URI="https://gitlab.com/gitlab-org/cli/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2" -SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" -S="${WORKDIR}/cli-v${PV}-${GIT_COMMIT}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -BDEPEND=">=dev-lang/go-1.23.0" - -# tests communicate with gitlab.com and require a personal access token -RESTRICT="test" - -src_compile() { - emake \ - GLAB_VERSION=v${PV} \ - build manpage -} - -src_install() { - dobin bin/glab - dodoc README.md - doman share/man/man1/* -} diff --git a/dev-util/gitlab-cli/gitlab-cli-1.48.0.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.48.0.ebuild deleted file mode 100644 index 2a677734fe73..000000000000 --- a/dev-util/gitlab-cli/gitlab-cli-1.48.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit go-module -GIT_COMMIT=2db471edb1eb73439eecc04e0a6ab5acc1f32c80 - -DESCRIPTION="the official gitlab command line interface" -HOMEPAGE="https://gitlab.com/gitlab-org/cli" -SRC_URI="https://gitlab.com/gitlab-org/cli/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2" -SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" -S="${WORKDIR}/cli-v${PV}-${GIT_COMMIT}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -BDEPEND=">=dev-lang/go-1.23.2" - -# tests communicate with gitlab.com and require a personal access token -RESTRICT="test" - -src_compile() { - emake \ - GLAB_VERSION=v${PV} \ - build manpage -} - -src_install() { - dobin bin/glab - dodoc README.md - doman share/man/man1/* -} diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest index cd861da190af..523cddaf4ddb 100644 --- a/dev-util/gnome-builder/Manifest +++ b/dev-util/gnome-builder/Manifest @@ -1,6 +1,5 @@ -AUX 44.2-fix-gtk-4.12.5-build.patch 819 BLAKE2B b3288a66448467e409127d639b5374707b6e4094b09db5a396ce85242cf87033a84ac4380559df6a65b230b5ce76682a4a77a230e09df668c1a1c173d59ec6eb SHA512 66f4d72b984f1ec2a853a73d694e0f197940a5cde34665b5e50a3817b8ce8489658603381eb57eb1e36ef39184fc923a12fdb830e155dfad2ef299d91b74d93b -DIST gnome-builder-44.2.tar.xz 9788192 BLAKE2B 3e31997a840ea288db37d942aa5b5ff92dce6754a9fe5984e9e20334c7e0323835d279bee0744277cbe2f111076a932efa692d3e0e229230da3c0d782faa7442 SHA512 0e0bdf57b1467789b6fe221e484e2cce5e37dae0fe3c190db51ec0f150a0ced1eca574bebceefe4ca33d31b4f09f472a0853fce24b1ef3f5de82256fa01f6090 DIST gnome-builder-46.3.tar.xz 9102324 BLAKE2B 3c03eab7e60e4e8a4f10e165b5ae8bbc764fb102df3b594160def47720b94787f6b8d25479e0148c5369b7cf3256d5c8455cf54cf0f42c78424a5e1e17028682 SHA512 1d765f9a4da17d6c1cda688c0590d34b9fc8da8c2d427e4fde57e35b4b78b13905792da065d630d1b351d90ca25a276cc7a680c3b02fd9d5ba4c236a150325cc -EBUILD gnome-builder-44.2-r1.ebuild 9323 BLAKE2B 4c18956b02573832ca9b49d2f9d5cfc7edb8f32c0a8be2dcf9983313e957fbc8eab7960aba5259af5ade1c367076901281413d5ea1a6aa722a31021b55a2c52f SHA512 d50b4dfc948d506ef7388259ef9ed3f52ebf5d063532953940294ed73aaba8eaf73df1efbda400143fc6d0c0f1437a232f0424ed21c0b92afd4f30d8f19727a2 +DIST gnome-builder-47.2.tar.xz 10652952 BLAKE2B 93356472ff321766dec00eb26f7f5e44e66f61661f5d5d67ace2290cf1e176925e05334769665ef381fd1469d8f04c297c01d97877357e349e4f5b5ee9f3f1c1 SHA512 fa26efcede1b44bf0a7e48dffb02fb80d11399386c2be65ac39207816191fe1c59900a1200c987a9077e64caf8a8ece60899b49019452caf66dc2076de75c5ea EBUILD gnome-builder-46.3.ebuild 8979 BLAKE2B 7c16a4d275cde59702dbbc46b2c0a8e7a90f586538c59d5d78d857cbfea33cd7e1b3a730f837a1cba44315b6ab7d3f17f21538861e4343c5e0a5c10939c1bcee SHA512 bab3c616f5a47fb1d8f6a659def8bfa1e1ea5119eb8308e0128999190d5e7880ad3c52220e9dc0906489c3663d17647b7df9981063190bacd1a1daa0f3443223 +EBUILD gnome-builder-47.2.ebuild 8947 BLAKE2B 9635fb1d6811d9a35af575850298f42dc61f56fccb09a70069997c8d7d818aace30a965b93cb2d4fce06d48c25e3c20ac68330203ad1da7708892f9c844ec4ed SHA512 bf5412c0eda7fca40db1b2a4bf039e50b319d269cb130a991b259b49a88511c07448f65da2f1a6d37670735043cb25321a84eff723f3ed1d81fac027c2f975a7 MISC metadata.xml 1096 BLAKE2B 3e0bbc30b7c25d5d9141e3e8ab125c0fc5782de1425a4a35aa4fdee14af084911c72aa3ee12c72e9f5089b47d4f42fc96a76532e49a2286e80f63b9b80e4881e SHA512 3ce02fedc562bae40502c7d9485523166feff517336c3d7494850d5939dc5d93ed54e455a1dbc9c934b898cb7464bd98ee90e7b64664a28bd48017ac2bdab764 diff --git a/dev-util/gnome-builder/files/44.2-fix-gtk-4.12.5-build.patch b/dev-util/gnome-builder/files/44.2-fix-gtk-4.12.5-build.patch deleted file mode 100644 index eccf90851fb7..000000000000 --- a/dev-util/gnome-builder/files/44.2-fix-gtk-4.12.5-build.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 43a7c586b7291b5cf82febdaa80b4fe4efea8f54 Mon Sep 17 00:00:00 2001 -From: Christian Hergert -Date: Mon, 15 Jan 2024 11:54:38 -0800 -Subject: [PATCH] libide/tweaks: remove autoptr cleanup - -This is not needed now with recent GTK changes merged this morning. ---- - src/libide/tweaks/ide-tweaks-window.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/libide/tweaks/ide-tweaks-window.c b/src/libide/tweaks/ide-tweaks-window.c -index f2553a396..dcb55bb35 100644 ---- a/src/libide/tweaks/ide-tweaks-window.c -+++ b/src/libide/tweaks/ide-tweaks-window.c -@@ -32,8 +32,6 @@ - #include "ide-tweaks-panel-list-private.h" - #include "ide-tweaks-window.h" - --G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkStackPage, g_object_unref) -- - struct _IdeTweaksWindow - { - AdwWindow parent_instance; --- -2.43.0 - diff --git a/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild b/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild deleted file mode 100644 index 6471a24d65e3..000000000000 --- a/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild +++ /dev/null @@ -1,288 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -DISABLE_AUTOFORMATTING=1 -FORCE_PRINT_ELOG=1 - -inherit gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg - -DESCRIPTION="An IDE for writing GNOME-based software" -HOMEPAGE="https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder" - -# FIXME: Review licenses at some point -LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0" -SLOT="0" -KEYWORDS="amd64 ~arm64" -IUSE="clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - flatpak? ( git ) -" - -# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within. -# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking. -# The listed RDEPEND order should roughly match that output as well, with toplevel one first then sorted by file path. -# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of -# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small -# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except. - -# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2? -# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4 - -# >=gtk-4.12.5 for relying on GtkStackPage autoptr cleanup added in that version - -# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build -RDEPEND=" - >=dev-libs/glib-2.75.0:2 - >=gui-libs/gtk-4.12.5:4[introspection] - >=gui-libs/libadwaita-1.3.0:1 - >=gui-libs/libpanel-1.1.2:1 - >=gui-libs/gtksourceview-5.7.2:5[introspection] - >=dev-libs/json-glib-1.2.0 - >=dev-libs/jsonrpc-glib-3.43.0:= - >=dev-libs/libdex-0.1.1:= - >=dev-libs/libpeas-1.34.0:0[python,${PYTHON_SINGLE_USEDEP}] - dev-libs/libportal:=[gtk,introspection] - >=dev-libs/template-glib-3.36.1:=[introspection] - >=gui-libs/vte-0.70.0:2.91-gtk4[introspection] - >=dev-libs/libxml2-2.9.0 - webkit? ( >=net-libs/webkit-gtk-2.38.0:6=[introspection] ) - >=app-text/cmark-0.29.0:0= - d-spy? ( >=dev-debug/d-spy-1.4.0:1 ) - app-text/editorconfig-core-c - flatpak? ( - dev-util/ostree - >=net-libs/libsoup-3:3.0 - >=sys-apps/flatpak-1.10.2 - ) - git? ( - dev-libs/libgit2:=[ssh,threads] - >=dev-libs/libgit2-glib-1.1.0[ssh] - ) - - >=dev-libs/gobject-introspection-1.54.0:= - $(python_gen_cond_dep ' - >=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}] - ') - ${PYTHON_DEPS} - clang? ( llvm-core/clang:= ) - spell? ( - app-text/enchant:2 - dev-libs/icu:= - ) - sysprof? ( - >=dev-util/sysprof-capture-3.46.0:4 - >=dev-util/sysprof-3.46.0:0/4 - ) -" -DEPEND="${RDEPEND}" -# TODO: runtime ctags path finding.. - -# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional -# appstream-glib needed for validation with appstream-util with FEATURES=test -BDEPEND=" - doc? ( - $(python_gen_cond_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] - ') - ) - gtk-doc? ( - dev-util/gi-docgen - app-text/docbook-xml-dtd:4.3 - ) - test? ( - dev-libs/appstream-glib - sys-apps/dbus - ) - dev-util/desktop-file-utils - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide -extra capabilities beyond these expressed via USE flags. Some of these -that are currently available with packages include: - -* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for - C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic - highlighting and symbol resolving support. -* dev-python/python-lsp-server for more accurate Python - autocompletion support. -* dev-debug/valgrind for integration with valgrind. -* dev-build/meson for integration with the Meson build system. -* dev-lang/rust{,-bin} for integration with the Rust Cargo build system. -* dev-build/cmake for integration with the CMake build system. -* net-libs/nodejs[npm] for integration with the NPM package system. -' -# FIXME: Package codespell and mention here -# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important -# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..) -# jhbuild support -# rust support via rust-analyzer; Go via go-langserver -# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template -# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE -# stylelint for stylesheet (CSS and co) linting -# gvls for vala language-server integration - -PATCHES=( - "${FILESDIR}"/${PV}-fix-gtk-4.12.5-build.patch -) - -llvm_check_deps() { - has_version "llvm-core/clang:${LLVM_SLOT}" -} - -pkg_setup() { - python-single-r1_pkg_setup - use clang && llvm_pkg_setup -} - -src_prepare() { - default - - # Fails with clang due to `environ` variable name shadowing unistd.h one - sed -i -e '/-Werror=shadow/d' meson.build || die -} - -src_configure() { - local emesonargs=( - -Dchannel=other - - -Ddevelopment=false - -Dtracing=false - -Dprofiling=false # not passing -pg to CFLAGS - -Dtcmalloc=false - -Dwith_safe_path='' - -Dgnome_sdk_version=master - $(meson_use doc help) - $(meson_use gtk-doc docs) - -Dnetwork_tests=false - -Dctags_path='' - $(meson_feature webkit) - - -Dplugin_autotools=true - -Dplugin_bash_language_server=true - -Dplugin_blueprint=true - -Dplugin_buildstream=true - -Dplugin_c_pack=true - -Dplugin_cargo=true - $(meson_use clang plugin_clang) - $(meson_use clang plugin_clangd) - $(meson_use clang plugin_clang_format) - -Dplugin_cmake=true - -Dplugin_codesearch=true - -Dplugin_codeshot=true - -Dplugin_codespell=true - -Dplugin_code_index=true - -Dplugin_copyright=true - -Dplugin_ctags=true - -Dplugin_deviced=false # libdeviced not packaged? - $(meson_use d-spy plugin_dspy) - -Dplugin_dub=true - -Dplugin_editorconfig=true - -Dplugin_eslint=true - -Dplugin_file_search=true - $(meson_use flatpak plugin_flatpak) - -Dplugin_gdb=true - -Dplugin_gdiagnose=true - -Dplugin_gettext=true - $(meson_use git plugin_git) - -Dplugin_glsl_language_server=true - -Dplugin_golang=true - -Dplugin_gopls=true - -Dplugin_gradle=true - -Dplugin_grep=true - -Dplugin_hadolint=true - -Dplugin_html_completion=true - $(meson_use webkit plugin_html_preview) - -Dplugin_intelephense=true - -Dplugin_jdtls=true - -Dplugin_jedi_language_server=false - -Dplugin_jhbuild=true - -Dplugin_lua_language_server=true - -Dplugin_make=true - -Dplugin_make_templates=true - $(meson_use webkit plugin_markdown_preview) - $(meson_use webkit plugin_markdown_indenter) - -Dplugin_maven=true - -Dplugin_meson=true - -Dplugin_meson_templates=true - -Dplugin_modelines=true - -Dplugin_mono=true - -Dplugin_newcomers=true - -Dplugin_notification=true - -Dplugin_npm=true - -Dplugin_phpize=true - -Dplugin_podman=true - -Dplugin_pygi=true - -Dplugin_python_lsp_server=true - -Dplugin_qemu=true - -Dplugin_quick_highlight=true - -Dplugin_retab=true - -Dplugin_rstcheck=true - -Dplugin_rubocop=true - -Dplugin_rust_analyzer=false # rust-analyzer not packaged - -Dplugin_serve_d=true - -Dplugin_shellcheck=true - -Dplugin_shellcmd=true - -Dplugin_sourcekit_lsp=true - $(meson_use spell plugin_spellcheck) - $(meson_use webkit plugin_sphinx_preview) - -Dplugin_stylelint=true - -Dplugin_swift=true - -Dplugin_swiftformat=true - -Dplugin_swiftlint=true - $(meson_use sysprof plugin_sysprof) - -Dplugin_todo=true - -Dplugin_ts_language_server=true - -Dplugin_update_manager=true - -Dplugin_valac=true - -Dplugin_vala_indenter=true - -Dplugin_vala_language_server=true - -Dplugin_valgrind=true - -Dplugin_waf=true - -Dplugin_words=true - -Dplugin_xml_pack=true - -Dplugin_zls=true - ) - meson_src_configure -} - -src_install() { - meson_src_install - python_optimize - if use doc; then - rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die - rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die - # custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825 - mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die - # _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is. - rmdir "${ED}"/usr/share/doc/gnome-builder/ || die - fi - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - readme.gentoo_print_elog - - optfeature_header "Language support" - optfeature "Rust's Cargo build system" dev-lang/rust dev-lang/rust-bin - optfeature "CMake" dev-build/cmake - optfeature "Java Maven build system" dev-java/maven-bin - optfeature "Meson Build system" dev-build/meson -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} - -src_test() { - virtx dbus-run-session meson test -C "${BUILD_DIR}" -} diff --git a/dev-util/gnome-builder/gnome-builder-47.2.ebuild b/dev-util/gnome-builder/gnome-builder-47.2.ebuild new file mode 100644 index 000000000000..339ac0b1696b --- /dev/null +++ b/dev-util/gnome-builder/gnome-builder-47.2.ebuild @@ -0,0 +1,273 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..13} ) +DISABLE_AUTOFORMATTING=1 +FORCE_PRINT_ELOG=1 + +inherit gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg + +DESCRIPTION="An IDE for writing GNOME-based software" +HOMEPAGE="https://apps.gnome.org/Builder/ https://gitlab.gnome.org/GNOME/gnome-builder" + +# FIXME: Review licenses at some point +LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + flatpak? ( git ) +" + +# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within. +# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking. +# The listed RDEPEND order should roughly match that output as well, with toplevel one first then sorted by file path. +# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of +# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small +# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except. + +# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2? +# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4 + +# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build +RDEPEND=" + >=dev-libs/glib-2.75:2 + >=gui-libs/gtk-4.15.5:4[introspection] + >=gui-libs/libadwaita-1.6_alpha:1 + >=gui-libs/libpanel-1.7.0:1 + >=gui-libs/gtksourceview-5.8:5[introspection] + >=dev-libs/json-glib-1.2.0 + >=dev-libs/jsonrpc-glib-3.43.0:= + >=dev-libs/libdex-0.7:= + >=dev-libs/libpeas-1.99.0:2[python,${PYTHON_SINGLE_USEDEP}] + dev-libs/libportal:=[gtk,introspection] + >=dev-libs/template-glib-3.36.1:=[introspection] + >=gui-libs/vte-0.75.0:2.91-gtk4[introspection] + >=dev-libs/libxml2-2.9.0 + webkit? ( >=net-libs/webkit-gtk-2.38.0:6=[introspection] ) + >=app-text/cmark-0.29.0:0= + app-text/editorconfig-core-c + flatpak? ( + dev-util/ostree + >=net-libs/libsoup-3:3.0 + >=sys-apps/flatpak-1.10.2 + ) + git? ( + dev-libs/libgit2:=[ssh,threads] + >=dev-libs/libgit2-glib-1.1.0[ssh] + ) + + >=dev-libs/gobject-introspection-1.74.0:= + ${PYTHON_DEPS} + clang? ( llvm-core/clang:= ) + spell? ( + >=app-text/libspelling-0.3 + ) + sysprof? ( + >=dev-util/sysprof-45.0[gtk] + ) +" +DEPEND="${RDEPEND}" +# TODO: runtime ctags path finding.. + +# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional +# appstream-glib needed for validation with appstream-util with FEATURES=test +BDEPEND=" + doc? ( + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] + ') + ) + gtk-doc? ( + dev-util/gi-docgen + app-text/docbook-xml-dtd:4.3 + ) + test? ( + dev-libs/appstream-glib + sys-apps/dbus + ) + dev-util/desktop-file-utils + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide +extra capabilities beyond these expressed via USE flags. Some of these +that are currently available with packages include: + +* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for + C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic + highlighting and symbol resolving support. +* dev-python/python-lsp-server for more accurate Python + autocompletion support. +* dev-debug/valgrind for integration with valgrind. +* dev-build/meson for integration with the Meson build system. +* dev-lang/rust{,-bin} for integration with the Rust Cargo build system. +* dev-build/cmake for integration with the CMake build system. +* net-libs/nodejs[npm] for integration with the NPM package system. +' +# FIXME: Package codespell and mention here +# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important +# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..) +# jhbuild support +# rust support via rust-analyzer; Go via go-langserver +# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template +# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE +# stylelint for stylesheet (CSS and co) linting +# gvls for vala language-server integration + +llvm_check_deps() { + has_version "llvm-core/clang:${LLVM_SLOT}" +} + +pkg_setup() { + python-single-r1_pkg_setup + use clang && llvm_pkg_setup +} + +src_configure() { + local emesonargs=( + -Dchannel=other + + -Ddevelopment=false + -Dtracing=false + -Dprofiling=false # not passing -pg to CFLAGS + -Dtcmalloc=false + -Dwith_safe_path='' + -Dgnome_sdk_version=master + $(meson_use doc help) + $(meson_use gtk-doc docs) + -Dnetwork_tests=false + -Dctags_path='' + $(meson_feature webkit) + + -Dplugin_autotools=true + -Dplugin_bash_language_server=true + -Dplugin_blueprint=true + -Dplugin_buildstream=true + -Dplugin_c_pack=true + -Dplugin_cargo=true + $(meson_use clang plugin_clang) + $(meson_use clang plugin_clangd) + $(meson_use clang plugin_clang_format) + -Dplugin_cmake=true + -Dplugin_codesearch=true + -Dplugin_codeshot=true + -Dplugin_codespell=true + -Dplugin_code_index=true + -Dplugin_copyright=true + -Dplugin_ctags=true + -Dplugin_deviced=false # libdeviced not packaged? + $(meson_use d-spy plugin_dspy) + -Dplugin_dub=true + -Dplugin_editorconfig=true + -Dplugin_elixir_ls=true + -Dplugin_eslint=true + -Dplugin_file_search=true + $(meson_use flatpak plugin_flatpak) + -Dplugin_flake8=true + -Dplugin_gdb=true + -Dplugin_gdiagnose=true + -Dplugin_gettext=true + $(meson_use git plugin_git) + -Dplugin_glsl_language_server=true + -Dplugin_golang=true + -Dplugin_gopls=true + -Dplugin_gradle=true + -Dplugin_grep=true + -Dplugin_hadolint=true + -Dplugin_html_completion=true + $(meson_use webkit plugin_html_preview) + -Dplugin_intelephense=true + -Dplugin_jdtls=true + -Dplugin_jedi_language_server=false + -Dplugin_jhbuild=true + -Dplugin_lua_language_server=true + -Dplugin_make=true + -Dplugin_make_templates=true + -Dplugin_manuals=false + $(meson_use webkit plugin_markdown_preview) + $(meson_use webkit plugin_markdown_indenter) + -Dplugin_maven=true + -Dplugin_meson=true + -Dplugin_mesonlsp=true + -Dplugin_meson_templates=true + -Dplugin_modelines=true + -Dplugin_mono=true + -Dplugin_newcomers=true + -Dplugin_notification=true + -Dplugin_npm=true + -Dplugin_phpize=true + -Dplugin_podman=true + -Dplugin_pygi=true + -Dplugin_python_lsp_server=true + -Dplugin_qemu=true + -Dplugin_quick_highlight=true + -Dplugin_retab=true + -Dplugin_rstcheck=true + -Dplugin_rubocop=true + -Dplugin_rust_analyzer=false # rust-analyzer not packaged + -Dplugin_serve_d=true + -Dplugin_shellcheck=true + -Dplugin_shellcmd=true + -Dplugin_sourcekit_lsp=true + $(meson_use spell plugin_spellcheck) + $(meson_use webkit plugin_sphinx_preview) + -Dplugin_stylelint=true + -Dplugin_swift=true + -Dplugin_swiftformat=true + -Dplugin_swiftlint=true + $(meson_use sysprof plugin_sysprof) + -Dplugin_todo=true + -Dplugin_ts_language_server=true + -Dplugin_update_manager=true + -Dplugin_valac=true + -Dplugin_vala_indenter=true + -Dplugin_vala_language_server=true + -Dplugin_valgrind=true + -Dplugin_waf=true + -Dplugin_words=true + -Dplugin_xml_pack=true + -Dplugin_zls=true + ) + meson_src_configure +} + +src_install() { + meson_src_install + python_optimize + if use doc; then + rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die + rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die + # custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825 + mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die + # _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is. + rmdir "${ED}"/usr/share/doc/gnome-builder/ || die + fi + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + readme.gentoo_print_elog + + optfeature_header "Language support" + optfeature "Rust's Cargo build system" dev-lang/rust dev-lang/rust-bin + optfeature "CMake" dev-build/cmake + optfeature "Java Maven build system" dev-java/maven-bin + optfeature "Meson Build system" dev-build/meson +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} + +src_test() { + virtx dbus-run-session meson test -C "${BUILD_DIR}" +} diff --git a/dev-util/imediff/Manifest b/dev-util/imediff/Manifest new file mode 100644 index 000000000000..0342624fd2b5 --- /dev/null +++ b/dev-util/imediff/Manifest @@ -0,0 +1,6 @@ +AUX 1.1.2.1-python-3.patch 5273 BLAKE2B cb2be2f11021d61f998d228d26cfad956ec3c6d18aeafb7ece82d5f3de1e624776033746a51542b601d3ab94db2d57aece68315f772d8299f22b2010d2151905 SHA512 212cb76362c8243824d16f514a2dafc0c746467454c463e34f1840022d4a988874878e544ee944726947a287e5db27a78d2b99b790a78f4188d10ed9e2eaaea5 +DIST imediff-3.3.1.tar.gz 98813 BLAKE2B af578358bd8670b15378879487cb7ee2096d0984251d39d4bb3cdd025794035a8a7e3f633afe80bf5805681614269abf6e03dae248b91470450d93e06256c885 SHA512 598cd499b757bd5f0255c5db909ffccce5ece3979af25a7919b9ad187744e89f321d6a97634dba3fa29fe7f0712212e3d16b7dabf9abf3d84893a7d30feec71b +DIST imediff2_1.1.2.1.orig.tar.gz 20393 BLAKE2B 560eef8600bac8ad302907563bd8520ef7881009c8a35c74427d0d5d9e8d4303446f1eb39c01fec201c798f286023765776a84b1e1aaa9e2d585a45870375f16 SHA512 ad0e22f5f2f16efb976a0d6d16c34798cc8aace4251a99cb7764df6841f93c2a6bb9dc8cbb59d8f3ae5a5ad7c161a05b9c3c7b36cc7bdf98eac3ef3b735ef6c4 +EBUILD imediff-1.1.2.1.ebuild 802 BLAKE2B 4bb095a3d032320385cc2b58b0a3273697107e0abeb958c42f677b8ee1b160ba73e43831fce24447dd686bdbb10d142d8feb340e66822b0bfd2c1ed6be23f8c5 SHA512 8c5a2a1bfbe82a00fff75afb5dcfaa07f82923d6a8fa87e3386e51262b603a09e409702f3d2ada199c28625e3c3eb8c2699486966de8d7993208991aa497e2e1 +EBUILD imediff-3.3.1.ebuild 868 BLAKE2B f53f9f764b6fe0a24cbeaafffd7281062a5a7edf7778300cf27a4095b70e4f6efe93c03c3afc45daf630bbab144890d1f85ad21115641f64fe69971c8a1a8508 SHA512 bd7bf7055cd66008484a333c0847607ead7aeba04986d80bd501c06e8e1a1bbe6ef6ceb44f2fbd669f87d4388c12f88bac976c12c450968e557c363cb108dd9a +MISC metadata.xml 274 BLAKE2B c12371b16b18c652b34dd07d73ec99c13ec413416e1ad91a88e560b5cda4e85a97f452e023c13a1a91e96d2741cbcd991c8ddd2a29686c7f6ac71a7ca4f5d6c8 SHA512 6d56009523ef3daf8e21c25045f97cc821852d12ae3ce220d9b51b61bedc37130ddfb20355b54101762af349d3c5fd383624300e1fa511840441427fd17075ae diff --git a/dev-util/imediff/files/1.1.2.1-python-3.patch b/dev-util/imediff/files/1.1.2.1-python-3.patch new file mode 100644 index 000000000000..aa26ad7f9dbb --- /dev/null +++ b/dev-util/imediff/files/1.1.2.1-python-3.patch @@ -0,0 +1,157 @@ +diff -aurN a/imediff2 b/imediff2 +--- a/imediff2 2018-10-20 13:36:19.000000000 -0400 ++++ b/imediff2 2021-03-03 10:03:31.121774492 -0500 +@@ -167,19 +167,19 @@ + def read_lines( filename ): + global assume_empty + try: +- fp = file( filename ) ++ fp = open( filename ) + l = fp.readlines() + fp.close() + return l +- except IOError, (error, message): +- if error == errno.ENOENT and assume_empty: ++ except IOError as e: ++ if e.errno == errno.ENOENT and assume_empty: + return "" + else: +- sys.stderr.write(_("Could not read '%s': %s\n") % (filename, message)) ++ sys.stderr.write(_("Could not read '%s': %s\n") % (filename, e.strerror)) + sys.exit(3) + + def strip_end_lines( txt ): +- return string.replace(string.replace(txt,"%c"%10,""),"%c"%13,"") ++ return txt.replace("%c"%10,"").replace("%c"%13,"") + + def main(stdscr, lines_a, lines_b, start_mode): + global sel, active_chunks, x,y, lines, textpad, contw,conth +@@ -283,7 +283,7 @@ + active_chunks.append( [j, j+len(line_list), i] ) + + for l in line_list: +- lines.append( [string.expandtabs(strip_end_lines(l)), ++ lines.append( [strip_end_lines(l).expandtabs(), + decor, color_pair] ) + j+=1 + +@@ -332,9 +332,9 @@ + def sel_next( dir ): + global sel, active_chunks + if dir == 'up': +- rng = range(sel-1, -1, -1) ++ rng = list(range(sel-1, -1, -1)) + else: +- rng = range(sel+1, len(active_chunks)) ++ rng = list(range(sel+1, len(active_chunks))) + for j in rng: + if active_chunks[j][1] > y and active_chunks[j][0] < y+winh: + sel = j +@@ -487,7 +487,7 @@ + elif c == ord('h') or c == ord('?') or c == curses.KEY_HELP: + helpw = 0 + helph = 0 +- for l in string.split(helptext(), "%c"%10): ++ for l in helptext().split("%c"%10): + helpw = max(helpw, len(l)) + helph += 1 + helppad = curses.newpad(helph+2, helpw+2) +@@ -502,7 +502,7 @@ + elif c == ord('q') or c == curses.KEY_CANCEL: + quitw = 0 + quith = 0 +- for l in string.split(quittext(), "%c"%10): ++ for l in quittext().split("%c"%10): + quitw = max(quitw, len(l)) + quith += 1 + quitpad = curses.newpad(quith+2, quitw+2) +@@ -571,33 +571,33 @@ + try: + opts, args = getopt.getopt(sys.argv[1:], "hmuo:abcNtV", + ["help","mono","unresolved","output=", "template", "version", "new-file"]) +-except getopt.GetoptError, e: +- print _("Error: ") + str(e) +- print usagetext() ++except getopt.GetoptError as e: ++ print((_("Error: ") + str(e))) ++ print(usagetext()) + sys.exit(2) + + for o, a in opts: + if o in ("-h", "--help"): +- print usagetext() ++ print((usagetext())) + sys.exit() + elif o in ("-t", "--template"): + try: + with open(config_file, 'w') as f: +- print >>f, "# Configuration for imediff2: (Erase this file to reset)" +- print >>f, "# " +- print >>f, "# edit only first character of each line to 'a'...'z'" +- print >>f, "#" ++ print(("# Configuration for imediff2: (Erase this file to reset)"), file=f) ++ print(("# "), file=f) ++ print(("# edit only first character of each line to 'a'...'z'"), file=f) ++ print(("#"), file=f) + for k in kcvalues: +- print >>f, "%s %s" % (k , k) ++ print(("%s %s" % (k , k)), file=f) + except: +- print "%s not writable, aborting" % config_file ++ print(("%s not writable, aborting" % config_file)) + sys.exit() + elif o in ("-V", "--version"): +- print "%s %s" % (PACKAGE, VERSION) ++ print(("%s %s" % (PACKAGE, VERSION))) + sys.exit() + + if len(args)<2: +- print usagetext() ++ print((usagetext())) + sys.exit(2) + + for o, a in opts: +@@ -692,14 +695,14 @@ + assert( not editor is None ) + try: + (of, of_name) = tempfile.mkstemp(prefix='imediff2') +- os.write( of, output ) ++ os.write( of, output.encode() ) + os.close(of) + time.sleep(0.1) # make the change visible - many editor look a lot like imediff2 + editor_ret = os.system('%s %s' % (editor, of_name)) + time.sleep(0.1) + if editor_ret == 0: + new_b_lines = read_lines(of_name) +- if string.join(new_b_lines, '') == output: ++ if ''.join(new_b_lines) == output: + chunk_mode = 'old' + elif new_b_lines != lines_a: + lines_b = new_b_lines +@@ -707,8 +710,8 @@ + else: + chunks = 'old' + os.unlink(of_name) +- except IOError, (error, message): +- sys.stderr.write(_("Could not write to '%s': %s\n") % (of_name, message)); ++ except IOError as e: ++ sys.stderr.write(_("Could not write to '%s': %s\n") % (of_name, e.strerror)); + + if not launch_editor: + break +@@ -719,11 +722,11 @@ + else: + try: + if ofile is not None: +- of = file(ofile, 'wb') +- of.write( output ) ++ of = open(ofile, 'wb') ++ of.write( output.encode() ) + of.close() + sys.exit(0) +- except IOError, (error, message): +- sys.stderr.write(_("Could not write to '%s': %s\n") % (ofile, message)); ++ except IOError as e: ++ sys.stderr.write(_("Could not write to '%s': %s\n") % (ofile, e.strerror)); + + sys.exit(3) diff --git a/dev-util/imediff/imediff-1.1.2.1.ebuild b/dev-util/imediff/imediff-1.1.2.1.ebuild new file mode 100644 index 000000000000..6afd7b40665a --- /dev/null +++ b/dev-util/imediff/imediff-1.1.2.1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_REQ_USE="ncurses" + +inherit python-single-r1 + +MY_PN="${PN}2" +MY_P="${MY_PN}_${PV}" + +DESCRIPTION="2-way/3-way merge tool (CLI, Ncurses)" +HOMEPAGE="https://github.com/osamuaoki/imediff" +SRC_URI="mirror://debian/pool/main/i/${MY_PN}/${MY_P}.orig.tar.gz" + +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 x86" + +DEPEND="${PYTHON_DEPS}" +RDEPEND="${DEPEND}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +PATCHES=( "${FILESDIR}/${PV}-python-3.patch" ) + +src_compile() { + # Otherwise the docs get regenerated :) + : +} + +src_install() { + python_doscript imediff2 + dobin git-ime + dodoc AUTHORS README.md + doman imediff2.1 git-ime.1 +} diff --git a/dev-util/imediff/imediff-3.3.1.ebuild b/dev-util/imediff/imediff-3.3.1.ebuild new file mode 100644 index 000000000000..e4c8e702aa50 --- /dev/null +++ b/dev-util/imediff/imediff-3.3.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_REQ_USE="ncurses" + +inherit distutils-r1 + +DESCRIPTION="2-way/3-way merge tool (CLI, Ncurses)" +HOMEPAGE="https://github.com/osamuaoki/imediff" +SRC_URI="https://github.com/osamuaoki/${PN}/archive/upstream/${PV}.tar.gz -> ${P}.tar.gz" + +S="${WORKDIR}/${PN}-upstream-${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="${PYTHON_DEPS}" +RDEPEND="${DEPEND}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +distutils_enable_tests unittest + +src_install() { + distutils-r1_src_install + rm "${ED}"/usr/bin/imediff_install || die + python_doscript "${ED}"/usr/bin/imediff + newbin usr/bin/git-ime.in git-ime + doman usr/share/man/man1/imediff.1 usr/share/man/man1/git-ime.1 +} diff --git a/dev-util/imediff/metadata.xml b/dev-util/imediff/metadata.xml new file mode 100644 index 000000000000..c27b2d8278c5 --- /dev/null +++ b/dev-util/imediff/metadata.xml @@ -0,0 +1,9 @@ + + + + + + osamuaoki/imediff + + + diff --git a/dev-util/imediff2/Manifest b/dev-util/imediff2/Manifest deleted file mode 100644 index 27f22e9a5b33..000000000000 --- a/dev-util/imediff2/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX 1.1.2.1-python-3.patch 5273 BLAKE2B cb2be2f11021d61f998d228d26cfad956ec3c6d18aeafb7ece82d5f3de1e624776033746a51542b601d3ab94db2d57aece68315f772d8299f22b2010d2151905 SHA512 212cb76362c8243824d16f514a2dafc0c746467454c463e34f1840022d4a988874878e544ee944726947a287e5db27a78d2b99b790a78f4188d10ed9e2eaaea5 -DIST imediff2_1.1.2.1.orig.tar.gz 20393 BLAKE2B 560eef8600bac8ad302907563bd8520ef7881009c8a35c74427d0d5d9e8d4303446f1eb39c01fec201c798f286023765776a84b1e1aaa9e2d585a45870375f16 SHA512 ad0e22f5f2f16efb976a0d6d16c34798cc8aace4251a99cb7764df6841f93c2a6bb9dc8cbb59d8f3ae5a5ad7c161a05b9c3c7b36cc7bdf98eac3ef3b735ef6c4 -EBUILD imediff2-1.1.2.1.ebuild 795 BLAKE2B f140ecd37f079aba6dd47f3278610d7d3d8014ef48fdce46840d5c6412424ca9f88183cf4b471eeac7809a074bc961d56ece8c2c92d73dfe91fb46c0b24a6338 SHA512 1a7fab32bc28e5c8ffbdef716024fb9e9e6b5238e11c6cc763f871e38e0e4fd5cc353e1adb844fa4d367c801435337aa454fce44e047600d794fcb3b213c75e5 -MISC metadata.xml 274 BLAKE2B c12371b16b18c652b34dd07d73ec99c13ec413416e1ad91a88e560b5cda4e85a97f452e023c13a1a91e96d2741cbcd991c8ddd2a29686c7f6ac71a7ca4f5d6c8 SHA512 6d56009523ef3daf8e21c25045f97cc821852d12ae3ce220d9b51b61bedc37130ddfb20355b54101762af349d3c5fd383624300e1fa511840441427fd17075ae diff --git a/dev-util/imediff2/files/1.1.2.1-python-3.patch b/dev-util/imediff2/files/1.1.2.1-python-3.patch deleted file mode 100644 index aa26ad7f9dbb..000000000000 --- a/dev-util/imediff2/files/1.1.2.1-python-3.patch +++ /dev/null @@ -1,157 +0,0 @@ -diff -aurN a/imediff2 b/imediff2 ---- a/imediff2 2018-10-20 13:36:19.000000000 -0400 -+++ b/imediff2 2021-03-03 10:03:31.121774492 -0500 -@@ -167,19 +167,19 @@ - def read_lines( filename ): - global assume_empty - try: -- fp = file( filename ) -+ fp = open( filename ) - l = fp.readlines() - fp.close() - return l -- except IOError, (error, message): -- if error == errno.ENOENT and assume_empty: -+ except IOError as e: -+ if e.errno == errno.ENOENT and assume_empty: - return "" - else: -- sys.stderr.write(_("Could not read '%s': %s\n") % (filename, message)) -+ sys.stderr.write(_("Could not read '%s': %s\n") % (filename, e.strerror)) - sys.exit(3) - - def strip_end_lines( txt ): -- return string.replace(string.replace(txt,"%c"%10,""),"%c"%13,"") -+ return txt.replace("%c"%10,"").replace("%c"%13,"") - - def main(stdscr, lines_a, lines_b, start_mode): - global sel, active_chunks, x,y, lines, textpad, contw,conth -@@ -283,7 +283,7 @@ - active_chunks.append( [j, j+len(line_list), i] ) - - for l in line_list: -- lines.append( [string.expandtabs(strip_end_lines(l)), -+ lines.append( [strip_end_lines(l).expandtabs(), - decor, color_pair] ) - j+=1 - -@@ -332,9 +332,9 @@ - def sel_next( dir ): - global sel, active_chunks - if dir == 'up': -- rng = range(sel-1, -1, -1) -+ rng = list(range(sel-1, -1, -1)) - else: -- rng = range(sel+1, len(active_chunks)) -+ rng = list(range(sel+1, len(active_chunks))) - for j in rng: - if active_chunks[j][1] > y and active_chunks[j][0] < y+winh: - sel = j -@@ -487,7 +487,7 @@ - elif c == ord('h') or c == ord('?') or c == curses.KEY_HELP: - helpw = 0 - helph = 0 -- for l in string.split(helptext(), "%c"%10): -+ for l in helptext().split("%c"%10): - helpw = max(helpw, len(l)) - helph += 1 - helppad = curses.newpad(helph+2, helpw+2) -@@ -502,7 +502,7 @@ - elif c == ord('q') or c == curses.KEY_CANCEL: - quitw = 0 - quith = 0 -- for l in string.split(quittext(), "%c"%10): -+ for l in quittext().split("%c"%10): - quitw = max(quitw, len(l)) - quith += 1 - quitpad = curses.newpad(quith+2, quitw+2) -@@ -571,33 +571,33 @@ - try: - opts, args = getopt.getopt(sys.argv[1:], "hmuo:abcNtV", - ["help","mono","unresolved","output=", "template", "version", "new-file"]) --except getopt.GetoptError, e: -- print _("Error: ") + str(e) -- print usagetext() -+except getopt.GetoptError as e: -+ print((_("Error: ") + str(e))) -+ print(usagetext()) - sys.exit(2) - - for o, a in opts: - if o in ("-h", "--help"): -- print usagetext() -+ print((usagetext())) - sys.exit() - elif o in ("-t", "--template"): - try: - with open(config_file, 'w') as f: -- print >>f, "# Configuration for imediff2: (Erase this file to reset)" -- print >>f, "# " -- print >>f, "# edit only first character of each line to 'a'...'z'" -- print >>f, "#" -+ print(("# Configuration for imediff2: (Erase this file to reset)"), file=f) -+ print(("# "), file=f) -+ print(("# edit only first character of each line to 'a'...'z'"), file=f) -+ print(("#"), file=f) - for k in kcvalues: -- print >>f, "%s %s" % (k , k) -+ print(("%s %s" % (k , k)), file=f) - except: -- print "%s not writable, aborting" % config_file -+ print(("%s not writable, aborting" % config_file)) - sys.exit() - elif o in ("-V", "--version"): -- print "%s %s" % (PACKAGE, VERSION) -+ print(("%s %s" % (PACKAGE, VERSION))) - sys.exit() - - if len(args)<2: -- print usagetext() -+ print((usagetext())) - sys.exit(2) - - for o, a in opts: -@@ -692,14 +695,14 @@ - assert( not editor is None ) - try: - (of, of_name) = tempfile.mkstemp(prefix='imediff2') -- os.write( of, output ) -+ os.write( of, output.encode() ) - os.close(of) - time.sleep(0.1) # make the change visible - many editor look a lot like imediff2 - editor_ret = os.system('%s %s' % (editor, of_name)) - time.sleep(0.1) - if editor_ret == 0: - new_b_lines = read_lines(of_name) -- if string.join(new_b_lines, '') == output: -+ if ''.join(new_b_lines) == output: - chunk_mode = 'old' - elif new_b_lines != lines_a: - lines_b = new_b_lines -@@ -707,8 +710,8 @@ - else: - chunks = 'old' - os.unlink(of_name) -- except IOError, (error, message): -- sys.stderr.write(_("Could not write to '%s': %s\n") % (of_name, message)); -+ except IOError as e: -+ sys.stderr.write(_("Could not write to '%s': %s\n") % (of_name, e.strerror)); - - if not launch_editor: - break -@@ -719,11 +722,11 @@ - else: - try: - if ofile is not None: -- of = file(ofile, 'wb') -- of.write( output ) -+ of = open(ofile, 'wb') -+ of.write( output.encode() ) - of.close() - sys.exit(0) -- except IOError, (error, message): -- sys.stderr.write(_("Could not write to '%s': %s\n") % (ofile, message)); -+ except IOError as e: -+ sys.stderr.write(_("Could not write to '%s': %s\n") % (ofile, e.strerror)); - - sys.exit(3) diff --git a/dev-util/imediff2/imediff2-1.1.2.1.ebuild b/dev-util/imediff2/imediff2-1.1.2.1.ebuild deleted file mode 100644 index e2e1bb5b5818..000000000000 --- a/dev-util/imediff2/imediff2-1.1.2.1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_REQ_USE="ncurses" - -inherit python-single-r1 - -MY_P="${PN}_${PV}" - -DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode" -HOMEPAGE="https://github.com/osamuaoki/imediff" -SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" - -DEPEND="${PYTHON_DEPS}" -RDEPEND="${DEPEND}" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -#S="${WORKDIR}/${PN}" - -PATCHES=( "${FILESDIR}/${PV}-python-3.patch" ) - -src_compile() { - # Otherwise the docs get regenerated :) - : -} - -src_install() { - python_doscript imediff2 - dobin git-ime - dodoc AUTHORS README.md - doman imediff2.1 git-ime.1 -} diff --git a/dev-util/imediff2/metadata.xml b/dev-util/imediff2/metadata.xml deleted file mode 100644 index c27b2d8278c5..000000000000 --- a/dev-util/imediff2/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - osamuaoki/imediff - - - diff --git a/dev-util/stressapptest/Manifest b/dev-util/stressapptest/Manifest index a28fe46c64f8..41a6415357ee 100644 --- a/dev-util/stressapptest/Manifest +++ b/dev-util/stressapptest/Manifest @@ -1,5 +1,3 @@ DIST stressapptest-1.0.11.tar.gz 230797 BLAKE2B 0b1a3cb999c3f7042ecdfc49e118d8abfb28367e9e53a646fe1c89441446b725231997321ecc599b78313a1100df31bf2057f9a60092234597cf633b8520ecd5 SHA512 4d4a1d018e03a857af16773238323a1fddaf2babde491249e80e2644bffa2673bee9a9f2c97931eda04cb9481bffe4434c0986d3660bd5d922955e7c76376597 -DIST stressapptest-1.0.9.tar.gz 219517 BLAKE2B 58fdb60b924bedd526cf31ed47a56cf4cca288abb43054fc6de5379ec2c6ea705c92eec1ef657274949009e40e8fa82ee9cc6e1bda2ef160a894ba95519fcfd8 SHA512 2680b9a4e148a2fe0cb7758ffde7624c8874bbae1e7650bb4df6916512be5949996da16d52f530b237fe4c6122fa9bb2d35b11092d106f59d614b44eec250595 EBUILD stressapptest-1.0.11.ebuild 604 BLAKE2B cbddcdb120e2be0265b0da5767ce5ddcd111c5717c4efe23d4ba5703c5bf6f649fa74488208aeec7bdd7c3249b13f68cb41427c340a193bbe94fd26c26844aa0 SHA512 b46f590339fd88164ffed49b6572792aa4d15ba784a3b63ba361de67d0fd4f8dc64e2abc7bb7c10105561c4958d98448d3c6dfdc814b21576423b2f1c87b564c -EBUILD stressapptest-1.0.9-r1.ebuild 604 BLAKE2B 664a5dfa7f44ae725f7531b3d2ae4134a5eb37e0f98c6974b183e0987fa834b8cd4caaf06ee39ca29a3847af0375aff00a09c5121a4e6e96568ca19e90645d27 SHA512 5adc5d65a6a6723ad074e03af7fc6ab0ad38a989e14b023fe8f8a8179c405f39c860739b297a12e116d889e043d80cba0f4be4480687bfa0ea4f3edf60b2dd54 MISC metadata.xml 260 BLAKE2B 11fec346d7e2540f6b618fdc45bc473451df4936b6134c7692772d2ffd177c648fd2fb54e1b7fc72625db0e245bd6de0ea0cd6149a971608eb9f25eb22052e8f SHA512 10f2b29277b481062a7303ebc085b24a2b970c373ce12ceac44acdcf96e20b30b87a3a8862678572058527fe48f2a2046889be780bb48b9505e5939c34505c34 diff --git a/dev-util/stressapptest/stressapptest-1.0.9-r1.ebuild b/dev-util/stressapptest/stressapptest-1.0.9-r1.ebuild deleted file mode 100644 index 7a237d62e478..000000000000 --- a/dev-util/stressapptest/stressapptest-1.0.9-r1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic - -DESCRIPTION="Stressful Application Test" -HOMEPAGE="https://github.com/stressapptest/stressapptest" -SRC_URI="https://github.com/stressapptest/stressapptest/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~x86" -IUSE="debug" - -RDEPEND="dev-libs/libaio" -DEPEND="${RDEPEND}" - -src_configure() { - # Matches the configure & sat.cc logic - use debug || append-cppflags -DNDEBUG -DCHECKOPTS - econf --disable-default-optimizations -} -- cgit v1.2.3