[gentoo-commits] dev/anarchy:master commit in: sys-apps/dbus/

[gentoo-commits] dev/anarchy:master commit in: sys-apps/dbus/

[Jory Pratt]

commit:     1a6bf01b13c593432c7d4a70185e5a39a6b36e7b
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  4 01:13:15 2012 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Wed Apr  4 01:13:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/anarchy.git;a=commit;h=1a6bf01b

update dbus with --disable-libaudit support to prevent breakage on
selinux

---
 sys-apps/dbus/Manifest                             |    4 +-
 .../{dbus-1.4.18.ebuild => dbus-1.4.20.ebuild}     |   49 +++++++++----------
 2 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index bab26cd..31a7b60 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,5 +1,5 @@
 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.initd 1185 RMD160 ddb4df28657c7cbceb20c67c95d78a982106759f SHA1 21cc5f013e061311d181b2eb6975f0fff48744da SHA256 98e37b8b6ed25004e48c5855d74c9361eea06d3fee13cefcc0ed10ccf452aa01
-DIST dbus-1.4.18.tar.gz 1893155 RMD160 cca7fd10a0e958ee5ada0bc0a591f567242dd959 SHA1 7586cea68193ba9df6c03d2731b8c675ca2bd52c SHA256 b5e0c3bd37fa0ca5e86e8d17c375d754de6cd5c1d46d5f2158a36ddd51de18cf
-EBUILD dbus-1.4.18.ebuild 4760 RMD160 86f2356e006eba0ec356193edad1cac9d1fcb791 SHA1 868a1e97639c6206c489ab39695224184b4cb443 SHA256 f09b3bfdb5cbb16adc8ff748c4d05c8d0ac7c93bf58e00dd7143db8f944289ab
+DIST dbus-1.4.20.tar.gz 1895099 RMD160 c0e88ab6bf6afe93a243a42d26f3b6c03e7892cd SHA1 9761eca23c0e6ea4ad822d92748703f9a0f58858 SHA256 103bdcd261a13140730b5fa69f56a98ab5c89ba3f0116ea62fcfd639520d5aaf
+EBUILD dbus-1.4.20.ebuild 4881 RMD160 bf77c57d90d6ce521f28c349cca184b2c2f65588 SHA1 9b410e2e039416d794386fb94968361da9f8a1bd SHA256 45e3f0c4c40a17385696c1a2e4a0423d90e7044c51854d7c950971e0d678495f

diff --git a/sys-apps/dbus/dbus-1.4.18.ebuild b/sys-apps/dbus/dbus-1.4.20.ebuild
similarity index 80%
rename from sys-apps/dbus/dbus-1.4.18.ebuild
rename to sys-apps/dbus/dbus-1.4.20.ebuild
index cf766bc..de38156 100644
--- a/sys-apps/dbus/dbus-1.4.18.ebuild
+++ b/sys-apps/dbus/dbus-1.4.20.ebuild
@@ -1,12 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.18.ebuild,v 1.1 2012/02/14 21:12:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.20.ebuild,v 1.1 2012/03/29 20:05:00 ssuominen Exp $
 
 EAPI=4
-
-PYTHON_DEPEND="test? 2:2.7"
-PYTHON_USE_WITH_OPT="test"
-
 inherit autotools eutils multilib flag-o-matic python systemd virtualx
 
 DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
@@ -34,8 +30,10 @@ DEPEND="${RDEPEND}
 		app-text/docbook-xml-dtd:4.1.2
 		app-text/xmlto
 		)
-	test? ( >=dev-libs/glib-2.28 )
-	!<dev-libs/glib-2.30.1-r2:2"
+	test? (
+		>=dev-libs/glib-2.24
+		dev-lang/python:2.7
+		)"
 
 # out of sources build directory
 BD=${WORKDIR}/${P}-build
@@ -46,6 +44,7 @@ pkg_setup() {
 	enewgroup messagebus
 	enewuser messagebus -1 -1 -1 messagebus
 
+	# FIXME: Test suite fails with Python 3.2 (last checked: 1.4.20)
 	if use test; then
 		python_set_active_version 2
 		python_pkg_setup
@@ -67,14 +66,15 @@ src_prepare() {
 }
 
 src_configure() {
-	local my_conf
+	local myconf
 
 	# 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="--disable-asserts
+	myconf=(
+		--disable-asserts
 		--disable-checks
 		--disable-embedded-tests
 		--disable-modular-tests
@@ -91,31 +91,28 @@ src_configure() {
 		--with-system-socket=/var/run/dbus/system_bus_socket
 		--with-session-socket-dir=/tmp
 		--with-dbus-user=messagebus
-		$(systemd_with_unitdir)
+		"$(systemd_with_unitdir)"
 		--localstatedir=/var
 		--docdir=/usr/share/doc/${PF}
-		--htmldir=/usr/share/doc/${PF}/html"
+		--htmldir=/usr/share/doc/${PF}/html
+		)
 
 	mkdir "${BD}"
 	cd "${BD}"
 	einfo "Running configure in ${BD}"
-	ECONF_SOURCE="${S}" econf ${my_conf} \
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" \
 		$(use_enable doc doxygen-docs) \
 		$(use_enable doc xml-docs)
 
 	if use test; then
-		local cir
-		has_version dev-libs/dbus-glib && cir="--enable-modular-tests"
-
 		mkdir "${TBD}"
 		cd "${TBD}"
 		einfo "Running configure in ${TBD}"
-		ECONF_SOURCE="${S}" econf \
-			${my_conf} \
+		ECONF_SOURCE="${S}" econf "${myconf[@]}" \
 			$(use_enable test checks) \
 			$(use_enable test embedded-tests) \
 			$(use_enable test asserts) \
-			${cir}
+			$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
 	fi
 }
 
@@ -141,22 +138,21 @@ src_test() {
 }
 
 src_install() {
-	# initscript
 	newinitd "${FILESDIR}"/dbus.initd dbus
 
 	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/
+		exeinto /etc/X11/xinit/xinitrc.d
 		doexe "${FILESDIR}"/80-dbus
 	fi
 
 	# 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/
+	keepdir /etc/dbus-1/system.d
+	keepdir /etc/dbus-1/session.d
+	keepdir /var/lib/dbus # See pkg_postinst() for symlink creation
 
 	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
 
@@ -178,8 +174,9 @@ pkg_postinst() {
 	ewarn "the new version of the daemon."
 	ewarn "Don't do this while X is running because it will restart your X as well."
 
-	# Move to /etc per #370451 and ensure unique id is generated
-	[[ -e ${EROOT}/var/lib/dbus/machine-id ]] && \
-		mv -vf "${EROOT}"/var/lib/dbus/machine-id "${EROOT}"/etc/machine-id
+	# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
+	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
+	# dependencies with hardcoded paths (although the known ones got fixed already)
 	dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
+	ln -sf "${EROOT}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
 }