Rearrange manpage dependencies to match git and future tarball

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 15 insertions, 9 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/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}