From c3ead765b783006a0e6ed1f2f6a4d53fca2e6865 Mon Sep 17 00:00:00 2001 From: Alfred Wingate Date: Thu, 17 Mar 2022 22:41:07 +0200 Subject: [PATCH] app-emulation/bottles: bump 20220314_p3, drop 3.1.5 Signed-off-by: Alfred Wingate --- app-emulation/bottles/Manifest | 2 +- .../bottles/bottles-20220314_p3.ebuild | 127 ++++++++++++++++++ app-emulation/bottles/bottles-3.1.15.ebuild | 84 ------------ app-emulation/bottles/bottles-99999999.ebuild | 19 ++- 4 files changed, 142 insertions(+), 90 deletions(-) create mode 100644 app-emulation/bottles/bottles-20220314_p3.ebuild delete mode 100644 app-emulation/bottles/bottles-3.1.15.ebuild diff --git a/app-emulation/bottles/Manifest b/app-emulation/bottles/Manifest index c7d28e4..8cf8629 100644 --- a/app-emulation/bottles/Manifest +++ b/app-emulation/bottles/Manifest @@ -1,2 +1,2 @@ DIST bottles-20211128.tar.gz 1179583 BLAKE2B f2e366a03c6d60ea43c6e89aa8ad901a28003a023f4d71b994fce8d9f499c5fa45bd93bbdf7ce7bcb4f3f909b1f7a79ed785360770eb3679a200b8c93a76e5f7 SHA512 f97203ba5e1a18241f2c29de8a8294cd962975878cf29e151fc16f07bd35c7786bc4173f1d4a372cc5d8c2659d6b33486ed10317bb65efadf9e15d57be658803 -DIST bottles-3.1.15.tar.gz 856553 BLAKE2B 024286e4c296a2833663a48425f89cd1849253cd217dd33e51c65b27e275914d1bd02670419a0aa404133efdcf453e5c654cf0f3f832a7942acac5789478d7f7 SHA512 d7f14f9f612e93905cc7da8203b6bb2752306b8e46721aa324fe300f9fc5a4b1badc0218e375419aabf164cd40a72d1443ddc80c42343123a4276610eae66e9e +DIST bottles-20220314_p3.tar.gz 1576626 BLAKE2B afd2f5d226f9d3ea396fdbbb2dd2d0325951f5a6a76f958c557f5ae295b5e706358fd4f31030b558d1e5448d437cd8e295bd61b944a5754d4f16a32495ae1d9b SHA512 20619e772edd58384e145187cbd3651585abfba4c18c4d3db5a536c69ad76e30a3c0f686bd6c4387d7890132ea02b91c89f58bdba7516f49e04602a5fde178ab diff --git a/app-emulation/bottles/bottles-20220314_p3.ebuild b/app-emulation/bottles/bottles-20220314_p3.ebuild new file mode 100644 index 0000000..9960b72 --- /dev/null +++ b/app-emulation/bottles/bottles-20220314_p3.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit optfeature gnome2-utils python-single-r1 meson xdg + +DESCRIPTION="Easily manage WINE prefixes in a new way" +HOMEPAGE=" + https://usebottles.com/ + https://github.com/bottlesdevs/Bottles +" + +LICENSE="GPL-3+" +SLOT="0" + +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}"}" + 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 )" +IUSE="test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +PROPERTIES="test_network" + +# Dependencies adapted from AppImageBuilder.yml, omitted selinux others might be redundant as well. +DEPEND=" + ${PYTHON_DEPS} + >=x11-libs/gtk+-3.24.10[introspection] + dev-libs/appstream-glib[introspection] + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP},cairo] + ') +" +BDEPEND=" + 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 +} + +src_prepare() { + eapply_user + + if [[ "${PV}" == *9999* ]]; then + # 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/" +} + +pkg_preinst() { + xdg_pkg_preinst + gnome2_schemas_savelist +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + optfeature "gamemode support" games-util/gamemode +} diff --git a/app-emulation/bottles/bottles-3.1.15.ebuild b/app-emulation/bottles/bottles-3.1.15.ebuild deleted file mode 100644 index 722213d..0000000 --- a/app-emulation/bottles/bottles-3.1.15.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit python-single-r1 meson gnome2-utils xdg - -DESCRIPTION="Easily manage WINE prefixes in a new way" -HOMEPAGE=" - https://usebottles.com/ - https://github.com/bottlesdevs/Bottles -" - -if [[ "${PV}" == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/bottlesdevs/${PN^}.git" -else - SRC_URI="https://github.com/bottlesdevs/${PN^}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/${P^}" -fi - -RESTRICT="mirror" -LICENSE="GPL-3" -SLOT="0" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND=" - ${PYTHON_DEPS} - >=x11-libs/gtk+-3.24.10[introspection] - dev-libs/appstream-glib[introspection] - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_MULTI_USEDEP},cairo] - ') -" -RDEPEND=" - ${DEPEND} - gui-libs/libhandy:1[introspection] -" - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - eapply_user - if [[ "${PV}" == *9999* ]]; then - local commit version - commit=$(git rev-parse HEAD) - version=$(cat "${S}/VERSION") - echo "${version%%.*}.${commit:0:7}" > "${S}/VERSION" - fi - sed -i \ - "s:^\(conf.set('PYTHON',\).*$:\1 '/usr/bin/${EPYTHON}'):" \ - "${S}/src/meson.build" || die - - # Hard skip network dependant test - sed -i \ - "s:\(if appstream\_util\.found()\):\1 and false:" \ - "${S}/data/meson.build" || die -} - -src_install() { - meson_src_install - python_optimize "${D}/usr/share/bottles/" -} - -pkg_preinst() { - gnome2_schemas_savelist - xdg_pkg_preinst -} - -pkg_postinst() { - gnome2_gconf_install - gnome2_schemas_update - xdg_pkg_postinst -} - -pkg_postrm() { - gnome2_gconf_uninstall - gnome2_schemas_update - xdg_pkg_postrm -} diff --git a/app-emulation/bottles/bottles-99999999.ebuild b/app-emulation/bottles/bottles-99999999.ebuild index 98fc42a..9960b72 100644 --- a/app-emulation/bottles/bottles-99999999.ebuild +++ b/app-emulation/bottles/bottles-99999999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -inherit optfeature python-single-r1 meson xdg +inherit optfeature gnome2-utils python-single-r1 meson xdg DESCRIPTION="Easily manage WINE prefixes in a new way" HOMEPAGE=" @@ -12,15 +12,16 @@ HOMEPAGE=" https://github.com/bottlesdevs/Bottles " -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" if [[ "${PV}" == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/bottlesdevs/${PN^}.git" else - VERSION_CODENAME="treviso" - MY_PV="${PV::4}.${PV:4:2}.${PV:6:2}-${VERSION_CODENAME}" + 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}"}" SRC_URI="https://github.com/bottlesdevs/${PN^}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="-* ~amd64" S="${WORKDIR}/${PN^}-${MY_PV}" @@ -71,6 +72,8 @@ RDEPEND=" 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? ( @@ -112,7 +115,13 @@ src_install() { python_optimize "${D}/usr/share/bottles/" } +pkg_preinst() { + xdg_pkg_preinst + gnome2_schemas_savelist +} + pkg_postinst() { xdg_pkg_postinst + gnome2_schemas_update optfeature "gamemode support" games-util/gamemode }