gentoo auto-resync : 18:04:2024 - 12:04:39

8 files changed, 4 insertions, 213 deletions

diff --git a/app-text/foliate/Manifest b/app-text/foliate/Manifest
index f9761c68abde..c8a0cf388aab 100644
--- a/app-text/foliate/Manifest
+++ b/app-text/foliate/Manifest
@@ -1,10 +1,3 @@
-AUX foliate-validate.patch 1073 BLAKE2B 276e30a9efd16cbbbe524bf4ef6edb3eee05b60dfe90a7b460718b016c9cf91ed751fc7a31922fcee4cf4f78cba8d478d9b19c48f9c6cd6a25227615474d2b55 SHA512 b1a28ba2e58440967b8ab683c3d0fc2e7e6510465690fd4494c643d2bad215fa57ce7cd5599def1fa585b8f6b94b650405e6355ef50b38d6bd6f8fcde56e63e7
-AUX foliate-webkit.patch 296 BLAKE2B bc6387586dcde1f2b59a7f1e1e5306f06c73813c0ab17d813eefd5b99fa08940e32307f94f9d6475a03255988aaf9968fbde6ed7111a626ec2c23def102aa7b8 SHA512 2ebc26006de0520edea6cdf427bb420e9a564a6e01294ddca45bb6973e505d54c4d4ff6b64301949a8494abd20a156c6e282ee3689e5206e8c5e2ae269efab0c
-DIST foliate-2.6.4.tar.gz 4824560 BLAKE2B fd109d76a7cd0cfbff3fb7273b232a7c749922c5e4d782ed4b7dcb63e914a7cc0bd6e7623a509c3117e45ead5c1d7538c57f322742e4e826b88bddc6182abdf1 SHA512 af58efa2c33451617dbf7327b56551557d762ac80f1b489d5da1c5a46ebbfe329052149deb8b2f4c7729a7fd46deccd5500fd96c0a662b731c871c1ad8061cd3
-DIST foliate-3.0.1.tar.bz2 7873783 BLAKE2B 678fcd9c384df8b623074a83d5ab64bbd6144301bad60813c2d7735e8c89ed94cc35ef90adf234db894d9fca5ed2a45db985944f5749d3c433f32ebfec0d87b2 SHA512 e4e7344858327b75cbd44c4b4243386c9f175499c14f3d4a4407c6d850af9b585878ead69b4ab1941561ab84b4aa9db0e1ef66eaeabe4bbae5078d652f16b2a8
 DIST foliate-3.1.0.tar.bz2 7902106 BLAKE2B cd804b168529ebde3312954de6e907d4de30ef4342dbcf872757f485d5b5e223c96629c01d6e0e0b3bb7cfcc1e98015b034b053d6a6429138a8aa1ed40b0b0c2 SHA512 36dfb6618b04fcfdd3d298133f9fb592e987b898420da08d1e2e1539f162abc4c06cf28e3c9e6ae5f008554fdec9ab36a69333f5c5074b069c345ae729301236
