commit: 182fadf3d1e7507d4ebfec0033cc5ef156a413c2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Mon Apr 12 21:23:22 2021 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Mon Apr 12 21:59:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=182fadf3
app-editors/gedit: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> app-editors/gedit/Manifest | 2 - .../gedit/files/3.32.2-make-spell-optional.patch | 61 ------------ .../gedit/files/3.36-make-gspell-optional.patch | 62 ------------ .../gedit/files/3.36-make-python-optional.patch | 90 ------------------ app-editors/gedit/gedit-3.34.1.ebuild | 100 -------------------- app-editors/gedit/gedit-3.36.2.ebuild | 104 --------------------- 6 files changed, 419 deletions(-) diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest index f8eabd40b86..72d680f9a73 100644 --- a/app-editors/gedit/Manifest +++ b/app-editors/gedit/Manifest @@ -1,4 +1,2 @@ -DIST gedit-3.34.1.tar.xz 14797588 BLAKE2B 8dfaac4660575d67e3f8396dfed675a737fc69bc2b34866ee467a3464a338240133cab8d067db7b87fdc129f06a2450b91f4e0f70a73912d4a274cca980196d6 SHA512 22968c678a2f7ecf062f490d5eedc97aaa53b15932db801ea83eb336f01f41e7a6037a85508a40164f38dee406f8db097b7ef6f1481ab44ea82668766d24966d -DIST gedit-3.36.2.tar.xz 14770004 BLAKE2B 505c01aa60e64e418a09c9fbd0c397a487c612117c3068e35a41b075a8d5440cf85daf6e011eeacee7b228306342cc5c4a3dc1af24d52583c9a896531355f6d0 SHA512 20c3592aaf08ad4a5842b14ecb1eb0c9ddbef190412dc3f70b60bbf6125c9c4791a48260c89402ce4773720ae65b36fab510f9d1e104f548e243d11bc49279b5 DIST gedit-3.38.1.tar.xz 6861368 BLAKE2B 3b202dbb7df8e91b58bd345fcaa309546af07bce60dc4638a3c344996d6c04ef7fe8a4824360c0f55970b759f9d7e2929c207992a9c80ad686d39e94ff741b7a SHA512 cd52cbcece3b007692294ab01b95fae7deb744b08a44da2d3cafa82a86d94c104abcdd4dcbe10630e0d633c8cc3c75f5e5dc6c8452a8c4bc2e6bb3c0de7d5547 DIST gedit-40.0.tar.xz 6852672 BLAKE2B 80af344cb6e848338f0c5921ff15e1d3e8566967756fbb832767c5d39914915f1c746c78c45e22d534dd8fc02c7e214e793b5a315ce2357e2afb3ca97312e45e SHA512 b1f6fc4f4894c3ada8e85b81df2fca6870acf725074b56b2c85b1c8f04e004f193e8fad3ac0c641bd0df6a704604ec054e130c60f0480c1abf62a91cb181429e diff --git a/app-editors/gedit/files/3.32.2-make-spell-optional.patch b/app-editors/gedit/files/3.32.2-make-spell-optional.patch deleted file mode 100644 index 1d772590f60..00000000000 --- a/app-editors/gedit/files/3.32.2-make-spell-optional.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 72efa486222cde6094c217efc6085f49af1cca85 Mon Sep 17 00:00:00 2001 -From: Sobhan Mohammadpour <[email protected]> -Date: Sun, 26 May 2019 14:19:17 -0400 -Subject: [PATCH] make spell optional - ---- - meson.build | 4 +++- - meson_options.txt | 4 ++++ - plugins/meson.build | 4 +++- - 3 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 2f4d7e5..f67e320 100644 ---- a/meson.build -+++ b/meson.build -@@ -86,7 +86,8 @@ libxml_dep = dependency('libxml-2.0', version: libxml_req) - libgd_dep = libgd_sp.get_variable('libgd_dep') - - libsoup_dep = dependency('libsoup-2.4', version: libsoup_req, required: true) --gspell_dep = dependency('gspell-1', version: gspell_req, required: true) -+with_gspell = get_option('spell') -+gspell_dep = dependency('gspell-1', version: gspell_req, required: false) - x11_dep = dependency('x11', required: false) - - introspection_dep = dependency('gobject-introspection-1.0', version: introspection_req, required: false) -@@ -189,6 +190,7 @@ summary = [ - ' Introspection: @0@'.format(generate_gir), - ' Plugins: @0@'.format(build_plugins), - ' Vala API: @0@'.format(generate_vapi), -+ ' Spell: @0@'.format(with_gspell), - ' Gvfs metadata: @0@'.format(enable_gvfs_metadata), - '', - 'Directories:', -diff --git a/meson_options.txt b/meson_options.txt -index 90803fa..e1f7349 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -16,3 +16,7 @@ option('documentation', - option('enable-gvfs-metadata', - type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto', - description: 'Enable using gvfs to store metadata') -+ -+option('spell', -+ type:'boolean', value: true, -+ description: 'Build spell support') -diff --git a/plugins/meson.build b/plugins/meson.build -index af94ab7..abeeac5 100644 ---- a/plugins/meson.build -+++ b/plugins/meson.build -@@ -21,5 +21,7 @@ subdir('quickhighlight') - subdir('quickopen') - subdir('snippets') - subdir('sort') --subdir('spell') -+if with_gspell -+ subdir('spell') -+endif - subdir('time') --- -2.21.0 - diff --git a/app-editors/gedit/files/3.36-make-gspell-optional.patch b/app-editors/gedit/files/3.36-make-gspell-optional.patch deleted file mode 100644 index e891f98f0c0..00000000000 --- a/app-editors/gedit/files/3.36-make-gspell-optional.patch +++ /dev/null @@ -1,62 +0,0 @@ -From d622460b08c7c13ce8e0c23e3afcbd1e4c65d019 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <[email protected]> -Date: Sun, 16 Aug 2020 23:20:31 +0300 -Subject: [PATCH] build: Make gspell optional - ---- - meson.build | 3 ++- - meson_options.txt | 4 ++++ - plugins/spell/meson.build | 4 ++++ - 3 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index edb2896a6..b8707f33d 100644 ---- a/meson.build -+++ b/meson.build -@@ -63,7 +63,7 @@ libpeas_gtk_dep = dependency('libpeas-gtk-1.0', version: libpeas_req) - - libgd_dep = libgd_subproject.get_variable('libgd_dep') - --gspell_dep = dependency('gspell-1', version: '>= 1.0', required: true) -+gspell_dep = dependency('gspell-1', version: '>= 1.0', required: get_option('spell')) - x11_dep = dependency('x11', required: false) - - introspection_dep = dependency('gobject-introspection-1.0', required: false) -@@ -154,6 +154,7 @@ summary = [ - ' User documentation: @0@'.format(get_option('user_documentation')), - ' GObject Introspection: @0@'.format(generate_gir), - ' Vala API: @0@'.format(generate_vapi), -+ ' Spell checker plugin: @0@'.format(gspell_dep.found().to_string()), - '', - ] - message('\n'.join(summary)) -diff --git a/meson_options.txt b/meson_options.txt -index d0cbf0720..03e07244e 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -10,6 +10,10 @@ option('gtk_doc', - type: 'boolean', value: false, - description: 'Build API reference for plugins (requires gtk-doc)') - -+option('spell', -+ type: 'feature', value: 'enabled', -+ description: 'Build spell checking plugin') -+ - # This option exists for the developers, to speed up the install. - option('user_documentation', - type: 'boolean', value: true, -diff --git a/plugins/spell/meson.build b/plugins/spell/meson.build -index 8ce7634b7..cccb42fc1 100644 ---- a/plugins/spell/meson.build -+++ b/plugins/spell/meson.build -@@ -1,3 +1,7 @@ -+if not gspell_dep.found() -+ subdir_done() -+endif -+ - libspell_sources = files( - 'gedit-spell-app-activatable.c', - 'gedit-spell-plugin.c', --- -2.20.1 - diff --git a/app-editors/gedit/files/3.36-make-python-optional.patch b/app-editors/gedit/files/3.36-make-python-optional.patch deleted file mode 100644 index c27a0551f00..00000000000 --- a/app-editors/gedit/files/3.36-make-python-optional.patch +++ /dev/null @@ -1,90 +0,0 @@ -From d082ef03b9f545980ab77e6c0a20d5bf4893be69 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <[email protected]> -Date: Sun, 16 Aug 2020 23:34:42 +0300 -Subject: [PATCH] build: Make python optional - ---- - gedit/meson.build | 2 ++ - meson.build | 4 +++- - meson_options.txt | 4 ++++ - plugins/meson.build | 11 +++++++---- - 4 files changed, 16 insertions(+), 5 deletions(-) - -diff --git a/gedit/meson.build b/gedit/meson.build -index 075c001b2..174deba04 100644 ---- a/gedit/meson.build -+++ b/gedit/meson.build -@@ -214,6 +214,7 @@ if generate_gir == true - install_dir_typelib: join_paths(pkglibdir, 'girepository-1.0'), - ) - -+if get_option('python') - python3.install_sources( - 'Gedit.py', - subdir: join_paths( -@@ -221,6 +222,7 @@ if generate_gir == true - 'overrides', - ) - ) -+endif - - libgedit_dep_sources += [ - libgedit_gir, -diff --git a/meson.build b/meson.build -index b8707f33d..4e40833ec 100644 ---- a/meson.build -+++ b/meson.build -@@ -69,7 +69,9 @@ x11_dep = dependency('x11', required: false) - introspection_dep = dependency('gobject-introspection-1.0', required: false) - vapigen_dep = dependency('vapigen', version: '>= 0.25.1', required: false) - --python3 = python.find_installation('python3') -+if get_option('python') -+ python3 = python.find_installation('python3') -+endif - - build_checkupdate_plugin = host_machine.system() == 'windows' - if build_checkupdate_plugin -diff --git a/meson_options.txt b/meson_options.txt -index 03e07244e..cdcec6165 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -10,6 +10,10 @@ option('gtk_doc', - type: 'boolean', value: false, - description: 'Build API reference for plugins (requires gtk-doc)') - -+option('python', -+ type: 'boolean', value: true, -+ description: 'Install GIR python overrides and python plugins') -+ - option('spell', - type: 'feature', value: 'enabled', - description: 'Build spell checking plugin') -diff --git a/plugins/meson.build b/plugins/meson.build -index a9167f8d6..97f1b1765 100644 ---- a/plugins/meson.build -+++ b/plugins/meson.build -@@ -20,13 +20,16 @@ if build_checkupdate_plugin - endif - - subdir('docinfo') --subdir('externaltools') - subdir('filebrowser') - subdir('modelines') --subdir('pythonconsole') - subdir('quickhighlight') --subdir('quickopen') --subdir('snippets') - subdir('sort') - subdir('spell') - subdir('time') -+ -+if get_option('python') -+ subdir('externaltools') -+ subdir('pythonconsole') -+ subdir('quickopen') -+ subdir('snippets') -+endif --- -2.20.1 - diff --git a/app-editors/gedit/gedit-3.34.1.ebuild b/app-editors/gedit/gedit-3.34.1.ebuild deleted file mode 100644 index 0d2d1f533f3..00000000000 --- a/app-editors/gedit/gedit-3.34.1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) -VALA_MIN_API_VERSION="0.26" -VALA_USE_DEPEND="vapigen" - -inherit gnome.org gnome2-utils meson python-single-r1 vala xdg - -DESCRIPTION="A text editor for the GNOME desktop" -HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"; - -LICENSE="GPL-2+ CC-BY-SA-3.0" -SLOT="0" - -IUSE="+introspection +python gtk-doc spell vala" -REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} ) spell? ( python )" - -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" - -DEPEND=" - >=dev-libs/glib-2.44:2 - >=x11-libs/gtk+-3.22.0:3[introspection?] - >=x11-libs/gtksourceview-4.0.2:4[introspection?] - >=dev-libs/libpeas-1.14.1[gtk] - >=dev-libs/libxml2-2.5.0:2 - >=net-libs/libsoup-2.60:2.4 - x11-libs/libX11 - - spell? ( >=app-text/gspell-0.2.5:0= ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pycairo[${PYTHON_MULTI_USEDEP}] - >=dev-python/pygobject-3:3[cairo,${PYTHON_MULTI_USEDEP}] - dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}] - ') - ) -" -RDEPEND="${DEPEND} - x11-themes/adwaita-icon-theme - gnome-base/gsettings-desktop-schemas - gnome-base/gvfs -" -BDEPEND=" - ${vala_depend} - app-text/docbook-xml-dtd:4.1.2 - dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1 ) - dev-util/itstool - >=sys-devel/gettext-0.18 - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/3.32.2-make-spell-optional.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - use vala && vala_src_prepare - xdg_src_prepare -} - -src_configure() { - local emesonargs=( - $(meson_use introspection) - $(meson_use vala vapi) - $(meson_use python plugins) - $(meson_use gtk-doc documentation) - -Denable-gvfs-metadata=yes - $(meson_use spell) - ) - meson_src_configure -} - -# Only appdata and desktop file validation in v3.32.2 -src_test() { :; } - -src_install() { - meson_src_install - if use python; then - python_optimize - python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/" - fi -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/app-editors/gedit/gedit-3.36.2.ebuild b/app-editors/gedit/gedit-3.36.2.ebuild deleted file mode 100644 index b767ef9772d..00000000000 --- a/app-editors/gedit/gedit-3.36.2.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) -VALA_MIN_API_VERSION="0.26" -VALA_USE_DEPEND="vapigen" - -inherit gnome.org gnome2-utils meson python-single-r1 vala xdg - -DESCRIPTION="A text editor for the GNOME desktop" -HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"; - -LICENSE="GPL-2+ CC-BY-SA-3.0" -SLOT="0" - -IUSE="+introspection +python gtk-doc spell vala" -REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )" - -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" - -DEPEND=" - >=dev-libs/glib-2.52:2 - >=dev-libs/libpeas-1.14.1[gtk] - >=x11-libs/gtk+-3.22.0:3[introspection?] - >=x11-libs/gtksourceview-4.0.2:4[introspection?] - >=gui-libs/tepl-4.4:4 - x11-libs/libX11 - - spell? ( >=app-text/gspell-0.2.5:0= ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pycairo[${PYTHON_USEDEP}] - >=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] - dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}] - ') - ) -" -RDEPEND="${DEPEND} - x11-themes/adwaita-icon-theme - gnome-base/gsettings-desktop-schemas - gnome-base/gvfs -" -BDEPEND=" - ${vala_depend} - app-text/docbook-xml-dtd:4.1.2 - dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1 ) - dev-util/itstool - >=sys-devel/gettext-0.18 - virtual/pkgconfig -" -PATCHES=( - # Don't force off overlay scrollbars for dubious reasons that GNOME designers heavily - # disagree with; those wanting them off in general would set that globally for gtk - "${FILESDIR}"/restore-overlay-scrollbars.patch - # Make gspell and python optional - "${FILESDIR}"/3.36-make-gspell-optional.patch - "${FILESDIR}"/3.36-make-python-optional.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - use vala && vala_src_prepare - xdg_src_prepare -} - -src_configure() { - local emesonargs=( - $(meson_use introspection) - $(meson_use vala vapi) - $(meson_use python) - $(meson_use gtk-doc gtk_doc) - -Duser_documentation=true - $(meson_feature spell) - ) - meson_src_configure -} - -# Only appdata and desktop file validation in v3.32.2 -src_test() { :; } - -src_install() { - meson_src_install - if use python; then - python_optimize - python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/" - fi -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -}
