Fixed sgml2* files and removed older version

6 files changed, 17 insertions, 118 deletions

diff --git a/app-text/sgmltools-lite/ChangeLog b/app-text/sgmltools-lite/ChangeLog
index 325521af4eca..484c3b17d95a 100644
--- a/app-text/sgmltools-lite/ChangeLog
+++ b/app-text/sgmltools-lite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/sgmltools-lite
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/ChangeLog,v 1.18 2003/06/12 20:28:17 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/ChangeLog,v 1.19 2003/09/27 14:58:26 obz Exp $
+
+  27 Sep 2003; Mike Gardiner <obz@gentoo.org> metadata.xml,
+  sgmltools-lite-3.0.3-r5.ebuild, sgmltools-lite-3.0.3-r6.ebuild:
+  Fixed the sgml2* tools, thanks to <parapente@mail15.com> for bug #27658. Added
+  metadata.xml and removed older -r5 version
 
   12 Jun 2003; <msterret@gentoo.org> sgmltools-lite-3.0.3-r5.ebuild,
   sgmltools-lite-3.0.3-r6.ebuild:
diff --git a/app-text/sgmltools-lite/Manifest b/app-text/sgmltools-lite/Manifest
index 310fb32ee255..5e7d9221dde9 100644
--- a/app-text/sgmltools-lite/Manifest
+++ b/app-text/sgmltools-lite/Manifest
@@ -1,6 +1,5 @@
-MD5 38c0d7bee7fbe74d42f6e7570d380879 ChangeLog 4031
-MD5 5d9fa5b409f78e473250f0c38a0c8d45 sgmltools-lite-3.0.3-r5.ebuild 2554
-MD5 27709477feab1be58ef369d6371092e4 sgmltools-lite-3.0.3-r6.ebuild 2168
-MD5 4068e19bd2400f18c7b90fc071c31619 files/digest-sgmltools-lite-3.0.3-r5 139
+MD5 4f2b4fb78e7a61d1c8fd8f4993a43ad9 sgmltools-lite-3.0.3-r6.ebuild 2180
+MD5 510a296a010b412b28e5be1541563d0a ChangeLog 4279
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 MD5 4068e19bd2400f18c7b90fc071c31619 files/digest-sgmltools-lite-3.0.3-r6 139
 MD5 5a72138dcb78d9d707c734eaf04d248b files/sgmltools-lite-3.0.3-gentoo.diff 679
diff --git a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r5 b/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r5
deleted file mode 100644
index caf2a88ba3cb..000000000000
--- a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 dab77d3d751ca381a95ccebd88480a85 sgmltools-lite-3.0.3.tar.gz 61342
-MD5 d1faad065777a538ac09691761577b26 nw-eps-icons-0.0.1.tar.gz 8733
diff --git a/app-text/sgmltools-lite/metadata.xml b/app-text/sgmltools-lite/metadata.xml
new file mode 100644
index 000000000000..06689a1a9114
--- /dev/null
+++ b/app-text/sgmltools-lite/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>text-markup</herd>
+</pkgmetadata>
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r5.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r5.ebuild
deleted file mode 100644
index 16c121c1f9ff..000000000000
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r5.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r5.ebuild,v 1.10 2003/09/05 22:37:22 msterret Exp $
-
-S=${WORKDIR}/${P}
-SRC_URI="mirror://sourceforge/sgmltools-lite/${P}.tar.gz
-		 mirror://sourceforge/sgmltools-lite/nw-eps-icons-0.0.1.tar.gz"
-HOMEPAGE="http://sgmltools-lite.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-DESCRIPTION="Python interface to SGML software specificially in a
-DocBook/OpenJade environment.  Provides sgml2{html,txt,rtf,dvi,ps}"
-
-DEPEND="virtual/python
-	app-text/sgml-common
-	=app-text/docbook-sgml-dtd-3.1-r1
-	app-text/docbook-dsssl-stylesheets
-	app-text/jadetex
-	app-text/openjade
-	net-www/lynx"
-
-KEYWORDS="x86 ppc sparc "
-
-src_compile() {
-	./configure 	\
-		--prefix=/usr \
-		--exec-prefix=/usr	\
-		--bindir=/usr/bin	\
-		--sbindir=/usr/sbin	\
-		--datadir=/usr/share	\
-		--mandir=/usr/share/man	|| die
-
-	make || die
-
-	#remove CVS directories from the tree
-	for dirs in bin doc dsssl dtd man python rpm
-	do
-		rm -rf ${dirs}/CVS
-	done
-
-}
-
-src_install() {
-	make	\
-		prefix=${D}/usr	\
-		exec-prefix=${D}/usr	\
-		datadir=${D}/usr/share	\
-		bindir=${D}/usr/bin	\
-		sysconfdir=${D}/etc	\
-		mandir=${D}/usr/share/man	\
-		etcdir=${D}/etc/sgml	\
-		install || die
-
-	dodoc COPYING ChangeLog POSTINSTALL README*
-	dohtml -r .
-
-	cd ${WORKDIR}/nw-eps-icons-0.0.1/images
-	insinto /usr/share/sgml/docbook/dsssl-stylesheets/images
-	doins *.eps
-
-	cd callouts
-	insinto /usr/share/sgml/docbook/dsssl-stylesheets/images/callouts
-	doins *.eps
-
-	rm ${D}/etc/sgml/catalog.{suse,rh62}
-
-	# Create simple alias scripts that people are used to
-	# And make the manpages for those link to the sgmltools-lite manpage
-	mandir=${D}/usr/share/man/man1
-	ScripTEXT="/usr/bin/sgmltools --backend="
-	for back in html ps dvi rtf txt
-	do
-		echo "${ScripTEXT}${back}" > sgml2${back}
-		exeinto /usr/bin
-		doexe sgml2${back}
-
-		cd ${mandir}
-		ln -sf sgmltools-lite.1.gz sgml2${back}.1.gz
-		cd ${S}
-	done
-
-
-}
-
-pkg_postinst() {
-
-	gensgmlenv
-	grep -v export /etc/sgml/sgml.env > /etc/env.d/93sgmltools-lite
-
-	if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ]
-	then
-		install-catalog --add \
-			/etc/sgml/sgml-lite.cat \
-			/usr/share/sgml/stylesheets/sgmltools/sgmltools.cat
-	fi
-}
-
-pkg_prerm() {
-	if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ]
-	then
-		if [ -e sgml-lite.cat ]
-		then
-			install-catalog --remove \
-				/etc/sgml/sgml-lite.cat \
-				/usr/share/sgml/stylesheets/sgmltools/sgmltools.cat
-		fi
-	fi
-}
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r6.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r6.ebuild
index 20a8317b813d..15a11b51ccc5 100644
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r6.ebuild
+++ b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r6.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/sgmltools-lite/sgmltools-lite-3.0.3-r6.ebuild,v 1.6 2003/09/05 22:37:22 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r6.ebuild,v 1.7 2003/09/27 14:58:26 obz Exp $
 
 inherit sgml-catalog
 
@@ -69,10 +69,10 @@ src_install() {
 	# Create simple alias scripts that people are used to
 	# And make the manpages for those link to the sgmltools-lite manpage
 	mandir=${D}/usr/share/man/man1
-	ScripTEXT="/usr/bin/sgmltools --backend="
+	ScripTEXT="#!/bin/sh\n/usr/bin/sgmltools --backend="
 	for back in html ps dvi rtf txt
 	do
-		echo "${ScripTEXT}${back}" > sgml2${back}
+		echo -e ${ScripTEXT}${back} '$*' > sgml2${back}
 		exeinto /usr/bin
 		doexe sgml2${back}