From f297ce6dacd544aa01caf013429c4518ffb9f6d3 Mon Sep 17 00:00:00 2001 From: Alfred Wingate Date: Fri, 23 Dec 2022 01:36:35 +0200 Subject: [PATCH] app-emulation/bottles: update live version Signed-off-by: Alfred Wingate --- app-emulation/bottles/bottles-99999999.ebuild | 110 +++++++++--------- 1 file changed, 53 insertions(+), 57 deletions(-) diff --git a/app-emulation/bottles/bottles-99999999.ebuild b/app-emulation/bottles/bottles-99999999.ebuild index 9960b72..0a22f9e 100644 --- a/app-emulation/bottles/bottles-99999999.ebuild +++ b/app-emulation/bottles/bottles-99999999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) inherit optfeature gnome2-utils python-single-r1 meson xdg DESCRIPTION="Easily manage WINE prefixes in a new way" @@ -19,79 +19,74 @@ if [[ "${PV}" == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/bottlesdevs/${PN^}.git" else - VERSION_CODENAME="trento" year="${PV::4}" month="${PV:4:2}" day="${PV:6:2}" patch="${PV:10:1}" - MY_PV="${year}.${month#0}.${day#0}-${VERSION_CODENAME}${patch:+"-${patch}"}" + MY_PV="${year}.${month}.${day}${patch:+".${patch}"}" SRC_URI="https://github.com/bottlesdevs/${PN^}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="-* ~amd64" S="${WORKDIR}/${PN^}-${MY_PV}" fi -RESTRICT="mirror !test? ( test )" +RESTRICT="!test? ( test )" +PROPERTIES="test_network" IUSE="test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -PROPERTIES="test_network" -# Dependencies adapted from AppImageBuilder.yml, omitted selinux others might be redundant as well. +# Very annoying to figure out the deps +# Script for getting python modules: +# https://gitlab.com/Parona/my-scripts/-/blob/master/scripts/python_deps.sh +# Runtime programs needed can be quickly found with: +# grep -r "shutil.which" +# But look at context to gauge if they are optional or not +# +# BDPEPEND dependencies can be thankfully gathered from the meson.build files +# DEPEND are instrospection files which can be found as such +# find . -name "*.blp" -exec grep -Eh "^using " {} + | sed 's/using \([A-Za-z]*\) \([0-9.]*\);/\1-\2.typelib/' +# And in similar vein find runtime required introspection files, similar deal with getting typelib file as above +# grep -r "gi.require_version + +# vkbasalt could be optional but vkbasalt-cli isnt +# It could work without wine but(!) it still requires all the runtime dependencies for wine +# so easier to depend on wine to get it for free + DEPEND=" + gui-libs/gtk:4[introspection] + gui-libs/libadwaita[introspection] +" +RDEPEND=" ${PYTHON_DEPS} - >=x11-libs/gtk+-3.24.10[introspection] - dev-libs/appstream-glib[introspection] + ${DEPEND} + app-arch/cabextract + app-arch/p7zip + gui-libs/gtksourceview[introspection] + media-gfx/imagemagick + >=sys-libs/glibc-2.32 + virtual/wine + x11-apps/xdpyinfo $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_USEDEP},cairo] + app-arch/patool[${PYTHON_USEDEP}] + dev-python/FVS[${PYTHON_USEDEP}] + dev-python/pygobject[${PYTHON_USEDEP}] + dev-python/icoextract[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + dev-python/orjson[${PYTHON_USEDEP}] + dev-python/pefile[${PYTHON_USEDEP}] + dev-python/pycurl[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/vkbasalt-cli[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] ') " BDEPEND=" + ${PYTHON_DEPS} + app-text/blueprint-compiler + dev-libs/glib:2 + sys-devel/gettext test? ( dev-libs/appstream dev-libs/glib dev-util/desktop-file-utils ) " -RDEPEND=" - ${DEPEND} - app-arch/bzip2 - app-arch/cabextract - app-arch/p7zip - app-i18n/ibus - dev-libs/expat - dev-libs/glib:2 - dev-libs/libffi - dev-libs/libgee - dev-libs/libgpg-error - dev-libs/libpcre:3 - gnome-base/dconf - gnome-base/gsettings-desktop-schemas - gnome-base/librsvg:2 - gui-libs/libhandy:1[introspection] - media-libs/freetype - media-libs/libcanberra[gtk3] - media-libs/vulkan-loader - net-fs/samba[winbind] - net-libs/gnutls - net-libs/webkit-gtk:4 - sys-libs/zlib - sys-process/procps - x11-apps/xdpyinfo - x11-libs/gtksourceview:4 - x11-libs/libnotify[introspection] - virtual/opengl - amd64? ( - media-libs/freetype[abi_x86_32(-)] - media-libs/vulkan-loader[abi_x86_32(-)] - net-libs/gnutls[abi_x86_32(-)] - sys-libs/glibc[multilib(-)] - virtual/opengl[abi_x86_32(-)] - ) - $(python_gen_cond_dep ' - app-arch/patool[${PYTHON_USEDEP}] - dev-python/certifi[${PYTHON_USEDEP}] - dev-python/markdown[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - - ') -" pkg_setup() { python-single-r1_pkg_setup @@ -104,15 +99,12 @@ src_prepare() { # https://github.com/bottlesdevs/Bottles#notices-for-package-maintainers sed -i "s/\(.*\)/\1-$(git rev-parse --short HEAD)/" "${S}/VERSION" || die fi - - sed -i \ - "s:^\(conf.set('PYTHON',\).*$:\1 '/usr/bin/${EPYTHON}'):" \ - "${S}/src/meson.build" || die } src_install() { meson_src_install python_optimize "${D}/usr/share/bottles/" + python_fix_shebang "${D}/usr/" } pkg_preinst() { @@ -124,4 +116,8 @@ pkg_postinst() { xdg_pkg_postinst gnome2_schemas_update optfeature "gamemode support" games-util/gamemode + optfeature "gamescope support" games-util/gamescope + optfeature "vmtouch support" dev-utils/vmtouch + #optfeature "MangoHub support" games-util/mangohub + #optfeature "obs-vkcapture support" media-video/obs-vkcapture }