summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2022-12-03 20:27:21 -0500
committerMatt Turner <mattst88@gentoo.org>2022-12-03 21:36:54 -0500
commit8ec9449dfe58f49c8f3081f9ac15c3b18f5c53d4 (patch)
tree6baa5e7e69653915325d2aa8df9d7596d2cfcf10 /dev-util/devhelp
parentdev-libs/template-glib: Drop old versions (diff)
downloadgentoo-8ec9449dfe58f49c8f3081f9ac15c3b18f5c53d4.tar.gz
gentoo-8ec9449dfe58f49c8f3081f9ac15c3b18f5c53d4.tar.bz2
gentoo-8ec9449dfe58f49c8f3081f9ac15c3b18f5c53d4.zip
dev-util/devhelp: Drop old versions
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'dev-util/devhelp')
-rw-r--r--dev-util/devhelp/Manifest1
-rw-r--r--dev-util/devhelp/devhelp-41.2.ebuild85
-rw-r--r--dev-util/devhelp/files/41.2-meson-0.61.patch52
-rw-r--r--dev-util/devhelp/files/41.2-webkitgtk40.patch38
4 files changed, 0 insertions, 176 deletions
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index fddd82c226f6..b2347f9eaea8 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,3 +1,2 @@
-DIST devhelp-41.2.tar.xz 1455736 BLAKE2B c531af6cded6c9624581e4d14fb4d7713afbdcf173ec2a82e49789af1752568790dc346cc0293eddc68c0943fec4f742de726953de34441771711a938ba858fa SHA512 99a75ff19bf1b4613c312921452f190334e3e2036c28cda070169e3d1d352a5d2e7a56a393326efd679076257412e281dc94b628429119fcad58060d1a88ea98
DIST devhelp-41.3.tar.xz 2303068 BLAKE2B 1c08931897a7cd1d15028d9394479297d6fffc48412aa31cc739380405b8588fec47fddbea803c80d44eb23d2fa84d5f9a42aa8b061859d459e450ccd76ee82d SHA512 91251f1d8c0380f16768a1fed2d0a0a19935a646613a966c48ae70e52bfe8b6aa0c683d2b371d9e25dfdfcaeac687ea2c83c2bfd5f4f35394bb4576e6f98b48d
DIST devhelp-43.0.tar.xz 327508 BLAKE2B 455015ec115610f27c2a1d9c3a8a21f50d8b061de7524371d892aba35173278f3aabe623b0b6770437b1501e6af795a9a12c9cc3ae238d8691d00e27388ae1a4 SHA512 92f147659754480ac4aa02f21558572d4bb8a034251225d344a8cae16824d9c14071751dfca6439f98dc7f7884fb35ef2d9c708e42f11bb6b3dfd8648b784654
diff --git a/dev-util/devhelp/devhelp-41.2.ebuild b/dev-util/devhelp/devhelp-41.2.ebuild
deleted file mode 100644
index 98fc2847065b..000000000000
--- a/dev-util/devhelp/devhelp-41.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="An API documentation browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
-
-LICENSE="GPL-3+ CC-BY-SA-4.0"
-SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="amd64 ~arm ~ppc64 ~sparc x86"
-IUSE="+gedit gtk-doc +introspection"
-REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} ) gtk-doc? ( introspection )"
-
-DEPEND="
- >=dev-libs/glib-2.64:2
- >=x11-libs/gtk+-3.22:3[introspection?]
- >=net-libs/webkit-gtk-2.26:4[introspection?]
- gnome-base/gsettings-desktop-schemas
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
- gedit? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- app-editors/gedit[introspection(+),python,${PYTHON_SINGLE_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- ')
- )
-"
-# libxml2 required for glib-compile-resources
-BDEPEND="
- ${PYTHON_DEPS}
- dev-libs/libxml2:2
- dev-util/glib-utils
- dev-util/itstool
- gtk-doc? ( >=dev-util/gi-docgen-2021.6 )
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-optional-introspection.patch
- "${FILESDIR}"/${PV}-webkitgtk40.patch
-
- "${FILESDIR}"/${PV}-meson-0.61.patch
-)
-
-pkg_setup() {
- use gedit && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local emesonargs=(
- -Dflatpak_build=false
- $(meson_use gtk-doc gtk_doc)
- $(meson_use introspection)
- -Dplugin_emacs=true
- $(meson_use gedit plugin_gedit)
- -Dplugin_vim=true
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
- if use gtk-doc; then
- mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
- mv "${ED}"/usr/share/doc/devhelp-3 "${ED}"/usr/share/gtk-doc/html/ || die
- fi
- use gedit && python_optimize "${ED}"/usr/$(get_libdir)/gedit/plugins
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/dev-util/devhelp/files/41.2-meson-0.61.patch b/dev-util/devhelp/files/41.2-meson-0.61.patch
deleted file mode 100644
index dd75f802056a..000000000000
--- a/dev-util/devhelp/files/41.2-meson-0.61.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://gitlab.gnome.org/GNOME/devhelp/-/merge_requests/43.patch
-https://gitlab.gnome.org/GNOME/devhelp/-/merge_requests/42.patch
-https://bugs.gentoo.org/831928
-
-From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Wed, 17 Nov 2021 18:02:20 +0800
-Subject: [PATCH] Remove incorrect arg for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments and
-explicitly rejects with error "ERROR: Function does not take
-positional arguments" since meson 0.60.0
----
- data/meson.build | 2 --
- plugins/gedit-plugin/meson.build | 1 -
- 2 files changed, 3 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index c6aeffb4..0bc531a2 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('application_id', APPLICATION_ID)
- appdata = APPLICATION_ID + '.appdata.xml'
- appdata_file = I18N.merge_file(
-- appdata,
- input: configure_file(
- input: 'org.gnome.Devhelp.appdata.xml.in.in',
- output: APPLICATION_ID + '.appdata.xml.in',
-@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
- desktop_conf.set('application_id', APPLICATION_ID)
- desktop = APPLICATION_ID + '.desktop'
- desktop_file = I18N.merge_file(
-- desktop,
- type: 'desktop',
- input: configure_file(
- input: 'org.gnome.Devhelp.desktop.in.in',
-diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
-index 4f779886..877a01ff 100644
---- a/plugins/gedit-plugin/meson.build
-+++ b/plugins/gedit-plugin/meson.build
-@@ -7,7 +7,6 @@ install_data(
-
- plugin_info_file = 'devhelp.plugin'
- I18N.merge_file(
-- plugin_info_file,
- type: 'desktop',
- input: plugin_info_file + '.desktop.in',
- output: plugin_info_file,
---
-GitLab
-
diff --git a/dev-util/devhelp/files/41.2-webkitgtk40.patch b/dev-util/devhelp/files/41.2-webkitgtk40.patch
deleted file mode 100644
index 967d276bfa83..000000000000
--- a/dev-util/devhelp/files/41.2-webkitgtk40.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7b0ef55edd63c71be209aa3b57e2190d4ce4fb90 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 3 Oct 2021 23:52:27 +0300
-Subject: [PATCH] build: Don't automagically depend on webkit2gtk-4.1
-
-That's the libsoup3 using webkit-gtk SLOT that we don't have. Patch it out,
-so it wouldn't be picked up automagically once it's added or comes from some
-overlay.
-
-This reverts commit f9d52aad23914df9dcb404723d1c99cf7b4e1eca.
----
- meson.build | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index e57e466e..492aafed 100644
---- a/meson.build
-+++ b/meson.build
-@@ -46,15 +46,10 @@ lt_revision = 3
- lt_age = 0
- LIBDEVHELP_LT_VERSION = '@0@.@1@.@2@'.format(lt_current, lt_revision, lt_age)
-
--webkit_dep = dependency('webkit2gtk-4.1', required : false)
--if not webkit_dep.found()
-- webkit_dep = dependency('webkit2gtk-4.0')
--endif
--
- LIBDEVHELP_PUBLIC_DEPS = [
- dependency('gio-2.0', version: '>= 2.64'),
- dependency('gtk+-3.0', version: '>= 3.22'),
-- webkit_dep,
-+ dependency('webkit2gtk-4.0', version: '>= 2.26'),
- ]
- LIBDEVHELP_PRIVATE_DEPS = [
- dependency('gsettings-desktop-schemas'),
---
-2.32.0
-