Oy. Tons of changes... Fixed all of these ebuilds to inherit from

sgml-catalog.eclass, and then set them all up to have proper dependencies on
the newest items, as well as use the new, more robust installation and removal
system.  This will probably have some growing pains over the next few days, but
the long range will be worth it.  All problem hints will be found at
http://www.gentoo.org/~satai/

12 files changed, 24 insertions, 250 deletions

diff --git a/app-text/sgmltools-lite/ChangeLog b/app-text/sgmltools-lite/ChangeLog
index 44e33979ae35..ef97802c54a9 100644
--- a/app-text/sgmltools-lite/ChangeLog
+++ b/app-text/sgmltools-lite/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/sgmltools-lite
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/ChangeLog,v 1.13 2002/12/13 10:56:20 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/ChangeLog,v 1.14 2002/12/31 04:36:56 satai Exp $
+
+  30 Dec 2002; Matthew Turk <satai@gentoo.org> :
+  Changed dependencies to work with new docbook-sgml-dtd's.
+
+*sgmltools-lite-3.0.3-r6 (30 Dec 2002)
+
+  30 Dec 2002; Matthew Turk <satai@gentoo.org> : 
+  changed to inherit sgml-catalog and better deal with catalogs. 
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r1 b/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r1
deleted file mode 100644
index caf2a88ba3cb..000000000000
--- a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r1
+++ /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/files/digest-sgmltools-lite-3.0.3-r2 b/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r2
deleted file mode 100644
index caf2a88ba3cb..000000000000
--- a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r2
+++ /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/files/digest-sgmltools-lite-3.0.3-r3 b/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r3
deleted file mode 100644
index caf2a88ba3cb..000000000000
--- a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r3
+++ /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/files/digest-sgmltools-lite-3.0.3-r4 b/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r4
deleted file mode 100644
index caf2a88ba3cb..000000000000
--- a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r4
+++ /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/files/digest-sgmltools-lite-3.0.3 b/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r6
index caf2a88ba3cb..caf2a88ba3cb 100644
--- a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3
+++ b/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r6
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r1.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r1.ebuild
deleted file mode 100644
index 413c1209f015..000000000000
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2002 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-r1.ebuild,v 1.9 2002/12/09 04:17:45 manson 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
-	app-text/docbook-dsssl-stylesheets
-	app-text/jadetex
-	app-text/openjade
-	net-www/lynx"
-KEYWORDS="x86 ppc sparc "
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${P}.tar.gz
-	cd ${S}
-	unpack nw-eps-icons-0.0.1.tar.gz
-	patch -p0 <${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	./configure --prefix=/usr || die
-	make || die
-}
-
-src_install () {
-	mv bin/gensgmlenv bin/gensgmlenv_orig
-	sed -e "s#/etc/sgml/sgml.env#${D}/etc/sgml/sgml.env#g" \
-		-e "s#/etc/sgml/sgml.cenv#${D}/etc/sgml/sgml.cenv#g" \
-		bin/gensgmlenv_orig > bin/gensgmlenv
-	make DESTDIR=${D} install
-
-	cd ${S}/bin
-	chmod a+x ./gensgmlenv
-	./gensgmlenv
-	cd ${S}/etc/sgml
-	dodir /etc/env.d
-	cat sgml.env | grep = > ${D}/etc/env.d/93sgmltools-lite
-	rm sgml.env sgml.cenv
-
-	cd ${S}/nw-eps-icons-0.0.1/images
-	insinto /usr/share/sgml/docbook/dsssl-stylesheets/images
-	doins *.eps
-	insinto /usr/share/sgml/docbook/dsssl-stylesheets/images/callouts
-	cd callouts
-	doins *.eps
-}
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r2.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r2.ebuild
deleted file mode 100644
index 94f2e01477ae..000000000000
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2002 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-r2.ebuild,v 1.9 2002/12/09 04:17:45 manson 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
-	app-text/docbook-dsssl-stylesheets
-	app-text/jadetex
-	app-text/openjade
-	net-www/lynx"
-
-KEYWORDS="x86 ppc sparc "
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${P}.tar.gz
-	cd ${S}
-	unpack nw-eps-icons-0.0.1.tar.gz
-	patch -p0 <${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		|| die
-	make || die
-}
-
-src_install () {
-	mv bin/gensgmlenv bin/gensgmlenv_orig
-	sed -e "s#/etc/sgml/sgml.env#${D}/etc/sgml/sgml.env#g" \
-		-e "s#/etc/sgml/sgml.cenv#${D}/etc/sgml/sgml.cenv#g" \
-		bin/gensgmlenv_orig > bin/gensgmlenv
-	make DESTDIR=${D} mandir=${D}/usr/share/man install
-
-	cd ${S}/bin
-	chmod a+x ./gensgmlenv
-	./gensgmlenv
-	cd ${S}/etc/sgml
-	dodir /etc/env.d
-	cat sgml.env | grep = > ${D}/etc/env.d/93sgmltools-lite
-	rm sgml.env sgml.cenv
-
-	cd ${S}/nw-eps-icons-0.0.1/images
-	insinto /usr/share/sgml/docbook/dsssl-stylesheets/images
-	doins *.eps
-	insinto /usr/share/sgml/docbook/dsssl-stylesheets/images/callouts
-	cd callouts
-	doins *.eps
-}
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r3.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r3.ebuild
deleted file mode 100644
index 45eaecaf0f2f..000000000000
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2002 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-r3.ebuild,v 1.10 2002/12/09 04:17:45 manson 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."
-
-DEPEND="virtual/python
-	app-text/sgml-common
-	=app-text/docbook-sgml-dtd-3.1
-	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
-}
-
-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}
-}
-
-pkg_postinst() {
-
-	gensgmlenv
-	grep -v export /etc/sgml/sgml.env > /etc/env.d/93sgmltools-lite
-}
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
index 3d262e8efcc1..4d1745b7836b 100644
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r5.ebuild
+++ b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r5.ebuild
@@ -14,7 +14,7 @@ DocBook/OpenJade environment.  Provides sgml2{html,txt,rtf,dvi,ps}"
 
 DEPEND="virtual/python
 	app-text/sgml-common
