Don't call sgml-catalog_cat_include from pkg_setup() (bug #98680)

(Portage version: 2.0.51.22-r1)

8 files changed, 43 insertions, 50 deletions

diff --git a/app-text/docbook-sgml-dtd/ChangeLog b/app-text/docbook-sgml-dtd/ChangeLog
index 767534359e45..017bac0c0e13 100644
--- a/app-text/docbook-sgml-dtd/ChangeLog
+++ b/app-text/docbook-sgml-dtd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/docbook-sgml-dtd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/ChangeLog,v 1.39 2005/07/12 17:29:20 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/ChangeLog,v 1.40 2005/07/15 16:54:46 leonardop Exp $
+
+  15 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
+  docbook-sgml-dtd-3.0-r3.ebuild, docbook-sgml-dtd-3.1-r3.ebuild,
+  docbook-sgml-dtd-4.0-r3.ebuild, docbook-sgml-dtd-4.1-r3.ebuild,
+  docbook-sgml-dtd-4.2-r2.ebuild, docbook-sgml-dtd-4.3-r2.ebuild,
+  docbook-sgml-dtd-4.4.ebuild:
+  Call sgml-catalog_cat_include() from the global scope again (bug #98680).
 
   12 Jul 2005; Guy Martin <gmsoft@gentoo.org>
   docbook-sgml-dtd-4.3-r2.ebuild:
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
index e6bd5fa53c1c..4a1a65fa9cc9 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.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/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild,v 1.1 2005/07/11 13:49:09 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild,v 1.2 2005/07/15 16:54:46 leonardop Exp $
 
 inherit sgml-catalog eutils
 
@@ -19,12 +19,10 @@ RDEPEND="app-text/sgml-common"
 
 S="${WORKDIR}"
 
-pkg_setup() {
-	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-		"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-		"/etc/sgml/sgml-docbook.cat"
-}
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
index 2836fd72a2b7..a9c8b1946357 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.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/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild,v 1.1 2005/07/11 13:49:09 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild,v 1.2 2005/07/15 16:54:46 leonardop Exp $
 
 inherit sgml-catalog eutils
 
@@ -19,12 +19,10 @@ RDEPEND="app-text/sgml-common"
 
 S="${WORKDIR}"
 
-pkg_setup() {
-	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-		"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-		"/etc/sgml/sgml-docbook.cat"
-}
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
index 788faa3d4b74..f67e6c0a2a73 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.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/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild,v 1.1 2005/07/11 13:49:09 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild,v 1.2 2005/07/15 16:54:46 leonardop Exp $
 
 inherit sgml-catalog eutils
 
@@ -19,12 +19,10 @@ RDEPEND="app-text/sgml-common"
 
 S="${WORKDIR}"
 
-pkg_setup() {
-	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-		"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-		"/etc/sgml/sgml-docbook.cat"
-}
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
index 66d73e515363..7bad7c551108 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.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/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild,v 1.1 2005/07/11 13:49:09 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild,v 1.2 2005/07/15 16:54:46 leonardop Exp $
 
 inherit sgml-catalog eutils
 
@@ -19,12 +19,10 @@ RDEPEND="app-text/sgml-common"
 
 S="${WORKDIR}"
 
-pkg_setup() {
-	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-		"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-		"/etc/sgml/sgml-docbook.cat"
-}
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
index 2cc3ae4d1c69..4779ae0dab89 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.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/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild,v 1.1 2005/07/11 13:49:09 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild,v 1.2 2005/07/15 16:54:46 leonardop Exp $
 
 inherit sgml-catalog eutils
 
@@ -19,12 +19,10 @@ RDEPEND="app-text/sgml-common"
 
 S="${WORKDIR}"
 
-pkg_setup() {
-	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-		"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-		"/etc/sgml/sgml-docbook.cat"
-}
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
index 0a1f49884a40..155fe11bfa4b 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.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/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild,v 1.2 2005/07/12 17:29:20 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild,v 1.3 2005/07/15 16:54:46 leonardop Exp $
 
 inherit sgml-catalog eutils
 
@@ -19,12 +19,10 @@ RDEPEND="app-text/sgml-common"
 
 S=${WORKDIR}
 
-pkg_setup() {
-	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-		"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-		"/etc/sgml/sgml-docbook.cat"
-}
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
index 867ac333ff74..98d11ae92232 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.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/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild,v 1.1 2005/07/12 02:26:16 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild,v 1.2 2005/07/15 16:54:46 leonardop Exp $
 
 inherit sgml-catalog eutils
 
@@ -19,12 +19,10 @@ RDEPEND="app-text/sgml-common"
 
 S=${WORKDIR}
 
-pkg_setup() {
-	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-		"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-		"/etc/sgml/sgml-docbook.cat"
-}
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
 
 src_unpack() {
 	unpack ${A}