Merge updates from master

This commit is contained in:
Repository mirror & CI
2022-10-07 13:17:42 +00:00
16 changed files with 160 additions and 298 deletions

View File

@@ -1,2 +1,3 @@
DIST certbot-1.29.0.tar.gz 1367853 BLAKE2B c0d8d2c05a061b2d50564a97bf17ae883bd443321bf99cea13fbae196c7ec876231d803d5389e524997dd8632035d5ad60b1a99b025a22a65d0865d564cfafc5 SHA512 755781e12e0e4cdb41aa16d90ab6a334ef41a98630e08127a867c8e8813ee45ebd3f6f54168fe747900f6ab59539e414ffed7891c05746b3a7af2e2a96a8d522
DIST certbot-1.30.0.tar.gz 1370072 BLAKE2B c9286bc6dfee59c5a7b458430b08ee273615b42e40d2355b41c5d58a0b8757d83551e947058660e4abda88d7f11c16184a248c313b4d01e145df0e39b717bf86 SHA512 15727a7a38a9cbe4890a347c0cc2a795be19502ece28034400d41cf96a6d4bef197890bd85cd02ecc6a792e3502ae8aa663aad45e980047567f0d3b161cbe3df
DIST certbot-1.31.0.tar.gz 1371459 BLAKE2B 95fc9f29b1e91f5bc12a9b7146d00f4f3b4647eeda8e866c46c17d8d8a2443bd46cfa04758e8571e84b2bbf70bd68943c47ceaf6d830d3e5121e41d9548da051 SHA512 a2f6d7714bfc8e2c400e69be038404da138b53f0dc09e071048d560ba9e9527cc0b786b8d210b62c3d07c3aeadaee12dc0d060d144af4b5c3178576fde65b052

View File

