millerson.name/gentoo
2
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2025-12-10 00:10:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI 2025-12-02 06:45:48 +00:00
commit e902f677f3
No known key found for this signature in database
GPG Key ID: 7C2AC09CD98F2EDF
13 changed files with 179 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app-emulation/wine-mono/Manifest
View File

@ -1,17 +1,13 @@
DIST wine-mono-10.0.0-x86.msi 84493824 BLAKE2B 013d38f30525295d83f430650269bdab12e73d8c7cf5084882eb7a4c4dd4fcca895128d51467154d94597ca67526696e55107bc8ed7418fc248ea2e20553195a SHA512 4238cef9a42b75fd8fc39ae042594266da971f00cb3f91d9bcb5e39454be7f9db403fd9f71c3d731fb692e5e25578a790723e2eac6a4cfbc34156e3c4cf4fb65
DIST wine-mono-10.0.0-x86.tar.xz 38907080 BLAKE2B a7efb7e9e3c03a92f3fc2c66172a2597ab4febfbf23a98c20d9ba46c48f0b96f568b21ea61f43cfa0cbbad2557cfafd665b63f3115611f0df9dd75ab358ecf43 SHA512 e7e5867d34b64a9603fb919280d31cc3ae726fcfd22b4972bbfeda470aaddeb618b50f7d63b0a0ea15fd40f7d5e242c335bd84504a67d4e49b457591741acf5c
DIST wine-mono-10.1.0-x86.msi 85491712 BLAKE2B f95777cc65ccd445aefb1f5e948505deab59654f588fbb88b782f0afb4c6a08df820401a49748f4887dc9a65667076c147c0ff100687d2be8cfd2035fc38b1e8 SHA512 51b740091b0cc33da30dac933796cafe10bc43891cafb087759711bcb6d1f649504de9b885db9b7f3da24e058f294e8ab3c8820d65c304214e4c0913b4446085
DIST wine-mono-10.1.0-x86.tar.xz 41299152 BLAKE2B cbf2a513da869266d2cd953fb33b4fccc129fe051247b393558a399087329696fc821b16d17b89ec0c4724217ed252f9e5e29063981a8e0ad8dee8222026b25b SHA512 6b2e08840715ccb26c5d624ab47fe443d93adcb550df565ae344b963c25ccd12aae31932a259cdc36ed02754e2f77806ce9bc919362d34bf35341075db5b4da9
DIST wine-mono-10.2.0-x86.msi 85497856 BLAKE2B 37c5aa18b7997ddf0ac5b22aebfc99f0be1d9b4a76b3d5b7f6b99da2a289d5b5b0b3f8b6d05766a2883e653736e6aa50e672900b306225cb168768a5d9b2ef9d SHA512 03ba4145964898cb3b02b0cce7a340e91f63552f04a5b35f0189bc7609b3afde491da245dd5a0d9c99300685115a77018f6e64617653dd1c880b395d0d59fb11
DIST wine-mono-10.2.0-x86.tar.xz 39565980 BLAKE2B c0c2c063de47b484758dc315496c4c8d477273ce286ab5408fbdf8aae2cb8187160faec151c1ecfc18a90a4c6f3b36df9c78097ddc862ee6056739c556af4ff8 SHA512 47e9cecb9488f5bd35045bb3f4017519220e72cb192c99356f1bddf2b6c0453170f14308cd60d51c3aa1e82ec52cc3c266a8befa346310c670270abfd39f3a45
DIST wine-mono-10.3.0-x86.msi 85515264 BLAKE2B 9cc4800695411a1de61c3b3e52d52edc2802fa7c99c18697e51cf200c284939e93434a03ff3227d6e8c652d046b30f38331f2ad3f11d6e0e9bf4f98d277d56e6 SHA512 fe8bed279d06522f8d0351b4026e6c24cda525f3911b6c7b900f49260e1027fd9f0504fa974b6af69262c5ddd02ee3eb24c0438400d0d33031c436e89e2badb5
DIST wine-mono-10.3.0-x86.tar.xz 39584548 BLAKE2B a3a63b1e8cf072923512923ccd7419fbdb4c9747b0a3c29111d2bda36ab1fd95d0fd4283f74126cfe0c60e639ce3d173d69efdb3d97bf2b39142eb3ed3a27ef7 SHA512 fc67b9524b6b53e9a773bf514b7faab5b699fa4c10f457ddfb8ee564788e262c43241dbd64bcc427420da51ce83a89436f32f42b14c5867ae8a7a5c83960be5f
DIST wine-mono-10.4.0-x86.msi 85490176 BLAKE2B 6179d3ca74733454bea62aa3beeccc01f02da7fea4361f7a5d776de34411dabf8e66b133d16bd171665202c66303a1fa798ba95745677899778ad5d7d5a1b6fd SHA512 239126b9fa3f003d6451e908b7d1db779172239471a6d207ee7790e23abba6b246e87ea6f97548ec4e968339370a295cd843e4aed7a940dadbc4510679ac2f5a
DIST wine-mono-10.4.0-x86.tar.xz 41326992 BLAKE2B 2abbf16156ad87feda3f413d71565e56db0ebf14a8cd920ecc24bdea7f818365751cb447b91f56f96bcec84e4e28e9c7d022fdaf0804330f056593a99a6e5c6b SHA512 7b99003cd19d0dd5fa6d918f20574b87638b8000836e5ab98f2f8147c01cd221d9c84e9d05b58c3a5fbf46d8caa714d4b6c68615ea368af483bd5f2c9ceb0435
DIST wine-mono-7.4.0-x86.msi 87334912 BLAKE2B c0b778f9db59d1a2917631f1d6ca1a1798972a6a42e27975da78f3a35b77018a99228d7d95e5640c57618533a6b01bf2252859e3e978e2aa8dbdc8cd62afcc28 SHA512 cf35513b368324487c387d4339e5b05a90c4825b25ea603140524b79e69786ccc20dfb898213a9548c0313c0b0e4b160acb88364e4b280dd6712d185d9e5ae57
DIST wine-mono-7.4.0-x86.tar.xz 45404344 BLAKE2B 3a74106b9b3f21a88c2435f7988d66a54e08beea931a0ce0df6431c21add4ee2685bf9c9cb2404ee1a685736d61b1aee3cdd507130e5c5dddba7e506a2ff18bb SHA512 108cb5d969e84deeda3d2b11dba7cd73853fc3b088ecf2bcdb9bc5c5bbaaff03e72cd4f485d1935eda43cdd95b927886441be1d2204edeaee1ff1fea75735d22
DIST wine-mono-8.1.0-x86.msi 84905984 BLAKE2B 948b014fc6fba94bc97642b8aae266b8179b119ea3d8a0fdf47daee33eac65b8cc5dd1bc483ae4c66bdd1bdc10f4b73258bb6c83bca0911a30e86e358faafd20 SHA512 5c788dfa0c9b664242f3ce0ab24f3f9256dabf1e9fadc516140f267c763da1865b4536c707660acaf66e4a37d93198f5499971b4261e63d91252f6a7fc3eae4e
DIST wine-mono-8.1.0-x86.tar.xz 40854944 BLAKE2B 0e0dd83b92016da328547173d25dc396a895a7a161cd54796c9bda34ae958856f1bee342c1bb5fcffcf695b35adf66b2bf83cfa61e01790bf4b0f2d198f84feb SHA512 ba87105a6527b9c392e9ad406e92fd90164e0abb3a348a1e343e63eff0ee8632399badb98f7fbc3581ce697ba09d98aafbf5033bf52fb14b7c7c280c64f25a84
DIST wine-mono-9.1.0-x86.msi 84623872 BLAKE2B 63e86a4f99a5300782017f0b1a2168ad49516e2b2a7e825d7f59b8e842874c7f84752058908e8f57ad1e650a68675c5ff81ad8ba973962ea075db590be0fa51b SHA512 e51744eb0b07a58516fe3f5115fe45b4924e285fe4688649d04dec522203af6b3aa066e5db9b37cbbfe6ce4b5d8e871e9881842227cbb20c0613b911b5bfc383
DIST wine-mono-9.1.0-x86.tar.xz 43820028 BLAKE2B 6249e661239b71ca2607cf5fb3285bbef3e4c056c87e15352e40d2875028dbaa7f1c1a8b4d908f74de8447b4166c61c708314dc6422e9f69a6eea5f588e7c73b SHA512 cede2b910e95fc43e658e6d4d8086ec5324407a32fff4852341178e1e56df240356c02f270e3be174f3ab82aa076e50d70be4da8e8c5f77e877fce8fe3217374
DIST wine-mono-9.3.1-x86.msi 84572160 BLAKE2B 82f0aaec4cb816b28708c8bd8f347a128451046f33958b63d8cf6b6009d2f426f03d419017de4303f722ac0232bb2c9a1aba957411114ffc0b392db930888f69 SHA512 6653c6dd5484f3687be7ce13ca74e95abb5b0fa3c6901d57a97f4a218986e68154846ef19bf8ef5667f375b61600bb37e2e339b62a638a5eacd6f15a0022fc8a
DIST wine-mono-9.3.1-x86.tar.xz 43896120 BLAKE2B 5f4c2a07355a3d394086467f1b0c45698cd83731a4137b59975abdeda2d564f44922a67b1bec111e4209c4fe74247486076e95dffc84d88b5b7a02774efd070b SHA512 cc4faff237b46d870e1afeb99be1e77f8f0d599c8567dfc365256558b4ec533efee3d5324bfe1bd5bc7f318112899dd800e3e2ef9cbc6d50063f47fc7039c879
DIST wine-mono-9.4.0-x86.msi 84639232 BLAKE2B fc53dadf9c73c489f0333ab25aa2ce85df7f1dcf82fd475ea0265772441f1b29804bd378e555f71eafc851393c833c5aef97f10103257ccb6c6951c46fcb5bd9 SHA512 c8907d1f3b04bfc86a4d230148558964984f4ce33a732802ccbbc89b3593bce1c32b2fae105db0efa7e1e7ee97e955e51b682f06efe595408ba4031b55b8fe0f

