Added much more robust file checking to several of these; hopefully this will

clear up any outstanding issues with sgml catalogs.  This should also fix the
behavior seen in bug 6854.

5 files changed, 68 insertions, 26 deletions

diff --git a/app-text/docbook-sgml-dtd/ChangeLog b/app-text/docbook-sgml-dtd/ChangeLog
index 1307cd509b5f..201e441560aa 100644
--- a/app-text/docbook-sgml-dtd/ChangeLog
+++ b/app-text/docbook-sgml-dtd/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for app-text/docbook-sgml-dtd
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/ChangeLog,v 1.3 2002/08/02 17:42:49 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/ChangeLog,v 1.4 2002/09/12 07:20:19 satai Exp $
+
+*docbook-sgml-dtd-4.0.ebuild (12 Sep 2002)
+
+  12 Sep 2002; satai <satai@gentoo.org> docbook-sgml-dtd-4.0.ebuild :
+  Added more robust file checking.
+
+*docbook-sgml-dtd-4.1.ebuild (12 Sep 2002)
+
+  12 Sep 2002; satai <satai@gentoo.org> docbook-sgml-dtd-4.1.ebuild :
+  Added more robust file checking.
+
+*docbook-sgml-dtd-3.0.ebuild (12 Sep 2002)
+
+  12 Sep 2002; satai <satai@gentoo.org> docbook-sgml-dtd-3.0.ebuild :
+  Added more robust file checking.
+
+*docbook-sgml-dtd-3.1.ebuild (12 Sep 2002)
+
+  12 Sep 2002; satai <satai@gentoo.org> docbook-sgml-dtd-3.1.ebuild :
+  Added more robust file checking.  Also added pkg_prerm.
 
 *docbook-sgml-dtd-4.0.ebuild (2 August 2002)
 
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0.ebuild
index 0be814f0dd1b..730c82a48db4 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0.ebuild,v 1.8 2002/08/16 02:42:01 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0.ebuild,v 1.9 2002/09/12 07:20:19 satai Exp $
 
 MY_P="docbk30"
 S=${WORKDIR}/${P}
@@ -42,11 +42,14 @@ pkg_postinst() {
 }
 pkg_prerm() {
 	if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ] ; then
-		install-catalog --remove \
-			/etc/sgml/sgml-docbook-${PV}.cat \
-			/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog
-		install-catalog --remove \
-			/etc/sgml/sgml-docbook-${PV}.cat \
-			/etc/sgml/sgml-docbook.cat
+		if [ -e /etc/sgml/sgml-docbook-${PV}.cat ]
+		then
+			install-catalog --remove \
+				/etc/sgml/sgml-docbook-${PV}.cat \
+				/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog
+			install-catalog --remove \
+				/etc/sgml/sgml-docbook-${PV}.cat \
+				/etc/sgml/sgml-docbook.cat
+		fi
 	fi
 }
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1.ebuild
index 3f8c672091f2..4f0c9fdf855b 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1.ebuild,v 1.9 2002/08/16 02:42:01 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1.ebuild,v 1.10 2002/09/12 07:20:19 satai Exp $
 
 MY_P="docbk31"
 S=${WORKDIR}/${P}
@@ -36,9 +36,23 @@ pkg_postinst() {
 		install-catalog --add \
 			/etc/sgml/sgml-docbook-${PV}.cat \
 			/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog
-			
-		install-catalog --add \
+		nstall-catalog --add \
 			/etc/sgml/sgml-docbook-${PV}.cat \
 			/etc/sgml/sgml-docbook.cat
 	fi
 }
+
+pkg_prerm() {
+	if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ]
+	then
+		if [ -e /etc/sgml/sgml-docbook-${PV}.cat ]
+		then
+			install-catalog --remove \
+				/etc/sgml/sgml-docbook-${PV}.cat \
+				/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog
+			install-catalog --remove \
+				/etc/sgml/sgml-docbook-${PV}.cat \
+				/etc/sgml/sgml-docbook.cat
+		fi
+	fi
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0.ebuild
index 33feb1e9125f..a8273afd12b2 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0.ebuild,v 1.8 2002/08/16 02:42:01 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0.ebuild,v 1.9 2002/09/12 07:20:19 satai Exp $
 
 MY_P="docbk40"
 S=${WORKDIR}/${P}
@@ -45,11 +45,14 @@ pkg_postinst() {
 pkg_prerm() {
 	if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ]
 	then
-		install-catalog --remove \
-			/etc/sgml/sgml-docbook-${PV}.cat \
-			/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog
-		install-catalog --remove \
-			/etc/sgml/sgml-docbook-${PV}.cat \
-			/etc/sgml/sgml-docbook.cat
+        if [ -e /etc/sgml/sgml-docbook-${PV}.cat ]
+		then
+			install-catalog --remove \
+				/etc/sgml/sgml-docbook-${PV}.cat \
+				/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog
+			install-catalog --remove \
+				/etc/sgml/sgml-docbook-${PV}.cat \
+				/etc/sgml/sgml-docbook.cat
+		fi
 	fi
 }
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1.ebuild
index 94481c1e52b4..af692bbcacf5 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1.ebuild,v 1.8 2002/08/16 02:42:01 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1.ebuild,v 1.9 2002/09/12 07:20:19 satai Exp $
 
 MY_P="docbk41"
 S=${WORKDIR}/${P}
@@ -45,12 +45,14 @@ pkg_postinst() {
 pkg_prerm() {
 	if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ]
 	then
-		install-catalog --remove \
-			/etc/sgml/sgml-docbook-${PV}.cat \
-			/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog
-
-		install-catalog --remove \
-			/etc/sgml/sgml-docbook-${PV}.cat \
-			/etc/sgml/sgml-docbook.cat
+		if [ -e /etc/sgml/sgml-docbook-${PV}.cat ]
+		then
+			install-catalog --remove \
+				/etc/sgml/sgml-docbook-${PV}.cat \
+				/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog
+			install-catalog --remove \
+				/etc/sgml/sgml-docbook-${PV}.cat \
+				/etc/sgml/sgml-docbook.cat
+		fi
 	fi
 }