Fix docbook-xml-dtd dep and handling (#222209) and pre-striping (#222283) thanks to Tristan Heaven <nyhm@gentoo.org>.

(Portage version: 2.1.4.4)

3 files changed, 130 insertions, 1 deletions

diff --git a/sys-apps/moreutils/ChangeLog b/sys-apps/moreutils/ChangeLog
index f34f4bbf7537..ef4c76045a32 100644
--- a/sys-apps/moreutils/ChangeLog
+++ b/sys-apps/moreutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/moreutils
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/ChangeLog,v 1.4 2008/05/31 16:48:38 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/ChangeLog,v 1.5 2008/05/31 17:16:47 coldwind Exp $
+
+*moreutils-0.30-r1 (31 May 2008)
+
+  31 May 2008; Santiago M. Mola <coldwind@gentoo.org>
+  +files/moreutils-0.30-dtd-path.patch, +moreutils-0.30-r1.ebuild:
+  Fix docbook-xml-dtd dep and handling (#222209) and pre-striping (#222283)
+  thanks to Tristan Heaven <nyhm@gentoo.org>.
 
   31 May 2008; Santiago M. Mola <coldwind@gentoo.org> moreutils-0.30.ebuild:
   Depend on new docbook2X, fixes #223971. Use S and remove redundant
diff --git a/sys-apps/moreutils/files/moreutils-0.30-dtd-path.patch b/sys-apps/moreutils/files/moreutils-0.30-dtd-path.patch
new file mode 100644
index 000000000000..f9fc90932b0e
--- /dev/null
+++ b/sys-apps/moreutils/files/moreutils-0.30-dtd-path.patch
@@ -0,0 +1,84 @@
+Fixes bug #222209.
+--- moreutils.orig/ifdata.docbook	2008-05-28 19:23:58.000000000 +0200
++++ moreutils/ifdata.docbook	2008-05-28 19:24:21.000000000 +0200
+@@ -21,7 +21,7 @@
+ -->
+ 
+ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
+-"file:///usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd"
++"file:///usr/share/sgml/docbook/xml-dtd-4.4/docbookx.dtd"
+ []>
+ 
+ <refentry>
+diff -ur moreutils.orig/ifne.docbook moreutils/ifne.docbook
+--- moreutils.orig/ifne.docbook	2008-05-28 19:23:58.000000000 +0200
++++ moreutils/ifne.docbook	2008-05-28 19:24:21.000000000 +0200
+@@ -21,7 +21,7 @@
+ -->
+ 
+ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
+-"file:///usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd"
++"file:///usr/share/sgml/docbook/xml-dtd-4.4/docbookx.dtd"
+ []>
+ 
+ <refentry>
+diff -ur moreutils.orig/isutf8.docbook moreutils/isutf8.docbook
+--- moreutils.orig/isutf8.docbook	2008-05-28 19:23:58.000000000 +0200
++++ moreutils/isutf8.docbook	2008-05-28 19:24:21.000000000 +0200
+@@ -21,7 +21,7 @@
+ -->
+ 
+ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
+-"file:///usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd"
++"file:///usr/share/sgml/docbook/xml-dtd-4.4/docbookx.dtd"
+ []>
+ 
+ <refentry>
+diff -ur moreutils.orig/lckdo.docbook moreutils/lckdo.docbook
+--- moreutils.orig/lckdo.docbook	2008-05-28 19:23:58.000000000 +0200
++++ moreutils/lckdo.docbook	2008-05-28 19:24:21.000000000 +0200
+@@ -8,7 +8,7 @@
+ -->
+ 
+ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
+-"file:///usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd"
++"file:///usr/share/sgml/docbook/xml-dtd-4.4/docbookx.dtd"
+ []>
+ 
+ <refentry>
+diff -ur moreutils.orig/mispipe.docbook moreutils/mispipe.docbook
+--- moreutils.orig/mispipe.docbook	2008-05-28 19:23:58.000000000 +0200
++++ moreutils/mispipe.docbook	2008-05-28 19:24:21.000000000 +0200
+@@ -21,7 +21,7 @@
+ -->
+ 
+ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
+-"file:///usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd"
++"file:///usr/share/sgml/docbook/xml-dtd-4.4/docbookx.dtd"
+ []>
+ 
+ <refentry>
+diff -ur moreutils.orig/pee.docbook moreutils/pee.docbook
+--- moreutils.orig/pee.docbook	2008-05-28 19:23:58.000000000 +0200
++++ moreutils/pee.docbook	2008-05-28 19:24:21.000000000 +0200
+@@ -21,7 +21,7 @@
+ -->
+ 
+ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
+-"file:///usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd"
++"file:///usr/share/sgml/docbook/xml-dtd-4.4/docbookx.dtd"
+ []>
+ 
+ <refentry>
+diff -ur moreutils.orig/sponge.docbook moreutils/sponge.docbook
+--- moreutils.orig/sponge.docbook	2008-05-28 19:23:58.000000000 +0200
++++ moreutils/sponge.docbook	2008-05-28 19:24:21.000000000 +0200
+@@ -21,7 +21,7 @@
+ -->
+ 
+ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
+-"file:///usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd"
++"file:///usr/share/sgml/docbook/xml-dtd-4.4/docbookx.dtd"
+ []>
+ 
+ <refentry>
diff --git a/sys-apps/moreutils/moreutils-0.30-r1.ebuild b/sys-apps/moreutils/moreutils-0.30-r1.ebuild
new file mode 100644
index 000000000000..49b62d78886b
--- /dev/null
+++ b/sys-apps/moreutils/moreutils-0.30-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/moreutils-0.30-r1.ebuild,v 1.1 2008/05/31 17:16:47 coldwind Exp $
+
+EAPI=1
+
+inherit eutils
+
+DESCRIPTION="a growing collection of the unix tools that nobody thought to write
+thirty years ago"
+HOMEPAGE="http://kitenet.net/~joey/code/moreutils/"
+SRC_URI="http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}
+	>=app-text/docbook2X-0.8.8-r2
+	app-text/docbook-xml-dtd:4.4"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-dtd-path.patch
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" DOCBOOK2XMAN="docbook2man.pl" || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_BIN=install install || die "install failed"
+}