diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2016-10-23 23:15:29 +0200 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2016-10-24 00:59:59 +0200 |
commit | 589b8a3b0ce0587d7ab9cad3fcf6a512efe9e423 (patch) | |
tree | fdf0471a504ce8b2c104194beb033a7d09762eb2 /gnome-extra/yelp | |
parent | gnome-extra/yelp: version bump 3.20.1 → 3.22.0 (diff) | |
download | gentoo-589b8a3b0ce0587d7ab9cad3fcf6a512efe9e423.tar.gz gentoo-589b8a3b0ce0587d7ab9cad3fcf6a512efe9e423.tar.bz2 gentoo-589b8a3b0ce0587d7ab9cad3fcf6a512efe9e423.zip |
gnome-extra/yelp: cleanup old revision
Package-Manager: portage-2.3.1
Diffstat (limited to 'gnome-extra/yelp')
-rw-r--r-- | gnome-extra/yelp/Manifest | 1 | ||||
-rw-r--r-- | gnome-extra/yelp/files/yelp-3.16.0-man-compatibility.patch | 114 | ||||
-rw-r--r-- | gnome-extra/yelp/yelp-3.18.1-r1.ebuild | 58 |
3 files changed, 0 insertions, 173 deletions
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest index 73b81d3cb25f..fe88e34cce31 100644 --- a/gnome-extra/yelp/Manifest +++ b/gnome-extra/yelp/Manifest @@ -1,3 +1,2 @@ -DIST yelp-3.18.1.tar.xz 1386044 SHA256 ba3a4eb4717c0ecf4a2e40eff0963fcd12c700c4fb80b83ecaad8b7032256880 SHA512 ebff55bb3eb0caad208abfad3d83fa996d63bb97647ff446d25590b5c84d341161f3fdb9987353bd55e73ef2634baa692928fbc21b4ed16b6070500228fc2425 WHIRLPOOL 2f7479641bea73e248508a51e056eb33c9e3c30994017b8c17dfb0153a71f6174152aa8c05dd76fbb4bcc06b72a92bbc1fc46a7c10b19c3b5a62d597390aa3f5 DIST yelp-3.20.1.tar.xz 1377544 SHA256 dda0b051ad32908cb9d894d1db3ffdac69b21849b8a6a9a74d9669b017f608c2 SHA512 a1b5d086e8850583ce3e8baee476f051f2d3d07e4457e2c3f7c197eb79a0fbf9f7ff48e40b47adf2f1008fb8113fd4377895128a5b2ede3de5be597a66ebfce6 WHIRLPOOL bbb8c034814919dea53f8c7a4f9a0ce014c7b56b07cf4d676161659eaf380e47b9edb52071b3a0879aa55637961f3fb5affd719b6d89f58e22a282b4e6e8a8eb DIST yelp-3.22.0.tar.xz 1383500 SHA256 8616b77c239aaa731312609f192c9b2c71d54b2cae42ff23efa23b5b3188778e SHA512 ba31c7801fc4642d9c4dcf34d4b8c02005f2ebfab4ecfe4e726685c5fb95f05311fc3a481f9b2d2e8b211395e4c932adba0e68b57d264cd1f6065402d9143d32 WHIRLPOOL 40227288b1f3788bb8740872f9e960f97765caf595d56ecb02cac451e08c155f15c47d086e00fc8f32c4e665ed8fb67da76312b7ef4d4c6f1c047d83687c2e86 diff --git a/gnome-extra/yelp/files/yelp-3.16.0-man-compatibility.patch b/gnome-extra/yelp/files/yelp-3.16.0-man-compatibility.patch deleted file mode 100644 index 9df6ef491793..000000000000 --- a/gnome-extra/yelp/files/yelp-3.16.0-man-compatibility.patch +++ /dev/null @@ -1,114 +0,0 @@ -From fb83e8cea7e9e521599e73180ecff8f1374edb8d Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gmail.com> -Date: Sun, 1 May 2011 22:52:14 -0400 -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 <tetromino@gmail.com> ---- - libyelp/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/libyelp/Makefile.am b/libyelp/Makefile.am -index 0ae9d60..0037ecd 100644 ---- a/libyelp/Makefile.am -+++ b/libyelp/Makefile.am -@@ -1,4 +1,5 @@ - lib_LTLIBRARIES = libyelp.la -+libexec_SCRIPTS = yelp-groff - - libyelp_la_SOURCES = \ - yelp-bookmarks.c \ -@@ -51,6 +52,7 @@ libyelp_la_CFLAGS = \ - $(YELP_CFLAGS) \ - -Wno-deprecated-declarations \ - -DDATADIR=\""$(datadir)"\" \ -+ -DLIBEXECDIR=\"$(libexecdir)\" \ - -DYELP_ICON_PATH=\"$(YELP_ICON_PATH)\" - - libyelp_la_LIBADD = $(YELP_LIBS) -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 <tetromino@gmail.com> -+# -+# 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.3.6 - diff --git a/gnome-extra/yelp/yelp-3.18.1-r1.ebuild b/gnome-extra/yelp/yelp-3.18.1-r1.ebuild deleted file mode 100644 index eb14fd92bbcc..000000000000 --- a/gnome-extra/yelp/yelp-3.18.1-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GNOME2_LA_PUNT="yes" -GCONF_DEBUG="no" - -inherit autotools eutils gnome2 - -DESCRIPTION="Help browser for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Yelp" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" - -RDEPEND=" - app-arch/bzip2:= - >=app-arch/xz-utils-4.9:= - dev-db/sqlite:3= - >=dev-libs/glib-2.38:2 - >=dev-libs/libxml2-2.6.5:2 - >=dev-libs/libxslt-1.1.4 - >=gnome-extra/yelp-xsl-3.12 - >=net-libs/webkit-gtk-2.7.2:4 - >=x11-libs/gtk+-3.13.3:3 - x11-themes/gnome-icon-theme-symbolic -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.13 - >=dev-util/intltool-0.41.0 - dev-util/itstool - >=sys-devel/gettext-0.17 - virtual/pkgconfig -" - -src_prepare() { - # Fix compatibility with Gentoo's sys-apps/man - # https://bugzilla.gnome.org/show_bug.cgi?id=648854 - epatch "${FILESDIR}"/${PN}-3.16.0-man-compatibility.patch - eautoreconf - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-static \ - --enable-bz2 \ - --enable-lzma -} - -src_install() { - gnome2_src_install - exeinto /usr/libexec/ - doexe "${S}"/libyelp/yelp-groff -} |