Merge branch 'bumps' into 'master'

app-emulation/bottles: new package, add 51.5, 9999

See uest src_prepare/src_prepare-overlay!360
This commit is contained in:
Parona 2023-02-24 18:22:49 +00:00
commit e5d92c2677
6 changed files with 48 additions and 302 deletions

View File

@ -1,3 +1 @@
DIST bottles-20211128.tar.gz 1179583 BLAKE2B f2e366a03c6d60ea43c6e89aa8ad901a28003a023f4d71b994fce8d9f499c5fa45bd93bbdf7ce7bcb4f3f909b1f7a79ed785360770eb3679a200b8c93a76e5f7 SHA512 f97203ba5e1a18241f2c29de8a8294cd962975878cf29e151fc16f07bd35c7786bc4173f1d4a372cc5d8c2659d6b33486ed10317bb65efadf9e15d57be658803 DIST bottles-51.5.tar.gz 2168592 BLAKE2B 5aee4a6db1f066cfed10262e7af5ec8ec3416583d92095c69e5bc9c8f0c17f083c2eee44dedf79b2405f442e7433b58209cb1b73f47a95ed51aacb24115c54b1 SHA512 5d238d62053d2bdb6ba17cc0e2903b45c9c87f08b0d737264a4d1efa7e10ca9d77fc722333ae91ad4929a5b742a628692601dcc915d4553815d1361d1a0a110e
DIST bottles-20220314_p3.tar.gz 1576626 BLAKE2B afd2f5d226f9d3ea396fdbbb2dd2d0325951f5a6a76f958c557f5ae295b5e706358fd4f31030b558d1e5448d437cd8e295bd61b944a5754d4f16a32495ae1d9b SHA512 20619e772edd58384e145187cbd3651585abfba4c18c4d3db5a536c69ad76e30a3c0f686bd6c4387d7890132ea02b91c89f58bdba7516f49e04602a5fde178ab
DIST bottles-20221214_p1.tar.gz 2063797 BLAKE2B 9f0e606b6c040549bdfd1aa91f21edbebd3bb07fd9cb323f73541a23d950ec55351ecf9ad491666cc7509a6907b66d26bcbb8e1d5319bcc6d82b024dd70e04fa SHA512 2eae013a5143f5cb2b9e70b094d160c036ff099b311ecc508721fecf4369bef98f7f7e37a1071a45ccb276371acf3b92fdc1b129d6986aa80d443c6883efc7e1

View File

@ -1,118 +0,0 @@
# Copyright 1999-2021 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
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="treviso"
MY_PV="${PV::4}.${PV:4:2}.${PV:6:2}-${VERSION_CODENAME}"
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-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_postinst() {
xdg_pkg_postinst
optfeature "gamemode support" games-util/gamemode
}

View File

@ -1,127 +0,0 @@
# 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
}

View File

