New revision, avoids collisions with sgml-common and linuxdoc-tools (to be added soon). Bug #88232

(Portage version: 2.0.51.22-r2)

4 files changed, 23 insertions, 9 deletions

diff --git a/app-text/sgmltools-lite/ChangeLog b/app-text/sgmltools-lite/ChangeLog
index 3b1e909020f2..b025b70ca0a2 100644
--- a/app-text/sgmltools-lite/ChangeLog
+++ b/app-text/sgmltools-lite/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/sgmltools-lite
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/ChangeLog,v 1.37 2005/07/15 17:00:57 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/ChangeLog,v 1.38 2005/08/13 10:17:34 leonardop Exp $
+
+*sgmltools-lite-3.0.3-r10 (13 Aug 2005)
+
+  13 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  sgmltools-lite-3.0.3-r10.ebuild:
+  Don't install files provided by other packages. In particular, don't
+  create sgml2{html,txt,rtf} scripts, as they are not good substitutes for
+  the real programs in linuxdoc-tools (bug #88232). Don't include the
+  linuxdoc catalog in the system global catalog.
 
   15 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
   sgmltools-lite-3.0.3-r9.ebuild:
diff --git a/app-text/sgmltools-lite/Manifest b/app-text/sgmltools-lite/Manifest
index 116df9faf533..784935c919e0 100644
--- a/app-text/sgmltools-lite/Manifest
+++ b/app-text/sgmltools-lite/Manifest
@@ -1,6 +1,9 @@
 MD5 b628b524d27f94dab27fd1ed0d609ef5 ChangeLog 6720
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+MD5 b9027e1b3cf9bb72e01a16263c6fb9f4 sgmltools-lite-3.0.3-r10.ebuild 2577
 MD5 0591c36449998317fed358dc63014316 sgmltools-lite-3.0.3-r7.ebuild 2053
 MD5 150a79783c5e4589ea47027e07a7369e sgmltools-lite-3.0.3-r9.ebuild 2452
+MD5 5dc62f716d7bcec0b83d0fbf80854b45 .sgmltools-lite-3.0.3-r10.ebuild.swp 12288
+MD5 4068e19bd2400f18c7b90fc071c31619 files/digest-sgmltools-lite-3.0.3-r10 139
 MD5 4068e19bd2400f18c7b90fc071c31619 files/digest-sgmltools-lite-3.0.3-r7 139
 MD5 4068e19bd2400f18c7b90fc071c31619 files/digest-sgmltools-lite-3.0.3-r9 139
diff --git a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r9 b/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r10
index caf2a88ba3cb..caf2a88ba3cb 100644
--- a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r9
+++ b/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r10
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r9.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r10.ebuild
index bc87996f5be1..3b94fc3673c3 100644
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r9.ebuild
+++ b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # 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-r9.ebuild,v 1.2 2005/07/15 17:00:57 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r10.ebuild,v 1.1 2005/08/13 10:17:34 leonardop Exp $
 
 inherit python sgml-catalog
 
@@ -22,14 +22,11 @@ DEPEND=">=virtual/python-1.5
 	tetex? ( app-text/jadetex )
 	|| (
 		www-client/w3m
-		www-client/lynx
-	)"
+		www-client/lynx )"
 
 
 sgml-catalog_cat_include "/etc/sgml/sgml-lite.cat" \
 	"/usr/share/sgml/stylesheets/sgmltools/sgmltools.cat"
-sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" \
-	"/usr/share/sgml/dtd/sgmltools/catalog"
 
 src_unpack() {
 	unpack ${A}
@@ -60,13 +57,18 @@ src_install() {
 
 	rm ${D}/etc/sgml/catalog.{suse,rh62}
 
+	# Remove file provided by sgml-common
+	rm ${D}/usr/bin/sgmlwhich
+
 	# Remove the backends that require tetex
 	use tetex || \
 		rm ${D}/usr/share/sgml/misc/sgmltools/python/backends/{Dvi,Ps,Pdf,JadeTeX}.py
 
-	# The list of backends to alias with sgml2* 
-	BACKENDS="html rtf txt"
-	use tetex && BACKENDS="${BACKENDS} ps dvi pdf"
+	# List of backends to alias with sgml2*
+	# Do not provide sgml2{txt,rtf,html} anymore, they are part of
+	# linuxdoc-tools
+	local BACKENDS=""
+	use tetex && BACKENDS="ps dvi pdf"
 
 	# Create simple alias scripts that people are used to
 	# And make the manpages for those link to the sgmltools-lite manpage