Version bump wrt #363399. Pass --without-systemdsystemunitdir to disable systemd support wrt #363961.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

3 files changed, 204 insertions, 6 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 8a87083bfad4..40b15a7e657f 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.282 2011/04/15 22:16:14 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.283 2011/04/20 13:44:33 ssuominen Exp $
+
+*dbus-1.4.8 (20 Apr 2011)
+
+  20 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> +dbus-1.4.8.ebuild:
+  Version bump wrt #363399. Pass --without-systemdsystemunitdir to disable
+  systemd support wrt #363961.
 
   15 Apr 2011; Christian Faulhammer <fauli@gentoo.org> dbus-1.4.6.ebuild:
   stable x86, bug 360769
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 1e7eff9a210c..7a1a840addc4 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,19 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 80-dbus 341 RMD160 3b7f55906289d91a1f0ed87edec7902ddac076c5 SHA1 df1f96934fbe164dc4f4e2e4d4b4cdeaf8cef2b5 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca1e07fd2
 AUX dbus-1.4.0-asneeded.patch 3696 RMD160 360f21c06d268116884ed441e7b91478829f1be5 SHA1 a15445bcc5d811276c681b543d0bcd14df9db32f SHA256 f785afd7943b3220ebcf2603b1c059a2dec46bdbfba376e60d8373ba3f933562
 AUX dbus.init-1.0 1152 RMD160 f0f409b59167beef2e2b8c14f701fbeaa54c3bc9 SHA1 b00e23868046c67eaec87220e92ffcea5d9dd911 SHA256 a2e13a025faa488ff35521188c0d44909bc82c55e8676a24a5a5179545303d98
 DIST dbus-1.4.1.tar.gz 1850139 RMD160 090740469872b31c24aafb4e4d40e690184b1580 SHA1 112279ff58305027294fe0eb5bee600f68cf0b50 SHA256 caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd
 DIST dbus-1.4.6.tar.gz 1835214 RMD160 c751630654225b729512d7a996e5ad70dbfc59fc SHA1 e87520518dfa0bfc4b8791105673e48f993874d7 SHA256 753e1e64df2de518ec93bdee9a813a85b3c147a363615412818c3c095cb8a567
+DIST dbus-1.4.8.tar.gz 1841864 RMD160 3f0f7ff7e952b93c33fe27862d2b4191394e0032 SHA1 68076715cc600964967715fff927face01313b6e SHA256 48bf73a35be0f0e2d9a5071d8f2d9c7c40b4254d9b405dee57f0fb07c9c3cf58
 EBUILD dbus-1.4.1.ebuild 5229 RMD160 db7f4d6d43d580057968abc4ea37977411c6403b SHA1 3ef8c357182389eb892d1f16ab6c041456a78910 SHA256 5c2b8b8a1d9bd2b59a935001636104be10c5da3f71881937359ea42f746df927
 EBUILD dbus-1.4.6.ebuild 4674 RMD160 0f94ec412363fec4cf21bb61773ab68404ff1d3e SHA1 0890fb7c2e484ab46f35601d0d666c655c88fc3f SHA256 636e21150f8e87fa0caa0319942ec31d302a3e77d0ac3f8b31818329a55f5c1e
-MISC ChangeLog 42645 RMD160 9199772ec3b1ca3f2f85be527e39b15f8cebb24f SHA1 8eb09fb09f558e8be81001ec71a0be97aa1142b1 SHA256 0d84a7db87daf21fa3b1274a342fce2c57b9434f0c361f555b5d5a8cb918cfc1
+EBUILD dbus-1.4.8.ebuild 4716 RMD160 9b33c9b6341b405e920032e7dda0d910445c80bf SHA1 357e898dfb2028f1c87fa02fc9dccee35be2601f SHA256 43259b5c228f762ee3a23ad572f9b49635f4a7bab1da2db310fcc45e56609648
+MISC ChangeLog 42857 RMD160 d83a280104f4394ef023412088be0dd10f38ce2f SHA1 6cf576ed9eed9cceb033b15ebdf8abcedf82d5ee SHA256 bcf7908c3a8802d71bad9ad9e86dde1861c8d3f82001c730f9454a088bce29db
 MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2ow80ACgkQNQqtfCuFneNeDQCgguCoqykrGq5bRqlSYd+/M4+U
