Fixed head syntax

6 files changed, 66 insertions, 8 deletions

diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index d5f8ff6aeebd..6f108e758264 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -1,12 +1,11 @@
-MD5 4ce8a07b319238d9d2944b4ab68cad61 docbook-sgml-utils-0.6.12.ebuild 1183
-MD5 0f92bfe3ade21bd2272e37199a8cc7e4 .docbook-sgml-utils-0.6.12-r2.ebuild.swp 12288
-MD5 bad72157428fad3868f7db2bf8432218 docbook-sgml-utils-0.6.12-r2.ebuild 1227
+MD5 d2cd535bc87779c70e77156e4516bbd8 docbook-sgml-utils-0.6.12.ebuild 1218
+MD5 1c107ef2608a979fa62e7e1ae288eb4e docbook-sgml-utils-0.6.12-r2.ebuild 1350
 MD5 15587e82ba1be1f8339a1e755d3ace9e docbook-sgml-utils-0.6.11-r2.ebuild 1170
-MD5 883aa046e05e18be7ad07241b9dbf465 ChangeLog 3024
+MD5 2942d97c376e95d4ae9c7131f4f7de82 ChangeLog 3281
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 5d794ea316e35bb65972fbd5edc2dc43 docbook-sgml-utils-0.6.12-r1.ebuild 1335
+MD5 7b8b3c901ac9aae3df67868ec98c8a72 docbook-sgml-utils-0.6.12-r1.ebuild 1375
 MD5 a52142a3e1462a0e62a1d4b0e4b9e685 files/docbook-sgml-utils-frontend.patch 455
-MD5 b2ee40edf50eb35756ef9b28eec0cad4 files/docbook-sgml-utils-head-jw.patch 369
+MD5 f38af9b0090827606a87754c15de3470 files/docbook-sgml-utils-head-jw.patch 379
 MD5 1dd65666f8e59fae0cbcc281806b1195 files/digest-docbook-sgml-utils-0.6.11-r2 72
 MD5 162814a2342da5479a18dc8e9f74182a files/digest-docbook-sgml-utils-0.6.12-r1 72
 MD5 162814a2342da5479a18dc8e9f74182a files/digest-docbook-sgml-utils-0.6.12-r2 72
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12-r1.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12-r1.ebuild
index 699cc8d6abdc..adebf8a0b90c 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12-r1.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # 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.12-r1.ebuild,v 1.2 2003/09/13 07:05:15 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12-r1.ebuild,v 1.3 2003/11/20 07:55:06 obz Exp $
 
 MY_PN=${PN/-sgml/}
 MY_P=${MY_PN}-${PV}
@@ -34,6 +34,7 @@ DEPEND=">=dev-lang/perl-5
 
 src_compile() {
 	patch -p1 < ${FILESDIR}/docbook-sgml-utils-frontend.patch || die
+	epatch ${FILESDIR}/${PN}-head-jw.patch
 	econf
 	make || die
 }
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12-r2.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12-r2.ebuild
new file mode 100644
index 000000000000..d71031d79622
--- /dev/null
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.12-r2.ebuild,v 1.1 2003/11/20 07:55:06 obz Exp $
+
+MY_PN=${PN/-sgml/}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Shell scripts to manage DocBook documents"
+SRC_URI="ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.gz"
+HOMEPAGE="http://sources.redhat.com/docbook-tools/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+IUSE="tetex"
+
+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-r1
+	=app-text/docbook-sgml-dtd-3.1-r1
+	=app-text/docbook-sgml-dtd-4.0-r1
+	=app-text/docbook-sgml-dtd-4.1-r1
+	tetex? ( app-text/jadetex )
+	|| ( net-www/lynx net-www/links )"
+
+# including both xml-simple-dtd 4.1.2.4 and 1.0, to ease
+# transition to simple-dtd 1.0, <obz@gentoo.org>
+
+src_compile() {
+	epatch ${FILESDIR}/${PN}-frontend.patch
+	epatch ${FILESDIR}/${PN}-head-jw.patch
+	econf
+	make || die
+}
+
+src_install() {
+	einstall htmldir=${D}/usr/share/doc/${PF}/html
+	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
+}
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12.ebuild
index f0eebf405ab6..d69ee704cbb0 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # 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.12.ebuild,v 1.11 2003/11/15 02:55:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12.ebuild,v 1.12 2003/11/20 07:55:06 obz Exp $
 
 MY_PN=${PN/-sgml/}
 MY_P=${MY_PN}-${PV}
@@ -29,6 +29,7 @@ DEPEND=">=dev-lang/perl-5
 
 src_compile() {
 	patch -p1 < ${FILESDIR}/docbook-sgml-utils-frontend.patch || die
+	epatch ${FILESDIR}/${PN}-head-jw.patch
 	econf
 	make || die
 }
diff --git a/app-text/docbook-sgml-utils/files/digest-docbook-sgml-utils-0.6.12-r2 b/app-text/docbook-sgml-utils/files/digest-docbook-sgml-utils-0.6.12-r2
new file mode 100644
index 000000000000..b2b5b8680071
--- /dev/null
+++ b/app-text/docbook-sgml-utils/files/digest-docbook-sgml-utils-0.6.12-r2
@@ -0,0 +1 @@
+MD5 e8541700e40e661ee3048617ec53dccf docbook-utils-0.6.12.tar.gz 118410
diff --git a/app-text/docbook-sgml-utils/files/docbook-sgml-utils-head-jw.patch b/app-text/docbook-sgml-utils/files/docbook-sgml-utils-head-jw.patch
new file mode 100644
index 000000000000..94063c6670d2
--- /dev/null
+++ b/app-text/docbook-sgml-utils/files/docbook-sgml-utils-head-jw.patch
@@ -0,0 +1,11 @@
+--- docbook-utils-0.6.12/bin/jw.in.orig	2003-11-20 15:44:45.000000000 +0800
++++ docbook-utils-0.6.12/bin/jw.in	2003-11-20 15:45:05.000000000 +0800
+@@ -360,7 +360,7 @@
+ 	papersize=
+ 	if [ -x /usr/bin/locale ]
+ 	then
+-	  h=$(/usr/bin/locale LC_PAPER 2>/dev/null | head -1)
++	  h=$(/usr/bin/locale LC_PAPER 2>/dev/null | head -n 1)
+ 	  if [ "$h" = 297 ]
+ 	  then
+ 	    papersize=A4