* [gentoo-commits] proj/gnome:master commit in: gnome-extra/yelp-xsl/, gnome-extra/yelp/, gnome-extra/yelp/files/
@ 2011-03-09 11:34 Nirbheek Chauhan
0 siblings, 0 replies; 2+ messages in thread
From: Nirbheek Chauhan @ 2011-03-09 11:34 UTC (permalink / raw
To: gentoo-commits
commit: c8815ffbbea73d590b326e4bee31d9f43a73639a
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 8 15:47:54 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar 9 11:21:35 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c8815ffb
gnome-extra/{yelp,yelp-xsl}: 2.91.90 → 2.91.91
---
...-xsl-2.91.90.ebuild => yelp-xsl-2.91.91.ebuild} | 0
.../yelp/files/yelp-2.91.90-fix-schema-typo.patch | 12 ------------
...{yelp-2.91.90-r1.ebuild => yelp-2.91.91.ebuild} | 2 --
3 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-2.91.90.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-2.91.91.ebuild
similarity index 100%
rename from gnome-extra/yelp-xsl/yelp-xsl-2.91.90.ebuild
rename to gnome-extra/yelp-xsl/yelp-xsl-2.91.91.ebuild
diff --git a/gnome-extra/yelp/files/yelp-2.91.90-fix-schema-typo.patch b/gnome-extra/yelp/files/yelp-2.91.90-fix-schema-typo.patch
deleted file mode 100644
index 96dfe8e..0000000
--- a/gnome-extra/yelp/files/yelp-2.91.90-fix-schema-typo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur yelp-2.91.90/src/yelp-application.c yelp-2.91.90.new/src/yelp-application.c
---- yelp-2.91.90/src/yelp-application.c 2011-02-22 02:37:18.000000000 +0530
-+++ yelp-2.91.90.new/src/yelp-application.c 2011-02-22 06:15:33.135000075 +0530
-@@ -582,7 +582,7 @@
- priv->backend,
- settings_path);
- else
-- settings = g_settings_new_with_path ("org.gnome.yelp.document",
-+ settings = g_settings_new_with_path ("org.gnome.yelp.documents",
- settings_path);
- key = g_strdup (doc_uri);
- g_hash_table_insert (priv->docsettings, key, settings);
diff --git a/gnome-extra/yelp/yelp-2.91.90-r1.ebuild b/gnome-extra/yelp/yelp-2.91.91.ebuild
similarity index 95%
rename from gnome-extra/yelp/yelp-2.91.90-r1.ebuild
rename to gnome-extra/yelp/yelp-2.91.91.ebuild
index 76e9cc6..5bc1995 100644
--- a/gnome-extra/yelp/yelp-2.91.90-r1.ebuild
+++ b/gnome-extra/yelp/yelp-2.91.91.ebuild
@@ -41,6 +41,4 @@ src_prepare() {
--disable-schemas-compile
--enable-bz2
$(use_enable lzma)"
-
- epatch "${FILESDIR}/${P}-fix-schema-typo.patch"
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/yelp-xsl/, gnome-extra/yelp/, gnome-extra/yelp/files/
@ 2012-09-05 15:49 Nirbheek Chauhan
0 siblings, 0 replies; 2+ messages in thread
From: Nirbheek Chauhan @ 2012-09-05 15:49 UTC (permalink / raw
To: gentoo-commits
commit: 96e43dcc9aee32c0a8864c19371b9dc35bb00d5c
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 5 03:39:02 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Sep 5 15:48:23 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=96e43dcc
Add gnome-extra/yelp{,-xsl}-3.5.91
---
| 31 +++++
| 31 +++++
.../yelp/files/yelp-3.0.3-man-compatibility.patch | 117 ++++++++++++++++++++
| 73 ++++++++++++
| 74 ++++++++++++
5 files changed, 326 insertions(+), 0 deletions(-)
--git a/gnome-extra/yelp-xsl/yelp-xsl-3.5.91.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.5.91.ebuild
new file mode 100644
index 0000000..3b751bf
--- /dev/null
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.5.91.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit gnome.org
+if [[ ${PV} = 9999 ]]; then
+ inherit gnome2-live
+fi
+
+DESCRIPTION="XSL stylesheets for yelp"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE=""
+if [[ ${PV} = 9999 ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND=">=dev-libs/libxml2-2.6.12
+ >=dev-libs/libxslt-1.1.8"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40
+ dev-util/itstool
+ sys-apps/gawk
+ sys-devel/gettext
+ virtual/pkgconfig"
--git a/gnome-extra/yelp-xsl/yelp-xsl-9999.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-9999.ebuild
new file mode 100644
index 0000000..3b751bf
--- /dev/null
+++ b/gnome-extra/yelp-xsl/yelp-xsl-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit gnome.org
+if [[ ${PV} = 9999 ]]; then
+ inherit gnome2-live
+fi
+
+DESCRIPTION="XSL stylesheets for yelp"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE=""
+if [[ ${PV} = 9999 ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND=">=dev-libs/libxml2-2.6.12
+ >=dev-libs/libxslt-1.1.8"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40
+ dev-util/itstool
+ sys-apps/gawk
+ sys-devel/gettext
+ virtual/pkgconfig"
diff --git a/gnome-extra/yelp/files/yelp-3.0.3-man-compatibility.patch b/gnome-extra/yelp/files/yelp-3.0.3-man-compatibility.patch
new file mode 100644
index 0000000..b57591c
--- /dev/null
+++ b/gnome-extra/yelp/files/yelp-3.0.3-man-compatibility.patch
@@ -0,0 +1,117 @@
+From 7e181e8d74f7e67b8b3acb8524fc85157ed39c8e 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 | 4 +-
+ 3 files changed, 53 insertions(+), 2 deletions(-)
+ create mode 100755 libyelp/yelp-groff
+
+diff --git a/libyelp/Makefile.am b/libyelp/Makefile.am
+index a4dd68b..5d55bf1 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 \
+@@ -49,6 +50,7 @@ endif
+ libyelp_la_CFLAGS = \
+ $(YELP_CFLAGS) \
+ -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 4001d38..9818803 100644
+--- a/libyelp/yelp-man-parser.c
++++ b/libyelp/yelp-man-parser.c
+@@ -371,9 +371,9 @@ get_troff (gchar *path, GError **error)
+ {
+ gint stdout;
+ GError *err = NULL;
+- gchar *argv[] = { "man", "-Z", "-Tutf8", "-EUTF-8", NULL, NULL };
++ gchar *argv[] = { LIBEXECDIR "/yelp-groff", NULL, NULL };
+
+- argv[4] = path;
++ argv[1] = path;
+
+ if (!g_spawn_async_with_pipes (NULL, argv, NULL,
+ G_SPAWN_SEARCH_PATH, NULL, NULL,
+--
+1.7.5.rc3
+
--git a/gnome-extra/yelp/yelp-3.5.91.ebuild b/gnome-extra/yelp/yelp-3.5.91.ebuild
new file mode 100644
index 0000000..4a522ed
--- /dev/null
+++ b/gnome-extra/yelp/yelp-3.5.91.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+if [[ ${PV} = 9999 ]]; then
+ inherit gnome2-live
+fi
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+# FIXME: gtk-doc scanner fails assertion in gtk_icon_theme_get_for_screen().
+# How? Why?
+IUSE="doc" # doc
+if [[ ${PV} = 9999 ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~mips ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+fi
+
+RDEPEND="
+ app-arch/bzip2
+ >=app-arch/xz-utils-4.9
+ dev-db/sqlite:3
+ >=dev-libs/dbus-glib-0.71
+ >=dev-libs/glib-2.25.11:2
+ >=dev-libs/libxml2-2.6.5:2
+ >=dev-libs/libxslt-1.1.4
+ >=gnome-extra/yelp-xsl-${PV}
+ >=net-libs/webkit-gtk-1.3.2:3
+ >=x11-libs/gtk+-2.91.8:3
+ x11-themes/gnome-icon-theme-symbolic"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.41.0
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ gnome-base/gnome-common
+ doc? ( >=dev-util/gtk-doc-1.13 )"
+# If eautoreconf:
+# gnome-base/gnome-common
+
+if [[ ${PV} = 9999 ]]; then
+ DEPEND="${DEPEND}
+ app-text/yelp-tools
+ gnome-base/gnome-common"
+fi
+
+pkg_setup() {
+ DOCS="AUTHORS ChangeLog NEWS README TODO"
+ G2CONF="${G2CONF}
+ --disable-static
+ --disable-schemas-compile
+ --enable-bz2
+ --enable-lzma"
+ [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+}
+
+src_prepare() {
+ # Fix compatibility with Gentoo's sys-apps/man
+ # https://bugzilla.gnome.org/show_bug.cgi?id=648854
+ epatch "${FILESDIR}/${PN}-3.0.3-man-compatibility.patch"
+
+ [[ ${PV} != 9999 ]] && eautoreconf
+
+ gnome2_src_prepare
+}
--git a/gnome-extra/yelp/yelp-9999.ebuild b/gnome-extra/yelp/yelp-9999.ebuild
new file mode 100644
index 0000000..b46642f
--- /dev/null
+++ b/gnome-extra/yelp/yelp-9999.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+if [[ ${PV} = 9999 ]]; then
+ inherit gnome2-live
+fi
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+# FIXME: gtk-doc scanner fails assertion in gtk_icon_theme_get_for_screen().
+# How? Why?
+IUSE="doc" # doc
+if [[ ${PV} = 9999 ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~mips ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+fi
+
+RDEPEND="
+ app-arch/bzip2
+ >=app-arch/xz-utils-4.9
+ dev-db/sqlite:3
+ >=dev-libs/dbus-glib-0.71
+ >=dev-libs/glib-2.25.11:2
+ >=dev-libs/libxml2-2.6.5:2
+ >=dev-libs/libxslt-1.1.4
+ >=gnome-extra/yelp-xsl-${PV}
+ >=net-libs/webkit-gtk-1.3.2:3
+ >=x11-libs/gtk+-2.91.8:3
+ x11-themes/gnome-icon-theme-symbolic"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.41.0
+ dev-util/itstool
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ gnome-base/gnome-common
+ doc? ( >=dev-util/gtk-doc-1.13 )"
+# If eautoreconf:
+# gnome-base/gnome-common
+
+if [[ ${PV} = 9999 ]]; then
+ DEPEND="${DEPEND}
+ app-text/yelp-tools
+ gnome-base/gnome-common"
+fi
+
+pkg_setup() {
+ DOCS="AUTHORS ChangeLog NEWS README TODO"
+ G2CONF="${G2CONF}
+ --disable-static
+ --disable-schemas-compile
+ --enable-bz2
+ --enable-lzma"
+ [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+}
+
+src_prepare() {
+ # Fix compatibility with Gentoo's sys-apps/man
+ # https://bugzilla.gnome.org/show_bug.cgi?id=648854
+ epatch "${FILESDIR}/${PN}-3.0.3-man-compatibility.patch"
+
+ [[ ${PV} != 9999 ]] && eautoreconf
+
+ gnome2_src_prepare
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-05 15:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-05 15:49 [gentoo-commits] proj/gnome:master commit in: gnome-extra/yelp-xsl/, gnome-extra/yelp/, gnome-extra/yelp/files/ Nirbheek Chauhan
-- strict thread matches above, loose matches on Subject: below --
2011-03-09 11:34 Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox