Re-arrange dependencies per bug 446196.

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

7 files changed, 19 insertions, 135 deletions

diff --git a/app-text/docbook-xml-dtd/ChangeLog b/app-text/docbook-xml-dtd/ChangeLog
index 47d16b93fd4a..ecc509682c31 100644
--- a/app-text/docbook-xml-dtd/ChangeLog
+++ b/app-text/docbook-xml-dtd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/docbook-xml-dtd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/ChangeLog,v 1.88 2012/04/26 18:27:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/ChangeLog,v 1.89 2012/12/06 03:12:11 floppym Exp $
+
+  06 Dec 2012; Mike Gilbert <floppym@gentoo.org> -docbook-xml-dtd-4.4-r1.ebuild,
+  -docbook-xml-dtd-4.5.ebuild, docbook-xml-dtd-4.1.2-r6.ebuild,
+  docbook-xml-dtd-4.2-r2.ebuild, docbook-xml-dtd-4.3-r1.ebuild,
+  docbook-xml-dtd-4.4-r2.ebuild:
+  Re-arrange dependencies per bug 446196.
 
   26 Apr 2012; Alexis Ballier <aballier@gentoo.org>
   docbook-xml-dtd-4.1.2-r6.ebuild, docbook-xml-dtd-4.3-r1.ebuild:
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
index 1915a6335b88..51494bc6b219 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild,v 1.22 2012/04/26 18:27:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild,v 1.23 2012/12/06 03:12:11 floppym Exp $
 
 inherit sgml-catalog
 
@@ -14,11 +14,9 @@ SLOT="${PV}"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND=""
-DEPEND=">=app-arch/unzip-5.41
-	>=dev-libs/libxml2-2.4
-	>=app-text/docbook-xsl-stylesheets-1.65
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
 	>=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
 
 sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
index c0883997bb69..c2aa0a614b74 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild,v 1.17 2012/04/26 17:22:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild,v 1.18 2012/12/06 03:12:11 floppym Exp $
 
 inherit sgml-catalog
 
@@ -14,11 +14,9 @@ SLOT="${PV}"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND=""
-DEPEND=">=app-arch/unzip-5.41
-	>=dev-libs/libxml2-2.4
-	>=app-text/docbook-xsl-stylesheets-1.65
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
 	>=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
 
 sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
index a14378e96c5f..8b83eeeff79a 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild,v 1.19 2012/04/26 18:27:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild,v 1.20 2012/12/06 03:12:11 floppym Exp $
 
 inherit sgml-catalog
 
@@ -14,11 +14,9 @@ SLOT="${PV}"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND=""
-DEPEND=">=app-arch/unzip-5.41
-	>=dev-libs/libxml2-2.4
-	>=app-text/docbook-xsl-stylesheets-1.65
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
 	>=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
 
 sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r1.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r1.ebuild
deleted file mode 100644
index c5ca099f133d..000000000000
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r1.ebuild,v 1.21 2010/02/11 14:51:39 ulm Exp $
-
-inherit sgml-catalog
-
-MY_P=${P/-dtd/}
-DESCRIPTION="Docbook DTD for XML"
-HOMEPAGE="http://www.docbook.org/"
-SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
-
-LICENSE="as-is"
-SLOT="${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=">=app-arch/unzip-5.41
-	>=dev-libs/libxml2-2.4
-	>=app-text/docbook-xsl-stylesheets-1.65
-	>=app-text/build-docbook-catalog-1.2"
-
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
-	"/etc/sgml/sgml-docbook.cat"
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-
-	# Prepend OVERRIDE directive
-	sed -i -e '1i\\OVERRIDE YES' docbook.cat
-}
-
-src_install() {
-	keepdir /etc/xml
-
-	insinto /usr/share/sgml/docbook/xml-dtd-${PV}
-	doins *.cat *.dtd *.mod || die
-	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
-	doins ent/*.ent || die
-
-	cp ent/README README.ent
-	dodoc ChangeLog README*
-}
-
-pkg_postinst() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postrm
-}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild
index 8828b9ef2ac3..ddb6e0bf7aa2 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild,v 1.11 2012/04/26 17:24:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild,v 1.12 2012/12/06 03:12:11 floppym Exp $
 
 inherit sgml-catalog
 
@@ -14,11 +14,9 @@ SLOT="${PV}"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND=""
-DEPEND=">=app-arch/unzip-5.41
-	>=dev-libs/libxml2-2.4
-	>=app-text/docbook-xsl-stylesheets-1.65
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
 	>=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
 
 sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5.ebuild
deleted file mode 100644
index dd9cda1d4550..000000000000
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5.ebuild,v 1.12 2010/02/11 14:51:39 ulm Exp $
-
-inherit sgml-catalog
-
-MY_P=${P/-dtd/}
-DESCRIPTION="Docbook DTD for XML"
-HOMEPAGE="http://www.docbook.org/"
-SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
-
-LICENSE="as-is"
-SLOT="${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=">=app-arch/unzip-5.41
-	>=dev-libs/libxml2-2.4
-	>=app-text/docbook-xsl-stylesheets-1.65
-	>=app-text/build-docbook-catalog-1.2"
-
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
-	"/etc/sgml/sgml-docbook.cat"
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-
-	# Prepend OVERRIDE directive
-	sed -i -e '1i\\OVERRIDE YES' docbook.cat
-}
-
-src_install() {
-	keepdir /etc/xml
-
-	insinto /usr/share/sgml/docbook/xml-dtd-${PV}
-	doins *.cat *.dtd *.mod *.xml || die
-	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
-	doins ent/*.ent || die
-
-	cp ent/README README.ent
-	dodoc ChangeLog README*
-}
-
-pkg_postinst() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postrm
-}