app-emulation/bottles/Manifest

@@ -1,2 +1 @@
 DIST bottles-2.0.9.7.tar.gz 1133843 BLAKE2B 9ca30c33d40b1101ad6cdee06e8cbaa8215832a3348f72b81d9ce0ee0763a1bfc3d9a36d2f00a8285887c82d0f12044145dc7216150554cdd4d10515bd699ae8 SHA512 305d12fd8626f5eab9cfb64672bbe3ec5c243f0f21e9869704fd04186eb5f0d5656560ab4a66957619577a8f68059d8171b9ad1cc5e4e6ab01ac93089d44784d
-DIST bottles-3.1.15.tar.gz 856553 BLAKE2B 024286e4c296a2833663a48425f89cd1849253cd217dd33e51c65b27e275914d1bd02670419a0aa404133efdcf453e5c654cf0f3f832a7942acac5789478d7f7 SHA512 d7f14f9f612e93905cc7da8203b6bb2752306b8e46721aa324fe300f9fc5a4b1badc0218e375419aabf164cd40a72d1443ddc80c42343123a4276610eae66e9e

app-emulation/bottles/bottles-3.1.15.ebuild

@@ -1,79 +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"
-}
-
-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
-}

app-emulation/bottles/bottles-9999.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit python-single-r1 meson gnome2-utils xdg
 
 DESCRIPTION="Easily manage WINE prefixes in a new way"
@@ -30,35 +30,27 @@ DEPEND="
 	${PYTHON_DEPS}
 	>=x11-libs/gtk+-3.24.10[introspection]
 	dev-libs/appstream-glib[introspection]
+	dev-util/desktop-file-utils
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP},cairo]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
 	')
 "
 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"
-}
-
 src_install() {
 	meson_src_install
-	python_optimize "${D}/usr/share/bottles/"
+	python_optimize
+
+	# TODO: find a better way to fix the python script
+	echo "#!/usr/bin/${EPYTHON}
+	$(cat ${D}/usr/bin/${PN})" > "${D}/usr/bin/${PN}"
 }
 
 pkg_preinst() {