Rearrange manpage dependencies to match git and future tarball

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 25 insertions, 19 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 7bdf817d9dee..aaaee70b14c5 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.936 2013/07/16 15:34:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.937 2013/07/17 04:28:55 ssuominen Exp $
+
+  17 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> udev-205.ebuild,
+  udev-9999.ebuild:
+  Pull in app-text/docbook-xml-dtd:4.2 for generation of udev(7), udevadm(8)
+  and systemd-udevd(8) manpages. Move libxslt and docbook(s) behind 9999 "if" and
+  "else" block again thanks to upstream shipping manpages in tarballs again wrt
+  http://cgit.freedesktop.org/systemd/systemd/commit/?id=b31c6d8d4f33502d6060e7
+  08f5252ee2ea8648ad
 
   16 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
   This commit will require 60-keyboard.hwdb file from sys-apps/hwids. Upstream
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index b9a0d84ec2c6..c511a91e09e0 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -13,9 +13,9 @@ DIST udev-205-patches-1.tar.xz 1288 SHA256 a574d5431d42802f222665019bf7cf1b0904a
 EBUILD udev-197-r8.ebuild 15057 SHA256 854d75fdb78b73399cb6f096c26cfbc640d8ca077fc62b1c63f5e9f6de62f36c SHA512 9e4da40b18bc6da38ccedc6675558672c1d7d73144fde6204fbaeea5f5080fd985429da0f54429613c98e8e9802505f9ce456874c143e5017e191a3df6875964 WHIRLPOOL 4485b8c1096f016f3bbcc96aa7ad119b3ca44604827afd9f1aa6c23172a66705f67522662539b9626b138a79833082d5979fa795777de25e128b7fd125e5e1e4
 EBUILD udev-200.ebuild 13602 SHA256 132c46b1cb398e17d3e9479ba6e6c0a96ccfbceaa867cd0b2c68004db8c52736 SHA512 3b8ebc3f7dc4263188edf2db529f6bb108433cb82c0dc3e35967b1b4ade60fe2a2106f7ab6febece842a8325f00aef13a0fe15d57b26f9b745237351b021924a WHIRLPOOL 742c5092c7fe211aef1d747642ab50f508c4cdfec8263830ccf76b65adb76e50bee5bff727d63c8492b937f3288dbe0749532c8145941b948c9e0d03c2556d23
 EBUILD udev-204.ebuild 13535 SHA256 78745d91a25801af0d5b27be6dc1bc3d481095f33fb45a65b75895b3041338e6 SHA512 28f4cc864cb639b98182bc38d0baf949d9be8be8855a5ffd63c8072aac7aa2688d710c9d182759cbcd2757afb774f98c263d3584f42961662e259ec2f7961225 WHIRLPOOL 32984b025d0500f017bb30bfbe2b7005e056f6f4b268e0c6970868fd899ba1bd6c0a8057894d7db11e70157155ea9360b50267b52a2f36d2967477df786ed1fc