33
app-emulation/wine-mono/wine-mono-10.2.0.ebuild
View File

@ -1,33 +0,0 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DESCRIPTION="Replacement for the .NET runtime and class libraries in Wine"
HOMEPAGE="
https://gitlab.winehq.org/wine/wine/-/wikis/Wine-Mono/
https://gitlab.winehq.org/mono/wine-mono/
"
SRC_URI="
shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.tar.xz )
!shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi )
"
S=${WORKDIR}
LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
SLOT="${PV}"
# keep straight-to-stable, builds nothing and the stabilization process
# is wasteful and annoying for users using ~testing wine in stable
# (wine also pins to specific versions, so stable won't use latest)
KEYWORDS="amd64 x86"
IUSE="+shared"
src_install() {
insinto /usr/share/wine/mono
if use shared; then
doins -r ${P}
else
doins "${DISTDIR}"/${P}-x86.msi
fi
}

0
app-emulation/wine-mono/wine-mono-10.1.0.ebuild → app-emulation/wine-mono/wine-mono-10.4.0.ebuild
View File

33
app-emulation/wine-mono/wine-mono-9.1.0.ebuild
View File

@ -1,33 +0,0 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DESCRIPTION="Replacement for the .NET runtime and class libraries in Wine"
HOMEPAGE="
https://gitlab.winehq.org/wine/wine/-/wikis/Wine-Mono/
https://gitlab.winehq.org/mono/wine-mono/
"
SRC_URI="
shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.tar.xz )
!shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi )
"
S=${WORKDIR}
LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
SLOT="${PV}"
# keep straight-to-stable, builds nothing and the stabilization process
# is wasteful and annoying for users using ~testing wine in stable
# (wine also pins to specific versions, so stable won't use latest)
KEYWORDS="amd64 x86"
IUSE="+shared"
src_install() {
insinto /usr/share/wine/mono
if use shared; then
doins -r ${P}
else
doins "${DISTDIR}"/${P}-x86.msi
fi
}

