Re-arrange dependencies per bug 446196.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

8 files changed, 34 insertions, 142 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/Manifest b/app-text/docbook-xml-dtd/Manifest
index 439d2f7e54fa..76417b0bdaaa 100644
--- a/app-text/docbook-xml-dtd/Manifest
+++ b/app-text/docbook-xml-dtd/Manifest
@@ -1,14 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST docbkx412.zip 75683 SHA256 30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772 SHA512 f700591a671694ca0ac51f5b5b7e825df5c0b3604b20baa6afd3aaafa7ce99470ca1c261781b105b42bfa5485c23217cf3db821b3fcf2ebdae9df07bb8ae4063 WHIRLPOOL d0eb5c989030d1371a8c27ba94d16513b859298081d502b553532cdb5e6af95cdcb28c062d26b59196d0de1cf623004125dfdd6f4ac7aa386831dfb0bcb8c240
 DIST docbook-xml-4.2.zip 78428 SHA256 acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2 SHA512 0c836346130d1e8f4e26e00959f6b4fd2c3c11269ba5cbf11cdc904724e189606f431c99cd5ab188877daa0eb44c58d0bc30556df3b51df480396818d61c4e0a WHIRLPOOL 97e9e87119ce16207be511ffe03ead982b2c33f9071f7c0a299bb50c6a3e707c39fbef5dcdc4a2bee70b80f55a18ca28f9ca94c06d613c9efcbeaa2ad3d1c162
 DIST docbook-xml-4.3.zip 83865 SHA256 23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464 SHA512 f5090fb74884bae3d4fac8a3c5060bffff5d6a74272de183c181a7642e4b91f4ed32ad028537d198010782c3d98575ce679672f76a9749ed124432195886a7cb WHIRLPOOL 3716b381cb3d39d9645b5d637a899f9bd985905dc00106f717767c934477979c5fe84984c49c62ff8d858e71caf69cef3305b34e68357ba4a1f3ac4df1d81dae
 DIST docbook-xml-4.4.zip 96107 SHA256 02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090 SHA512 7df5af4df24e4618b09814e4e20c147c722962531f03a40c28cd60f1db16b4c330420adf96adb7d66ed6eda84046ee91b467fd6f6fbfac2201537e2080735d76 WHIRLPOOL 3e56c7a1bcaee412f4915ccade689d7ac897e267775d26d8abf200edf2ef7ba63a477053273d8b12f2fbb8d22eb7e5498c9bad0d0cbdd4770600c3e56199d11a
 DIST docbook-xml-4.5.zip 98497 SHA256 4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4 SHA512 1ee282fe86c9282610ee72c0e1d1acfc03f1afb9dc67166f438f2703109046479edb6329313ecb2949db27993077e077d111501c10b8769ebb20719eb6213d27 WHIRLPOOL e28a36a51b66eeb721b0c9f33e9deabb0645dfa53af883f991f58e9fbd52386351bb03b7a9ad61239cbc92f7f4375c001d25e468fd6199fe0d08c92e979b891f
