Move the #ifdefs around a bit and remove double deps from the live ebuild. Bump to 200.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

4 files changed, 265 insertions, 23 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 699d5651f5dd..e1c2b9af1121 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.103 2013/03/29 15:26:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.104 2013/03/29 15:49:38 mgorny Exp $
+
+*systemd-200 (29 Mar 2013)
+
+  29 Mar 2013; Michał Górny <mgorny@gentoo.org> +systemd-200.ebuild,
+  systemd-9999.ebuild:
+  Move the #ifdefs around a bit and remove double deps from the live ebuild.
+  Bump to 200.
 
   29 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd-9999.ebuild:
   Move udev executables to rootfs to avoid breaking the few systems which
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index a1cf712b32ef..d73bc8a011fa 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -15,29 +15,31 @@ AUX var-run.mount 536 SHA256 55b9e277560b875475535f8121ad45e7fcee836bb48efe2c4f3
 DIST systemd-197.tar.xz 2054644 SHA256 e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5 SHA512 df158f85dee4c38dc2ff305bc03eee3b71d77eb683ab2739549282f7d552af4d2a247f52241f68e1b7c88c668bce93531986a39937a99cac401791ec95916769 WHIRLPOOL 027fc6aa5972988173721b120b8c1f371bc02d3066e04ea0923d6cc70778a3381f600a865aa136b5789755fbd5358e97304da265f8937d789a28b33cc778df46
 DIST systemd-198.tar.xz 2140964 SHA256 444492355e5ff0ad99e0691ecaff1081ee8d45901580f47ba8b74e56107c71bf SHA512 29b07d934dbcda876feddf2b93c1f35f4bdceb0ba76dd18563e79da65a794b2450b283b6ec93b09828cc8fe918e007511f3bb2218fb0bcb3cb2fdbf940d3cf71 WHIRLPOOL 9e124534121086b666e285adff44778d03f42d52c13ef78281728882d79fa32fdd58e27c41d7f8402a62b20bff65fdf1a4a3ee4680c1327cf7895169c66c07c7
 DIST systemd-199.tar.xz 2101604 SHA256 8c4462a04f3ecf7f083782e5e0687913b1d33c6444bf20fa2f31df9222965fed SHA512 fd0174b69b9709bc93123956389f2264edd7105b60b58487473a39f1c0022a2e91ef6ccf01841406ab51262dbb583a03bc3ee351b664ed698cfa9e2f38fd24a4 WHIRLPOOL 1383e1fffbbf847186275dae72e9700a8d12dddf5ed7fd969ef637bcef68375071ff0383e015063621e28166a5739dfb26bba32aa8392a3bcbc0f0e6935e41a4
