commit: 31a2c18d756c653b7a6b6779a392f38404815c12 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sat Nov 22 08:28:18 2025 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sat Nov 22 08:39:25 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31a2c18d
gnome-extra/yelp: drop 42.2-r3 Bug: https://bugs.gentoo.org/953900 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> gnome-extra/yelp/Manifest | 1 - .../yelp/files/yelp-3.20.0-man-compatibility.patch | 117 --------------------- gnome-extra/yelp/yelp-42.2-r3.ebuild | 61 ----------- 3 files changed, 179 deletions(-) diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest index 075a284fb77f..9111e8ecce7c 100644 --- a/gnome-extra/yelp/Manifest +++ b/gnome-extra/yelp/Manifest @@ -1,2 +1 @@ -DIST yelp-42.2.tar.xz 1506136 BLAKE2B dbde815af6902eebae0e6dcdb12e0e0c8981fa64608e6ba3c8950b908b13981c335011ee2e2240e8a96c4aff3f8b682d630ea34215918374e231220eb87e0f2b SHA512 7fd8da347b3cdb9b24a31eebe14c4964c5e41956caa2b79e70d6ea0c829d94f8428bbd96a2472c02d56673ca0ed1c75f7c6f874a59c4eea0b1440918a99969f4 DIST yelp-42.3.tar.xz 1223408 BLAKE2B 99d530b65c070d57b7bd06768772cb8d900d6cb392f7030795c4b52117f403ac95b25f535dbbef018dce81a16de8aac8e6582191cc24843d02ccb3005a900233 SHA512 53cb9477eb01bd2a38be2b5a4d31b2c7ff1e964b555055f9f1c0806848265ce665ea43bf554f0f69b46fc37a0a37ae32d5eb5c2505f8792856a51b4c3f1a2adc diff --git a/gnome-extra/yelp/files/yelp-3.20.0-man-compatibility.patch b/gnome-extra/yelp/files/yelp-3.20.0-man-compatibility.patch deleted file mode 100644 index b756b67462bc..000000000000 --- a/gnome-extra/yelp/files/yelp-3.20.0-man-compatibility.patch +++ /dev/null @@ -1,117 +0,0 @@ -From b7f00d9fc5f4c948b3b412fa22488517e71a2987 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <[email protected]> -Date: Sun, 27 Mar 2016 17:11:59 +0200 -Subject: [PATCH] Enable compatibility with traditional man (#648854) - -As of commit 46a82ade3e6f0fac8f08b18e7fc23d8665f6f728, Yelp runs -"man -Z -Tutf8 -EUTF-8 [FILE]" to obtain the groff intermediate format -of the man page. However, the only implementation of man that accepts -these options is man-db (used by Debian, Fedora, SUSE & Ubuntu). -The traditional Linux man used by other distros and man implementations -on non-Linux Unixes (FreeBSD, Solaris) do not have command-line options -for outputting groff intermediate format. -Therefore, on systems that do not use man-db, we need to manually -uncompress the nroff source file and feed it to groff. This is best done -using a small shell script (/usr/libexec/yelp-groff), both for for -clarity and for ease of modification on systems with weird man setups. - -Signed-off-by: Alexandre Rostovtsev <[email protected]> -Signed-off-by: Ole Reifschneider <[email protected]> ---- - Makefile.am | 2 ++ - libyelp/yelp-groff | 49 +++++++++++++++++++++++++++++++++++++++++++++++ - libyelp/yelp-man-parser.c | 2 +- - 3 files changed, 52 insertions(+), 1 deletion(-) - create mode 100755 libyelp/yelp-groff - -diff --git a/Makefile.am b/Makefile.am -index 30eba2c..b87f2b2 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -6,6 +6,7 @@ BUILT_SOURCES = \ - $(nodist_libyelp_libyelp_la_SOURCES) - - lib_LTLIBRARIES = libyelp/libyelp.la -+libexec_SCRIPTS = libyelp/yelp-groff - - libyelp_libyelp_la_SOURCES = \ - libyelp/yelp-bookmarks.c \ -@@ -58,6 +59,7 @@ libyelp_libyelp_la_CFLAGS = \ - - libyelp_libyelp_la_CPPFLAGS = \ - -DDATADIR=\""$(datadir)"\" \ -+ -DLIBEXECDIR=\"$(libexecdir)\" \ - -DYELP_ICON_PATH=\"$(YELP_ICON_PATH)\" \ - -DYELP_WEB_EXTENSIONS_DIR=\""$(pkglibdir)/"web-extensions\" \ - -I$(top_builddir)/libyelp -diff --git a/libyelp/yelp-groff b/libyelp/yelp-groff -new file mode 100755 -index 0000000..5348024 ---- /dev/null -+++ b/libyelp/yelp-groff -@@ -0,0 +1,49 @@ -+#!/bin/sh -+# -+# Copyright (c) 2011 Alexandre Rostovtsev <[email protected]> -+# -+# This program is free software; you can redistribute it and/or -+# modify it under the terms of the GNU General Public License as -+# published by the Free Software Foundation; either version 2 of the -+# License, or (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# General Public License for more details. -+# -+# You should have received a copy of the GNU General Public -+# License along with this program; if not, write to the -+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+# -+### -+# -+# Process the requested compressed source nroff file and output groff -+# intermediate format. -+# -+ -+filename=$1 -+ -+if [ -z ${filename} ] ; then -+ echo "Usage: yelp-groff [FILE]" >&2 -+ echo "Process a man FILE and output groff intermediate format." -+ exit 1 -+fi -+ -+# If "man -Z -Tutf8 -EUTF-8" works (i.e. if man is man-db), use that. -+man -Z -Tutf8 -EUTF-8 ${filename} 2>/dev/null && exit 0 -+ -+# Otherwise, manually uncompress the file ... -+cat="cat" -+case ${filename} in -+ *.bz2) cat="bzip2 -c -d" ;; -+ *.gz) cat="gunzip -c" ;; -+ *.lzma) cat="unlzma -c -d" ;; -+ *.xz) cat="unxz -c" ;; -+ *.Z) cat="zcat" ;; -+esac -+ -+# ... and run groff to get the intermediate format; preprocess with tbl -+# unless MANROFFSEQ is defined. -+${cat} ${filename} | groff -${MANROFFSEQ:-t} -man -Z -Tutf8 -diff --git a/libyelp/yelp-man-parser.c b/libyelp/yelp-man-parser.c -index 46073a2..792e695 100644 ---- a/libyelp/yelp-man-parser.c -+++ b/libyelp/yelp-man-parser.c -@@ -369,7 +369,7 @@ get_troff (gchar *path, GError **error) - { - gint ystdout; - GError *err = NULL; -- const gchar *argv[] = { "man", "-Z", "-Tutf8", "-EUTF-8", path, NULL }; -+ const gchar *argv[] = { LIBEXECDIR "/yelp-groff", path, NULL }; - gchar **my_argv; - - /* g_strdupv() should accept a "const gchar **". */ --- -2.7.4 - diff --git a/gnome-extra/yelp/yelp-42.2-r3.ebuild b/gnome-extra/yelp/yelp-42.2-r3.ebuild deleted file mode 100644 index e13d1dd4cd7e..000000000000 --- a/gnome-extra/yelp/yelp-42.2-r3.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -GNOME2_EAUTORECONF="yes" - -inherit flag-o-matic gnome2 - -DESCRIPTION="Help browser for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"; - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" -# Removed upstream in 49.beta -IUSE="X" - -RDEPEND=" - app-arch/bzip2:= - >=app-arch/xz-utils-4.9:= - dev-db/sqlite:3= - >=dev-libs/glib-2.67.4:2 - >=dev-libs/libxml2-2.6.5:2= - >=dev-libs/libxslt-1.1.4 - >=gnome-extra/yelp-xsl-41.0 - net-libs/webkit-gtk:4.1 - >=x11-libs/gtk+-3.13.3:3[X?] - >=gui-libs/libhandy-1.5.0:1 - x11-themes/adwaita-icon-theme -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-libs/appstream-glib - >=dev-build/gtk-doc-am-1.13 - dev-util/glib-utils - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( - # Fix compatibility with Gentoo's sys-apps/man - # https://bugzilla.gnome.org/show_bug.cgi?id=648854 - "${FILESDIR}"/${PN}-3.20.0-man-compatibility.patch # needs eautoreconf -) - -src_configure() { - use X || append-cppflags -DGENTOO_GTK_HIDE_X11 - - gnome2_src_configure \ - --disable-static \ - --enable-bz2 \ - --enable-lzma \ - APPSTREAM_UTIL=$(type -P true) -} - -src_install() { - gnome2_src_install - exeinto /usr/libexec/ - doexe "${S}"/libyelp/yelp-groff -}
