From 0c9444558bd34e1d0e6a94bb41a59a905619efba Mon Sep 17 00:00:00 2001 From: Gerben Jan Dijkman Date: Tue, 6 Aug 2024 14:16:46 +0200 Subject: [PATCH] Updated --- .../gnome-settings-daemon/files/358.diff | 27 - gnome-extra/evolution-data-server/Manifest | 4 +- ...ld => evolution-data-server-3.52.4.ebuild} | 0 media-libs/libcamera/Manifest | 2 +- ...ra-0.3.0.ebuild => libcamera-0.3.1.ebuild} | 0 media-video/pipewire/pipewire-1.2.0-r3.ebuild | 519 ------------------ net-fs/s3fs/Manifest | 1 - net-fs/s3fs/s3fs-1.93.ebuild | 67 --- net-mail/ripole/Manifest | 1 - .../ripole/files/ripole-0.2.0-ldflags.patch | 19 - net-mail/ripole/ripole-0.2.2.ebuild | 27 - net-mail/tnef/Manifest | 1 - net-mail/tnef/tnef-1.4.18.ebuild | 23 - www-apache/modsecurity-crs/Manifest | 4 +- .../modsecurity-crs-3.3.5.ebuild | 43 -- ....0.ebuild => modsecurity-crs-4.5.0.ebuild} | 0 16 files changed, 3 insertions(+), 735 deletions(-) delete mode 100644 gnome-base/gnome-settings-daemon/files/358.diff rename gnome-extra/evolution-data-server/{evolution-data-server-3.52.1.ebuild => evolution-data-server-3.52.4.ebuild} (100%) rename media-libs/libcamera/{libcamera-0.3.0.ebuild => libcamera-0.3.1.ebuild} (100%) delete mode 100644 media-video/pipewire/pipewire-1.2.0-r3.ebuild delete mode 100644 net-fs/s3fs/s3fs-1.93.ebuild delete mode 100644 net-mail/ripole/Manifest delete mode 100644 net-mail/ripole/files/ripole-0.2.0-ldflags.patch delete mode 100644 net-mail/ripole/ripole-0.2.2.ebuild delete mode 100644 net-mail/tnef/Manifest delete mode 100644 net-mail/tnef/tnef-1.4.18.ebuild delete mode 100644 www-apache/modsecurity-crs/modsecurity-crs-3.3.5.ebuild rename www-apache/modsecurity-crs/{modsecurity-crs-4.0.0.ebuild => modsecurity-crs-4.5.0.ebuild} (100%) diff --git a/gnome-base/gnome-settings-daemon/files/358.diff b/gnome-base/gnome-settings-daemon/files/358.diff deleted file mode 100644 index dee49ef..0000000 --- a/gnome-base/gnome-settings-daemon/files/358.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/meson.build b/meson.build -index ff4fcb515489758ffea10a3e8c6bf3b0a16b2575..a1e8e6a44c6cf0a1b5589e5a438ca9aeeb674617 100644 ---- a/meson.build -+++ b/meson.build -@@ -111,16 +111,13 @@ x11_dep = dependency('x11') - xfixes_dep = dependency('xfixes', version: '>= 6.0') - - enable_systemd = get_option('systemd') --if enable_systemd -- systemd_dep = dependency('systemd', version: '>= 243', required: false) -- assert(systemd_dep.found(), 'Systemd support explicitly required, but systemd not found') -- -- libsystemd_dep = dependency('libsystemd', version: '>= 243', required: false) -- assert(libsystemd_dep.found(), 'Systemd support explicitly required, but libsystemd not found') -- -- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir', -- define_variable: ['prefix', gsd_prefix]) -+systemd_dep = dependency('systemd', version: '>= 243', required: enable_systemd) -+if systemd_dep.found() -+ systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir', -+ define_variable: ['prefix', gsd_prefix]) - endif -+libsystemd_dep = dependency('libsystemd', version: '>= 243', required: enable_systemd) -+ - - m_dep = cc.find_library('m') - diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest index 65c9c1d..9c76c09 100644 --- a/gnome-extra/evolution-data-server/Manifest +++ b/gnome-extra/evolution-data-server/Manifest @@ -1,4 +1,2 @@ -DIST evolution-data-server-3.50.2.tar.xz 4964152 BLAKE2B 7279a5bcb0399fdcce723336a052dca13efa6f0af6ef7371b7cb8e76fbd7e1b0313e7f677cea530de62a93770c35887fd70bac551338f9a89860e2529b1f1519 SHA512 9e2a34e06a446ae142535072a3d6916e31b7be987b114c111fb0687fa32a3fe4085ba5a09ccd77fb395d107e5c673130dc770bae74a50fdb566c91cd9de85610 -DIST evolution-data-server-3.50.4.tar.xz 4964564 BLAKE2B 7e3cf51856a1b12fcbd7e0b6ab98b8616c6e6047afb7fc59f8366920177c30b4d18f58cdd11825e81054ef46d61d3addf9eb646310510ba44f60bc5a2c2abe50 SHA512 e83f4222615d518e536a622808896b1da7e425e90d9b3c3545c6b850f955bd6d4b4a6815904fcdcfa373b3c01a6ce61377e259bc740941fc3f641e60eddacaed -DIST evolution-data-server-3.52.1.tar.xz 5048124 BLAKE2B 6dd6dc89c7efb7484c075cc51c5e2056ee62a50b810e479f39d04fe62f1a095e49783c20d23372efed954d7f9b78681b7af45389410f2cffb53af8ab2cd22bb3 SHA512 67f08fc3c8f7393fa66dc91f6fb33aa17644eb036d6c3552c3e7b30f128756b9e232cbf2a38eab43d0451699bb8799d9a869198bd9c293c0e2456b8e00339286 DIST evolution-data-server-3.52.2.tar.xz 5051576 BLAKE2B f4c897fe533e5d8bf13f21e1964b4a300b55e2422b00a2e02e87a1e7a73e82012b7f7719f92a3a7d6e133de9270a776c4ce09ccf8d9cc55e27ee1cb298fa94d6 SHA512 31c0ae52bcf6a96b4d128e39c85a1f1f3cb29f1d7e2ffca3aa0dac95431830e38f2fb1dd3323e77e9e353d260f6681c7f8a55fff421336e152e0902f0085cd34 +DIST evolution-data-server-3.52.4.tar.xz 5055252 BLAKE2B e493f16700533e97440a13dead51bb4654fbbb0345718eeb91e1e052f9599ededacb6e6693fa9de3d68288a6472503ab3a01cab4ac27be8cfc2d693389021aa0 SHA512 2847a15f7cb5b41cce94565a06f7baa02d8dd40241d59029ccebeb21215500ca6f1ac978f1142bde9348917f0534e181e2f7011ed245b6e7a6b1afda9975cfef diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.52.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.52.4.ebuild similarity index 100% rename from gnome-extra/evolution-data-server/evolution-data-server-3.52.1.ebuild rename to gnome-extra/evolution-data-server/evolution-data-server-3.52.4.ebuild diff --git a/media-libs/libcamera/Manifest b/media-libs/libcamera/Manifest index 067a7f9..64b13b2 100644 --- a/media-libs/libcamera/Manifest +++ b/media-libs/libcamera/Manifest @@ -1 +1 @@ -DIST libcamera-0.3.0.tar.gz 1540043 BLAKE2B 334357a92726189bc6a8c8fca2a74501183ea77cd111d6bd714dd9a178cc68448fe09612ea3300044cb27da909821993c3e5c7032fa82b81ba740601070ddae5 SHA512 b55228ddbc9beed112f60900dd66c502485badf55f9462d2dd7c0882f2a08012bc78a05a4c8fd0d94718aab2579b6c28ab938b36648678abc4f1f59c2ca93729 +DIST libcamera-0.3.1.tar.gz 1584441 BLAKE2B da09b2c5a6dbb4ecc9bbad6924b6573462d76f8c94d8e88f53aa606f61ce2b53b10f380f55ace1f4d615662c12e727a148b0ee542bac947b5dcb249ea983dcc5 SHA512 0c7d34adb8fcce4a1f935b4f6bd664fcf363eca980cc5b943dd054e76c701066af8eaf1cb3b15ff143b720d275912d198d332467ad21e42124b9fca962039427 diff --git a/media-libs/libcamera/libcamera-0.3.0.ebuild b/media-libs/libcamera/libcamera-0.3.1.ebuild similarity index 100% rename from media-libs/libcamera/libcamera-0.3.0.ebuild rename to media-libs/libcamera/libcamera-0.3.1.ebuild diff --git a/media-video/pipewire/pipewire-1.2.0-r3.ebuild b/media-video/pipewire/pipewire-1.2.0-r3.ebuild deleted file mode 100644 index d35d290..0000000 --- a/media-video/pipewire/pipewire-1.2.0-r3.ebuild +++ /dev/null @@ -1,519 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# 1. Please regularly check (even at the point of bumping) Fedora's packaging -# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide. -# -# 2. Upstream also sometimes amend release notes for the previous release to mention -# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros -# -# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things -# continue to move quickly. It's not uncommon for fixes to be made shortly -# after releases. - -# TODO: Maybe get upstream to produce `meson dist` tarballs: -# - https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3663 -# - https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1788 -# -# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-pipewire-docs -# Set to 1 if prebuilt, 0 if not -# (the construct below is to allow overriding from env for script) -: ${PIPEWIRE_DOCS_PREBUILT:=1} - -PIPEWIRE_DOCS_PREBUILT_DEV=sam -PIPEWIRE_DOCS_VERSION="${PV}" -# Default to generating docs (inc. man pages) if no prebuilt; overridden later -PIPEWIRE_DOCS_USEFLAG="+man" -PYTHON_COMPAT=( python3_{10..12} ) -inherit meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev - -if [[ ${PV} == 9999 ]]; then - PIPEWIRE_DOCS_PREBUILT=0 - EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git" - inherit git-r3 -else - if [[ ${PV} == *_p* ]] ; then - MY_COMMIT="" - SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2" - S="${WORKDIR}"/${PN}-${MY_COMMIT} - else - SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2" - fi - - if [[ ${PIPEWIRE_DOCS_PREBUILT} == 1 ]] ; then - SRC_URI+=" !man? ( https://dev.gentoo.org/~${PIPEWIRE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${PIPEWIRE_DOCS_VERSION}-docs.tar.xz )" - PIPEWIRE_DOCS_USEFLAG="man" - fi - - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -DESCRIPTION="Multimedia processing graphs" -HOMEPAGE="https://pipewire.org/" - -LICENSE="MIT LGPL-2.1+ GPL-2" -# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 -SLOT="0/0.4" -IUSE="${PIPEWIRE_DOCS_USEFLAG} bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings ieee1394 jack-client jack-sdk liblc3 lv2" -IUSE+=" modemmanager pipewire-alsa readline roc selinux sound-server ssl system-service systemd test v4l X zeroconf +libcamera" - -# Once replacing system JACK libraries is possible, it's likely that -# jack-client IUSE will need blocking to avoid users accidentally -# configuring their systems to send PW sink output to the emulated -# JACK's sink - doing so is likely to yield no audio, cause a CPU -# cycles consuming loop (and may even cause GUI crashes)! - -# - TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled -# - TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work -# which provides adequate guarantee that alsa-lib will be able to provide audio services. -# If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL. -# When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally. -# - ffmpeg is only used for pw-cat. We don't build the spa plugin which receives barely any activity. -REQUIRED_USE=" - ffmpeg? ( extra ) - bluetooth? ( dbus ) - jack-sdk? ( !jack-client ) - modemmanager? ( bluetooth ) - system-service? ( systemd ) - !sound-server? ( !pipewire-alsa ) - jack-client? ( dbus ) -" - -RESTRICT="!test? ( test )" - -BDEPEND=" - >=dev-build/meson-0.59 - virtual/pkgconfig - dbus? ( dev-util/gdbus-codegen ) - doc? ( - ${PYTHON_DEPS} - >=app-text/doxygen-1.9.8 - media-gfx/graphviz - ) - man? ( - ${PYTHON_DEPS} - >=app-text/doxygen-1.9.8 - ) -" -# * While udev could technically be optional, it's needed for a number of options, -# and not really worth it, bug #877769. -# -# * Supports both legacy webrtc-audio-processing:0 and new webrtc-audio-processing:1. -# We depend on :1 as it prefers that, it's not legacy, and to avoid automagic. -# -# * Older Doxygen (<1.9.8) may work but inferior output is created: -# - https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1778 -# - https://github.com/doxygen/doxygen/issues/9254 -RDEPEND=" - acct-group/audio - acct-group/pipewire - media-libs/alsa-lib[${MULTILIB_USEDEP}] - sys-libs/ncurses:=[unicode(+)] - virtual/libintl[${MULTILIB_USEDEP}] - virtual/libudev[${MULTILIB_USEDEP}] - bluetooth? ( - dev-libs/glib - media-libs/fdk-aac - media-libs/libldac - media-libs/libfreeaptx - media-libs/opus - media-libs/sbc - >=net-wireless/bluez-4.101:= - virtual/libusb:1 - ) - dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - echo-cancel? ( >=media-libs/webrtc-audio-processing-1.2:1 ) - extra? ( >=media-libs/libsndfile-1.0.20 ) - ffmpeg? ( media-video/ffmpeg:= ) - flatpak? ( dev-libs/glib ) - gstreamer? ( - >=dev-libs/glib-2.32.0:2 - >=media-libs/gstreamer-1.10.0:1.0 - media-libs/gst-plugins-base:1.0 - ) - gsettings? ( >=dev-libs/glib-2.26.0:2 ) - ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] ) - jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) - jack-sdk? ( - !media-sound/jack-audio-connection-kit - !media-sound/jack2 - ) - liblc3? ( media-sound/liblc3 ) - lv2? ( media-libs/lilv ) - modemmanager? ( >=net-misc/modemmanager-1.10.0 ) - pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] ) - sound-server? ( !media-sound/pulseaudio-daemon ) - roc? ( >=media-libs/roc-toolkit-0.3.0:= ) - readline? ( sys-libs/readline:= ) - selinux? ( sys-libs/libselinux ) - ssl? ( dev-libs/openssl:= ) - systemd? ( sys-apps/systemd ) - system-service? ( acct-user/pipewire ) - v4l? ( media-libs/libv4l ) - X? ( - media-libs/libcanberra - x11-libs/libX11 - x11-libs/libXfixes - ) - zeroconf? ( net-dns/avahi ) - libcamera? ( media-libs/libcamera ) -" - -DEPEND="${RDEPEND}" - -PDEPEND=">=media-video/wireplumber-0.5.2" - -# Present RDEPEND that are currently always disabled due to the PW -# code using them being required to be disabled by Gentoo guidelines -# (i.e. developer binaries not meant for users) and unready code -# media-libs/libsdl2 -# >=media-libs/vulkan-loader-1.1.69 -# -# Ditto for DEPEND -# >=dev-util/vulkan-headers-1.1.69 - -PATCHES=( - "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch - # https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/2061 - "${FILESDIR}"/${P}-automagic-gsettings.patch - "${FILESDIR}"/0001-Use-libcamera-by-default-if-it-s-found-and-supported.patch -) - -pkg_setup() { - if use doc || use man ; then - python-any-r1_pkg_setup - fi -} - -src_prepare() { - default - - # Used for upstream backports - [[ -d "${FILESDIR}"/${PV} ]] && eapply "${FILESDIR}"/${PV} -} - -multilib_src_configure() { - local emesonargs=( - -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} - - $(meson_feature dbus) - $(meson_native_use_feature zeroconf avahi) - $(meson_native_use_feature doc docs) - $(meson_native_use_feature man) - $(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone - $(meson_feature test tests) - -Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests - $(meson_feature ieee1394 libffado) - $(meson_native_use_feature gstreamer) - $(meson_native_use_feature gstreamer gstreamer-device-provider) - $(meson_native_use_feature gsettings) - $(meson_native_use_feature systemd) - - $(meson_native_use_feature system-service systemd-system-service) - -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)" - -Dsystemd-user-unit-dir="$(systemd_get_userunitdir)" - - $(meson_native_use_feature systemd systemd-user-service) - $(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph - $(meson_feature selinux) - -Dspa-plugins=enabled - -Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible) - -Dcompress-offload=disabled # TODO: tinycompress unpackaged - -Daudiomixer=enabled # Matches upstream - -Daudioconvert=enabled # Matches upstream - $(meson_native_use_feature bluetooth bluez5) - $(meson_native_use_feature bluetooth bluez5-backend-hsp-native) - $(meson_native_use_feature bluetooth bluez5-backend-hfp-native) - # https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1379 - $(meson_native_use_feature modemmanager bluez5-backend-native-mm) - $(meson_native_use_feature bluetooth bluez5-backend-ofono) - $(meson_native_use_feature bluetooth bluez5-backend-hsphfpd) - $(meson_native_use_feature bluetooth bluez5-codec-aac) - $(meson_native_use_feature bluetooth bluez5-codec-aptx) - $(meson_native_use_feature bluetooth bluez5-codec-ldac) - $(meson_native_use_feature bluetooth opus) - $(meson_native_use_feature bluetooth bluez5-codec-opus) - $(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters) - $(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889 - -Dcontrol=enabled # Matches upstream - -Daudiotestsrc=enabled # Matches upstream - -Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020 - $(meson_native_use_feature ffmpeg pw-cat-ffmpeg) - $(meson_native_use_feature flatpak) - -Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph - $(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client - $(meson_use jack-sdk jack-devel) - $(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '') - -Dsupport=enabled # Miscellaneous/common plugins, such as null sink - -Devl=disabled # Matches upstream - -Dtest=disabled # fakesink and fakesource plugins - -Dbluez5-codec-lc3plus=disabled # unpackaged - $(meson_native_use_feature liblc3 bluez5-codec-lc3) - $(meson_native_use_feature lv2) - $(meson_native_use_feature v4l v4l2) - -Dlibcamera=enabled # libcamera is not in Portage tree - $(meson_native_use_feature roc) - $(meson_native_use_feature readline) - $(meson_native_use_feature ssl raop) - -Dvideoconvert=enabled # Matches upstream - -Dvideotestsrc=enabled # Matches upstream - -Dvolume=enabled # Matches upstream - -Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream) - $(meson_native_use_feature extra pw-cat) - -Dudev=enabled - -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" - -Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install) - -Dlibmysofa=disabled # libmysofa is unpackaged - $(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat) - -Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build - - # We still have <5.16 kernels packaged in Gentoo and 6.1 (LTS) only - # just became stable, with 5.15 being the previous LTS. Many people - # are still on it. - -Dpam-defaults-install=true - - # Just for bell sounds in X11 right now. - $(meson_native_use_feature X x11) - $(meson_native_use_feature X x11-xfixes) - $(meson_native_use_feature X libcanberra) - - # TODO - -Dsnap=disabled - ) - - # This installs the schema file for pulseaudio-daemon, iff we are replacing - # the official sound-server - if use !sound-server; then - emesonargs+=( '-Dgsettings-pulse-schema=disabled' ) - else - emesonargs+=( - $(meson_native_use_feature gsettings gsettings-pulse-schema) - ) - fi - - meson_src_configure -} - -multilib_src_test() { - meson_src_test --timeout-multiplier 10 -} - -multilib_src_install() { - # Our custom DOCS do not exist in multilib source directory - DOCS= meson_src_install -} - -multilib_src_install_all() { - einstalldocs - - if ! use man && [[ ${PIPEWIRE_DOCS_PREBUILT} == 1 ]] ; then - doman "${WORKDIR}"/${PN}-${PIPEWIRE_DOCS_VERSION}-docs/man/*/*.[0-8] - fi - - if use pipewire-alsa; then - dodir /etc/alsa/conf.d - - # Install pipewire conf loader hook - insinto /usr/share/alsa/alsa.conf.d - doins "${FILESDIR}"/99-pipewire-default-hook.conf - eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf - - # These will break if someone has /etc that is a symbolic link to a subfolder! See #724222 - # And the current dosym8 -r implementation is likely affected by the same issue, too. - dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf - dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf - fi - - # Enable required wireplumber alsa and bluez monitors - if use sound-server; then - # Install sound-server enabler for wireplumber 0.5.0+ conf syntax - insinto /etc/wireplumber/wireplumber.conf.d - doins "${FILESDIR}"/gentoo-sound-server-enable-audio-bluetooth.conf - fi - - if use system-service; then - newtmpfiles - pipewire.conf <<-EOF || die - d /run/pipewire 0755 pipewire pipewire - - - EOF - fi - - if ! use systemd; then - insinto /etc/xdg/autostart - newins "${FILESDIR}"/pipewire.desktop-r2 pipewire.desktop - - exeinto /usr/bin - newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r3 gentoo-pipewire-launcher - - doman "${FILESDIR}"/gentoo-pipewire-launcher.1 - - # Disable pipewire-pulse if sound-server is disabled. - if ! use sound-server ; then - sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die - fi - - eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher - fi -} - -pkg_postrm() { - udev_reload -} - -pkg_preinst() { - HAD_SOUND_SERVER=0 - HAD_SYSTEM_SERVICE=0 - - if has_version "media-video/pipewire[sound-server(-)]" ; then - HAD_SOUND_SERVER=1 - fi - - if has_version "media-video/pipewire[system-service(-)]" ; then - HAD_SYSTEM_SERVICE=1 - fi -} - -pkg_postinst() { - udev_reload - - use system-service && tmpfiles_process pipewire.conf - - local ver - for ver in ${REPLACING_VERSIONS} ; do - if has_version kde-plasma/kwin[screencast] || has_version x11-wm/mutter[screencast] ; then - # https://bugs.gentoo.org/908490 - # https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3243 - ewarn "Please restart KWin/Mutter after upgrading PipeWire." - ewarn "Screencasting may not work until you do." - fi - - if ver_test ${ver} -le 0.3.66-r1 ; then - elog ">=pipewire-0.3.66 uses the 'pipewire' group to manage permissions" - elog "and limits needed to function smoothly:" - elog - elog "1. Please make sure your user is in the 'pipewire' group for" - elog "the best experience with realtime scheduling (PAM limits behavior)!" - elog "You can add your account with:" - elog " usermod -aG pipewire " - elog - elog "2. For the best experience with fast user switching, it is recommended" - elog "that you remove your user from the 'audio' group unless you rely on the" - elog "audio group for device access control or ACLs.:" - elog " usermod -rG audio " - elog - - if ! use jack-sdk ; then - elog - elog "JACK emulation is incomplete and not all programs will work. PipeWire's" - elog "alternative libraries have been installed to a non-default location." - elog "To use them, put pw-jack before every JACK application." - elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack" - elog "provider is still needed to compile the JACK applications themselves." - elog - fi - - if use systemd ; then - ewarn - ewarn "PipeWire daemon startup has been moved to a launcher script!" - ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no" - ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all" - ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)" - ewarn - ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from" - ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly" - ewarn "advised that a D-Bus user session is set up before starting the script." - ewarn - fi - - if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then - elog - elog "This ebuild auto-enables PulseAudio replacement. Because of that, users" - elog "are recommended to edit pulseaudio client configuration files:" - elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf" - elog "if it exists, and disable autospawning of the original daemon by setting:" - elog - elog " autospawn = no" - elog - elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!" - elog - elog "Alternatively, if replacing PulseAudio daemon is not desired, edit" - elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant" - elog "command:" - elog - elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &" - elog - fi - - if has_version 'net-misc/ofono' ; then - ewarn "Native backend has become default. Please disable oFono via:" - if systemd_is_booted ; then - ewarn "systemctl disable ofono" - else - ewarn "rc-update delete ofono" - fi - fi - fi - done - - if [[ ${HAD_SOUND_SERVER} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then - # TODO: We could drop most of this if we set up systemd presets? - # They're worth looking into because right now, the out-of-the-box experience - # is automatic on OpenRC, while it needs manual intervention on systemd. - if use sound-server && use systemd ; then - elog - elog "When switching from PulseAudio, you may need to disable PulseAudio:" - elog - elog " systemctl --user disable pulseaudio.service pulseaudio.socket" - elog - elog "To use PipeWire, the user units must be manually enabled" - elog "by running this command as each user you use for desktop activities:" - elog - elog " systemctl --user enable pipewire.socket pipewire-pulse.socket" - elog - elog "A reboot is recommended to avoid interferences from still running" - elog "PulseAudio daemon." - elog - elog "Both new users and those upgrading need to enable WirePlumber" - elog "for relevant users:" - elog - elog " systemctl --user disable pipewire-media-session.service" - elog " systemctl --user --force enable wireplumber.service" - elog - elog "Root user may replace --user with --global to change system default" - elog "configuration for all of the above commands." - elog - fi - - if ! use sound-server ; then - ewarn - ewarn "USE=sound-server is disabled! If you want PipeWire to provide" - ewarn "your sound, please enable it. See the wiki at" - ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio" - ewarn "for more details." - ewarn - fi - fi - - if use system-service && [[ ${HAD_SYSTEM_SERVICE} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then - ewarn - ewarn "You have enabled the system-service USE flag, which installs" - ewarn "the system-wide systemd units that enable PipeWire to run as a system" - ewarn "service. This is more than likely NOT what you want. You are strongly" - ewarn "advised not to enable this mode and instead stick with systemd user" - ewarn "units. The default configuration files will likely not work out of the" - ewarn "box, and you are on your own with configuration." - ewarn - fi - - elog "For latest tips and tricks, troubleshooting information, and documentation" - elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire" - elog - - optfeature_header "The following can be installed for optional runtime features:" - optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit - - if use sound-server && ! use pipewire-alsa; then - optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]" - fi -} diff --git a/net-fs/s3fs/Manifest b/net-fs/s3fs/Manifest index bf655a3..a98681d 100644 --- a/net-fs/s3fs/Manifest +++ b/net-fs/s3fs/Manifest @@ -1,2 +1 @@ -DIST s3fs-1.93.tar.gz 284353 BLAKE2B bae0d850f69f04b18327790406260721a0a2d981f5b2cbc8e6ebc059f4db83bd0810780b68d334a50cbba4654301a395683a778567ce3f08d4b9f69fef5ed282 SHA512 613ad713ac426236b471aa4b2f8292ee0558017f149bfe51aa7fad1bacd60fccf00c31404ebc14b692787e524704e9cd9111b84540f1309ba99900d42d03dc5d DIST s3fs-1.94.tar.gz 291170 BLAKE2B 86a0271cfedc38778b4e8a50cb4515a3b921e0c69618ff7b2db411a95c3ed37e43f5e394c47937fd9072530177faf4f014e395feb519e995bf386d538318d3bf SHA512 1a29d4f0b73f844ea1d4ad6e0b36d601fb7ab5818af0a90564b77182564c04fbef308362a9a749038b17f28f07f79b6debb661610f69c039a405b931361abe9c diff --git a/net-fs/s3fs/s3fs-1.93.ebuild b/net-fs/s3fs/s3fs-1.93.ebuild deleted file mode 100644 index e45695a..0000000 --- a/net-fs/s3fs/s3fs-1.93.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -MY_PN=${PN}-fuse -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Amazon S3 mounting via fuse" -HOMEPAGE="https://github.com/s3fs-fuse/s3fs-fuse/" -SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86 ~arm ~arm64" -IUSE="gnutls nettle nss" -REQUIRED_USE="nettle? ( gnutls !nss )" - -# Requires active internet connection and it tries to download some binaries for later execution -RESTRICT="test" - -DEPEND=" - dev-libs/libxml2:2 - net-misc/curl - sys-fs/fuse:0 - nss? ( dev-libs/nss ) - !nss? ( - gnutls? ( - net-libs/gnutls:= - nettle? ( dev-libs/nettle:= ) - ) - !gnutls? ( dev-libs/openssl:0= ) - ) -" - -RDEPEND="${DEPEND} - app-misc/mime-types -" - -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - sed -i 's/-D_FORTIFY_SOURCE=2//' configure.ac || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_with nettle) - ) - if use nss; then - myeconfargs+=( $(use_with nss) ) - elif use gnutls; then - myeconfargs+=( $(use_with gnutls) ) - else - myeconfargs+=( --with-openssl ) - fi - - econf "${myeconfargs[@]}" -} diff --git a/net-mail/ripole/Manifest b/net-mail/ripole/Manifest deleted file mode 100644 index f81a47d..0000000 --- a/net-mail/ripole/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ripole-0.2.2.tar.gz 30629 BLAKE2B 63ff7c0d086861d8aa9c1fea7e69086874b90e3181898e36338cb3913e90c6ed7e6f222ff985d92386535a222e44e8a324658f0b4bd51de508f92a82f37f5eb1 SHA512 de3a4fe511e11d4ed8b5589aaf102c60c59c8a3cbbd1d988955b89d597ac7a5992f63a7ac36d8aad3916fa9f6311c5a0260136d534973fdf1b4a5fa5296b6b92 diff --git a/net-mail/ripole/files/ripole-0.2.0-ldflags.patch b/net-mail/ripole/files/ripole-0.2.0-ldflags.patch deleted file mode 100644 index b1de502..0000000 --- a/net-mail/ripole/files/ripole-0.2.0-ldflags.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit eae881de61b8622913761d88a79ee827d8dee002 -Author: Eray Aslan -Date: Mon Jun 6 13:03:44 2011 +0300 - - Respect LDFLAGS - bug #337843 - -diff --git a/Makefile b/Makefile -index e32ba91..c5240ae 100644 ---- a/Makefile -+++ b/Makefile -@@ -12,7 +12,7 @@ clean: - rm -f *.o ripole - - ripole: $(OBJS) ripole.[ch] -- $(CC) $(CFLAGS) $(OBJS) $(DEFINES) ripole.c -o ripole -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(DEFINES) ripole.c -o ripole - - validate: ripole - cp ripole validate diff --git a/net-mail/ripole/ripole-0.2.2.ebuild b/net-mail/ripole/ripole-0.2.2.ebuild deleted file mode 100644 index 232c62e..0000000 --- a/net-mail/ripole/ripole-0.2.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Program/library to pull out attachment from OLE2 data files" -HOMEPAGE="http://www.pldaniels.com/ripole/" -SRC_URI="http://www.pldaniels.com/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~arm ~arm64" - -PATCHES=( - "${FILESDIR}"/${PN}-0.2.0-ldflags.patch -) - -src_compile() { - emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" -} - -src_install() { - dobin ripole - dodoc CHANGELOG README CONTRIBUTORS -} diff --git a/net-mail/tnef/Manifest b/net-mail/tnef/Manifest deleted file mode 100644 index 9c3910c..0000000 --- a/net-mail/tnef/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST tnef-1.4.18.tar.gz 4650361 BLAKE2B e6c02cf06454932d32ac68f569fdbc29979bace8afe1b997a47a1ef0e42d9464426afcdd1641509501604191d1a99d8374a078e53f5531fe3bc887df7bce194b SHA512 bc53daaca9c260a804681c040d01f80bbd8b0d3597678c774975e988cdf83dad6b0d6c66b22e0d40ed2300efddef0bc663236ead4dfe687eb33af7f27dbb6000 diff --git a/net-mail/tnef/tnef-1.4.18.ebuild b/net-mail/tnef/tnef-1.4.18.ebuild deleted file mode 100644 index cdee6c1..0000000 --- a/net-mail/tnef/tnef-1.4.18.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="Decodes MS-TNEF MIME attachments" -HOMEPAGE="https://github.com/verdammelt/tnef/" -SRC_URI="https://github.com/verdammelt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~arm ~arm64" - -src_prepare() { - default - - eautoreconf -} - -src_test() { - emake -j1 check -} diff --git a/www-apache/modsecurity-crs/Manifest b/www-apache/modsecurity-crs/Manifest index 42d6a88..86395a1 100644 --- a/www-apache/modsecurity-crs/Manifest +++ b/www-apache/modsecurity-crs/Manifest @@ -1,3 +1 @@ -DIST modsecurity-crs-3.3.5.tar.gz 299458 BLAKE2B b8617de77cf5168c7b95fab46eae45e2101b4ec7a537d8d471b9b1b27a856b1d370a9de43ee262c07dc9371b3ff79cd86b7328b171fde003da9110897206e91e SHA512 001f9afe25f479dd988aaec1a4a2c0197b2d27e00d2cd10b70892e4889b399259cd0655f42a96965ae655855abdb7f9d8295c225ae17bf1e47361b70232633e5 -DIST modsecurity-crs-4.0.0.tar.gz 504720 BLAKE2B e6da0268ae9209179d1f6cefba34e097b614dd4659a4b4df2ef3e6a0b32be7be9d825beaf6d8ca1fbef0dd27217b4707090844e59eaa817111be4a6f8333e205 SHA512 c25bfd6de772815977783e78d7afd388d60bbba151762a38c7050fd5ecde6a48baa0a850028a24d42855ae4a788404ad1ee0f7a4ad2d94d53a46e261a00f7224 -DIST modsecurity-crs-4.0.0_rc2.tar.gz 491479 BLAKE2B 71a016b7e45a991373357ece9cc7a59afe54daf91ffa826b76fd4a986b6e8989efb54ca3b83fac9307cf6ede1e1f7a78f9534cc5682e63ea3d75b9092c295d30 SHA512 302129aa3c476afd84b41bfdf73afaa1561f300ecad6ea3540d977639dc3c2167169298fbbe453ceb108d10dee3835b2e4f30f0c12cc413d3acd530906123021 +DIST modsecurity-crs-4.5.0.tar.gz 508360 BLAKE2B 88d63ed74e0c10577fd614cd782a247b00fc2e9a18f3f8c8dcb26f848e8b2025aa699a125c682cd2d82d386202205278b570d8adc57c56ad1e8ada1c780841a7 SHA512 057ed442b435efe4f6092bc05e55a7d133e3a62b92744c2a151291e6e21722fa37857729c4434814f0996b3f814118fd64a76c8ceb7b430cbe0b8921295556df diff --git a/www-apache/modsecurity-crs/modsecurity-crs-3.3.5.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-3.3.5.ebuild deleted file mode 100644 index 2f186d7..0000000 --- a/www-apache/modsecurity-crs/modsecurity-crs-3.3.5.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit optfeature - -DESCRIPTION="OWASP ModSecurity Core Rule Set" -HOMEPAGE="https://coreruleset.org/" -SRC_URI="https://github.com/coreruleset/coreruleset/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/coreruleset-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~arm64" -IUSE="+apache2" - -RDEPEND="apache2? ( >=www-apache/mod_security-2.9.6 )" - -DOCS=( CHANGES.md CONTRIBUTORS.md crs-setup.conf.example KNOWN_BUGS README.md ) - -src_install() { - insinto "/usr/share/${PN}" - doins -r rules - - einstalldocs - - if use apache2; then - # I don't think it's worth pulling in apache-module.eclass just for - # this path... - insinto /etc/apache2/modules.d - doins "${FILESDIR}/80_mod_security-crs.conf" - fi -} - -pkg_postinst() { - if use apache2; then - einfo "The CRS configuration file has been installed to:" - einfo " ${ROOT}/etc/apache2/modules.d/80_mod_security-crs.conf" - fi - - optfeature "apache-less installations, e.g. nginx" dev-libs/modsecurity -} diff --git a/www-apache/modsecurity-crs/modsecurity-crs-4.0.0.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-4.5.0.ebuild similarity index 100% rename from www-apache/modsecurity-crs/modsecurity-crs-4.0.0.ebuild rename to www-apache/modsecurity-crs/modsecurity-crs-4.5.0.ebuild