@@ -18,6 +18,7 @@ if [[ "${PV}" == *9999 ]]; then
EGIT_SUBMODULES=()
EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_PN}"
else
# To rename with .gh.tar.gz extension once parent package also uses this naming.
SRC_URI="
https://github.com/certbot/certbot/archive/v${PV}.tar.gz
-> ${PARENT_P}.tar.gz
@@ -46,12 +47,20 @@ RDEPEND="
distutils_enable_tests pytest
# Same than PATCHES but from repository's root directory,
# please see function `python_prepare_all` below.
# Simplier for users IMHO.
PARENT_PATCHES=(
)
# Here for patches within "${PN}" subdirectory.
PATCHES=(
)
python_prepare_all() {
pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
default
[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
eapply_user
popd > /dev/null || die
distutils-r1_python_prepare_all

View File

@@ -18,6 +18,7 @@ if [[ "${PV}" == *9999 ]]; then
EGIT_SUBMODULES=()
EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_PN}"
else
# To rename with .gh.tar.gz extension once parent package also uses this naming.
SRC_URI="
https://github.com/certbot/certbot/archive/v${PV}.tar.gz
-> ${PARENT_P}.tar.gz
@@ -46,12 +47,20 @@ RDEPEND="
distutils_enable_tests pytest
# Same than PATCHES but from repository's root directory,
# please see function `python_prepare_all` below.
# Simplier for users IMHO.
PARENT_PATCHES=(
)
# Here for patches within "${PN}" subdirectory.
PATCHES=(
)
python_prepare_all() {
pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
default
[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
eapply_user
popd > /dev/null || die
distutils-r1_python_prepare_all

View File

@@ -0,0 +1,67 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
PARENT_PN="${PN%-dns-rfc2136}"
PARENT_P="${PARENT_PN}-${PV}"
if [[ "${PV}" == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
EGIT_SUBMODULES=()
EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_PN}"
else
# To rename with .gh.tar.gz extension once parent package also uses this naming.
SRC_URI="
https://github.com/certbot/certbot/archive/v${PV}.tar.gz
-> ${PARENT_P}.tar.gz
"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
DESCRIPTION="RFC 2136 DNS Authenticator plugin for Certbot (Lets Encrypt client)"
HOMEPAGE="
https://letsencrypt.org/
"
LICENSE="Apache-2.0"
SLOT="0"
S="${WORKDIR}/${PARENT_P}/${PN}"
RDEPEND="
${PYTHON_DEPS}
>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
>=dev-python/pyopenssl-22.0.0[${PYTHON_USEDEP}]
>=dev-python/pyparsing-3.0.9[${PYTHON_USEDEP}]
>=dev-python/zope-interface-5.4.0[${PYTHON_USEDEP}]
"
distutils_enable_tests pytest
# Same than PATCHES but from repository's root directory,
# please see function `python_prepare_all` below.
# Simplier for users IMHO.
PARENT_PATCHES=(
)
# Here for patches within "${PN}" subdirectory.
PATCHES=(
)
python_prepare_all() {
pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
eapply_user
popd > /dev/null || die
distutils-r1_python_prepare_all
}

View File

@@ -20,7 +20,7 @@ if [[ "${PV}" == *9999 ]]; then
else
SRC_URI="
https://github.com/certbot/certbot/archive/v${PV}.tar.gz
-> ${PARENT_P}.tar.gz
-> ${PARENT_P}.gh.tar.gz
"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
@@ -46,12 +46,20 @@ RDEPEND="
distutils_enable_tests pytest
# Same than PATCHES but from repository's root directory,
# please see function `python_prepare_all` below.
# Simplier for users IMHO.
PARENT_PATCHES=(
)
# Here for patches within "${PN}" subdirectory.
PATCHES=(
)
python_prepare_all() {
pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
default
[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
eapply_user
popd > /dev/null || die
distutils-r1_python_prepare_all

View File

@@ -3,8 +3,7 @@
EAPI=8
# bug #834994
DISTUTILS_USE_SETUPTOOLS=pyproject.toml
DISTUTILS_USE_PEP517=poetry
PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
@@ -15,7 +14,10 @@ HOMEPAGE="
https://github.com/pgjones/hypercorn
https://pypi.org/project/hypercorn/
"
SRC_URI="https://github.com/pgjones/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
SRC_URI="
https://github.com/pgjones/hypercorn/archive/${PV}.tar.gz
-> ${P}.gh.tar.gz
"
LICENSE="MIT"
SLOT="0"
@@ -42,4 +44,5 @@ PATCHES=( "${FILESDIR}/${P}-no-coverage.patch" )
distutils_enable_tests pytest
distutils_enable_sphinx docs dev-python/pydata-sphinx-theme
distutils_enable_sphinx docs \
dev-python/pydata-sphinx-theme

View File

@@ -1,2 +1 @@
DIST dosbox-x-v0.84.1.tar.gz 67617800 BLAKE2B b7a93ac662d987f99884078fa8a2b566c8aef691861cd8b8270698470cef70e352616970e46439664eedb37b11f673a3cf7d253e45ed756e28740dd06080fffc SHA512 2104352f5756fa394c6a38f6b82694e4b17878b87d64cb67aeeb8ef9f9cf12cadfc8cd23b4626bbb59b8f0657ae6747633ac80016df511b7d9612245b32d21ca
DIST dosbox-x-windows-v2022.08.0.tar.gz 67809452 BLAKE2B d0d8c6b6b328b363ea939de93e920ce33b260f4f986be50028c4a2e188c292be38c256bed7b0d6e052bf2b74600ece662f05b16943e90fbd44e48e2c6b4bc3cc SHA512 d11b907ff99e8599b454dc5979055dd85a64215913cb905c66d534930ce31afaab14d04169450eef5cb286c65933159f44be6cecad6adf6c7adad1a249758d7b

View File

@@ -1,215 +0,0 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit autotools flag-o-matic toolchain-funcs xdg
if [[ "${PV}" == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/joncampbell123/dosbox-x.git"
else
SRC_URI="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v${PV}.tar.gz"
S="${WORKDIR}/${PN}-${PN}-v${PV}"
KEYWORDS="~amd64"
fi
DESCRIPTION="Complete, accurate DOS emulator forked from DOSBox"
HOMEPAGE="https://dosbox-x.com/"
# Stay consistent with games-emulation/dosbox::gentoo even though source file
# headers specify the GPL version to be "either version 2 of the License, or
# (at your option) any later version." The same header is used in both the
# DOSBox source tree and the DOSBox-X source tree.
LICENSE="GPL-2"
SLOT="0"
IUSE="X debug ffmpeg fluidsynth freetype opengl png slirp"
BDEPEND="
dev-lang/nasm
sys-libs/libcap
"
# Unconditionally pulling in automagically-enabled optional dependencies:
# - media-libs/alsa-lib
# - media-libs/sdl2-net
# - net-libs/libpcap
#
# With media-libs/libsdl2[-X,wayland], this package does work on a Wayland
# desktop, but (at least on GNOME) the program does not launch in a movable
# and resizable window; whereas with media-libs/libsdl2[X], it does. Thus,
# unconditionally require media-libs/libsdl2[X] for better user experience.
RDEPEND="
media-libs/alsa-lib
media-libs/libsdl2[X,opengl?,sound,threads,video]
media-libs/sdl2-net
net-libs/libpcap
sys-libs/zlib
X? (
x11-libs/libX11
x11-libs/libXrandr
x11-libs/libxkbfile
)
debug? ( sys-libs/ncurses:= )
ffmpeg? ( media-video/ffmpeg:= )
fluidsynth? ( media-sound/fluidsynth:= )
freetype? ( media-libs/freetype )
opengl? ( media-libs/libglvnd[X] )
png? ( media-libs/libpng:= )
slirp? ( net-libs/libslirp )
"
DEPEND="
${RDEPEND}
"
PATCHES=(
# Only needed on 0.84.1; please remove for newer releases
"${FILESDIR}/${P}-fix-build-error-with-disable-x11.patch"
)
pkg_pretend() {
if use ffmpeg && use !png; then
ewarn "Setting the 'ffmpeg' USE flag when the 'png' USE flag is"
ewarn "unset does not have any effect. Unsetting the 'png' USE"
ewarn "flag disables the video capture feature, so additional"
ewarn "video capture formats enabled by the 'ffmpeg' USE flag"
ewarn "will end up being unused."
fi
}
src_prepare() {
default
# Patch command lines like the following in Makefile.am:
# -test -x /usr/sbin/setcap && setcap cap_net_raw=ep $(DESTDIR)$(bindir)/dosbox-x
#
# The purpose of these commands is, if the 'setcap' program exists and is
# executable, then invoke it to set capabilities required by the PCAP
# networking back-end for better out-of-box user experience; otherwise,
# ignore unsatisfied preconditions or 'setcap' errors since they are not
# critical, which is achieved by having a '-' in front of each line.
#
# Unfortunately, 'test -x /usr/sbin/setcap' does not always work as
# expected on Gentoo because it ignores the fact that some distributions,
# including Gentoo, may still have split /sbin and /usr/sbin and install
# 'setcap' to /sbin.
#
# As long as sys-libs/libcap is declared in BDEPEND of this ebuild, the
# availability of 'setcap' can be assumed, rendering the test redundant.
# However, successfully setting capabilities via 'setcap' usually requires
# the root account (which is not guaranteed on Prefix) and xattr support
# for the file system being used, so the '-' in front of each line is
# preserved to tolerate the expected 'setcap' failures.
sed -i -e 's|test -x /usr/sbin/setcap && ||' Makefile.am ||
die "Failed to remove check for setcap in Makefile.am"
eautoreconf
# https://bugs.gentoo.org/859973
# https://github.com/joncampbell123/dosbox-x/issues/3663
# No upstream response regarding LTO yet; disable it for now
filter-lto
}
src_configure() {
local myconf=(
# --disable-core-inline could cause compiler errors
# as of v0.84.1, so enable it unconditionally
--enable-core-inline
# Always use SDL 2, even though the package provides the option to
# build with SDL 1.x, because this package is expected to be built
# with the bundled, heavily-modified version of SDL 1.x if that
# branch is used. Compiler errors are likely to occur if the
# bundled version of SDL 1.x is not used. Bundled dependencies
# should be avoided on Gentoo, so SDL 2 is more preferable.
--enable-sdl2
# Explicitly enable ALSA MIDI support, same as default. As of
# v0.84.1, even when it is disabled, media-libs/alsa-lib will
# still be automagically linked if it is present in the build
# environment (presumably for other components of this package),
# so the dependency cannot be made optional by disabling this
# option. Plus, disabling this option has no observable effect
# on build time, build size, or the program's functionality, as
# 'mididevice=alsa' still works with '--disable-alsa-midi'.
--enable-alsa-midi
$(use_enable debug '' heavy)
$(use_enable X x11)
$(use_enable ffmpeg avcodec)
$(use_enable fluidsynth libfluidsynth)
$(use_enable freetype)
$(use_enable opengl)
$(use_enable png screenshots)
$(use_enable slirp libslirp)
)
econf "${myconf[@]}"
}
src_compile() {
# https://bugs.gentoo.org/856352
emake AR="$(tc-getAR)"
}
pkg_preinst() {
xdg_pkg_preinst
# Returns whether or not the USE flag specified with the first positional
# argument is newly enabled for this installation of the package.
newuse() {
local flag="${1}"
# The 'has_version' call tests if any USE flags are newly enabled.
# It is to extract information about any existing copy of this
# package installed on the system, which is why it should be made
# before the new copy of this package just built is merged.
use "${flag}" && ! has_version "${CATEGORY}/${PN}[${flag}]"
}
newuse debug && PRINT_NOTES_FOR_DEBUGGER=1
newuse fluidsynth && PRINT_NOTES_FOR_FLUIDSYNTH=1
}
pkg_postinst() {
xdg_pkg_postinst
if [[ "${PRINT_NOTES_FOR_DEBUGGER}" ]]; then
elog
elog "Note on the Debugger"
elog
elog "The debugger can only be started when DOSBox-X is launched"
elog "from a terminal. Otherwise, the \"Start DOSBox-X Debugger\""
elog "option in the \"Debug\" drop-down menu would be unavailable."
elog
elog "For more information about the debugger, please consult:"
elog " ${EPREFIX}/usr/share/doc/${PF}/README.debugger*"
fi
if [[ "${PRINT_NOTES_FOR_FLUIDSYNTH}" ]]; then
elog
elog "Note on FluidSynth"
elog
elog "To use FluidSynth as the MIDI device for DOSBox-X, a soundfont"
elog "is required. If no existing soundfont is available, a new one"
elog "can be installed and configured for DOSBox-X very easily:"
elog
elog "1. Install the following package:"
elog " media-sound/fluid-soundfont"
elog "2. Add the following lines to DOSBox-X's configuration file:"
elog " [midi]"
elog " mididevice=fluidsynth"
elog
elog "Usually, there is no need to explicitly specify the soundfont"
elog "file's path because the package mentioned in step 1 installs"
elog "soundfont files to a standard location, allowing them to be"
elog "detected and selected automatically."
elog
elog "For advanced FluidSynth configuration, please consult:"
elog " https://dosbox-x.com/wiki/Guide%3ASetting-up-MIDI-in-DOSBox%E2%80%90X#_fluidsynth"
fi
}

View File

@@ -76,39 +76,11 @@ pkg_pretend() {
src_prepare() {
default
# Patch command lines like the following in Makefile.am:
# -test -x /usr/sbin/setcap && setcap cap_net_raw=ep $(DESTDIR)$(bindir)/dosbox-x
#
# The purpose of these commands is, if the 'setcap' program exists and is
# executable, then invoke it to set capabilities required by the PCAP
# networking back-end for better out-of-box user experience; otherwise,
# ignore unsatisfied preconditions or 'setcap' errors since they are not
# critical, which is achieved by having a '-' in front of each line.
#
# Unfortunately, 'test -x /usr/sbin/setcap' does not always work as
# expected on Gentoo because it ignores the fact that some distributions,
# including Gentoo, may still have split /sbin and /usr/sbin and install
# 'setcap' to /sbin.
#
# As long as sys-libs/libcap is declared in BDEPEND of this ebuild, the
# availability of 'setcap' can be assumed, rendering the test redundant.
# However, successfully setting capabilities via 'setcap' usually requires
# the root account (which is not guaranteed on Prefix) and xattr support
# for the file system being used, so the '-' in front of each line is
# preserved to tolerate the expected 'setcap' failures.
sed -i -e 's|test -x /usr/sbin/setcap && ||' Makefile.am ||
die "Failed to remove check for setcap in Makefile.am"
eautoreconf
}
src_configure() {
local myconf=(
# --disable-core-inline could cause compiler errors
# as of v2022.08.0, so enable it unconditionally
--enable-core-inline
# Always use SDL 2, even though the package provides the option to
# build with SDL 1.x, because this package is expected to be built
# with the bundled, heavily-modified version of SDL 1.x if that

View File

@@ -1,43 +0,0 @@
Staged upstream change after the v0.84.1 release; only needed on 0.84.1
to support the '--disable-x11' configuration option and thus USE='-X'.
Closes: https://github.com/joncampbell123/dosbox-x/issues/3602
From 07e51e044acbe05c3e4ebb6c54b67575a811ae09 Mon Sep 17 00:00:00 2001
From: Wengier <wengierwu@yahoo.com>
Date: Fri, 1 Jul 2022 18:12:17 -0400
Subject: [PATCH] update
---
src/gui/sdlmain_linux.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/gui/sdlmain_linux.cpp b/src/gui/sdlmain_linux.cpp
index 94dd1875f..b22e987a8 100644
--- a/src/gui/sdlmain_linux.cpp
+++ b/src/gui/sdlmain_linux.cpp
@@ -16,10 +16,6 @@
# if C_X11_EXT_XKBRULES
# include <X11/extensions/XKBrules.h>
# endif
-#endif
-
-void UpdateWindowDimensions(Bitu width, Bitu height);
-void UpdateWindowMaximized(bool flag);
/* X11 Error handler.
* Apparently it is possible with SDL2 to resize the window in such a way that
@@ -49,6 +45,10 @@ int X11_ErrorHandler(Display *disp,XErrorEvent *xev) {
void X11_ErrorHandlerInstall(void) {
XSetErrorHandler(X11_ErrorHandler);
}
+#endif
+
+void UpdateWindowDimensions(Bitu width, Bitu height);
+void UpdateWindowMaximized(bool flag);
#if C_X11_XRANDR
#include <X11/extensions/Xrandr.h>
--
2.35.1

View File

@@ -1,2 +1,2 @@
DIST extension-manager-0.3.1.tar.gz 1441120 BLAKE2B bd1f6ac1a30521d7ff209c556bcc4ce0103666b9740aa982f0e1a7727b40106df482b693ece920a7449a634955984fa363e217a6b7d14fa0861effe27490824c SHA512 fd434baf0889fcf20a41be71d8bbe6d82aed0baff989747d4da3e8c0ae04a90b6b0b8ad54eede28f266250ca94db8711f35f6a6aa90ceb23195d3460bbd8f1ca
DIST extension-manager-0.3.2.tar.gz 1447521 BLAKE2B 55d09b54219804c1910a572953d7fee4b8a9131085260db1d4ef014bccf8b13fa2da0a8673c0d78643841d603878183c2b573b084bcd5cb1818721e8194c871b SHA512 84ff2f246d582cdae06a12e5e88309d67ae32502e9885675c08d75dc686fdea28b53bffa37d396ffface8515712f0b990603b5832704ae722342f0ad49748150
DIST extension-manager-0.4.0.tar.gz 1476951 BLAKE2B 9cf6ed74d30e22de8621ff9481de65295d9be07b82134b861192dfe3a9ebad4ea09be136beda0badc78d45cfd15a889b39b907ef4e258bc4229f6a342adde73d SHA512 9ec774c2dbd9476eeafbad19ea4d7d17ed9dd1de6cabe83511f372434cec11511dfd973cb5d67fba7e062314e2309150014ae83ce9768bb6f2e2f410909c8a1f

View File

@@ -30,9 +30,10 @@ RDEPEND="
dev-libs/glib:2
dev-libs/json-glib
gui-libs/gtk:4[introspection]
gui-libs/libadwaita:1[introspection]
>=gui-libs/libadwaita-1.2.0:1[introspection]
gui-libs/text-engine
net-libs/libsoup:3.0
sys-libs/libbacktrace
"
DEPEND="

View File

@@ -30,9 +30,10 @@ RDEPEND="
dev-libs/glib:2
dev-libs/json-glib
gui-libs/gtk:4[introspection]
gui-libs/libadwaita:1[introspection]
>=gui-libs/libadwaita-1.2.0:1[introspection]
gui-libs/text-engine
net-libs/libsoup:3.0
sys-libs/libbacktrace
"
DEPEND="

View File

@@ -0,0 +1 @@
DIST power-profiles-daemon-0.12.tar.gz 55705 BLAKE2B 7e78744186d1175d7dc67e3fe84481f68e14ed409639a44bd834ffae820b0828428271360f4f7faa0e2c2323f2ce4d1061e1b260b74aaf5da5cd35881def4a6f SHA512 d6645432751cbf94166307d2d3f982a598c28c0541bda666bc04c2da68ca7d0a129209312a9e6437fe80b786d7040ea34e5e921bc23f0a8d554f72fac1aada5a

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
<use>
<flag name="pylint">Run pylint checks</flag>
</use>
</pkgmetadata>

View File

@@ -0,0 +1,38 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit meson # gnome.org meson xdg
DESCRIPTION="Makes power profiles handling available over D-Bus."
HOMEPAGE="https://gitlab.freedesktop.org/hadess/power-profiles-daemon/"
SRC_URI="https://gitlab.freedesktop.org/hadess/${PN}/-/archive/${PV}/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64"
IUSE="gtk-doc pylint"
RDEPEND="
>=dev-libs/glib-2.0:2
>=dev-libs/libgudev-234
sys-power/upower
>=sys-auth/polkit-0.114
pylint? ( dev-python/pylint )
sys-apps/systemd
"
DEPEND="${RDEPEND}"
BDEPEND="
gtk-doc? ( dev-util/gi-docgen )
"
src_configure() {
local emesonargs=(
$(meson_use gtk-doc gtk_doc)
$(meson_use pylint)
-Dtests=false
)
meson_src_configure
}