*** empty log message ***

5 files changed, 66 insertions, 42 deletions

diff --git a/app-text/docbook2X/docbook2X-0.6.1.ebuild b/app-text/docbook2X/docbook2X-0.6.1.ebuild
index ac302422f248..4f044fd51c4c 100644
--- a/app-text/docbook2X/docbook2X-0.6.1.ebuild
+++ b/app-text/docbook2X/docbook2X-0.6.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/docbook2X-0.6.1.ebuild,v 1.1 2001/03/18 00:06:08 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/docbook2X-0.6.1.ebuild,v 1.2 2001/03/19 21:00:02 achim Exp $
 
 #P=
 A=${P}.tar.gz
@@ -22,14 +22,14 @@ src_install () {
     doins XML/DOM/Map.pm
     insinto /usr/lib/perl5/site_perl/5.6.0/XML
     doins XML/SGMLSpl.pm
-    insinto /usr/share/sgml/docbook/db2X/common
+    insinto /usr/share/sgml/docbook/db2X-customization/common
     doins xslt/common/*
-    insinto /usr/share/sgml/docbook/db2X/lib
+    insinto /usr/share/sgml/docbook/db2X-customization/lib
     doins xslt/lib/*
-    insinto /usr/share/sgml/docbook/db2X/texi
+    insinto /usr/share/sgml/docbook/db2X-customization/texi
     doins xslt/texi/*
-    insinto /usr/share/sgml/docbook/db2X/dtd
-    newins dtd/Texi-XML Texi-XML.dtd
+    insinto /usr/share/sgml/docbook/db2X-customization/dtd
+    doins dtd/Texi-XML 
     exeinto /usr/bin
     doexe docbook2man docbook2manxml docbook2texi docbook2texixml
     doexe docbook2man-spec.pl docbook2texi-spec.pl texi_xml man_xml
diff --git a/app-text/jadetex/jadetex-2.20.ebuild b/app-text/jadetex/jadetex-2.20.ebuild
index 92766d2337dd..04e61965fb14 100644
--- a/app-text/jadetex/jadetex-2.20.ebuild
+++ b/app-text/jadetex/jadetex-2.20.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/jadetex/jadetex-2.20.ebuild,v 1.3 2001/01/24 18:11:47 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jadetex/jadetex-2.20.ebuild,v 1.4 2001/03/19 21:00:02 achim Exp $
 
-A="${P}.zip ${P}-makefile.patch"
+A="${P}.zip"
 S=${WORKDIR}/${P}
 DESCRIPTION="TeX macros used by Jade TeX output."
-SRC_URI="ftp://ftp.kde.org/pub/kde/devel/docbook/SOURCES//jadetex-2.20.zip
-	 ftp://ftp.kde.org/pub/kde/devel/docbook/SOURCES/${P}-makefile.patch"
+SRC_URI="ftp://ftp.kde.org/pub/kde/devel/docbook/SOURCES//jadetex-2.20.zip"
 HOMEPAGE="http://"
 
 DEPEND=">=app-arch/unzip-5.41
@@ -18,28 +17,30 @@ src_unpack() {
   mkdir ${S}
   cd ${S}
   unpack ${P}.zip
-  patch -p0 < ${DISTDIR}/${P}-makefile.patch
+  patch -p0 < ${FILESDIR}/${P}-Makefile-gentoo.diff
 
 }
 
 src_compile() {
 
-    cd ${S}
     try make
 
 }
 
 src_install () {
 
-    cd ${S}
     try make DESTDIR=${D} install
     dodoc ChangeLog
     doman *.1
 
     dodir /usr/bin
     cd ${D}/usr/bin
-    ln -sf virtex jadetext
-    ln -sf pdfvirtex pdfjadetex
+    ln -s /usr/bin/virtex jadetex
+    ln -s /usr/bin/pdfvirtex pdfjadetex
 
 }
 
+pkg_postinst () {
+    mktexlsr
+}
+
diff --git a/app-text/openjade/openjade-1.3-r1.ebuild b/app-text/openjade/openjade-1.3-r1.ebuild
index 1bc5f30a2bc9..3550be49eb08 100644
--- a/app-text/openjade/openjade-1.3-r1.ebuild
+++ b/app-text/openjade/openjade-1.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/openjade-1.3-r1.ebuild,v 1.6 2000/11/01 04:44:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/openjade-1.3-r1.ebuild,v 1.7 2001/03/19 21:00:02 achim Exp $
 
 P=openjade-1.3
 A=${P}.tar.gz
@@ -10,27 +10,26 @@ DESCRIPTION="Jade is an implemetation of DSSSL - an ISO standard for formatting
 SRC_URI="http://download.sourceforge.net/openjade/"${A}
 HOMEPAGE="http://openjade.sourceforge.net"
 
-DEPEND=">=sys-devel/gcc-2.95.2
-	>=sys-devel/perl-5
-	>=sys-libs/glibc-2.1.3"
+DEPEND="virtual/glibc
+	sys-devel/perl"
+
+RDEPEND="virtual/glibc
+	app-text/sgml-common"
 
-src_unpack() {
-  unpack ${A}
-}
 
 src_compile() {                           
-  cd ${S}
+
   SGML_PREFIX=/usr/share/sgml
   try ./configure --host=${CHOST} --prefix=/usr \
 	--enable-http \
-	--enable-default-catalog=/usr/share/sgml/${P}/catalog \
+	--enable-default-catalog=/etc/sgml/catalog \
 	--enable-default-search-path=/usr/share/sgml \
 	--datadir=/usr/share/sgml/${P}
   try make
 }
 
 src_install() {                               
-  cd ${S}
+
   dodir /usr
   dodir /usr/lib
   try make prefix=${D}/usr datadir=${D}/usr/share/sgml/${P} install
@@ -50,17 +49,17 @@ src_install() {
   insinto /usr/include/sp/lib
   doins lib/*.h
 
-
   insinto /usr/share/sgml/${P}/
-  for i in catalog dsssl.dtd style-sheet.dtd fot.dtd
-  do
-    doins dsssl/$i
-  done
+  doins dsssl/builtins.dsl
 
-#  for i in unicode dsssl pubtext
-#  do
-#    cp -af $i ${D}/usr/share/sgml/${P}
-#  done
+  echo 'SYSTEM "builtins.dsl" "builtins.dsl"' > ${D}/usr/share/sgml/${P}/catalog
+  insinto /usr/share/sgml/${P}/dsssl
+  doins dsssl/{dsssl.dtd,style-sheet.dtd,fot.dtd}
+  newins ${FILESDIR}/${P}.dsssl-catalog catalog
+#  insinto /usr/share/sgml/${P}/unicode
+#  doins unicode/{catalog,unicode.sd,unicode.syn}
+  insinto /usr/share/sgml/${P}/pubtext
+  doins pubtext/*
 
   dodoc COPYING NEWS README VERSION
   docinto html/doc
@@ -72,6 +71,18 @@ src_install() {
 
 }
 
+pkg_postinst() {
+    install-catalog --add /etc/sgml/${P}.cat /usr/share/sgml/openjade-1.3/catalog
+    install-catalog --add /etc/sgml/${P}.cat /usr/share/sgml/openjade-1.3/dsssl/catalog
+    install-catalog --add /etc/sgml/${P}.cat /usr/share/sgml/openjade-1.3/unicode/catalog
+    install-catalog --add /etc/sgml/sgml-docbook.cat /etc/sgml/${P}.cat
+}
 
+pkg_prerm() {
+    install-catalog --remove /etc/sgml/${P}.cat /usr/share/sgml/openjade-1.3/catalog
+    install-catalog --remove /etc/sgml/${P}.cat /usr/share/sgml/openjade-1.3/dsssl/catalog
+    install-catalog --remove /etc/sgml/${P}.cat /usr/share/sgml/openjade-1.3/unicode/catalog
+    install-catalog --add /etc/sgml/sgml-docbook.cat /etc/sgml/${P}.cat
+}
 
 
diff --git a/app-text/sgml-common/sgml-common-0.6.1.ebuild b/app-text/sgml-common/sgml-common-0.6.1.ebuild
index cc9e482c6d63..961436473e5b 100644
--- a/app-text/sgml-common/sgml-common-0.6.1.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/sgml-common-0.6.1.ebuild,v 1.1 2001/03/06 06:20:41 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/sgml-common-0.6.1.ebuild,v 1.2 2001/03/19 21:00:02 achim Exp $
 
 A=${P}.tgz
 S=${WORKDIR}/${P}
@@ -10,18 +10,29 @@ SRC_URI="ftp://ftp.kde.org/pub/kde/devel/docbook/SOURCES/${A}
 	 http://download.sourceforge.net/pub/mirrors/kde/devel/docbook/SOURCES/${A}"
 HOMEPAGE="http://www.iso.ch/cate/3524030.html"
 
-DEPEND=">=sys-apps/bash-2.04"
+src_unpack() {
 
-src_compile() {
+    unpack ${A}
+    # We use a hacked version of install-catalog that supports the ROOT variable
+    cp ${FILESDIR}/${P}-install-catalog.in ${S}/bin
+}
 
+src_compile() {
   try ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man
   try make
 }
 src_install () {
-
-    cd ${S}
     try make prefix=${D}/usr sysconfdir=${D}/etc mandir=${D}/usr/share/man \
         docdir=${D}/usr/share/doc install
 
 }
 
+pkg_postinst() {
+    install-catalog --add /etc/sgml/sgml-ent.cat /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
+    install-catalog --add /etc/sgml/sgml-docbook.cat /etc/sgml/sgml-ent.cat
+}
+
+pkg_prerm() {
+    install-catalog --remove /etc/sgml/sgml-ent.cat /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
+    install-catalog --add /etc/sgml/sgml-docbook.cat /etc/sgml/sgml-ent.cat
+}
\ No newline at end of file
diff --git a/app-text/xmltex/xmltex-1.0.ebuild b/app-text/xmltex/xmltex-1.0.ebuild
index 4f8a69711838..cc20657217be 100644
--- a/app-text/xmltex/xmltex-1.0.ebuild
+++ b/app-text/xmltex/xmltex-1.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmltex/xmltex-1.0.ebuild,v 1.1 2001/03/17 22:40:54 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmltex/xmltex-1.0.ebuild,v 1.2 2001/03/19 21:00:02 achim Exp $
 
 #P=
 A=base.tar.gz
@@ -25,9 +25,10 @@ src_compile() {
 src_install () {
 
     try make DESTDIR=${D} install
+    dodir /usr/bin
     cd ${D}/usr/bin
-    ln -sf virtex xmltext
-    ln -sf pdfvirtex pdfxmltex
+    ln -sf /usr/bin/virtex xmltext
+    ln -sf /usr/bin/pdfvirtex pdfxmltex
 }
 
 pkg_postinst() {