@ -1,35 +1,31 @@
# Copyright 1999-2022 Gentoo Authors # Copyright 2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
# todo patool, icoextract
PYTHON_COMPAT=( python3_{9..10} ) PYTHON_COMPAT=( python3_{9..10} )
inherit optfeature gnome2-utils python-single-r1 meson xdg inherit gnome2-utils python-single-r1 meson xdg optfeature
DESCRIPTION="Easily manage WINE prefixes in a new way" DESCRIPTION="Run Windows software and games on Linux"
HOMEPAGE=" HOMEPAGE="https://usebottles.com/"
https://usebottles.com/
https://github.com/bottlesdevs/Bottles
"
LICENSE="GPL-3+" if [[ "${PV}" == "9999" ]]; then
SLOT="0"
if [[ "${PV}" == *9999* ]]; then
inherit git-r3 inherit git-r3
EGIT_REPO_URI="https://github.com/bottlesdevs/${PN^}.git" EGIT_REPO_URI="https://github.com/bottlesdevs/Bottles/"
else else
year="${PV::4}" month="${PV:4:2}" day="${PV:6:2}" patch="${PV:10:1}" SRC_URI="https://github.com/bottlesdevs/Bottles/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
MY_PV="${year}.${month}.${day}${patch:+".${patch}"}" S="${WORKDIR}/Bottles-${PV}"
SRC_URI="https://github.com/bottlesdevs/${PN^}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64"
KEYWORDS="-* ~amd64"
S="${WORKDIR}/${PN^}-${MY_PV}"
fi fi
RESTRICT="!test? ( test )" LICENSE="GPL-3"
PROPERTIES="test_network" SLOT="0"
IUSE="test" IUSE="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}" REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# tests are quite pointless as they check static files and releases are tagged with them still failing
RESTRICT="test"
# Very annoying to figure out the deps # Very annoying to figure out the deps
# Script for getting python modules: # Script for getting python modules:
@ -69,6 +65,7 @@ RDEPEND="
dev-python/icoextract[${PYTHON_USEDEP}] dev-python/icoextract[${PYTHON_USEDEP}]
dev-python/markdown[${PYTHON_USEDEP}] dev-python/markdown[${PYTHON_USEDEP}]
dev-python/orjson[${PYTHON_USEDEP}] dev-python/orjson[${PYTHON_USEDEP}]
dev-python/pathvalidate[${PYTHON_USEDEP}]
dev-python/pefile[${PYTHON_USEDEP}] dev-python/pefile[${PYTHON_USEDEP}]
dev-python/pycurl[${PYTHON_USEDEP}] dev-python/pycurl[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}]
@ -92,13 +89,13 @@ pkg_setup() {
python-single-r1_pkg_setup python-single-r1_pkg_setup
} }
src_prepare() { src_configure() {
eapply_user if [[ "${PV}" == "9999" ]]; then
local emesonargs=(
if [[ "${PV}" == *9999* ]]; then -Ddevel=true
# https://github.com/bottlesdevs/Bottles#notices-for-package-maintainers )
sed -i "s/\(.*\)/\1-$(git rev-parse --short HEAD)/" "${S}/VERSION" || die
fi fi
meson_src_configure
} }
src_install() { src_install() {

View File

@ -1,37 +1,31 @@
# Copyright 1999-2022 Gentoo Authors # Copyright 2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
# todo patool, icoextract
PYTHON_COMPAT=( python3_{9..10} ) PYTHON_COMPAT=( python3_{9..10} )
inherit optfeature gnome2-utils python-single-r1 meson xdg inherit gnome2-utils python-single-r1 meson xdg optfeature
DESCRIPTION="Easily manage WINE prefixes in a new way" DESCRIPTION="Run Windows software and games on Linux"
HOMEPAGE=" HOMEPAGE="https://usebottles.com/"
https://usebottles.com/
https://github.com/bottlesdevs/Bottles
"
LICENSE="GPL-3+" if [[ "${PV}" == "9999" ]]; then
SLOT="0"
if [[ "${PV}" == *9999* ]]; then
inherit git-r3 inherit git-r3
EGIT_REPO_URI="https://github.com/bottlesdevs/${PN^}.git" EGIT_REPO_URI="https://github.com/bottlesdevs/Bottles/"
else else
year="${PV::4}" month="${PV:4:2}" day="${PV:6:2}" patch="${PV:10:1}" SRC_URI="https://github.com/bottlesdevs/Bottles/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
MY_PV="${year}.${month}.${day}${patch:+".${patch}"}" S="${WORKDIR}/Bottles-${PV}"
SRC_URI="https://github.com/bottlesdevs/${PN^}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64"
KEYWORDS="-* ~amd64"
S="${WORKDIR}/${PN^}-${MY_PV}"
fi fi
# Appstream file fails to validate, upstream issue LICENSE="GPL-3"
RESTRICT="test" SLOT="0"
#RESTRICT="!test? ( test )"
PROPERTIES="test_network"
IUSE="test" IUSE="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}" REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# tests are quite pointless as they check static files and releases are tagged with them still failing
RESTRICT="test"
# Very annoying to figure out the deps # Very annoying to figure out the deps
# Script for getting python modules: # Script for getting python modules:
@ -71,6 +65,7 @@ RDEPEND="
dev-python/icoextract[${PYTHON_USEDEP}] dev-python/icoextract[${PYTHON_USEDEP}]
dev-python/markdown[${PYTHON_USEDEP}] dev-python/markdown[${PYTHON_USEDEP}]
dev-python/orjson[${PYTHON_USEDEP}] dev-python/orjson[${PYTHON_USEDEP}]
dev-python/pathvalidate[${PYTHON_USEDEP}]
dev-python/pefile[${PYTHON_USEDEP}] dev-python/pefile[${PYTHON_USEDEP}]
dev-python/pycurl[${PYTHON_USEDEP}] dev-python/pycurl[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}]
@ -94,13 +89,13 @@ pkg_setup() {
python-single-r1_pkg_setup python-single-r1_pkg_setup
} }
src_prepare() { src_configure() {
eapply_user if [[ "${PV}" == "9999" ]]; then
local emesonargs=(
if [[ "${PV}" == *9999* ]]; then -Ddevel=true
# https://github.com/bottlesdevs/Bottles#notices-for-package-maintainers )
sed -i "s/\(.*\)/\1-$(git rev-parse --short HEAD)/" "${S}/VERSION" || die
fi fi
meson_src_configure
} }
src_install() { src_install() {

View File

@ -1,10 +1,10 @@
# Copyright 2022 Gentoo Authors # Copyright 2022-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
DISTUTILS_USE_PEP517=setuptools DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{9..10} ) PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1 inherit distutils-r1
DESCRIPTION="Extract icons from Windows PE files (.exe/.dll)" DESCRIPTION="Extract icons from Windows PE files (.exe/.dll)"
@ -32,6 +32,7 @@ BDEPEND="
distutils_enable_tests unittest distutils_enable_tests unittest
src_test() { src_test() {
export PATH="${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}"
emake -C tests emake -C tests
distutils-r1_src_test distutils-r1_src_test
} }