-EBUILD udev-205.ebuild 14441 SHA256 1b6354c42781a83870809310a91b49e714a62557e4541dcc5c84f37e83d50174 SHA512 b0f1bf8a6b9ce299621f6233e3951cd8cc48c9f542c8c94d1ec343b9764415e648e948a8040a9dd0c2d3596f2003e00db107ca41bc2c4dbf80d423303c739d5c WHIRLPOOL b93b62c291cb09fc5393a514c92746d325983aeb6bebaf1aa3195f666e20d848a2185e44d3f857a04769e5b2737e6a643c750d1c3539f9a4f1dc176f6ad960ae
-EBUILD udev-9999.ebuild 13971 SHA256 df7ae97cbf27046eb4370f6d14a8697da6cbe5f5ba5b93a8df862db5e2abd586 SHA512 05d2a25957c25aa28e0f0bb99045503686935f3637c96d9fb0ebc3f3c5944ca21aebfa8467e61eebb9d581d4037a6c744bdf8a7c97a489262b5513ac21a45d41 WHIRLPOOL ecf37249e51c66894d4ded92f09e61fc50fc1fc249a0728da8e58e8d20486e3c834c5104a871c7ff9e11fcc880d3ab0ba4eb4e6873a0e9c8b1d8b98e0954c22f
-MISC ChangeLog 29744 SHA256 3e9cf0f02e62fdb6bb5976e7c41d45e1c760158dc5ab6ada77ea8dcc80e59b91 SHA512 1c42947ad11e7cf933fbba0818879c28b3769d1a2ccd235044c73ced425b179fb3a8d76d5671763bb67c067f86b4b8a5c87f5d0ddcd5735deecf738aabb9b9fe WHIRLPOOL 029e53eef05152ebf22e82580b7da4ddcf657ac549c7670d5befd6f781c0cb6aeb8dd6788d822cc1c6f0b3da0d879fd5f821ea06d3ed886503800a5bfa1c616b
+EBUILD udev-205.ebuild 14467 SHA256 86bc51e39aa5f136c780927f4780ae14648d2e4888d0b597d3f4ed4326c61b18 SHA512 b64f8e8ea69562e7d880e22a59460d5cf03c2a9fff16e5faa5c30ed123bb5d1ec749e03f254e5531ac0bb61624c7a389e255407edbca1d349e58665e908dbec0 WHIRLPOOL dd27805bcfdba29e3fb05463d7d598290ee49a5e489e6dda8d2d8c9a750b6aa6d57d3a6e28397c6a8a98ea18f95ad61c3c799679ac7f00f05c43a639fc8a4f54
+EBUILD udev-9999.ebuild 14004 SHA256 b1662c949ee244c3bce46b77d288bbe1d154aff75f556f4263b004da750300a5 SHA512 23140b21ace11c9692a32cec4a98c2cb8af50c671e898395e67dc3a3b44544d14f7ebcfb55f8292c95e294cc5086ab57d246cba393c549e28d4bfee3e6777c01 WHIRLPOOL 8a4c0d556b2fd147de67cf47f674229062680965b643114bd0000dbab00a9f25e5ce0f0f441eea22a8ef3cd45abae4af62ffc52544373f652dd17f393f5d542f
+MISC ChangeLog 30176 SHA256 7a9f0278a4f3b5213326a033999b8a7e51aa1c7eb1ab52a0f2893759091cb7bf SHA512 8ff502a2a86401f8df571dbd1cfaadcf090099662d707bc4073fcdc059226f72cd15dce2f146a7008f43ab47685523b48ba44371a3a0b003b4c7c2352a7868c9 WHIRLPOOL 9a33446078d24ac53d2cd2680b2531d979c598679a1e3ec10f70179d5c4e4d4993aff9ee16e36f5727906538cfe613517e860a65c34a28716365f78db3ce8fcb
 MISC ChangeLog-2009 105929 SHA256 94137298457e8d6361cf25e664279d2f9b424f6758814e7ba90e9e2cbf1ea7e5 SHA512 f110e1aa70b11c28263ec5e88973c99426717bce62400c8e9ad860b9e7b67d4aadc053596a9e54faa9435a774c1e8aa0954ae8541760cf061beef26867871548 WHIRLPOOL 215252c0a5c249241813d1bb208da62e68c858e07d1df327cf9175ac739f214813a33c09a64afb4821445e93394dd6d6d500b33e35ed912c1eeccff3365cb7fb
 MISC ChangeLog-2010 10729 SHA256 44fe328d57b1ba342b328c7a256632e7960976a12e8e9c9791a5fc8ce52c67ca SHA512 a8c371aafe757923e24c023cbf55f3ad084f15f0f038eceaee0dffe58919a17b17bc16cb4b7b1d3f65a19c82b20330a854ec2c801f6d7c7799723ab92d255b49 WHIRLPOOL 3d34e758def921d3d2ed7369392ba5f833fc3a899181c2895fd3da6c9846cf41c9eddbf56de60a52fadd76ffd4c66d92b660b0bc6ca4dddbb2fa49fe0f93cb0b
 MISC ChangeLog-2011 11721 SHA256 363429a267f251b1ac1c34479e7afa5d7ea13811aa1ba46d7c5489860e542276 SHA512 be7bbaa68602c30ba9cb3e5037ee91ff94c35a0c2ff0b96c5eee14c0e81f8e52232bae44f1d01ff23acedabdb03fdc78f3d11a40cfed2cfef1c45fe2492f7bf4 WHIRLPOOL 3e85eb967f26a8224fd0ed5824009c62271fa5269a6a207da8c8abd7b09cc4308ff847021afcae5a86cedd723a5aeca1ce2f6712a187dfbd36118e097d74510f