-EBUILD docbook-xml-dtd-4.1.2-r6.ebuild 1486 SHA256 f1a70020219ea374abbfe93451625aa617573eec81c8c0246f4ef9fbfb0b8c07 SHA512 591f497ca51819a5d81956f9f62e762eba0911824f0822ad6f5856d5431ee5d464fab7251ed9399e2bbb931bb252c15e6812e9eda18ae6f3c3139216dedfa1df WHIRLPOOL 571b4727e3d9cdb0720124088d85542cb6a516d045ba9c9aba567d1c251657cb4af3fdd4c7e30a1c67097888d71041c494745edc9057ad26d8bebd61a098974b
-EBUILD docbook-xml-dtd-4.2-r2.ebuild 1497 SHA256 7dca6553f94d0362394f04be0b6b41d8760223431d6a92c1ed83c8d06b2fe3c4 SHA512 42be17be8c9809fec1595bccd8b3b8fa43c57cd36d4d86102219095834903c86910d7582a0811081aa1d48d32065771173a841f99d7f3d106bf7ffe58d8dd38e WHIRLPOOL 9de226a1daf66bb9641bfcbde4e5cca268726c03a870739033be0370f7170d11dbae3865e15d29b851522e2aa27704ccdb6dd3da57b526dc8e350f91f8503d18
-EBUILD docbook-xml-dtd-4.3-r1.ebuild 1515 SHA256 121fc2e5f686d18bb1ad04d8d9fbe7ca1534711e323e1f822075c4cb27097a3f SHA512 f7a925933c85053125250191aa209f3583b74096c403c64db8efb9d4a285f495ffc607446a92e11fe1aa1b989c6db89d3383d0324b9ab6fe2ea84de306c82e6f WHIRLPOOL 1faafd72259012868fbe9287df4f61d7517e7a47033fcd1e24ab3bbcd46e7badf396048c3522cd5cc60b1368fc922c2af0e22d6efbe18aab321abfb17b7f0b24
-EBUILD docbook-xml-dtd-4.4-r1.ebuild 1494 SHA256 d34dc383deb121356f6eef72918043e766ada712a3415799b061c3fcb3ae0c70 SHA512 65bc6b2391b2bd0d576dee9d55a684e55a6e0b4938f36f461987e8cd520c7e05d68f3799f18390690c42d43914b8f831e8afc267b8b5f4010a44164b8a548ee3 WHIRLPOOL 00add9b0bf176376576c742292bc5b653a6c082b595ac7ebe323ca08e030a9e8a19717a7f7f4091f56ea1d552e7eba4e72cedac846e1a50ff74c987ebaeb409d
-EBUILD docbook-xml-dtd-4.4-r2.ebuild 1696 SHA256 39e5346b80a86eb2a988ddde01d4128d62c21b6927caf07df7509cb60f0069c6 SHA512 2c27781ed6bd7dad9f3113eec97f92e7e784e9c0db1a792ec0ea1b75f2948dbc77298a9f71d7f7057ce200534d403df76351a5fdf8e77a4675da1d09cf31cc87 WHIRLPOOL 400120e4f9be4488a11f79a9132031bd62f1ac130e300b51e27cf8ee6c862704f8cd50eef7843ce8eacc7fd3409e1aec93c5ac4f08faed20de644a96f3fac7e1
+EBUILD docbook-xml-dtd-4.1.2-r6.ebuild 1459 SHA256 082e89ddf0184627b993796b363e31b6792490a3fa5d493cfb2ec5aef6da47d6 SHA512 a0b47fbf6ee357f60ebc7db2e41789182769a82272670b3f077cdf0df73bb0668de6914958d7aeb8d0aa5bb1f8ee96033d02cbd4a16bd9387fed9b05e1656a67 WHIRLPOOL 03be17bc72e6cf74aa6a2c3ebf5ad5a3c07808d2304125a6f3e8ee28c33cf126cce7936a06dc08e1f4b1498bd7b7c3da1e57e7ca00f9dcb05aeef01e8ed4793c
+EBUILD docbook-xml-dtd-4.2-r2.ebuild 1470 SHA256 99a66754b826bcb980cea9b338ddd01647a22e269c17cfe32228a16d56a34ddb SHA512 54265a35c44fca75f35dc8cbbb6784e2d79722d87d2d19f0f02d746d74e8725f6bd0cc7c6deb7c35d553d090644f62be0b1145733d416879da3668ccf187b8fb WHIRLPOOL d8bda8748f91c705e0f84366a775aed574b0bc31eda3601d86b7314a03deb28abe888d5aa52fea855acae4979fa2f7af0e44049d386fd7f7c9dd869f0e27ee24
+EBUILD docbook-xml-dtd-4.3-r1.ebuild 1488 SHA256 7cf90099166bfde571e76f010853ccf8622e2975631461f0e30297f37128c61c SHA512 2a362d85982bb25d4455f5abd3fff33d96f3b241d5c57aa2124381e70920b31f0dfc2cdecc2f11671a585845d1cb3139db39b456dbde06b2dec7d390c7ca08ed WHIRLPOOL 52169a9401873e8e1cbc3e0bd90e78584fcd66f50dc116c3cdef68b3305dbf88ac86b834e78419542ce34a169b7cab53f4cc2064196e8a173d33a212a9cef110
+EBUILD docbook-xml-dtd-4.4-r2.ebuild 1669 SHA256 f6cd1fab819b8a3dc61954218e6a1e0336cef0d074e7d1d06626514edee7e19b SHA512 26d7f0b11ffbfb359ddad9f3ffe8538b89f5ff9bceeb70d06bf027d5a3cd2340b91f527c0a864e1d21f3672acc7f5d2f5592fa46b1ca7934e0aa36c0775cc123 WHIRLPOOL b80482d7106af1480a53f4469b4ce2c3341c0dd5eff514e4b014e8f2783f1a9c012a985290aa9fa3a9ae81e0684af1a12897684774a7589e3749508461076a82
 EBUILD docbook-xml-dtd-4.5-r1.ebuild 1707 SHA256 93c07fe7f59f8c14c6915623b5c9dd10ee242e15912a981c8e6fe6c67503fb0a SHA512 c3533e73dc6900cd7f7eae54c07e12147b42ac2282f2e572c47edf84ccb1424cb291294bfed9ff8e6e24611d3a9efe8f991e17babc55de3899a32bd4f8e3b363 WHIRLPOOL 8b191ea5456adf9651798b40bae79fe6680b326b106604d73e53ee1e7b29715ecf570c951480640d674c8c41c3bfe2384e4c947aa5bee683b75e675492b06054
