fix bug 338853

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 90 insertions, 2 deletions

diff --git a/app-text/docbook-sgml-utils/ChangeLog b/app-text/docbook-sgml-utils/ChangeLog
index 9e0831d05a36..eeb7ba5d9151 100644
--- a/app-text/docbook-sgml-utils/ChangeLog
+++ b/app-text/docbook-sgml-utils/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/docbook-sgml-utils
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/ChangeLog,v 1.55 2009/08/23 16:03:57 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/ChangeLog,v 1.56 2010/10/03 17:54:57 xmw Exp $
+
+*docbook-sgml-utils-0.6.14-r1 (03 Oct 2010)
+
+  03 Oct 2010; Michael Weber <xmw@gentoo.org>
+  +docbook-sgml-utils-0.6.14-r1.ebuild,
+  +files/docbook-sgml-utils-0.6.14-grep-2.7.patch:
+  Revision bump to respect new sys-apps/grep-2.7 syntax check ([:space:] and
+  [:digits:] no longer accepted as classes, bug #338853).
+  Thanks tampakrap and ABCD for the review.
 
   23 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   docbook-sgml-utils-0.6.14.ebuild:
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r1.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r1.ebuild
new file mode 100644
index 000000000000..98daa4288a45
--- /dev/null
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r1.ebuild,v 1.1 2010/10/03 17:54:57 xmw Exp $
+
+EAPI=3
+
+inherit eutils
+
+MY_PN=${PN/-sgml/}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Shell scripts to manage DocBook documents"
+HOMEPAGE="http://sources.redhat.com/docbook-tools/"
+SRC_URI="ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="jadetex"
+
+DEPEND=">=dev-lang/perl-5
+	app-text/docbook-dsssl-stylesheets
+	app-text/openjade
+	dev-perl/SGMLSpm
+	~app-text/docbook-xml-simple-dtd-4.1.2.4
+	~app-text/docbook-xml-simple-dtd-1.0
+	app-text/docbook-xml-dtd
+	~app-text/docbook-sgml-dtd-3.0
+	~app-text/docbook-sgml-dtd-3.1
+	~app-text/docbook-sgml-dtd-4.0
+	~app-text/docbook-sgml-dtd-4.1
+	jadetex? ( app-text/jadetex )
+	userland_GNU? ( sys-apps/which )
+	|| (
+		www-client/lynx
+		www-client/links
+		www-client/elinks
+		virtual/w3m )"
+
+# including both xml-simple-dtd 4.1.2.4 and 1.0, to ease
+# transition to simple-dtd 1.0, <obz@gentoo.org>
+
+src_prepare() {
+	epatch "${FILESDIR}"/${MY_P}-elinks.patch
+	epatch "${FILESDIR}"/${P}-grep-2.7.patch
+}
+
+src_install() {
+	make DESTDIR="${D}" \
+		htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		install || die "Installation failed"
+
+	if ! use jadetex ; then
+		for i in dvi pdf ps ; do
+			rm "${ED}"/usr/bin/docbook2$i || die
+			rm "${ED}"/usr/share/sgml/docbook/utils-${PV}/backends/$i || die
+			rm "${ED}"/usr/share/man/man1/docbook2$i.1 || die
+		done
+	fi
+	dodoc AUTHORS ChangeLog NEWS README TODO || die
+}
diff --git a/app-text/docbook-sgml-utils/files/docbook-sgml-utils-0.6.14-grep-2.7.patch b/app-text/docbook-sgml-utils/files/docbook-sgml-utils-0.6.14-grep-2.7.patch
new file mode 100644
index 000000000000..490d65a0aa43
--- /dev/null
+++ b/app-text/docbook-sgml-utils/files/docbook-sgml-utils-0.6.14-grep-2.7.patch
@@ -0,0 +1,17 @@
+Fix wrong charakter classes no longer missinterpreted by grep-2.7
+Michael Weber <xmw@gentoo.org>
+
+--- docbook-utils-0.6.14/bin/jw.in
++++ docbook-utils-0.6.14/bin/jw.in
+@@ -80,9 +80,9 @@
+ SGML_CATALOGS_DIR="/etc/sgml"
+ if [ -f "$SGML_CONF" ]
+ then
+-  RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*'
++  RE='^[[:space:]]*SGML_BASE_DIR[[:space:]]*=[[:space:]]*'
+   SGML_BASE_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"`
+-  RE='^[:space:]*SGML_CATALOGS_DIR[:space:]*=[:space:]*'
++  RE='^[[:space:]]*SGML_CATALOGS_DIR[[:space:]]*=[[:space:]]*'
+   SGML_CATALOGS_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"`
+ fi
+