diff options
| -rw-r--r-- | media-gfx/simple-scan/Manifest | 2 | ||||
| -rw-r--r-- | media-gfx/simple-scan/files/40.7-fix-build-with-meson-0.61.1.patch | 39 | ||||
| -rw-r--r-- | media-gfx/simple-scan/simple-scan-40.7.ebuild | 75 | ||||
| -rw-r--r-- | media-gfx/simple-scan/simple-scan-42.0.ebuild | 75 |
4 files changed, 0 insertions, 191 deletions
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest index 2242576c119b..24e51e762427 100644 --- a/media-gfx/simple-scan/Manifest +++ b/media-gfx/simple-scan/Manifest @@ -1,3 +1 @@ -DIST simple-scan-40.7.tar.xz 1480288 BLAKE2B 8068105db77196157495cbb2eb4c3e6a82531ed4bb727c05884154a661a9669426047c6cbbcffdd696c8e4d27721f2ca6249be14b6b4cc62be96bdbfe1b67a4c SHA512 36dc321e83bdf02fb9267d299abeee7f56bb6ee786e09811ba1244a2cee2c3baa0c5bbf3a4d6a6eadfc093d0e792b3511855c7e32caa2f6864face620fa4e7f6 -DIST simple-scan-42.0.tar.xz 1097464 BLAKE2B e2ca253d6fcff9a320312bbf32e50242b64c22a1f89cf99aa705214c5a393f1e76fb14693f508d0bc7231b97d47a5b7fa3fe767527206615df361c9edf5315c6 SHA512 0ccbe82a85fa802f53899df6109be93d58adc5028e6d904da7fc91e25cfd225fff757a7b65380abd7d3e7dfd35feab586bcf5b7504cc46d42822d3b2179bdec0 DIST simple-scan-42.1.tar.xz 1100296 BLAKE2B 86d22abb8e3f72f19ab856d8e3578f57f71bc8e34ee5bb6e3809f160bc733b7f5753b947cbd12714829b29662087cdb601687cdd9ca1b1cbba41e543ce033ed2 SHA512 c4919ade08a30ee185eb4c62f59777fc360aa35c009f033ee9a9d10e23104fc0c44016509551e3d8de2948a3657c6c4d6c2fbbd955c4c09c6698d6733a55cfce diff --git a/media-gfx/simple-scan/files/40.7-fix-build-with-meson-0.61.1.patch b/media-gfx/simple-scan/files/40.7-fix-build-with-meson-0.61.1.patch deleted file mode 100644 index b1a161df922a..000000000000 --- a/media-gfx/simple-scan/files/40.7-fix-build-with-meson-0.61.1.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://gitlab.gnome.org/GNOME/simple-scan/-/commit/da6626debe00be1a0660f30cf2bf7629186c01d5 -https://bugs.gentoo.org/831891 - -From: r-value <i@rvalue.moe> -Date: Tue, 16 Nov 2021 02:43:11 +0800 -Subject: [PATCH] Remove incorrect i18n.merge_file argument - -The positional argument was being silently ignored until meson 0.60.0 where -it fails with "ERROR: Function does not take positional arguments". ---- - data/meson.build | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 2b5a0ee3..cf6e4ae1 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gschema.xml', - install_dir: join_paths (datadir, 'glib-2.0', 'schemas')) - meson.add_install_script ('meson_compile_gschema.py') - --i18n.merge_file ('desktop-file', -- input: 'simple-scan.desktop.in', -+i18n.merge_file (input: 'simple-scan.desktop.in', - output: 'simple-scan.desktop', - install: true, - install_dir: join_paths (datadir, 'applications'), - po_dir: '../po', - type: 'desktop') - --i18n.merge_file ('appdata-file', -- input: 'simple-scan.appdata.xml.in', -+i18n.merge_file (input: 'simple-scan.appdata.xml.in', - output: 'simple-scan.appdata.xml', - install: true, - install_dir: join_paths (datadir, 'metainfo'), --- -GitLab - diff --git a/media-gfx/simple-scan/simple-scan-40.7.ebuild b/media-gfx/simple-scan/simple-scan-40.7.ebuild deleted file mode 100644 index 0b752878e6c9..000000000000 --- a/media-gfx/simple-scan/simple-scan-40.7.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) -VALA_MIN_API_VERSION="0.34" -inherit gnome.org gnome2-utils meson python-any-r1 vala xdg - -DESCRIPTION="Simple document scanning utility" -HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" -IUSE="colord webp" - -DEPEND=" - >=dev-libs/glib-2.38:2 - >=x11-libs/gtk+-3.22:3 - >=gui-libs/libhandy-1.1.90:1= - >=sys-libs/zlib-1.2.3.1:= - x11-libs/cairo:= - x11-libs/gdk-pixbuf:2 - >=dev-libs/libgusb-0.2.7 - colord? ( >=x11-misc/colord-0.1.24:=[udev(+)] ) - webp? ( media-libs/libwebp ) - >=media-gfx/sane-backends-1.0.20:= - - virtual/jpeg:0= -" -# packagekit? ( >=app-admin/packagekit-base-1.1.5 ) -RDEPEND="${DEPEND} - x11-misc/xdg-utils -" -BDEPEND=" - ${PYTHON_DEPS} - $(vala_depend) - dev-libs/libxml2:2 - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - gui-libs/libhandy:1[vala] - dev-libs/libgusb[vala] - colord? ( x11-misc/colord[vala] ) -" - -PATCHES=( - # Add control for optional dependencies - "${FILESDIR}"/40.0-add-control-optional-deps.patch - "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch -) - -src_prepare() { - vala_src_prepare - xdg_src_prepare -} - -src_configure() { - local emesonargs=( - $(meson_use colord) - -Dpackagekit=false - $(meson_use webp) - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/media-gfx/simple-scan/simple-scan-42.0.ebuild b/media-gfx/simple-scan/simple-scan-42.0.ebuild deleted file mode 100644 index 0b16fcd3aa71..000000000000 --- a/media-gfx/simple-scan/simple-scan-42.0.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -VALA_MIN_API_VERSION="0.34" -inherit gnome.org gnome2-utils meson python-any-r1 vala xdg - -DESCRIPTION="Simple document scanning utility" -HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="colord webp" - -DEPEND=" - >=dev-libs/glib-2.38:2 - >=x11-libs/gtk+-3.24:3 - >=gui-libs/libhandy-1.5.0:1= - >=sys-libs/zlib-1.2.3.1:= - x11-libs/cairo:= - x11-libs/gdk-pixbuf:2 - >=dev-libs/libgusb-0.2.7 - colord? ( >=x11-misc/colord-0.1.24:=[udev(+)] ) - webp? ( media-libs/libwebp ) - >=media-gfx/sane-backends-1.0.20:= - - virtual/jpeg:0= -" -# packagekit? ( >=app-admin/packagekit-base-1.1.5 ) -RDEPEND="${DEPEND} - x11-misc/xdg-utils -" -BDEPEND=" - ${PYTHON_DEPS} - $(vala_depend) - dev-libs/libxml2:2 - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - gui-libs/libhandy:1[vala] - dev-libs/libgusb[vala] - colord? ( x11-misc/colord[vala] ) -" - -PATCHES=( - # Add control for optional dependencies - "${FILESDIR}"/40.0-add-control-optional-deps.patch -) - -src_prepare() { - default - vala_setup - xdg_environment_reset -} - -src_configure() { - local emesonargs=( - $(meson_use colord) - -Dpackagekit=false - $(meson_use webp) - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} |