-EBUILD foliate-2.6.4-r2.ebuild 1209 BLAKE2B bfca831829a675d16b39a27a3a1449431cdb206b7609625df542e7c50d57c682065456e75cdee11126d8c4fbf1ae275b616349792bdfd5c332fa574c3e825285 SHA512 b9f37500296ac30323f85e8d42038438c4f5dc9cc11f6250548d3923a21d96c71e6917b02259a5de62a6585b02b1d46eca2bdbea7d03577b8de5c7fc789e4ffc
-EBUILD foliate-2.6.4-r3.ebuild 1386 BLAKE2B 169da3eec3f401b75bb94da57f182b8491031103c8f771de76e1df4e8a49c29bbe634b04499fdbbbd1838cba7f2997bbf1b84c83f9a1c7f344d4924047ae6eaa SHA512 9d0978ebd368c7b71715aa0e5d27d4834b38617f28189ad1a2eb491c243cef27ef946e587277f0495f90666aae8d73d5f8c3ba929e91bf0e5bbcdb779c0843d6
-EBUILD foliate-3.0.1.ebuild 918 BLAKE2B af474939033cf62326bbae2f2c0eb8655ccbb31a156bf4a3ced4ca9663c176192e58697c42e106809d21898d1de60193bad661158569da6671c83f416fe460cf SHA512 44c20dd72ae14b1cbf3920e59e92bc488d784e9848b0f1e1d3a0c7d4b385e7da7dd1b936d38c1128874a138b66e460dec92d03ff0e8e2c97e52621b63657f351
-EBUILD foliate-3.1.0.ebuild 921 BLAKE2B e2dff17cf6d747361089b49393d84309b223893ede229cd4fda93710dd5dbf2ec364da55f7f8e2e484f088b17b9b4bd6d28f22efa7c866dd91979c401e1f38a9 SHA512 3a679ddcd7d390a6028ac0298e4c7fdfe8592fc3960181939d041876abcba1f43aa6de8f2b1e022e0899fa8de788585d0105447ee53f3c5657f0d1033e751c10
-MISC metadata.xml 607 BLAKE2B ab5cffaca496e55fe6c7cce465104fe2c0010d4ef6110c816575944d7f48ae94d834ac61430e1c722daca0ceb739fdb4e2ad35b2afef010675726aea967d2ea2 SHA512 7e1d53bcd78408d6ef3803871d131beced46b118555d7daf0ccc0abf6233d3892568ca3264f1b123f20524d56600cb162c53057fb38a0811571a98ca0051573b
+EBUILD foliate-3.1.0.ebuild 920 BLAKE2B c84656143ae140f637f6962f6dbc99e16e94ae6c74cc3e752fcc701b5ea9b97adbc2b8bffad07326a3f9c1f2cc7ac6d187d3ebd91693dc7dd3754d242da1211f SHA512 54db85697a1ab7529f3e11c7b5c36cb52844213a9228e7cd1264923ac4a65c62546046d389979c9854a7c228ebe9ff7906edeb5988f05d85032828992187733d
+MISC metadata.xml 527 BLAKE2B b5c85198cff7dacca2093d8ba3899e74d8cfdef703f5166517cbef8084eb1386494ab4749d7609bdfa39b18051ffecfc10eb31604088c7c73343731cd21384bc SHA512 1235c2c0a5f68cd6c2e11f2563a61239960b76ca23cf98ac37340ac19c33d14e82a0063842fa93f6347cba5b813c8207388dbb3299edc1aeb6ff2843b6ed139d
diff --git a/app-text/foliate/files/foliate-validate.patch b/app-text/foliate/files/foliate-validate.patch
deleted file mode 100644
index 45d2c42eef73..000000000000
--- a/app-text/foliate/files/foliate-validate.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -r -U3 foliate-2.6.4.orig/data/meson.build foliate-2.6.4/data/meson.build
---- foliate-2.6.4.orig/data/meson.build	2022-01-13 19:23:26.000000000 +0700
-+++ foliate-2.6.4/data/meson.build	2023-05-14 13:08:00.443754308 +0700
-@@ -7,13 +7,6 @@
-   install_dir: join_paths(get_option('datadir'), 'applications')
- )
- 
--desktop_utils = find_program('desktop-file-validate', required: false)
--if desktop_utils.found()
--  test('Validate desktop file', desktop_utils,
--    args: [desktop_file]
--  )
--endif
--
- appstream_file = i18n.merge_file(
-   input: 'com.github.johnfactotum.Foliate.metainfo.xml.in',
-   output: 'com.github.johnfactotum.Foliate.metainfo.xml',
-@@ -22,13 +15,6 @@
-   install_dir: join_paths(get_option('datadir'), 'metainfo')
- )
- 
--appstream_util = find_program('appstream-util', required: false)
--if appstream_util.found()
--  test('Validate appstream file', appstream_util,
--    args: ['validate', appstream_file]
--  )
--endif
--
- install_data('com.github.johnfactotum.Foliate.gschema.xml',
-   install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')
- )
diff --git a/app-text/foliate/files/foliate-webkit.patch b/app-text/foliate/files/foliate-webkit.patch
deleted file mode 100644
index cb559bf0003d..000000000000
--- a/app-text/foliate/files/foliate-webkit.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/main.js b/src/main.js
-index 718d420..2ea2018 100644
---- a/src/main.js
-+++ b/src/main.js
-@@ -18,7 +18,7 @@ pkg.initFormat()
- pkg.require({
-     'Gio': '2.0',
-     'Gtk': '3.0',
--    'WebKit2': '4.0'
-+    'WebKit2': '4.1'
- })
- 
- const { Gio, Gtk, Gdk, GLib, WebKit2 } = imports.gi
diff --git a/app-text/foliate/foliate-2.6.4-r2.ebuild b/app-text/foliate/foliate-2.6.4-r2.ebuild
deleted file mode 100644
index 55777f866399..000000000000
--- a/app-text/foliate/foliate-2.6.4-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-PYTHON_COMPAT=( python3_{9..11} )
-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/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-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'
-
-	rm_po() {
-		rm po/${1}.po
-		sed -e "/^${1}/d" -i po/LINGUAS
-	}
-
-	plocale_for_each_disabled_locale rm_po
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/app-text/foliate/foliate-2.6.4-r3.ebuild b/app-text/foliate/foliate-2.6.4-r3.ebuild
deleted file mode 100644
index 666dca3a88a1..000000000000
--- a/app-text/foliate/foliate-2.6.4-r3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-PYTHON_COMPAT=( python3_{9..11} )
-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/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-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.1[introspection]
-	sys-devel/gettext
-	handy? ( gui-libs/libhandy:=[introspection] )
-	spell? ( app-text/gspell[introspection] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-webkit.patch "${FILESDIR}"/${PN}-validate.patch )
-
-src_prepare() {
-	default
-	python_fix_shebang build-aux/meson
-	xdg_environment_reset
-
-	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
-}
-
-src_install() {
-	meson_src_install
-	dosym com.github.johnfactotum.Foliate /usr/bin/foliate
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/app-text/foliate/foliate-3.0.1.ebuild b/app-text/foliate/foliate-3.0.1.ebuild
deleted file mode 100644
index 675697e18bee..000000000000
--- a/app-text/foliate/foliate-3.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PLOCALES="ar cs de el es eu fa_IR fr he hi id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW"
-inherit meson plocale xdg gnome2-utils
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
-DESCRIPTION="gtk ebook reader built with gjs"
-HOMEPAGE="https://github.com/johnfactotum/foliate/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="${MESON_DEPEND}"
-RDEPEND=">=dev-libs/gjs-1.76
-	>=gui-libs/gtk-4.12
-	gui-libs/libadwaita
-	net-libs/webkit-gtk:6[introspection]
-	sys-devel/gettext"
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	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_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/app-text/foliate/foliate-3.1.0.ebuild b/app-text/foliate/foliate-3.1.0.ebuild
index f52ddf361f68..87f75f240349 100644
--- a/app-text/foliate/foliate-3.1.0.ebuild
+++ b/app-text/foliate/foliate-3.1.0.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 PLOCALES="ar cs de el es eu fa_IR fr he hi hr id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW"
 inherit meson plocale xdg gnome2-utils
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
 DESCRIPTION="gtk ebook reader built with gjs"
 HOMEPAGE="https://github.com/johnfactotum/foliate/"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="${MESON_DEPEND}"
 RDEPEND=">=dev-libs/gjs-1.76
diff --git a/app-text/foliate/metadata.xml b/app-text/foliate/metadata.xml
index 86063f52e8d8..56812b6b96b7 100644
--- a/app-text/foliate/metadata.xml
+++ b/app-text/foliate/metadata.xml
@@ -9,9 +9,6 @@
     Supported formats:
     epub, epub3, azw, azw3, mobi, fb2, fb2.zip, cbr, cbz, cbt, cb7, txt
   </longdescription>
-  <use>
-    <flag name="handy">Use <pkg>gui-libs/libhandy</pkg></flag>
-  </use>
   <upstream>
     <remote-id type="github">johnfactotum/foliate</remote-id>
   </upstream>