+DIST systemd-200.tar.xz 2109864 SHA256 9a08baa8fa5c48f0aab683b2f771e4be75c3c852afc45e5cb4df06428ac8c217 SHA512 6ad440f91dfa5a739a29d07c4144a2faad627a523c4f893656693cdfbdf2a6048f84d96e06ebe805ec18d04e5a1760c9efdcec738654d006a348c0385a983833 WHIRLPOOL 7969f2410aad42c60ba5b979727f5e90be62a5826aabfeb3103b8284115120a5c8c944d0631eabff719dfb84a4096b6eebe8e6dc3718ee47a3672dc1089be371
 EBUILD systemd-197-r1.ebuild 6496 SHA256 0069c8127574ee382c55b790a3ef807c1db064057dc7ab9a24aec195e8907aa5 SHA512 ce8fdb78c5cce5e34474b12e29bed83814746949b676025e8780206ac716c1dab863be31f3d83db02de09be00a5ac26ebe70ca2474ea2e244f4903bbd5e6871a WHIRLPOOL 2f316c077c6fa23d02e12985131a915947aac265009094ff851d65cc403ca10aefbc8c3f3b6ced4ce6f9c551f52223ca01ec46545bc4b3cccd78633c04534dc1
 EBUILD systemd-198-r1.ebuild 6869 SHA256 bd68d6866eed550d86f04c1f365caf2256fb9f552711073864833599a55eb632 SHA512 76394453ded9cdbf364f79c0e1426ee575b3ad88e38dc53661db0ae87b03fafaaae6720c3f231340995af4db73172515e5a0fd6c997ec42d70a4edb70041eb51 WHIRLPOOL a82174d69c02fcbb6ed5c262c6a58706181f047bb306a053500f5833d3819e272282a0bf5d88ca4116e719b8cb50fefaefe105570bd4f35e26ece1caf741fa72
 EBUILD systemd-198-r5.ebuild 7203 SHA256 e919cc434b34107294156166236558170d093db7633adcb9664403b8e975cf2a SHA512 8b20498ad093a387fffc0b338fd4a48441ee38bce903e6ee41c919b4b8d9eee4b2b157aee376f880396fd5dfd01702785db50cd13ff6c11dfee82ee6fe42a850 WHIRLPOOL 7c8409b9c0ea08bc9d1021267cd0613df49d8aaa16399711e87bf6c7d30f2de4d29592ef57c6bf4d23146edbdf73231bb809176181cfc5bed489cc42dfb1e461
 EBUILD systemd-199.ebuild 6753 SHA256 f53bc401651e6122c65f1020de00fb2755e789295a3d37aff052ab9706aeeafb SHA512 c0ee0301c938fa125b24092dd8f5eb9c7e360b456e0b7350da472d4d6c05bd41106b4fcdcecf8d2fc2178d3e769ba95f38f1a0239dc8ac140c965eea7c9ade8f WHIRLPOOL e0de214346b828d95bf49d3841099e7c1a25d0fe16ca2e429a709cf149af4eb082ee7b6ba03d51e83f81bfbf6d9e9e1dbee00d964cf20f5c2358ac0ddbd952d6
-EBUILD systemd-9999.ebuild 7630 SHA256 1a193a7f67188ab671f899e9aa761e95934784e469045bc3cab5c541627c1704 SHA512 6fc2cc01bb69772af8719d9ae30f0f05169ebaf25b650c0f8147efab40f0941c4dd76395c509b9f7173ae13227322c329e4535117538d61e411251ca9cf4f760 WHIRLPOOL 5e9a58d9906fb0dd19cf59a22f8eafff2c7ad09e61109aab14c94b30d3b8ad5f62a49f288d336eedd85e9b5d2accb473123c097f35ad900c28ad6dbd258d8717
-MISC ChangeLog 20157 SHA256 0bfc276864d603ca07b6a8945247323f0dcc0b10cb26696f136e097309faac67 SHA512 d956c99cfc2076b5cb5a42911227078074f8ccf9979d454367e6fa96d3acff8d9e95ee930ae8061f410169be744136cc1830139235f537150b55f49db329eb58 WHIRLPOOL 573fd45d67a80f8a331c46331de439422ffe32017bde0a5315cafcba9e5f75f278d8cf6e540a1484d6a639a0d369cb7c6c44d3c04ca866a427ba7a69add11666
+EBUILD systemd-200.ebuild 6951 SHA256 e1384599b0654bc527a73c10fded80e72a09770070c3b9887d6ed4dd9efa8bb5 SHA512 c3105e1b1d116d23d1b2da53004b7921d5348081366d00bd4d2296abe5ff1d572935dc5d4ebba7cf653237557cb999948c462455c8c633301263b371b17481bc WHIRLPOOL c6c6df1c4ed99e54960d4f3796b706ce206faa9a78e85d988888dd65a14aa170948b311b2ea73f530b4b34947759012244f56a5b33ccaca169b7ae88ecc4daca
+EBUILD systemd-9999.ebuild 7562 SHA256 915d82b979f9bf336ab0eddbb48c7cb665856c2dbf6a0c73863b33da429c914a SHA512 460fc009618ef29e25dfa241983d3899ff6db5ab0dfcd3d29064360f0dd76410636696d14053a8777110a8273b5893092df9f2a2f7725bf778247102d2039722 WHIRLPOOL 9e58e4b035a300bf0231a7fcfe6cd1384cea0c21e01da77ad6a6476c8491485aadcee11cb2d9ec362b389454f935fb7b968b42c89c00f61aeaf1e1c2057c43fb
+MISC ChangeLog 20372 SHA256 ff10d93510d47a6b2c97431988c2857ceb00340c1eb595842b4a3ea5fedb5986 SHA512 6fcb310c3ca45c56da31c72ee2068c6aefdcfb48d462236878abae00cf2f4b109af65814de79245767fe96177894f81b74fd0fcb0d3e4ffbe37a0977b67c499b WHIRLPOOL f8e17cef65ce67180d76a2672c33610d9dd985c4df7173613b86ad24865928f7269f068218dd472d8b104cbe4316fbf44377e13ac8cf130bbc0790076170fa3b
 MISC metadata.xml 931 SHA256 62b80c12536efbf1d14d93155aa18e3af1011709efd96c66c0176300d6a468b3 SHA512 ca3eedc144f671828d3555820d4effaccd24e86dedb894fd173d044c08a4213166f2dfe6c58fb6b80cdfa79e5ab2a9a3918971b49b433947389580b75f77ad97 WHIRLPOOL fd5185112548fea3c9f3710e53e073366a2285b6e0e3d30a653db24b9e868cfb57f839ca90ffd9955e0d4b6d687e9946f01ef1f8dd3b724fd1b1197a0285bc1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRVbL7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRVbhWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDuE4P/10cxCx5J+Ktba326izncz3K