-	=app-text/docbook-sgml-dtd-3.1
+	=app-text/docbook-sgml-dtd-3.1-r1
 	app-text/docbook-dsssl-stylesheets
 	app-text/jadetex
 	app-text/openjade
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r4.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r6.ebuild
index cf08634e1957..a19d8b6bf28a 100644
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r4.ebuild
+++ b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r6.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2002 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-r4.ebuild,v 1.10 2002/12/09 04:17:45 manson Exp $
+# $Header:
+# /home/cvsroot/gentoo-x86/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r4.ebuild,v 1.7 2002/08/16 02:42:02 murphy Exp $
+
+inherit sgml-catalog
 
 S=${WORKDIR}/${P}
 SRC_URI="mirror://sourceforge/sgmltools-lite/${P}.tar.gz
@@ -8,11 +11,12 @@ SRC_URI="mirror://sourceforge/sgmltools-lite/${P}.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}"
+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
+	=app-text/docbook-sgml-dtd-3.1-r1
 	app-text/docbook-dsssl-stylesheets
 	app-text/jadetex
 	app-text/openjade
@@ -78,11 +82,17 @@ src_install() {
 		cd ${S}
 	done
 
-	
+
 }
 
+sgml-catalog_cat_include "/etc/sgml/sgml-lite.cat" \
+	"/usr/share/sgml/stylesheets/sgmltools/sgmltools.cat"
+
 pkg_postinst() {
 
 	gensgmlenv
 	grep -v export /etc/sgml/sgml.env > /etc/env.d/93sgmltools-lite
+
+	sgml-catalog_pkg_postinst
+
 }
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3.ebuild
deleted file mode 100644
index 27e23af4aa87..000000000000
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2002 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.ebuild,v 1.14 2002/12/09 04:17:45 manson 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
-	app-text/docbook-dsssl-stylesheets
-	app-text/jadetex
-	app-text/openjade
-	net-www/lynx"
-KEYWORDS="x86 ppc sparc "
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${P}.tar.gz
-	cd ${S}
-	unpack nw-eps-icons-0.0.1.tar.gz
-	patch -p0 <${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	./configure --prefix=/usr || die
-	make || die
-}
-
-src_install () {
-	mv bin/gensgmlenv bin/gensgmlenv_orig
-	sed -e "s#/etc/sgml/sgml.env#${D}/etc/sgml/sgml.env#g" \
-		-e "s#/etc/sgml/sgml.cenv#${D}/etc/sgml/sgml.cenv#g" \
-		bin/gensgmlenv_orig > bin/gensgmlenv
-	make DESTDIR=${D} install
-
-	cd ${S}/bin
-	chmod a+x ./gensgmlenv
-	./gensgmlenv
-	cd /etc/sgml
-	dodir /etc/env.d
-	cat sgml.env | grep = > ${D}/etc/env.d/93sgmltools-lite
-	rm sgml.env sgml.cenv
-
-	cd ${S}/nw-eps-icons-0.0.1/images
-	insinto /usr/share/sgml/docbook/dsssl-stylesheets/images
-	doins *.eps
-	insinto /usr/share/sgml/docbook/dsssl-stylesheets/images/callouts
-	cd callouts
-	doins *.eps
-}