x11-misc/portfolio: tweaks; add myself to maintainers

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Maciej Barć <xgqt@protonmail.com>

app-emulation/bottles/Manifest

@@ -0,0 +1 @@
+DIST bottles-2.0.9.7.tar.gz 1133843 BLAKE2B 9ca30c33d40b1101ad6cdee06e8cbaa8215832a3348f72b81d9ce0ee0763a1bfc3d9a36d2f00a8285887c82d0f12044145dc7216150554cdd4d10515bd699ae8 SHA512 305d12fd8626f5eab9cfb64672bbe3ec5c243f0f21e9869704fd04186eb5f0d5656560ab4a66957619577a8f68059d8171b9ad1cc5e4e6ab01ac93089d44784d

app-emulation/bottles/bottles-2.0.9.7.ebuild

@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+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]
+	dev-util/desktop-file-utils
+	$(python_gen_cond_dep '
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+"
+RDEPEND="
+	${DEPEND}
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	meson_src_install
+	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}"
+
+	mv "${D}/usr/share/appdata" "${D}/usr/share/metainfo" || die
+}
+
+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

@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+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]
+	dev-util/desktop-file-utils
+	$(python_gen_cond_dep '
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+"
+RDEPEND="
+	${DEPEND}
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	meson_src_install
+	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() {
+	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/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>xgqt@protonmail.com</email>
+        <name>Maciej Barć</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">bottlesdevs/Bottles</remote-id>
+    </upstream>
+</pkgmetadata>

x11-misc/portfolio/metadata.xml

@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+    <maintainer type="person">
+        <email>xgqt@protonmail.com</email>
+        <name>Maciej Barć</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">tchx84/Portfolio</remote-id>
+    </upstream>
 </pkgmetadata>

x11-misc/portfolio/portfolio-0.9.2.ebuild

@@ -16,7 +16,7 @@ if [[ "${PV}" == *9999* ]]; then
 else
 	SRC_URI="https://github.com/tchx84/${PN^}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN^}-${PV}"
+	S="${WORKDIR}/${P^}"
 fi
 
 RESTRICT="
@@ -36,15 +36,15 @@ RDEPEND="
 		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
 	')
+"
+DEPEND="
+	${RDEPEND}
 	test? (
 		dev-python/black
 		dev-python/pyflakes
 		dev-python/pytest
 	)
 "
-DEPEND="
-	${RDEPEND}
-"
 
 pkg_setup() {
 	python-single-r1_pkg_setup
@@ -54,6 +54,7 @@ src_install() {
 	meson_src_install
 	python_optimize
 
+	# TODO: find a better way to fix the python script
 	echo "#!/usr/bin/${EPYTHON}
 	$(cat ${D}/usr/bin/dev.tchx84.Portfolio)" > "${D}/usr/bin/dev.tchx84.Portfolio" || die
 }

x11-misc/portfolio/portfolio-9999.ebuild

@@ -16,7 +16,7 @@ if [[ "${PV}" == *9999* ]]; then
 else
 	SRC_URI="https://github.com/tchx84/${PN^}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN^}-${PV}"
+	S="${WORKDIR}/${P^}"
 fi
 
 RESTRICT="
@@ -36,15 +36,15 @@ RDEPEND="
 		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
 	')
+"
+DEPEND="
+	${RDEPEND}
 	test? (
 		dev-python/black
 		dev-python/pyflakes
 		dev-python/pytest
 	)
 "
-DEPEND="
-	${RDEPEND}
-"
 
 pkg_setup() {
 	python-single-r1_pkg_setup
@@ -54,6 +54,7 @@ src_install() {
 	meson_src_install
 	python_optimize
 
+	# TODO: find a better way to fix the python script
 	echo "#!/usr/bin/${EPYTHON}
 	$(cat ${D}/usr/bin/dev.tchx84.Portfolio)" > "${D}/usr/bin/dev.tchx84.Portfolio" || die
 }