2
app-emulation/wine-staging/wine-staging-9999.ebuild
View File

@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{11..14} )
inherit edo optfeature python-any-r1 wine
WINE_GECKO=2.47.4
WINE_MONO=10.3.0
WINE_MONO=10.4.0
WINE_P=wine-$(ver_cut 1-2)
if [[ ${PV} == 9999 ]]; then

2
app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
View File

@ -6,7 +6,7 @@ EAPI=8
inherit optfeature wine
WINE_GECKO=2.47.4
WINE_MONO=10.3.0
WINE_MONO=10.4.0
if [[ ${PV} == 9999 ]]; then
inherit git-r3

1
app-text/rpl/Manifest
View File

@ -1,2 +1,3 @@
DIST rpl-1.15.5.gh.tar.gz 24401 BLAKE2B 91f0914ce80167305f9b403f691e58cd3f219d9e22f0ae7587b6dc5c60809e03bf38bd3878696916026b7cd0e597b67a6fcbb97d55005fd113e80aa7296f0e95 SHA512 1669a2de5b09090a3058421e2f9560f9b155151ec6d91f9d4f3b43070082d2541981de7754f047771c515e6d1450998c55e3b018a589a5ae4bd48e28464bb858
DIST rpl-1.18.gh.tar.gz 25750 BLAKE2B f090049d51e3fa4da1d0c3827a750b861fbd730b66d2e5336193332b119ac58bc26d64f429090443b6f45099fe078e0499f0aaf9e5488a543b5792de8f2d33a9 SHA512 08b68c0894085451a9bce169e972a67cddbbbc18565f514fc53a4ae1dbcc13818f71b8a6402e305c47298b1abc75a2ae39ac1acf175c29ee86fe6f6d2e6f474c
DIST rpl-2.0.4.tar.gz 1098594 BLAKE2B 5337bbc9e2fa42d4904f04aee3db711d9446717b3727b5971d4cf2be8b583b42f5e1ae1aae58b3d15564e48b76246638c769be8a6445d0dee6e3f252f44c9d94 SHA512 0908f53bb6b48a1a80f8c9c364da01430d2d630848f6c99691ccf8d630121811c1d85218d68576b611877667039c882eb7d245f24152207cb48dcfa5d19fafa5

