Version bump and update patch.

Package-Manager: portage-2.2_rc98/cvs/Linux x86_64

4 files changed, 159 insertions, 2 deletions

diff --git a/sys-apps/moreutils/ChangeLog b/sys-apps/moreutils/ChangeLog
index c8f2cc39b1c6..da6e4c6c7972 100644
--- a/sys-apps/moreutils/ChangeLog
+++ b/sys-apps/moreutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/moreutils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/ChangeLog,v 1.19 2010/07/20 16:27:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/ChangeLog,v 1.20 2010/10/22 07:12:59 radhermit Exp $
+
+*moreutils-0.42 (22 Oct 2010)
+
+  22 Oct 2010; Tim Harder <radhermit@gentoo.org> +moreutils-0.42.ebuild,
+  +files/moreutils-0.42-dtd-path.patch:
+  Version bump and update patch.
 
   20 Jul 2010; Jeroen Roovers <jer@gentoo.org> moreutils-0.39.ebuild:
   Stable for HPPA (bug #328831).
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index 01618d6c74d9..321b7a4bc847 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -1,7 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX moreutils-0.30-dtd-path.patch 2894 RMD160 e2ebb2d3ad8f72230fa0ea4f6c9e8bfffd712d96 SHA1 d3420b1fbf6dce6dffa06766e50533c27abdab13 SHA256 253208d704080b26e7e1b5c8ee6006acf9d2a441a37039c573c5e0ae57c1af70
+AUX moreutils-0.42-dtd-path.patch 3368 RMD160 71ff93fa1149040e8820044aa3c3de77403a0718 SHA1 d0a245ab92e9b77c9f3972eff6f09e62b1bdc0e2 SHA256 05e066eb79d242ccfd86b49ab09e6e0915465ba5bbe6dc5e6dc88cb4df407862
 DIST moreutils_0.39.tar.gz 40591 RMD160 5b7be7b4b07497c04f5792021bf1dc54ec5d07a8 SHA1 ebf83f430a8c30b4f787e0b469ef2a37b6e2ae42 SHA256 6c982ed4c863f385da1ec9f90665cb9000c84f59b56340ca0832fea2d4b8bb98
 DIST moreutils_0.40.tar.gz 41625 RMD160 48a44657a35114198b984188dd54357db75596ab SHA1 614731f3534684a5e69747aee4ab59fd5886d0df SHA256 0ab604692b4c7a3b1398018af44e1d64a2180d618a2c6f89cc482efeb83ffd9e
+DIST moreutils_0.42.tar.gz 43296 RMD160 a7aa45bd8c5aaad6a3b67961ecb843fff5f1e09c SHA1 8644f01fe27a042295c92c92ae64a837e88d9986 SHA256 71cf9b37dd5093d51c4c7bbebca786bee54806b13b9c6be683f486fc0d5b614f
 EBUILD moreutils-0.39.ebuild 947 RMD160 a4e98c7dd721d5be4788b4eb1f8633f5114117b3 SHA1 1f74e5992347749fa28e438e25a02f2b38888353 SHA256 ada4e9037c11b287ad2752c8e0c78415e92dd971d6ccf233190bc7117d521875
 EBUILD moreutils-0.40.ebuild 956 RMD160 ded15e6f9a34d710dcd2fd8e91d21da890737c9a SHA1 ef8b7d52932ae1055a6b4e47641310df355915b7 SHA256 e3b613edd8e19c335394efe8dba9474e1de95a6363d615aba63c54a02d220540
-MISC ChangeLog 2782 RMD160 381e66c71a8b5c4ea6602dfb8a6c2faddc144e34 SHA1 332a14d8a22cd1866fdf39cf5e1b261ca0cf973e SHA256 41076caa114e3105ee60f8e9b45f21c5b5b10331cc63e5d690725b0f2428a616
+EBUILD moreutils-0.42.ebuild 950 RMD160 06ec415407fb50f158356e6ce428315a088afcca SHA1 f7b0f2bdb9be20a2b4244c826b39f6eb0221d02c SHA256 9d6d3383d32ad64ee3bf38087699aa09b9ca7c756bcebeffe788d1c1220ea009
+MISC ChangeLog 2966 RMD160 b235dadbeeec8a65b8f5c0e0362346974f9c0348 SHA1 baf2bb4f0c98d21659bb75915990474b1db3ca63 SHA256 347e1e7dc859cd4f292a09dc08615958b7836e808de7b2441847f571d539b871
 MISC metadata.xml 254 RMD160 ef248147782784116dcd92d8ff9c8cd5d302da3b SHA1 e9975a8c657d8f8a1d723d6f92074a4db95a2a19 SHA256 f65d3202ba781538623f44eaa8996de9b4fa1a43f828821dfcad736cec27aba6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBAgAGBQJMwTmEAAoJEEqz6FtPBkyj7s8IALTq0ocQ2z32SfwzCmrY6PFw
+B1sq11EZou2eeppJNikvXeOKiOZIJlrpVwsGGgEFO09tXmXYpj6ULNCBUm3eMF6k
+MbaKgyh+m0QhLdz8CkLYTY4YzT52zYqEdermOu7A3IdGkVQscSuDT80n9cTQVHl4
+K/9sefgZOeY7oGEM82Q3ly3zC3inbFnxSUSpoQj5k7F7OzP2YNdTyq4o5VNT7TOz
+G+sVelq7YvKBWP5h+vOv4kMXNL6TcvZ/LTxB8rLuNNUtrTd7ek3vDreqi9s6ac0N
+jRI0gEvHfZng5UNSaPFr3exYyTdLPmqmZdrK3z9fXqZi1/4mrMKMYNqxpumc9EA=
+=5yHE
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/moreutils/files/moreutils-0.42-dtd-path.patch b/sys-apps/moreutils/files/moreutils-0.42-dtd-path.patch
new file mode 100644
index 000000000000..5fc7712609be
--- /dev/null
+++ b/sys-apps/moreutils/files/moreutils-0.42-dtd-path.patch
@@ -0,0 +1,96 @@
+diff -ur moreutils.orig/ifdata.docbook moreutils/ifdata.docbook
+--- moreutils.orig/ifdata.docbook	2010-07-12 11:54:30.000000000 -0700
++++ moreutils/ifdata.docbook	2010-10-22 00:00:23.541560714 -0700
+@@ -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-12-16 15:19:10.000000000 -0800
++++ moreutils/ifne.docbook	2010-10-22 00:00:23.541560714 -0700
+@@ -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	2010-07-12 11:55:50.000000000 -0700
++++ moreutils/isutf8.docbook	2010-10-22 00:00:23.541560714 -0700
+@@ -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	2010-07-12 11:56:34.000000000 -0700
++++ moreutils/lckdo.docbook	2010-10-22 00:00:23.541560714 -0700
+@@ -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	2010-07-12 11:58:00.000000000 -0700
++++ moreutils/mispipe.docbook	2010-10-22 00:00:23.542560723 -0700
+@@ -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/parallel.docbook moreutils/parallel.docbook
+--- moreutils.orig/parallel.docbook	2010-07-12 11:58:31.000000000 -0700
++++ moreutils/parallel.docbook	2010-10-22 00:01:28.913093253 -0700
+@@ -7,7 +7,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	2010-09-07 23:09:27.000000000 -0700
++++ moreutils/pee.docbook	2010-10-22 00:00:23.542560723 -0700
+@@ -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	2010-09-13 13:38:24.000000000 -0700
++++ moreutils/sponge.docbook	2010-10-22 00:00:23.542560723 -0700
+@@ -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.42.ebuild b/sys-apps/moreutils/moreutils-0.42.ebuild
new file mode 100644
index 000000000000..395875f206b8
--- /dev/null
+++ b/sys-apps/moreutils/moreutils-0.42.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/moreutils-0.42.ebuild,v 1.1 2010/10/22 07:12:59 radhermit Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+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="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	dev-perl/Time-Duration
+	dev-perl/TimeDate"
+DEPEND="${RDEPEND}
+	>=app-text/docbook2X-0.8.8-r2
+	app-text/docbook-xml-dtd:4.4"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-dtd-path.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake CFLAGS="${CFLAGS}" DOCBOOK2XMAN=docbook2man.pl || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_BIN=install install || die
+}