gentoo resync : 20.03.2022

3 files changed, 10 insertions, 62 deletions

diff --git a/app-text/foliate/Manifest b/app-text/foliate/Manifest
index 765543d2818c..4af649e22e97 100644
--- a/app-text/foliate/Manifest
+++ b/app-text/foliate/Manifest
@@ -1,7 +1,5 @@
-DIST foliate-2.6.2.tar.gz 4760966 BLAKE2B 299dd8ab9f489772d18b85749cb312c8ddd4b21855452f87176ddfe068ff9e1e78cb5465fec97dbf70de22e7a773cf0910c11c3be7d0adb19279f4d9813249a1 SHA512 30bff00c34f90bfbd26b9e2b567a7cbcb1243cc5da17ff060762b7f1aafa4159daacee615de7f9bfef7d29d8209c8191094a154564f04321280037d2ec76a63e
 DIST foliate-2.6.3.tar.gz 4822251 BLAKE2B c6cedf4f5ae4e728ab2a7fc35a9fa1e9c69f9d2f8af92060b5363675d5e3fc5cb90698f4b184e792852d66a51e90c361b14d38034149304d10cdacc94100dda7 SHA512 b3dd5bc5a02d3f2210b0c7376426a7ea1668a81fa64fea179da2ab1d852778414cce45171143814d2010d6c03b0287dbbc512884107774ec211e24c6ed8127cb
 DIST foliate-2.6.4.tar.gz 4824560 BLAKE2B fd109d76a7cd0cfbff3fb7273b232a7c749922c5e4d782ed4b7dcb63e914a7cc0bd6e7623a509c3117e45ead5c1d7538c57f322742e4e826b88bddc6182abdf1 SHA512 af58efa2c33451617dbf7327b56551557d762ac80f1b489d5da1c5a46ebbfe329052149deb8b2f4c7729a7fd46deccd5500fd96c0a662b731c871c1ad8061cd3
-EBUILD foliate-2.6.2.ebuild 1217 BLAKE2B bad2c61ebe50ad2780fcf432273ce882f04eefb16119d6627b185db713717ef68d408e08cd18b5af63db2d94971291744b734fbad43ae2e20ba66e3ae78aec9a SHA512 253edf5d06def6414bc22ae06a834260609b065a292dadc5a038fd8e0a44116f7ed68372be55b731a97f1bc4c12a002a247a6886d1bbc0723f923cc3748cff7a
 EBUILD foliate-2.6.3.ebuild 1202 BLAKE2B c3e662e2218eb04cb4be8090eedeea2325c49d586e52040f5dcf976cfbdd9f029e0c9d41fd5b9165d9d760d46d3afcba116b85063b76187e816017f81148f9c9 SHA512 4e2c3de331b47ae613dd90d5fba956a4c7ed80788737a321e9a91612004328cf1f6cb6c286964431bbf8d88712c98fc219aa91efad5fa6ca358a5f4a70c5d6b7
-EBUILD foliate-2.6.4.ebuild 1202 BLAKE2B 5393135b4883f5cd16ca754cfd1ad41f53606118c44469d5fb03788ed1069d7dab0890628cc80aad692be1f4a345558eaad8bf1f95c4993290bb6f572a9b88b5 SHA512 e5b91817a3abac0ad25b54b0adaa0450937383a7f5bfba879c62c072658e38632218fc1fc9ee9345228d8266418de8e4fca43de4f3771e5af20dfd3be8b5e760
+EBUILD foliate-2.6.4-r1.ebuild 1210 BLAKE2B 8fa95a0d012751c378194e284391d30f0f4dec8e13ab8bc299cd3bbc4633a9385528dc0cb5576172a9e91abeec157ccc564492c1402b0009cc50ecac5a692ea0 SHA512 01d4b52af39728a8cfe02810c8c154c99451aafb90eae8791be2bd70f4cb7fdc9111b0bcaf51109b9e5b38bc83abf9b383f5a8c61354116c94f169e39e61ada7
 MISC metadata.xml 607 BLAKE2B ab5cffaca496e55fe6c7cce465104fe2c0010d4ef6110c816575944d7f48ae94d834ac61430e1c722daca0ceb739fdb4e2ad35b2afef010675726aea967d2ea2 SHA512 7e1d53bcd78408d6ef3803871d131beced46b118555d7daf0ccc0abf6233d3892568ca3264f1b123f20524d56600cb162c53057fb38a0811571a98ca0051573b
diff --git a/app-text/foliate/foliate-2.6.2.ebuild b/app-text/foliate/foliate-2.6.2.ebuild
deleted file mode 100644
index 685d66123a4f..000000000000
--- a/app-text/foliate/foliate-2.6.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PLOCALES="cs_CS de_DE es eu fr_FR id_ID ie it ko nb nl nn pt_BR ru_RU sv tr uk zh_CN zh_TW"
-inherit meson plocale xdg-utils gnome2-utils
-SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="gtk ebook reader built with gjs"
-HOMEPAGE="https://github.com/johnfactotum/foliate/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="handy spell"
-
-BDEPEND="${MESON_DEPEND}
-	sys-devel/gettext"
-RDEPEND="dev-libs/gjs
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	net-libs/webkit-gtk:4[introspection]
-	handy? ( gui-libs/libhandy:=[introspection] )
-	spell? ( app-text/gspell[introspection] )"
-
-src_prepare() {
-	default
-
-	plocale_find_changes "${S}"/po '' '.po'
-
-	rm_po() {
-		rm po/${1}.po
-		sed -e "/^${1}/d" -i po/LINGUAS
-	}
-
-	plocale_for_each_disabled_locale rm_po
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/app-text/foliate/foliate-2.6.4.ebuild b/app-text/foliate/foliate-2.6.4-r1.ebuild
index e884210fcfef..f6ded40f0ee6 100644
--- a/app-text/foliate/foliate-2.6.4.ebuild
+++ b/app-text/foliate/foliate-2.6.4-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 PLOCALES="cs de es eu fr id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW"
-inherit meson plocale xdg-utils gnome2-utils
+PYTHON_COMPAT=( python3_{8..10} )
+inherit meson python-any-r1 plocale xdg gnome2-utils
 SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="gtk ebook reader built with gjs"
 HOMEPAGE="https://github.com/johnfactotum/foliate/"
@@ -14,17 +15,21 @@ KEYWORDS="~amd64"
 IUSE="handy spell"
 
 BDEPEND="${MESON_DEPEND}
+	${PYTHON_DEPS}
 	sys-devel/gettext"
 RDEPEND="dev-libs/gjs
 	x11-libs/gtk+:3[introspection]
 	x11-libs/pango[introspection]
 	x11-libs/gdk-pixbuf:2[introspection]
 	net-libs/webkit-gtk:4[introspection]
+	sys-devel/gettext
 	handy? ( gui-libs/libhandy:=[introspection] )
 	spell? ( app-text/gspell[introspection] )"
 
 src_prepare() {
 	default
+	python_fix_shebang build-aux/meson
+	xdg_environment_reset
 
 	plocale_find_changes "${S}"/po '' '.po'
 
@@ -37,15 +42,11 @@ src_prepare() {
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
+	xdg_pkg_postinst
 	gnome2_schemas_update
 }
 
 pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
+	xdg_pkg_postinst
 	gnome2_schemas_update
 }