[gentoo-commits] proj/betagarden:master commit in: sys-apps/dbus/

[gentoo-commits] proj/betagarden:master commit in: sys-apps/dbus/

[Johannes Huber]

commit:     06095c1925f8049077e4ac061cf479171ea8085d
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu May  3 11:29:21 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu May  3 11:29:21 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=06095c19

[sys-apps/dbus] Sync with tree. Move to git-2 eclass.

(Portage version: 2.2.0_alpha101/git/Linux i686, signed Manifest commit with key F3CFD2BD)

---
 sys-apps/dbus/dbus-9999.ebuild |  154 +++++++++++++++++++++-------------------
 sys-apps/dbus/metadata.xml     |    8 ++
 2 files changed, 90 insertions(+), 72 deletions(-)

diff --git a/sys-apps/dbus/dbus-9999.ebuild b/sys-apps/dbus/dbus-9999.ebuild
index 3dc7b05..05f0316 100644
--- a/sys-apps/dbus/dbus-9999.ebuild
+++ b/sys-apps/dbus/dbus-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
-
-inherit autotools eutils multilib flag-o-matic git
+EAPI=4
+inherit autotools eutils multilib flag-o-matic python systemd virtualx git-2
 
 DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
 HOMEPAGE="http://dbus.freedesktop.org/"
@@ -12,20 +11,29 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${PN}"
 
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc selinux test X systemd"
-
-RDEPEND="X? ( x11-libs/libXt x11-libs/libX11 )
-	selinux? ( sys-libs/libselinux
-				sec-policy/selinux-dbus )
-	>=dev-libs/expat-1.95.8
-	!<sys-apps/dbus-0.91"
+KEYWORDS=""
+IUSE="debug doc selinux static-libs test X"
+
+RDEPEND=">=dev-libs/expat-2
+	selinux? (
+		sec-policy/selinux-dbus
+		sys-libs/libselinux
+		)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+		)"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
+	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
+		app-text/docbook-xml-dtd:4.1.2
 		app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2 )"
+		)
+	test? (
+		>=dev-libs/glib-2.24
+		dev-lang/python:2.7
+		)"
 
 # out of sources build directory
 BD=${WORKDIR}/${P}-build
@@ -34,47 +42,65 @@ TBD=${WORKDIR}/${P}-tests-build
 
 pkg_setup() {
 	enewgroup messagebus
-	enewuser messagebus -1 "-1" -1 messagebus
-}
+	enewuser messagebus -1 -1 -1 messagebus
 
-src_unpack() {
-	git_src_unpack
+	# 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
+	fi
 }
 
 src_prepare() {
-	sed 's/-Wno-pointer-sign//g' -i configure.in || die "sed failed"
-	sed -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
-		-e '/"dispatch"/d' -i "${S}/bus/test-main.c"
+	# 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
+	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="$(use_with X x)
+	myconf=(
+		--disable-asserts
+		--disable-checks
+		--disable-embedded-tests
+		--disable-modular-tests
+		$(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
-		--localstatedir=/var"
-
-	if use systemd; then
-		my_conf+=" --with-systemdsystemunitdir=/lib/systemd/system"
-	fi
+		"$(systemd_with_unitdir)"
+		--localstatedir=/var
+		--docdir=/usr/share/doc/${PF}
+		--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)
 
@@ -82,11 +108,11 @@ src_configure() {
 		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 tests) \
-			$(use_enable test asserts)
+			$(use_enable test embedded-tests) \
+			$(use_enable test asserts) \
+			$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
 	fi
 }
 
@@ -97,56 +123,43 @@ src_compile() {
 
 	cd "${BD}"
 	einfo "Running make in ${BD}"
-	emake || die "make failed"
-
-	if use doc; then
-		einfo "Building API documentation..."
-		doxygen || die "doxygen failed"
-	fi
+	emake
 
 	if use test; then
 		cd "${TBD}"
 		einfo "Running make in ${TBD}"
-		emake || die "make failed"
+		emake
 	fi
 }
 
 src_test() {
 	cd "${TBD}"
-	DBUS_VERBOSE=1 make check || die "make check failed"
+	DBUS_VERBOSE=1 Xemake -j1 check
 }
 
 src_install() {
-	# initscript
-	newinitd "${FILESDIR}"/dbus.init-1.0 dbus
+	newinitd "${FILESDIR}"/dbus.initd dbus
 
-	if use X ; then
+	if use X; then
 		# dbus X session script (#77504)
-		# turns out to only work for GDM. has been merged into other desktop
-		# (kdm and such scripts)
-		exeinto /etc/X11/xinit/xinitrc.d/
-		doexe "${FILESDIR}"/30-dbus || die "doexe failed"
+		# 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
 	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/
+	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 || die "dodoc failed"
+	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
 
 	cd "${BD}"
-	# FIXME: split dtd's in dbus-dtd ebuild
-	emake DESTDIR="${D}" install || die "make install failed"
-	if use doc; then
-		dohtml doc/*.html doc/api/html/* || die "dohtml failed"
-	fi
+	emake DESTDIR="${D}" install
+
+	find "${ED}" -type f -name '*.la' -exec rm -f {} +
 }
 
 pkg_postinst() {
@@ -159,14 +172,11 @@ pkg_postinst() {
 	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."
 
-	if has_version "x11-base/xorg-server[hal]"; then
-		elog
-		ewarn "You are currently running X with the hal useflag enabled"
-		ewarn "restarting the dbus service WILL restart X as well"
-		ebeep 5
-	fi
-
-	# Ensure unique id is generated
-	dbus-uuidgen --ensure="${ROOT}"/var/lib/dbus/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
 }

diff --git a/sys-apps/dbus/metadata.xml b/sys-apps/dbus/metadata.xml
new file mode 100644
index 0000000..9879e83
--- /dev/null
+++ b/sys-apps/dbus/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>freedesktop</herd>
+  <maintainer>
+    <email>freedesktop-bugs@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>