-16ulMr8j1ZrAUFBOLM/cxBOr58IFj4ZWHDGc6njnDMdSZlKSuBLHEpWouzoGnG10
-05fMc3mZ91AABpZbDNAgUS9Cwh1KvBIEZmMgEyKHTBgiwcCnTr8QoCGjIPpWlPFW
-cN8+nZGLsK3bqyKQavUJqv/Nvkf5y2qELOS7Zn8iJgPz9YrLqTwb0BCW3TzYgKuM
-C9yce+xcBxymIRqJZ034FPlhl97Rifjt+L4klbcUxePqFOym95GFtIPJKeDJqkjb
-iEUg+Qgjq1SevnpgbTDWGiHGfdmslbn/qMH9TG9rrl+eccOpWQRVse1F2IWeVzAX
-RdOWAUwHyt5NVf9plrmcA3B2b76hzy+39K/p91/kSFcf/cdhOjMCnRforgm5I8Oj
-3pCQ1M5rV0hOClssBy0QB5seW9f+8M6rR5M8V0UMHQNwZ8xvrJo6Bg1jnkZbEQD0
-4a6ciB3UDOfW7EgkCMkdrNcTmGlM/BbLbORkIlfHIEUti51eW1AJ6aO/6N0HwMK6
-68Gt+oDBP+ZgFlkH9KhJf294i6uZzJt8MSVQgVH9NybLMZlo7Q6qW0d7oUJ2gTYf
-58RUmanFPLNM3vYxtJmA9QVLs31P44y2EzitYcPr1ZdqGKffBEW2BoXyjqTJDORt
-wHCsuyjX4WpySLeZ/TyJ
-=S3Aw
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZD1BQP/20pmGUd//JtK5mZM+6ytLKZ
+WaY3SGU6Siwjj9/OaTwyYrCr/7ymcS/ELisligwpOEKiiCrAkYubFRv0lyTaKu1D
+iEs/Gww/h4tPqw18UFSfJ877rOqSphMSLWTE7AAVaXHnboCGq4GZvCxc9Zm7G73l
+PrrnLUSlOXyW2itp6g+NwtzaBhT2Ze+I7bEIgskcaj9rcg/Rftq+jDWhH6/3zwaS
++nVKF8mwr/HR86Fwz0cWq2na3WKFjaToNAzwDuXG2u8xKzXveAXFCuPDLaGdAo+y
+uR857lWA3YND6tiSvy72dDDzsHk2IF0KaMYx63g4XMMRHnD5eUBuYhkjTllY95UA
+LDbNbN75qaULQScFAXOjBR6RFhuUf3FoMVzVBEEsb/JNVZ4ZYnAERNUCoU3/Tpoi
+ETemydkkMulNVqJQX3TYAIJHXKKheP7sw0S/4smaYjJ+AgRzZTrAkFpNf7m4MFlC
+gtPNWqxbnkH/92Hfoa8404146sIcZ3uJOG8BnwH3RHg5IJfgvVzagkyzNa6xywm3
+nUiPmHYFfXNI8IRotbnfsjJC0x/+VQG3nVwtctUQYR4X5wA/270AwnsyFvWOtzIy
+nZo0yiIr5mr0GhXwBjiar+DGeot78DOeKQuPYSGI0Vbzg2OHQpViXuLm0S8tcMum
+q3OCf0lxo4qitkvxeJKB
+=w0i8
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-200.ebuild b/sys-apps/systemd/systemd-200.ebuild
new file mode 100644
index 000000000000..92060a8f4dab
--- /dev/null
+++ b/sys-apps/systemd/systemd-200.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-200.ebuild,v 1.1 2013/03/29 15:49:38 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools-utils linux-info multilib pam python-single-r1 systemd udev user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
+SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="acl audit cryptsetup doc gcrypt gudev http
+	introspection +kmod lzma pam python qrcode selinux static-libs
+	tcpd vanilla xattr"
+
+MINKV="2.6.39"
+
+COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1
+	>=sys-apps/util-linux-2.20
+	sys-libs/libcap
+	acl? ( sys-apps/acl )
+	audit? ( >=sys-process/audit-2 )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5 )
+	gudev? ( >=dev-libs/glib-2 )
+	http? ( net-libs/libmicrohttpd )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+	kmod? ( >=sys-apps/kmod-12 )
+	lzma? ( app-arch/xz-utils )
+	pam? ( virtual/pam )
+	python? ( ${PYTHON_DEPS} )
+	qrcode? ( media-gfx/qrencode )
+	selinux? ( sys-libs/libselinux )
+	tcpd? ( sys-apps/tcp-wrappers )
+	xattr? ( sys-apps/attr )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/baselayout-2.2
+	>=sys-apps/hwids-20130309-r1[udev]
+	|| (
+		>=sys-apps/util-linux-2.22
+		<sys-apps/sysvinit-2.88-r4
+	)
+	!sys-auth/nss-myhostname
+	!<sys-libs/glibc-2.10
+	!sys-fs/udev"
+
+# sys-fs/quota is necessary to store correct paths in unit files
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	sys-fs/quota
+	>=sys-kernel/linux-headers-${MINKV}
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.18 )"
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var
+		--with-firmware-path="/lib/firmware/updates:/lib/firmware"
+		# install everything to /usr
+		--with-rootprefix=/usr
+		--with-rootlibdir=/usr/$(get_libdir)
+		# but pam modules have to lie in /lib*
+		--with-pamlibdir=/$(get_libdir)/security
+		# make sure we get /bin:/sbin in $PATH
+		--enable-split-usr
+		# disable sysv compatibility
+		--with-sysvinit-path=
+		--with-sysvrcnd-path=
+		# just text files
+		--enable-polkit
+		# no deps
+		--enable-keymap
+		--enable-efi
+		# optional components/dependencies
+		$(use_enable acl)
+		$(use_enable audit)
+		$(use_enable cryptsetup libcryptsetup)
+		$(use_enable doc gtk-doc)
+		$(use_enable gcrypt)
+		$(use_enable gudev)
+		$(use_enable http microhttpd)
+		$(use_enable introspection)
+		$(use_enable kmod)
+		$(use_enable lzma xz)
+		$(use_enable pam)
+		$(use_with python)
+		$(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python})
+		$(use_enable qrcode qrencode)
+		$(use_enable selinux)
+		$(use_enable tcpd tcpwrap)
+		$(use_enable xattr)
+	)
+
+	# Keep using the one where the rules were installed.
+	MY_UDEVDIR=$(get_udevdir)
+
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile \
+		udevlibexecdir="${MY_UDEVDIR}"
+}
+
+src_install() {
+	autotools-utils_src_install -j1 \
+		udevlibexecdir="${MY_UDEVDIR}" \
+		dist_udevhwdb_DATA=
+
+	# keep udev working without initramfs, for openrc compat
+	dodir /sbin
+	mv "${D}"/usr/lib/systemd/systemd-udevd "${D}"/sbin/udevd || die
+	mv "${D}"/usr/bin/udevadm "${D}"/sbin/udevadm || die
+	dosym ../../../sbin/udevd /usr/lib/systemd/systemd-udevd
+	dosym ../../sbin/udevadm /usr/bin/udevadm
+
+	# zsh completion
+	insinto /usr/share/zsh/site-functions
+	newins shell-completion/systemd-zsh-completion.zsh "_${PN}"
+
+	# remove pam.d plugin .la-file
+	prune_libtool_files --modules
+
+	# compat for init= use
+	dosym ../usr/lib/systemd/systemd /bin/systemd
+	dosym ../lib/systemd/systemd /usr/bin/systemd
+	# rsyslog.service depends on it...
+	dosym ../usr/bin/systemctl /bin/systemctl
+
+	# we just keep sysvinit tools, so no need for the mans
+	rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+		|| die
+	rm "${D}"/usr/share/man/man1/init.1 || die
+
+	if ! use vanilla; then
+		# Create /run/lock as required by new baselay/OpenRC compat.
+		systemd_dotmpfilesd "${FILESDIR}"/gentoo-run.conf
+
+		# Add mount-rules for /var/lock and /var/run, bug #433607
+		systemd_dounit "${FILESDIR}"/var-{lock,run}.mount
+		systemd_enable_service sysinit.target var-lock.mount
+		systemd_enable_service sysinit.target var-run.mount
+	fi
+
+	# Disable storing coredumps in journald, bug #433457
+	mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
+		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
+
+	# Check whether we won't break user's system.
+	local x
+	for x in /bin/systemd /usr/bin/systemd \
+		/usr/bin/udevadm /usr/lib/systemd/systemd-udevd
+	do
+		[[ -x ${D}${x} ]] || die "${x} symlink broken, aborting."
+	done
+}
+
+pkg_preinst() {
+	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS
+		~FANOTIFY ~HOTPLUG ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS ~SIGNALFD
+		~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
+	kernel_is -ge ${MINKV//./ } || ewarn "Kernel version at least ${MINKV} required"
+	check_extra_config
+}
+
+optfeature() {
+	local i desc=${1} text
+	shift
+
+	text="  [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}"
+	shift
+
+	for i; do
+		elog "${text}"
+		text="& [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}"
+	done
+	elog "${text} (${desc})"
+}
+
+pkg_postinst() {
+	# for udev rules
+	enewgroup dialout
+
+	enewgroup systemd-journal
+	if use http; then
+		enewgroup systemd-journal-gateway
+		enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway
+	fi
+	systemd_update_catalog
+
+	if [[ ! -L "${ROOT}"/etc/mtab ]]; then
+		ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts."
+		ewarn "It is known to cause users being unable to unmount user mounts. If you don't"
+		ewarn "require that specific feature, please call:"
+		ewarn "	$ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
+		ewarn
+	fi
+
+	elog "To get additional features, a number of optional runtime dependencies may"
+	elog "be installed:"
+	optfeature 'for GTK+ systemadm UI and gnome-ask-password-agent' \
+		'sys-apps/systemd-ui'
+
+	# read null-terminated argv[0] from PID 1
+	# and see which path to systemd was used (if any)
+	local init_path
+	IFS= read -r -d '' init_path < /proc/1/cmdline
+	if [[ ${init_path} == */bin/systemd ]]; then
+		ewarn
+		ewarn "You are using a compatibility symlink to run systemd. The symlink"
+		ewarn "will be removed in near future. Please update your bootloader"
+		ewarn "to use:"
+		ewarn
+		ewarn "	init=/usr/lib/systemd/systemd"
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index efeba6521cbc..3de7b0ac7320 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-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-apps/systemd/systemd-9999.ebuild,v 1.32 2013/03/29 15:26:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.33 2013/03/29 15:49:38 mgorny Exp $
 
 EAPI=5
 
@@ -73,8 +73,6 @@ DEPEND="${COMMON_DEPEND}
 
 #if LIVE
 DEPEND="${DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
 	dev-libs/gobject-introspection
 	>=dev-libs/libgcrypt-1.4.5
 	>=dev-util/gtk-doc-1.18"
@@ -87,15 +85,13 @@ pkg_pretend() {
 	ewarn "and it is an easy way to get your system broken and unbootable."
 	ewarn "Please consider using the release ebuilds instead."
 }
-#endif
 
 src_prepare() {
-#if LIVE
 	gtkdocize --docdir docs/ || die
-#endif
 
 	autotools-utils_src_prepare
 }
+#endif
 
 src_configure() {
 	local myeconfargs=(