@@ -24,11 +24,11 @@ MISC metadata.xml 804 SHA256 2489d91db9d09f0d411b17dff6c8a595fb48ca65e8b6abcbdf9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR5WfnAAoJEEdUh39IaPFNhS4H/RvBazgNudW1Ji0gvF3Eq9hk
-6nnbN/E522b6Xru5e9iJHjMHL8otrONTmZeco0cRAbIg0IRed3b+wtgZqIkm8jLc
-NOlQ2jcmGgZfDwt/3uHMzMvtQXpHcwvwrHuOI+2fiox0FR6YRGkUZfO4e+9CjfAe
-wJnsK3Wx/aZKyQlvKno56yjLOA933M7xOTmjZq1Uv7xn0sOalTyZ/bUVV6ZhDpsy
-/7V57aCS7c20xEbIEPNU4l2LoSqBqtZ1maNrt4OK4y4b4SSqXfyGcvWfqJfPdTZ3
-NjDP8JnRHPFvL98Wjt8FzPsYbCSkck8lUAdW+sjkGKAmkTydlb8RutGLFy2w5g0=
-=3KmE
+iQEcBAEBCAAGBQJR5h17AAoJEEdUh39IaPFNkUgIAKK03swM6p7U1i7xe4zMJ039
+46KYzHShcBXiclHYutzxOMlzdO0xU++v1ROdfclmRgyfA5zON+nKphpvV7H9Zszt
+i9abbFTT6GInNhkI169YU3u1SoyxGqTtCIr4yIwvSaZ3em/AWc5mcQi8c2nJHhlL
+z6Wg//GK19OTCF3eSes2XVp5bZzYCYjm09rPz7Rk81bGhyPdWfe6fOlUFveU8hDA
+p9+S6Znxgv+PMfZHXl0bXHTCBbWN4pQGKFSmz5P54AN3D4zhjIvz8nz0yATAsTe/
+lWsi5Nyk01q/GkmhetBas3NJ0I/gRUg/SeObGxIQ8MpHORILG06xgiZsIcJekqI=
+=9VYU
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-205.ebuild b/sys-fs/udev/udev-205.ebuild
index bed9675289dc..798585fe194d 100644
--- a/sys-fs/udev/udev-205.ebuild
+++ b/sys-fs/udev/udev-205.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-205.ebuild,v 1.1 2013/07/04 12:11:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-205.ebuild,v 1.2 2013/07/17 04:28:55 ssuominen Exp $
 
 EAPI=5
 
@@ -44,8 +44,8 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
 	!<sys-libs/glibc-2.11
 	!sys-apps/systemd"
-
 DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	>=sys-devel/make-3.82-r4
@@ -54,13 +54,11 @@ DEPEND="${COMMON_DEPEND}
 	!<sys-kernel/linux-headers-${KV_min}
 	doc? ( >=dev-util/gtk-doc-1.18 )
 	keymap? ( dev-util/gperf )"
-
 if [[ ${PV} = 9999* ]]; then
 	DEPEND="${DEPEND}
 		dev-util/gperf
 		>=dev-util/intltool-0.50"
 fi
-
 RDEPEND="${COMMON_DEPEND}
 	openrc? ( !<sys-apps/openrc-0.9.9 )
 	!sys-apps/coldplug
@@ -70,7 +68,6 @@ RDEPEND="${COMMON_DEPEND}
 	!<sys-kernel/dracut-017-r1
 	!<sys-kernel/genkernel-3.4.25
 	!<sec-policy/selinux-base-2.20120725-r10"
-
 PDEPEND=">=virtual/udev-197-r1
 	hwdb? ( >=sys-apps/hwids-20130326.1[udev] )
 	openrc? ( >=sys-fs/udev-init-scripts-25 )"
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 17b551eb7d7a..90e0d6ec7de0 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.236 2013/07/16 15:34:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.237 2013/07/17 04:28:55 ssuominen Exp $
 
 EAPI=5
 
@@ -45,8 +45,6 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	!<sys-libs/glibc-2.11
 	!sys-apps/systemd"
 DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
 	dev-util/gperf
 	>=sys-devel/make-3.82-r4
 	virtual/os-headers
@@ -55,6 +53,9 @@ DEPEND="${COMMON_DEPEND}
 	doc? ( >=dev-util/gtk-doc-1.18 )"
 if [[ ${PV} = 9999* ]]; then
 	DEPEND="${DEPEND}
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
 		>=dev-util/intltool-0.50"
 fi
 RDEPEND="${COMMON_DEPEND}