24
app-text/rpl/files/rpl-2.0.4-tests.patch Normal file
View File

@ -0,0 +1,24 @@
diff --git a/test.vala b/test.vala
index 8e62a32..0e8c8a7 100644
--- a/test.vala
+++ b/test.vala
@@ -77,16 +77,9 @@ Subprocess check_prog (string prog, string[] args) throws Error {
}
bool try_sudo (string[] cmd) {
- try {
- var cmd_args = new Array<string>.take_zero_terminated(cmd);
- cmd_args.prepend_val ("-n");
- check_prog ("sudo", cmd_args.data);
- return true;
- } catch (Error e) {
- print ("cannot sudo, skipping test\n");
- Test.skip ();
- return false;
- }
+ print ("cannot sudo, skipping test\n");
+ Test.skip ();
+ return false;
}
Output run_prog (string prog, string[] args, int expected_rc = 0) {

108
app-text/rpl/files/rpl-2.0.4-uchardet-vala.patch Normal file
View File

@ -0,0 +1,108 @@
From 3669921bb1bab7bc9f7f5fb1ef4b9ceb2cf02ff7 Mon Sep 17 00:00:00 2001
From: Reuben Thomas <rrt@sc3d.org>
Date: Mon, 10 Nov 2025 23:37:49 +0000
Subject: [PATCH] Revert "Use UcharDet VAPI from vala-extra-vapis project, not
our own one"
This reverts commit f5e40e01f84b8841c8a30ef9b7890bf0cbd0beaf.
The vala-extra-vapis VAPI does not work properly with pkg-config; see
https://gitlab.gnome.org/GNOME/vala-extra-vapis/-/issues/28
---
.gitmodules | 3 ---
Makefile.am | 4 ++--
rpl.vala | 5 ++---
uchardet.vapi | 36 ++++++++++++++++++++++++++++++++++++
vala-extra-vapis | 1 -
5 files changed, 40 insertions(+), 9 deletions(-)
create mode 100644 uchardet.vapi
delete mode 160000 vala-extra-vapis
diff --git a/Makefile.am b/Makefile.am
index 8c3301d..5a86282 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,11 +8,11 @@ SUBDIRS = lib
include $(top_srcdir)/aminclude_static.am
-AM_VALAFLAGS = --debug --vapidir=$(srcdir) --vapidir=$(srcdir)/vala-extra-vapis
+AM_VALAFLAGS = --debug --vapidir=$(srcdir)
if OS_WIN32
AM_VALAFLAGS += -D WINDOWS
endif
-VAPIS = config.vapi cmdline.vapi gnu.vapi pcre2.vapi
+VAPIS = config.vapi cmdline.vapi gnu.vapi pcre2.vapi uchardet.vapi
LDADD = $(top_builddir)/lib/libgnu.a $(CODE_COVERAGE_LDFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib $(CODE_COVERAGE_CPPFLAGS)
diff --git a/rpl.vala b/rpl.vala
index 32aab87..9bc0374 100644
--- a/rpl.vala
+++ b/rpl.vala
@@ -1,4 +1,4 @@
-#! /usr/bin/env -S vala --vapidir=. --vapidir=./vala-extra-vapis --pkg gio-2.0 --pkg posix --pkg gnu --pkg config --pkg cmdline --pkg pcre2 --pkg uchardet fd-stream.vala prefix-input-stream.vala
+#! /usr/bin/env -S vala --vapidir=. --pkg gio-2.0 --pkg posix --pkg gnu --pkg config --pkg cmdline --pkg pcre2 --pkg uchardet fd-stream.vala prefix-input-stream.vala
// rpl: search and replace text in files
//
// © 2025 Reuben Thomas <rrt@sc3d.org>
@@ -20,7 +20,6 @@ using Config;
using Posix;
using Pcre2;
using Gengetopt;
-using UcharDet;
void info (string msg) {
@@ -569,7 +568,7 @@ int main (string[] argv) {
warn (@"error reading $filename: $(e.message); skipping!");
continue;
} // GCOVR_EXCL_STOP
- var detector = new UcharDet.Classifier ();
+ var detector = new UCharDet ();
var ok = detector.handle_data (buf.data) == 0;
GLib.assert (ok);
detector.data_end ();
diff --git a/uchardet.vapi b/uchardet.vapi
new file mode 100644
index 0000000..db25893
--- /dev/null
+++ b/uchardet.vapi
@@ -0,0 +1,36 @@
+/* uchardet.vapi
+ *
+ * Copyright (C) 2025 Reuben Thomas
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Author:
+ * Reuben Thomas <rrt@sc3d.org>
+ */
+
+[Compact]
+[CCode (cprefix = "uchardet_", cheader_filename = "uchardet.h", cname = "uchardet_t", free_function = "uchardet_delete")]
+public class UCharDet {
+ [CCode (cname = "uchardet_new")]
+ public UCharDet ();
+
+ public int handle_data ([CCode (array_length_type = "size_t")] uint8[] data);
+
+ public void data_end ();
+
+ public void data_reset ();
+
+ public unowned string get_charset ();
+}
\ No newline at end of file

1
app-text/rpl/metadata.xml
View File

@ -5,7 +5,6 @@
<email>shell-tools@gentoo.org</email>
<name>Gentoo Shell Tools Project</name>
</maintainer>
<stabilize-allarches/>
<upstream>
<remote-id type="sourceforge">rpl</remote-id>
<remote-id type="github">rrthomas/rpl</remote-id>

2
app-text/rpl/rpl-1.15.5.ebuild
View File

@ -16,7 +16,7 @@ SRC_URI="
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="amd64 ~ppc ~sparc ~x86"
KEYWORDS="amd64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"

2
app-text/rpl/rpl-1.18.ebuild
View File

@ -16,7 +16,7 @@ SRC_URI="
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="amd64 ~ppc ~sparc ~x86"
KEYWORDS="amd64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"

40
app-text/rpl/rpl-2.0.4.ebuild Normal file
View File

@ -0,0 +1,40 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit autotools vala
DESCRIPTION="Intelligent recursive search/replace utility"
HOMEPAGE="https://rpl.sourceforge.net/ https://github.com/rrthomas/rpl"
SRC_URI="https://github.com/rrthomas/rpl/releases/download/v${PV}/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64"
# unable to cause tests to pass fully
RESTRICT="test"
RDEPEND="
app-i18n/uchardet
dev-libs/glib:2
dev-libs/libpcre2:=
"
DEPEND="${RDEPEND}"
BDEPEND="
dev-util/gengetopt
sys-apps/help2man
virtual/pkgconfig
$(vala_depend)
"
PATCHES=(
"${FILESDIR}/${P}-uchardet-vala.patch"
)
src_prepare() {
default
eautoreconf
vala_setup
rm *_vala.stamp || die
}