-EBUILD docbook-xml-dtd-4.5.ebuild 1497 SHA256 d9a2d3f48b5e5f921c76638463f5a45e9cab21e431fa8fe624ee1b87473b8c6f SHA512 429d3568f6cad9050a39342d430f1a3b26e67bd88f7e05fdbeac3069c8a9f4712cd2ba38f015ffd447cb68a5d020682d689b0506a090de2c75db4567d163ead9 WHIRLPOOL 5f6456c0d473af10183ca17fded2c37278b352c92958daaca2e7513d2710adbd98fa9198d30ced26e051fbdf8363889d8217322ffeb95f1130bddef2dc914127
-MISC ChangeLog 13090 SHA256 3e03ef3c593b2bf9dd7da17bb5500659b7dbfc1262205349b5fcaf38b2d9db15 SHA512 4d985502c7bb1f37a4bb49dde387b328ca9ee1e6f9f4f09ccc52a7e1cf6358d97fc4905ce71ff9cb104dd5b7e8669914935d124c5d13ae60da46d464f19b2318 WHIRLPOOL 498854f1efcd5b82871780e4af0d6b33a041736846c5ff7e7831b0041ed53c85ac39e1e6aaced48bd5d47ed208429321bfd43e8599e21a8c5824ef2ec2ee4c1a
+MISC ChangeLog 13374 SHA256 61150e1f65b5a12628d7d97a9b3062864367c0b4e9e853c6f2e1f6370ffe3c5e SHA512 6f22eb277fdd9300b95e7df8b1ad8a91c075d84948870d5ca1c6bfd5af5e1d86a57c8db373c83fd66f7441dc9b3607adf028e3117105f6f34c7c85ecf183f729 WHIRLPOOL 9f1a59581f4504f20fa5b9329a39a8897361a115f231ecf7ada73df190bd05c165db6994141026eec002b688695a15a20edb0e64d743d5f310c595971c207d8d
 MISC metadata.xml 159 SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3 SHA512 119d9e98ba4d956ad7811e557e8013b976337b14029b994bfa4eb08ba24cfe6ae7757a814a02c0526246b3c77ce1eb55b81681731863a10b72436dbe47e693d2 WHIRLPOOL a6d40a902f676b47e088ee88d7149fa3c2d6e8ac1117a265e083196abdb95483f506974afbdcfdcb3e6a14a85d4726ba2876d7cfb90efa8586a3d1581f30274b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlDADQ0ACgkQC77qH+pIQ6QkEwEAsQoOCC1s3wyuV5zG+yAe5zJq
+eQb0UipTidV/nte03wEA/0RcqiX6MoYMw1tCrr9Wi/5/2T3O0ulODnzWsSwRPa1e
+=B9hH
+-----END PGP SIGNATURE-----
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
-}