From 7f0f0328de13606f0d573a5187a10aa070169b06 Mon Sep 17 00:00:00 2001 From: Agostino Sarubbo Date: Thu, 15 May 2025 08:59:30 +0200 Subject: [PATCH 01/13] net-vpn/openvpn: sync modifications from 2.6.14 to 9999 Signed-off-by: Agostino Sarubbo --- net-vpn/openvpn/openvpn-9999.ebuild | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild index ca32558901d9c..1ae2e1d0357de 100644 --- a/net-vpn/openvpn/openvpn-9999.ebuild +++ b/net-vpn/openvpn/openvpn-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 inherit autotools systemd linux-info tmpfiles DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes" -HOMEPAGE="https://openvpn.net/" +HOMEPAGE="https://openvpn.net" if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git" @@ -149,29 +149,24 @@ src_install() { pkg_postinst() { tmpfiles_process openvpn.conf - if use x64-macos ; then - elog "You might want to install tuntaposx for TAP interface support:" - elog "http://tuntaposx.sourceforge.net" - fi - if systemd_is_booted || has_version sys-apps/systemd ; then elog "In order to use OpenVPN with systemd please use the correct systemd service file." - elog "" + elog elog "server:" - elog "" + elog elog "- Place your server configuration file in /etc/openvpn/server" elog "- Use the openvpn-server@.service like so" elog "systemctl start openvpn-server@{Server-config}" - elog "" + elog elog "client:" - elog "" + elog elog "- Place your client configuration file in /etc/openvpn/client" elog "- Use the openvpn-client@.service like so:" elog "systemctl start openvpn-client@{Client-config}" else elog "The openvpn init script expects to find the configuration file" elog "openvpn.conf in /etc/openvpn along with any extra files it may need." - elog "" + elog elog "To create more VPNs, simply create a new .conf file for it and" elog "then create a symlink to the openvpn init script from a link called" elog "openvpn.newconfname - like so" @@ -179,13 +174,13 @@ pkg_postinst() { elog " ${EDITOR##*/} foo.conf" elog " cd /etc/init.d" elog " ln -s openvpn openvpn.foo" - elog "" + elog elog "You can then treat openvpn.foo as any other service, so you can" elog "stop one vpn and start another if you need to." fi if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then - ewarn "" + ewarn ewarn "WARNING: If you use the remote keyword then you are deemed to be" ewarn "a client by our init script and as such we force up,down scripts." ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you" @@ -193,7 +188,7 @@ pkg_postinst() { fi if use plugins ; then - einfo "" + einfo einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins" fi } From 66ed8d364c625dccabae508ca5a697a81923fa1e Mon Sep 17 00:00:00 2001 From: hololeap Date: Sat, 12 Apr 2025 12:17:07 -0600 Subject: [PATCH 02/13] dev-haskell/pandoc: Add missing haskell-cabal_pkg_postinst MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hololeap Part-of: https://github.com/gentoo/gentoo/pull/41562 Signed-off-by: Arsen Arsenović --- .../pandoc/{pandoc-3.1.8-r1.ebuild => pandoc-3.1.8-r2.ebuild} | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename dev-haskell/pandoc/{pandoc-3.1.8-r1.ebuild => pandoc-3.1.8-r2.ebuild} (98%) diff --git a/dev-haskell/pandoc/pandoc-3.1.8-r1.ebuild b/dev-haskell/pandoc/pandoc-3.1.8-r2.ebuild similarity index 98% rename from dev-haskell/pandoc/pandoc-3.1.8-r1.ebuild rename to dev-haskell/pandoc/pandoc-3.1.8-r2.ebuild index f66010e6cc3ad..28bdf05d01d0a 100644 --- a/dev-haskell/pandoc/pandoc-3.1.8-r1.ebuild +++ b/dev-haskell/pandoc/pandoc-3.1.8-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -102,4 +102,6 @@ src_install() { pkg_postinst() { einfo "As of version 3, ${PN} no longer packages the pandoc executable" einfo "as standard. For the executable, run 'emerge -av app-text/pandoc-cli'." + + haskell-cabal_pkg_postinst } From 78beda50cf5b46f553803b31e294569a1317aa1b Mon Sep 17 00:00:00 2001 From: hololeap Date: Sat, 12 Apr 2025 11:41:40 -0600 Subject: [PATCH 03/13] haskell-cabal.eclass: Output ghc version in src_configure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will provide valuable ghc version info in build logs Signed-off-by: hololeap Part-of: https://github.com/gentoo/gentoo/pull/41562 Signed-off-by: Arsen Arsenović --- eclass/haskell-cabal.eclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index 2e77bc648b165..e228d7fbc1bcc 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -711,6 +711,8 @@ haskell-cabal_src_prepare() { } haskell-cabal_src_configure() { + einfo "GHC version: $(ghc-version) $(ghc-pm-version)" + cabal-is-dummy-lib && return pushd "${S}" > /dev/null || die From 8ae4c6d315b09451163b0f8fdc95b52ce1f1374c Mon Sep 17 00:00:00 2001 From: hololeap Date: Sat, 12 Apr 2025 11:41:40 -0600 Subject: [PATCH 04/13] haskell-cabal.eclass: Add early check for invalid GHC cache MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the GHC cache is invalid, it can create a confusing error during src_compile. Add a check in haskell-cabal-pkg_setup that checks for and fixes an invalid cache. Closes: https://bugs.gentoo.org/916785 Closes: https://bugs.gentoo.org/916971 Closes: https://bugs.gentoo.org/920879 Closes: https://github.com/gentoo-haskell/gentoo-haskell/issues/1469 Thanks-to: Tom Gillespie Signed-off-by: hololeap Part-of: https://github.com/gentoo/gentoo/pull/41562 Closes: https://github.com/gentoo/gentoo/pull/41562 Signed-off-by: Arsen Arsenović --- eclass/haskell-cabal.eclass | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index e228d7fbc1bcc..bb73c0e4881db 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -661,6 +661,23 @@ cabal-is-dummy-lib() { return 1 } +# @FUNCTION: cabal-check-cache +# @DESCRIPTION: +# Check the state of the GHC cache by running 'ghc-pkg check' and looking +# for the string "WARNING: cache is out of date". If the string is not found, +# the cache is considered valid and the function returns 0. If it is found, +# the cache is considered invalid and the function returns 1. +cabal-check-cache() { + if $(ghc-getghcpkg) check 2>&1 \ + | grep -q 'WARNING: cache is out of date' + then + ewarn 'GHC cache is out of date!' + return 1 + else + return 0 + fi +} + # exported function: check if cabal is correctly installed for # the currently active ghc (we cannot guarantee this with portage) haskell-cabal_pkg_setup() { @@ -672,6 +689,13 @@ haskell-cabal_pkg_setup() { fi if cabal-is-dummy-lib; then einfo "${P} is included in ghc-${CABAL_CORE_LIB_GHC_PV}, nothing to install." + else + # bug 916785 + if ! cabal-check-cache; then + # avoid running ghc-recache-db so as not to set _GHC_RECACHE_CALLED + einfo "Recaching GHC package DB" + $(ghc-getghcpkg) recache + fi fi } From fa1b0ff46e9a6039cf6d205b22250ca72ae5ab56 Mon Sep 17 00:00:00 2001 From: Alfred Wingate Date: Wed, 14 May 2025 03:53:57 +0300 Subject: [PATCH 05/13] dot-a.eclass: exit early if static-libs use disabled Otherwise it will try to run inside the build directory if there is a static-libs use flag which is disabled. llvm-bitcode-strip: error: './build/obj/lib/x509_x509path.o': The file was not recognized as a valid object file Signed-off-by: Alfred Wingate Signed-off-by: Sam James --- eclass/dot-a.eclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eclass/dot-a.eclass b/eclass/dot-a.eclass index 541c5b5c12698..f82e5da5be897 100644 --- a/eclass/dot-a.eclass +++ b/eclass/dot-a.eclass @@ -84,6 +84,8 @@ strip-lto-bytecode() { # so we expect to be called on *something*, but nothing was explicitly # passed. Try scanning ${ED} automatically. set -- "${ED}" + else + return fi fi From 1b8399f044d11e6203e647e02196ef1493397e4f Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 15 May 2025 08:10:19 +0100 Subject: [PATCH 06/13] x11-libs/wxGTK: Stabilize 3.2.8 amd64, #955299 Signed-off-by: Sam James --- x11-libs/wxGTK/wxGTK-3.2.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-libs/wxGTK/wxGTK-3.2.8.ebuild b/x11-libs/wxGTK/wxGTK-3.2.8.ebuild index 96902890a1189..eb42f1f970292 100644 --- a/x11-libs/wxGTK/wxGTK-3.2.8.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.2.8.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}/wxWidgets-${PV}" LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" SLOT="${WXRELEASE}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit X" REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) keyring? ( X )" RESTRICT="!test? ( test )" From d8aa26f2c04067a98d18a4c04af4564f5c62292b Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 15 May 2025 08:10:23 +0100 Subject: [PATCH 07/13] x11-libs/wxGTK: Stabilize 3.2.8 arm, #955299 Signed-off-by: Sam James --- x11-libs/wxGTK/wxGTK-3.2.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-libs/wxGTK/wxGTK-3.2.8.ebuild b/x11-libs/wxGTK/wxGTK-3.2.8.ebuild index eb42f1f970292..7e37bfbe8c37f 100644 --- a/x11-libs/wxGTK/wxGTK-3.2.8.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.2.8.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}/wxWidgets-${PV}" LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" SLOT="${WXRELEASE}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit X" REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) keyring? ( X )" RESTRICT="!test? ( test )" From 15e0dfd8d8eeb58244758f53429740632652ccc4 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 15 May 2025 08:10:26 +0100 Subject: [PATCH 08/13] x11-libs/wxGTK: Stabilize 3.2.8 arm64, #955299 Signed-off-by: Sam James --- x11-libs/wxGTK/wxGTK-3.2.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-libs/wxGTK/wxGTK-3.2.8.ebuild b/x11-libs/wxGTK/wxGTK-3.2.8.ebuild index 7e37bfbe8c37f..ec184da6d5f1f 100644 --- a/x11-libs/wxGTK/wxGTK-3.2.8.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.2.8.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}/wxWidgets-${PV}" LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" SLOT="${WXRELEASE}" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit X" REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) keyring? ( X )" RESTRICT="!test? ( test )" From b64aa5b8327831e1adcdf0e051b3a5a8861d4a81 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 15 May 2025 08:10:30 +0100 Subject: [PATCH 09/13] x11-libs/wxGTK: Stabilize 3.2.8 x86, #955299 Signed-off-by: Sam James --- x11-libs/wxGTK/wxGTK-3.2.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-libs/wxGTK/wxGTK-3.2.8.ebuild b/x11-libs/wxGTK/wxGTK-3.2.8.ebuild index ec184da6d5f1f..6ed389732dc67 100644 --- a/x11-libs/wxGTK/wxGTK-3.2.8.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.2.8.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}/wxWidgets-${PV}" LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" SLOT="${WXRELEASE}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit X" REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) keyring? ( X )" RESTRICT="!test? ( test )" From 2ea2642cd2341836b98c29aa0ed55411b94c77f6 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 15 May 2025 08:10:33 +0100 Subject: [PATCH 10/13] x11-libs/wxGTK: Stabilize 3.2.8 ppc, #955299 Signed-off-by: Sam James --- x11-libs/wxGTK/wxGTK-3.2.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-libs/wxGTK/wxGTK-3.2.8.ebuild b/x11-libs/wxGTK/wxGTK-3.2.8.ebuild index 6ed389732dc67..08b0a81269956 100644 --- a/x11-libs/wxGTK/wxGTK-3.2.8.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.2.8.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}/wxWidgets-${PV}" LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" SLOT="${WXRELEASE}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit X" REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) keyring? ( X )" RESTRICT="!test? ( test )" From 050c84b858eac025af127da0ac62afeee67c901a Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 15 May 2025 08:10:37 +0100 Subject: [PATCH 11/13] x11-libs/wxGTK: Stabilize 3.2.8 ppc64, #955299 Signed-off-by: Sam James --- x11-libs/wxGTK/wxGTK-3.2.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-libs/wxGTK/wxGTK-3.2.8.ebuild b/x11-libs/wxGTK/wxGTK-3.2.8.ebuild index 08b0a81269956..7694203e25ba2 100644 --- a/x11-libs/wxGTK/wxGTK-3.2.8.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.2.8.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}/wxWidgets-${PV}" LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" SLOT="${WXRELEASE}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit X" REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) keyring? ( X )" RESTRICT="!test? ( test )" From f5d77f382cae929c69b205e73f4ba485a597cc1c Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 15 May 2025 08:10:41 +0100 Subject: [PATCH 12/13] x11-libs/wxGTK: Stabilize 3.2.8 sparc, #955299 Signed-off-by: Sam James --- x11-libs/wxGTK/wxGTK-3.2.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-libs/wxGTK/wxGTK-3.2.8.ebuild b/x11-libs/wxGTK/wxGTK-3.2.8.ebuild index 7694203e25ba2..9a231b453e327 100644 --- a/x11-libs/wxGTK/wxGTK-3.2.8.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.2.8.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}/wxWidgets-${PV}" LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" SLOT="${WXRELEASE}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit X" REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) keyring? ( X )" RESTRICT="!test? ( test )" From a74848a0bc3eeb4dad1ccfcbb3c299a2ca815e09 Mon Sep 17 00:00:00 2001 From: Patrick Lauer Date: Thu, 15 May 2025 07:12:03 +0000 Subject: [PATCH 13/13] dev-db/duckdb: Fix build with gcc15 Closes: https://bugs.gentoo.org/949694 Signed-off-by: Patrick Lauer --- .../{duckdb-1.2.2.ebuild => duckdb-1.2.2-r1.ebuild} | 8 ++++++++ dev-db/duckdb/files/thrift-cstdint.patch | 10 ++++++++++ 2 files changed, 18 insertions(+) rename dev-db/duckdb/{duckdb-1.2.2.ebuild => duckdb-1.2.2-r1.ebuild} (81%) create mode 100644 dev-db/duckdb/files/thrift-cstdint.patch diff --git a/dev-db/duckdb/duckdb-1.2.2.ebuild b/dev-db/duckdb/duckdb-1.2.2-r1.ebuild similarity index 81% rename from dev-db/duckdb/duckdb-1.2.2.ebuild rename to dev-db/duckdb/duckdb-1.2.2-r1.ebuild index d1cdf950958fa..e98b466b9339d 100644 --- a/dev-db/duckdb/duckdb-1.2.2.ebuild +++ b/dev-db/duckdb/duckdb-1.2.2-r1.ebuild @@ -17,6 +17,14 @@ KEYWORDS="~amd64" RESTRICT="test" +src_prepare() { + cd third_party/thrift/thrift/transport/ + eapply "${FILESDIR}/thrift-cstdint.patch" + cd ${S} + eapply_user + cmake_src_prepare +} + src_configure() { mycmakeargs=( "-DINSTALL_LIB_DIR=/usr/$(get_libdir)/" "-DOVERRIDE_GIT_DESCRIBE=v${PV}" diff --git a/dev-db/duckdb/files/thrift-cstdint.patch b/dev-db/duckdb/files/thrift-cstdint.patch new file mode 100644 index 0000000000000..af47df814445a --- /dev/null +++ b/dev-db/duckdb/files/thrift-cstdint.patch @@ -0,0 +1,10 @@ +--- a/TTransport.h 2025-04-07 09:28:46.000000000 -0000 ++++ b/TTransport.h 2025-05-15 07:01:41.119463408 -0000 +@@ -24,6 +24,7 @@ + #include "thrift/transport/TTransportException.h" + #include + #include ++#include + + namespace duckdb_apache { + namespace thrift {