-ObMAn0zRi8qSzAZpEYGfF8W4p7cBf+6S
-=l5Qo
+iF4EAREIAAYFAk2u43UACgkQXkR9YqOcLPE8BgEAmAEamAHCHKcbXvF4DIjxAaDh
+KYz2dYz4L8NEn+rcmGEA/j8A4uOVFJTTp284Uwl+XlYDEM4ft4nCb38aQzEj3LG8
+=0zJX
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.4.8.ebuild b/sys-apps/dbus/dbus-1.4.8.ebuild
new file mode 100644
index 000000000000..59a48aa42b6d
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.4.8.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.8.ebuild,v 1.1 2011/04/20 13:44:33 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils multilib flag-o-matic python virtualx
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
+HOMEPAGE="http://dbus.freedesktop.org/"
+SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 AFL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc selinux static-libs test X"
+
+CDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	selinux? (
+		sys-libs/libselinux
+		sec-policy/selinux-dbus
+	)
+"
+RDEPEND="${CDEPEND}
+	>=dev-libs/expat-1.95.8
+"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+	doc? (
+		app-doc/doxygen
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	)
+	test? ( =dev-lang/python-2* )
+"
+
+# out of sources build directory
+BD=${WORKDIR}/${P}-build
+# out of sources build dir for make check
+TBD=${WORKDIR}/${P}-tests-build
+
+pkg_setup() {
+	enewgroup messagebus
+	enewuser messagebus -1 "-1" -1 messagebus
+
+	if use test; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Tests were restricted because of this
+	sed -i \
+		-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
+		-e '/"dispatch"/d' \
+		bus/test-main.c || die
+
+	epatch "${FILESDIR}"/${PN}-1.4.0-asneeded.patch
+
+	# required for asneeded patch but also for bug 263909, cross-compile so
+	# don't remove eautoreconf
+	eautoreconf
+}
+
+src_configure() {
+	local my_conf
+
+	# so we can get backtraces from apps
+	append-flags -rdynamic
+
+	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
+	# not on an SELinux profile.
+	my_conf="$(use_with X x)
+		$(use_enable debug verbose-mode)
+		$(use_enable debug asserts)
+		$(use_enable kernel_linux inotify)
+		$(use_enable kernel_FreeBSD kqueue)
+		$(use_enable selinux)
+		$(use_enable selinux libaudit)
+		$(use_enable static-libs static)
+		--enable-shared
+		--with-xml=expat
+		--with-system-pid-file=/var/run/dbus.pid
+		--with-system-socket=/var/run/dbus/system_bus_socket
+		--with-session-socket-dir=/tmp
+		--with-dbus-user=messagebus
+		--without-systemdsystemunitdir
+		--localstatedir=/var"
+
+	mkdir "${BD}"
+	cd "${BD}"
+	einfo "Running configure in ${BD}"
+	ECONF_SOURCE="${S}" econf ${my_conf} \
+		$(use_enable doc doxygen-docs) \
+		$(use_enable doc xml-docs)
+
+	if use test; then
+		mkdir "${TBD}"
+		cd "${TBD}"
+		einfo "Running configure in ${TBD}"
+		ECONF_SOURCE="${S}" econf \
+			${my_conf} \
+			$(use_enable test checks) \
+			$(use_enable test tests) \
+			$(use_enable test asserts)
+	fi
+}
+
+src_compile() {
+	# after the compile, it uses a selinuxfs interface to
+	# check if the SELinux policy has the right support
+	use selinux && addwrite /selinux/access
+
+	cd "${BD}"
+	einfo "Running make in ${BD}"
+	emake || die
+
+	if use doc; then
+		doxygen || die
+	fi
+
+	if use test; then
+		cd "${TBD}"
+		einfo "Running make in ${TBD}"
+		emake || die
+	fi
+}
+
+src_test() {
+	cd "${TBD}"
+	DBUS_VERBOSE=1 Xemake -j1 check || die
+}
+
+src_install() {
+	# initscript
+	newinitd "${FILESDIR}"/dbus.init-1.0 dbus || die
+
+	if use X ; then
+		# dbus X session script (#77504)
+		# turns out to only work for GDM (and startx). has been merged into
+		# other desktop (kdm and such scripts)
+		exeinto /etc/X11/xinit/xinitrc.d/
+		doexe "${FILESDIR}"/80-dbus || die
+	fi
+
+	# needs to exist for the system socket
+	keepdir /var/run/dbus
+	# needs to exist for machine id
+	keepdir /var/lib/dbus
+	# needs to exist for dbus sessions to launch
+
+	keepdir /usr/lib/dbus-1.0/services
+	keepdir /usr/share/dbus-1/services
+	keepdir /etc/dbus-1/system.d/
+	keepdir /etc/dbus-1/session.d/
+
+	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO || die
+
+	cd "${BD}"
+	# FIXME: split dtd's in dbus-dtd ebuild
+	emake DESTDIR="${D}" install || die
+	if use doc; then
+		dohtml -p api/ doc/api/html/* || die
+		cd "${S}"
+		dohtml doc/*.html || die
+	fi
+
+	# Remove .la files
+	find "${D}" -type f -name '*.la' -exec rm -f {} +
+}
+
+pkg_postinst() {
+	elog "To start the D-Bus system-wide messagebus by default"
+	elog "you should add it to the default runlevel :"
+	elog "\`rc-update add dbus default\`"
+	elog
+	elog "Some applications require a session bus in addition to the system"
+	elog "bus. Please see \`man dbus-launch\` for more information."
+	elog
+	ewarn "You must restart D-Bus \`/etc/init.d/dbus restart\` to run"
+	ewarn "the new version of the daemon."
+	ewarn "Don't do this while X is running because it will restart your X as well."
+
+	# Ensure unique id is generated
+	dbus-uuidgen --ensure="${ROOT}"/var/lib/dbus/machine-id
+}