From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- app-text/evince/Manifest | 11 +- app-text/evince/evince-41.3.ebuild | 126 --------------------- app-text/evince/evince-42.1.ebuild | 122 -------------------- app-text/evince/evince-42.2.ebuild | 2 +- app-text/evince/evince-42.3.ebuild | 122 ++++++++++++++++++++ .../files/41.3-fix-build-with-meson-0.61.1.patch | 54 --------- app-text/evince/metadata.xml | 2 - 7 files changed, 127 insertions(+), 312 deletions(-) delete mode 100644 app-text/evince/evince-41.3.ebuild delete mode 100644 app-text/evince/evince-42.1.ebuild create mode 100644 app-text/evince/evince-42.3.ebuild delete mode 100644 app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch (limited to 'app-text/evince') diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest index 0254b4bd3292..4238629ebba0 100644 --- a/app-text/evince/Manifest +++ b/app-text/evince/Manifest @@ -1,8 +1,5 @@ -AUX 41.3-fix-build-with-meson-0.61.1.patch 1385 BLAKE2B 70740f1424234b056537cd2781aed5c9b114aa6eaa629d48a24022de0a6ec789630a8ab32b8451655b049e3b55db88895654cdd78cee89d4d91858cb60237a47 SHA512 588b93f599b31cd80ada5b599b267ba9eced928b3b9597c43dc1319f41996df056704860cbf7ebe1815b0e91ffd467fb019d7ec64eb09f08d1a969fbea55f46e -DIST evince-41.3.tar.xz 2889368 BLAKE2B c6ef9b4c126f938ef8b50aa65d8591e0ce02e7404dd1984bce27e0acce6e62462d42665ad19992cb2fa22afd09d6da49ecdbbb51eb209518d415966824523628 SHA512 b00422ef0fd752e5afacea2db852ad71d8d16514945a9a54c54967cecd2b1f5058b762ec53eb9057b8f583d5e1e3363c2b7ae1f4434fa6637ad45c5217f082cd -DIST evince-42.1.tar.xz 2850652 BLAKE2B 4fb03270caf1be548a82f9094973e584807c497171cef960f344c14158420e02a0fed6d84dcc8d09d3a7f2e8a68f69ffae36398fe6e747d86e3a63132d5a36d6 SHA512 d8ea086b6530c186ac48d88fa2546cd8abd8a075d79037c1f0bf76e63b28914b04a58af83c96e44e04d625fec674f3989bfd51472cd458be9c903a1a4512d8df DIST evince-42.2.tar.xz 2854836 BLAKE2B ed8b9e6117d2d456e59d5fd4aac664b73fb450589a04b04b3ada7f1606781001c5ab75a98d425fdf00409e2f4abad59f6a140f39df4ca6bd82a641caaf944062 SHA512 81e93eb5575169ed1a31fdd321a1d7080b4391ddf1ebf13ce49df5ede8bb5f578094b55b2e1075f0a418ef21e8b73f02b259c2bda44b317ea9f551372ee3b860 -EBUILD evince-41.3.ebuild 3094 BLAKE2B fe2c2043c253f814971a5b969362ee476888cf84d77aa3c2c3fbe9739f5c0bbca71fa4e299443b37b3cd50a915a0cb23dc515ab9f589f36c3669283d810250e5 SHA512 8e433656bb0a3a0906a70e76face51562382024dabb7354114010517e6134cd25fe46f1a0def22d748445730273c58db2ba22f8c57731cb12a95cdb264cc7950 -EBUILD evince-42.1.ebuild 2985 BLAKE2B 87fee16941d147f814ec070aafbe49511543d52a2e7002f18b81e6808603f2af6762567a53e3094fb5ea8094b2042dbf5b1a95a364e613b4027351ff9b895def SHA512 f0f2767ed97610288c524e6724c070ca386d6261138660eba4778676c7b124c2781f73591d41b63954ec25c56018d067e664e20ea097d2af23ff5b97bc179c58 -EBUILD evince-42.2.ebuild 2985 BLAKE2B 87fee16941d147f814ec070aafbe49511543d52a2e7002f18b81e6808603f2af6762567a53e3094fb5ea8094b2042dbf5b1a95a364e613b4027351ff9b895def SHA512 f0f2767ed97610288c524e6724c070ca386d6261138660eba4778676c7b124c2781f73591d41b63954ec25c56018d067e664e20ea097d2af23ff5b97bc179c58 -MISC metadata.xml 882 BLAKE2B 5a52fc8a3986b5a07774f6b157e0c13b3c29a6f5d9bbbedba6367a0dce8a057c6c43ac9b2864a98ec4413e66365971935e4f111ae2be0d2430769f3fcb2b5047 SHA512 73a18d8f42a94322d8292b4ace3bc256dd170af87f160f9e33c12c3b5c76c2032beebbb7eaf9facd2f9d9ee8d669f0f5f805dfeef5c406f75f13f90105521f9f +DIST evince-42.3.tar.xz 2856080 BLAKE2B 55711dd1869e9cce783845683093bb621b416de66f1d53f901353f6f66ff97ec80ce45e0d32e346b2b37d18285568d01ee96cfe851b09f893565d277651d837c SHA512 4ec212e90c3fd259a2afe191592c135938766b11c6891297a10dc34152f69bba9350a467c394ec6cacde5bd16ced02d0c38b7a112dd7d676f53b12fd1b29a62e +EBUILD evince-42.2.ebuild 2982 BLAKE2B e5c9636f07a3753ee22b51a7cc93c62d18f85358b659a03695956e1de463af926103b638734757d7312ab774a369e8006936e9692594d274366ee52354cedd05 SHA512 d513cd58ac2215971eabf20012122c6c16a85340f5e2990120913deab38342de25c5ff3ba44ecf6f0908cad97ba4a9b528a5fdf74bc222207bb5afcd760be79f +EBUILD evince-42.3.ebuild 2985 BLAKE2B 87fee16941d147f814ec070aafbe49511543d52a2e7002f18b81e6808603f2af6762567a53e3094fb5ea8094b2042dbf5b1a95a364e613b4027351ff9b895def SHA512 f0f2767ed97610288c524e6724c070ca386d6261138660eba4778676c7b124c2781f73591d41b63954ec25c56018d067e664e20ea097d2af23ff5b97bc179c58 +MISC metadata.xml 769 BLAKE2B 3ad6f00e7633640decc7dcd6725a5ebbfbccf41b5feda031eba03c0b532a2a191f17a1e6e666046e8c65e5f8e694894e66938ff4b9f3df6464e242bfa7de345a SHA512 5397254ba7d615a65633baefdd23c23e9d96a8e13326975f3c8df784c6bd182840d7db29a0e67d24accffe9d62099bb7b59ca96719c68db7fcfedfaf1678f74b diff --git a/app-text/evince/evince-41.3.ebuild b/app-text/evince/evince-41.3.ebuild deleted file mode 100644 index 59de9f043515..000000000000 --- a/app-text/evince/evince-41.3.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org gnome2-utils meson systemd xdg - -DESCRIPTION="Simple document viewer for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Evince" - -LICENSE="GPL-2+ CC-BY-SA-3.0" -# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3) -SLOT="0/evd3.4-evv3.3" -IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell t1lib tiff xps" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" - -# atk used in libview -# bundles unarr -DEPEND=" - dev-libs/atk - >=dev-libs/glib-2.44.0:2 - >=gui-libs/libhandy-1.0:1= - >=dev-libs/libxml2-2.5:2 - sys-libs/zlib:= - >=x11-libs/gdk-pixbuf-2.40:2 - >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] - gnome-base/gsettings-desktop-schemas - >=x11-libs/cairo-1.10:= - >=app-text/poppler-0.86.0[cairo] - >=app-arch/libarchive-3.2.0 - djvu? ( >=app-text/djvu-3.5.22:= ) - dvi? ( - >=app-text/libspectre-0.2:= - dev-libs/kpathsea:= - t1lib? ( >=media-libs/t1lib-5:= ) ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - media-libs/gst-plugins-good:1.0 ) - gnome? ( gnome-base/gnome-desktop:3= ) - gnome-keyring? ( >=app-crypt/libsecret-0.5 ) - introspection? ( >=dev-libs/gobject-introspection-1:= ) - nautilus? ( >=gnome-base/nautilus-3.28.0 ) - postscript? ( >=app-text/libspectre-0.2:= ) - spell? ( >=app-text/gspell-1.6.0:= ) - tiff? ( >=media-libs/tiff-4.0:0= ) - xps? ( >=app-text/libgxps-0.2.1:= ) -" -RDEPEND="${DEPEND} - gnome-base/gvfs - gnome-base/librsvg - || ( - >=x11-themes/adwaita-icon-theme-2.17.1 - >=x11-themes/hicolor-icon-theme-0.10 - ) -" -BDEPEND=" - gtk-doc? ( - >=dev-util/gtk-doc-1.33 - app-text/docbook-xml-dtd:4.3 - ) - dev-libs/appstream-glib - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch -) - -src_prepare() { - xdg_src_prepare - - # Do not depend on adwaita-icon-theme, bug #326855, #391859 - # https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7 - sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die -} - -src_configure() { - local emesonargs=( - -Ddevelopment=false - -Dplatform=gnome - - -Dviewer=true - -Dpreviewer=true - -Dthumbnailer=true - $(meson_use nautilus) - - -Dcomics=enabled - $(meson_feature djvu) - $(meson_feature dvi) - -Dpdf=enabled - $(meson_feature postscript ps) - $(meson_feature tiff) - $(meson_feature xps) - - $(meson_use gtk-doc gtk_doc) - -Duser_doc=true - $(meson_use introspection) - -Ddbus=true - $(meson_feature gnome-keyring keyring) - $(meson_feature cups gtk_unix_print) - $(meson_feature gnome thumbnail_cache) - $(meson_feature gstreamer multimedia) - $(meson_feature spell gspell) - - -Dinternal_synctex=true - $(meson_feature t1lib) - - -Dsystemduserunitdir="$(systemd_get_userunitdir)" - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/app-text/evince/evince-42.1.ebuild b/app-text/evince/evince-42.1.ebuild deleted file mode 100644 index c8e4f7b17473..000000000000 --- a/app-text/evince/evince-42.1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org gnome2-utils meson systemd xdg - -DESCRIPTION="Simple document viewer for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Evince" - -LICENSE="GPL-2+ CC-BY-SA-3.0" -# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3) -SLOT="0/evd3.4-evv3.3" -IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" - -# atk used in libview -# bundles unarr -DEPEND=" - dev-libs/atk - >=dev-libs/glib-2.44.0:2 - >=gui-libs/libhandy-1.5.0:1= - >=dev-libs/libxml2-2.5:2 - sys-libs/zlib:= - >=x11-libs/gdk-pixbuf-2.40:2 - >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] - gnome-base/gsettings-desktop-schemas - >=x11-libs/cairo-1.10:= - >=app-text/poppler-22.02.0[cairo] - >=app-arch/libarchive-3.6.0 - djvu? ( >=app-text/djvu-3.5.22:= ) - dvi? ( - >=app-text/libspectre-0.2:= - dev-libs/kpathsea:= - ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - media-libs/gst-plugins-good:1.0 ) - gnome? ( gnome-base/gnome-desktop:3= ) - gnome-keyring? ( >=app-crypt/libsecret-0.5 ) - introspection? ( >=dev-libs/gobject-introspection-1:= ) - nautilus? ( >=gnome-base/nautilus-3.28.0 ) - postscript? ( >=app-text/libspectre-0.2:= ) - spell? ( >=app-text/gspell-1.6.0:= ) - tiff? ( >=media-libs/tiff-4.0:0= ) - xps? ( >=app-text/libgxps-0.2.1:= ) -" -RDEPEND="${DEPEND} - gnome-base/gvfs - gnome-base/librsvg - || ( - >=x11-themes/adwaita-icon-theme-2.17.1 - >=x11-themes/hicolor-icon-theme-0.10 - ) -" -BDEPEND=" - gtk-doc? ( - >=dev-util/gi-docgen-2021.1 - app-text/docbook-xml-dtd:4.3 - ) - dev-libs/appstream-glib - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -src_prepare() { - default - xdg_environment_reset - - # Do not depend on adwaita-icon-theme, bug #326855, #391859 - # https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7 - sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die -} - -src_configure() { - local emesonargs=( - -Ddevelopment=false - -Dplatform=gnome - - -Dviewer=true - -Dpreviewer=true - -Dthumbnailer=true - $(meson_use nautilus) - - -Dcomics=enabled - $(meson_feature djvu) - $(meson_feature dvi) - -Dpdf=enabled - $(meson_feature postscript ps) - $(meson_feature tiff) - $(meson_feature xps) - - $(meson_use gtk-doc gtk_doc) - -Duser_doc=true - $(meson_use introspection) - -Ddbus=true - $(meson_feature gnome-keyring keyring) - $(meson_feature cups gtk_unix_print) - $(meson_feature gnome thumbnail_cache) - $(meson_feature gstreamer multimedia) - $(meson_feature spell gspell) - - -Dinternal_synctex=true - - -Dsystemduserunitdir="$(systemd_get_userunitdir)" - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/app-text/evince/evince-42.2.ebuild b/app-text/evince/evince-42.2.ebuild index c8e4f7b17473..b299f33dce27 100644 --- a/app-text/evince/evince-42.2.ebuild +++ b/app-text/evince/evince-42.2.ebuild @@ -12,7 +12,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0" # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3) SLOT="0/evd3.4-evv3.3" IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" # atk used in libview # bundles unarr diff --git a/app-text/evince/evince-42.3.ebuild b/app-text/evince/evince-42.3.ebuild new file mode 100644 index 000000000000..c8e4f7b17473 --- /dev/null +++ b/app-text/evince/evince-42.3.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson systemd xdg + +DESCRIPTION="Simple document viewer for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Evince" + +LICENSE="GPL-2+ CC-BY-SA-3.0" +# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3) +SLOT="0/evd3.4-evv3.3" +IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" + +# atk used in libview +# bundles unarr +DEPEND=" + dev-libs/atk + >=dev-libs/glib-2.44.0:2 + >=gui-libs/libhandy-1.5.0:1= + >=dev-libs/libxml2-2.5:2 + sys-libs/zlib:= + >=x11-libs/gdk-pixbuf-2.40:2 + >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] + gnome-base/gsettings-desktop-schemas + >=x11-libs/cairo-1.10:= + >=app-text/poppler-22.02.0[cairo] + >=app-arch/libarchive-3.6.0 + djvu? ( >=app-text/djvu-3.5.22:= ) + dvi? ( + >=app-text/libspectre-0.2:= + dev-libs/kpathsea:= + ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + media-libs/gst-plugins-good:1.0 ) + gnome? ( gnome-base/gnome-desktop:3= ) + gnome-keyring? ( >=app-crypt/libsecret-0.5 ) + introspection? ( >=dev-libs/gobject-introspection-1:= ) + nautilus? ( >=gnome-base/nautilus-3.28.0 ) + postscript? ( >=app-text/libspectre-0.2:= ) + spell? ( >=app-text/gspell-1.6.0:= ) + tiff? ( >=media-libs/tiff-4.0:0= ) + xps? ( >=app-text/libgxps-0.2.1:= ) +" +RDEPEND="${DEPEND} + gnome-base/gvfs + gnome-base/librsvg + || ( + >=x11-themes/adwaita-icon-theme-2.17.1 + >=x11-themes/hicolor-icon-theme-0.10 + ) +" +BDEPEND=" + gtk-doc? ( + >=dev-util/gi-docgen-2021.1 + app-text/docbook-xml-dtd:4.3 + ) + dev-libs/appstream-glib + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_prepare() { + default + xdg_environment_reset + + # Do not depend on adwaita-icon-theme, bug #326855, #391859 + # https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7 + sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die +} + +src_configure() { + local emesonargs=( + -Ddevelopment=false + -Dplatform=gnome + + -Dviewer=true + -Dpreviewer=true + -Dthumbnailer=true + $(meson_use nautilus) + + -Dcomics=enabled + $(meson_feature djvu) + $(meson_feature dvi) + -Dpdf=enabled + $(meson_feature postscript ps) + $(meson_feature tiff) + $(meson_feature xps) + + $(meson_use gtk-doc gtk_doc) + -Duser_doc=true + $(meson_use introspection) + -Ddbus=true + $(meson_feature gnome-keyring keyring) + $(meson_feature cups gtk_unix_print) + $(meson_feature gnome thumbnail_cache) + $(meson_feature gstreamer multimedia) + $(meson_feature spell gspell) + + -Dinternal_synctex=true + + -Dsystemduserunitdir="$(systemd_get_userunitdir)" + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch b/app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch deleted file mode 100644 index fa0a5cd82914..000000000000 --- a/app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://gitlab.gnome.org/GNOME/evince/-/commit/1060b24d051607f14220f148d2f7723b29897a54 -https://bugs.gentoo.org/831853 - -From: r-value -Date: Wed, 17 Nov 2021 18:22:45 +0800 -Subject: [PATCH] Remove incorrect args for i18n.merge_file - -`i18n.merge_file` has been ignoring positional arguments for -a time and explicitly rejects with error since meson 0.60.0 ---- - backend/meson.build | 1 - - data/meson.build | 1 - - meson.build | 1 - - 3 files changed, 3 deletions(-) - -diff --git a/backend/meson.build b/backend/meson.build -index e44c1d6d7..ab3df9acf 100644 ---- a/backend/meson.build -+++ b/backend/meson.build -@@ -50,7 +50,6 @@ foreach backend, backend_mime_types: backends - ) - - i18n.merge_file( -- appstream, - input: appstream_in, - output: appstream, - po_dir: po_dir, -diff --git a/data/meson.build b/data/meson.build -index 8a308b853..afc302098 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -15,7 +15,6 @@ foreach desktop: desktops - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/meson.build b/meson.build -index 34c86661f..f74efb3c4 100644 ---- a/meson.build -+++ b/meson.build -@@ -492,7 +492,6 @@ install_headers( - appdata = ev_namespace + '.appdata.xml' - - i18n.merge_file( -- appdata, - input: appdata + '.in', - output: appdata, - po_dir: po_dir, --- -GitLab - diff --git a/app-text/evince/metadata.xml b/app-text/evince/metadata.xml index 978268577550..87c11128663d 100644 --- a/app-text/evince/metadata.xml +++ b/app-text/evince/metadata.xml @@ -10,8 +10,6 @@ Enable property page extension in gnome-base/nautilus Enable support for PostScript and Adobe Illustrator documents with app-text/libspectre Enable inline spell check for annotations via app-text/gspell - Enable the Type-1 fonts for the built-in DVI viewer - (media-libs/t1lib) Enable XPS viewer using app-text/libgxps -- cgit v1.2.3