Version bump wrt #377603 by Sebastian Pipping. Fix API documentation building and installing wrt #372293 by Chris Mayo.

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

3 files changed, 204 insertions, 7 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 604439b4f6a1..d3ecaac92570 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.298 2011/07/03 11:25:58 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.299 2011/08/05 14:30:34 ssuominen Exp $
+
+*dbus-1.4.14 (05 Aug 2011)
+
+  05 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> +dbus-1.4.14.ebuild:
+  Version bump wrt #377603 by Sebastian Pipping. Fix API documentation building
+  and installing wrt #372293 by Chris Mayo.
 
   03 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> dbus-1.4.12.ebuild:
   ppc64 stable wrt #371261
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 154590455ba4..036ce867d17f 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -6,20 +6,20 @@ AUX dbus-1.4.0-asneeded.patch 3696 RMD160 360f21c06d268116884ed441e7b91478829f1b
 AUX dbus.init-1.0 1152 RMD160 f0f409b59167beef2e2b8c14f701fbeaa54c3bc9 SHA1 b00e23868046c67eaec87220e92ffcea5d9dd911 SHA256 a2e13a025faa488ff35521188c0d44909bc82c55e8676a24a5a5179545303d98
 DIST dbus-1.4.10.tar.gz 1862554 RMD160 7eb3fd372eca42331541eb7465b62c18cd4a2546 SHA1 8a35d253d444d1450a206f717445b371e1d936a1 SHA256 fcb4b41121525d485da32b5c988e1b31cab109c74d72c5abf05ae2a5b7db9517
 DIST dbus-1.4.12.tar.gz 1878025 RMD160 4c5c718117ebf453844743f6d3c3525d7593d722 SHA1 6288a0826fe02d02ddbe62af03c9401501e69cc2 SHA256 da3c97fd546610558d588799e27c4fa81101e754acbcd34747a42c131f30dbe7
+DIST dbus-1.4.14.tar.gz 1880298 RMD160 fe48465c7505b7f0f96b4d4c1eb80194d21aaded SHA1 40ccb6ff7b6f7a018cf020fef7c06131f7e5871c SHA256 47f27efc29aa9d1cc64b74e374204084d6fd53191e70dd584b604181059e5877
 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.10.ebuild 4774 RMD160 23eae6495a2153a1b6658a93a43817fab51d7865 SHA1 97b6190c6949c92d956d210279ca4dd68b44867e SHA256 323b8bfbee5072119bee57f4f8ec8df16f4d5cbcfc456651c3097ad8a318d016
 EBUILD dbus-1.4.12.ebuild 5033 RMD160 7fa7355bea5e98fd6119da855c88880093c15f38 SHA1 17e12b2302990f2fe9e6eeebe31b0ef4eddac328 SHA256 bda8a2dc34b8778c99df13f75b5c4def5b5f5cdf7cdbebed1cee1771209cdbec
+EBUILD dbus-1.4.14.ebuild 4926 RMD160 45b681904c243ff40a388df7a3ea172b6f145092 SHA1 2bde5d9c86309d5e1f20e636cef6461194f18843 SHA256 5adc2dc59afd56cc72b3480a14f7f1c6ff44bd5b91b867523b40b25cc1d82f88
 EBUILD dbus-1.4.6.ebuild 4672 RMD160 bf4985c13160d74929a42ee11fc00ca7b9a355c6 SHA1 640c6ace3c712307c540bf5ba371736f805ecf57 SHA256 88b4b014c7618ae2369ff350886c83249a597fe2c3ce85b7dfded590da3df948
 EBUILD dbus-1.4.8-r1.ebuild 4698 RMD160 16110f83ebe71536dffbdad3021a5fbcd3042bf0 SHA1 1b9da73f3b1a183e79ea515570f2460e0ebfeaca SHA256 1aa36033de2cf4603d2d51b08bc5ba0b7414c5cd312adab5f7cb329fe796ea46
-MISC ChangeLog 44551 RMD160 bd55ce3f4843daace5149033d81ce72232ab0392 SHA1 5e0d904bc53ae0ef7aa72408d65e9e1c7ba2cc27 SHA256 77f6b7b1a8dcc9366786b0a74a7336eba68ffe7b7ab906e415781e1ecbeaa9fd
+MISC ChangeLog 44778 RMD160 349fd59fae54097f726201bedb871d4d6f93eabe SHA1 10aff597bcc3fadb4a0186f839dca4be6fa10dd2 SHA256 d8c44bd15999fbe5d4ac973d7a8d86c2feb88dd2880e5e58239255828ad3d528
 MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk4QUcwACgkQIiMqcbOVdxSS4AP9HZeEJYJChpGqelnFFWk7Ctx6
-CM8YFuagMTKbbpbiXco7Y2ZG0kc9RJQUwSIQCCvZblvXGBwusutp/NgF4KFQfbGV
-hHgybeOQgx1OxSs+dnGaDpQis+CZcAfXihvQSU+PgZKrSLlc7XtGicWxT7Oexv01
-uB+qU9S8tx6NEysYO0A=
-=MtfS
+iF4EAREIAAYFAk47/dIACgkQXkR9YqOcLPFVpQD6AjarS4ox7O4iDRhAwrDz5uBK
+7GQpr4+E8K44jFjFM1AA/iMGGKxiOcO5I+URyAwbgei9Oe2eRYTqGOAE0hiZZWix
+=ZfFy
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.4.14.ebuild b/sys-apps/dbus/dbus-1.4.14.ebuild
new file mode 100644
index 000000000000..e8f0813675f1
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.4.14.ebuild
@@ -0,0 +1,191 @@
+# 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.14.ebuild,v 1.1 2011/08/05 14:30:34 ssuominen Exp $
+
+EAPI=2
+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"
+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"
+
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	selinux? (
+		sys-libs/libselinux
+		sec-policy/selinux-dbus
+	)
+	>=dev-libs/expat-1.95.8
+"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? (
+		app-doc/doxygen
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	)
+	test? (
+		=dev-lang/python-2*
+		>=dev-libs/glib-2.22: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
+		$(systemd_with_unitdir)
+		--localstatedir=/var
+		--htmldir=/usr/share/doc/${PF}/html"
+
+	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
+		local circular
+		if ! has_version dev-libs/dbus-glib; then
+			circular="--disable-modular-tests"
+			ewarn "Skipping modular tests because dev-libs/dbus-glib is missing"
+		fi
+
+		mkdir "${TBD}"
+		cd "${TBD}"
+		einfo "Running configure in ${TBD}"
+		ECONF_SOURCE="${S}" econf \
+			${my_conf} \
+			$(use_enable test checks) \
+			$(use_enable test embedded-tests) \
+			$(use_enable test modular-tests) \
+			$(use_enable test asserts) \
+			${circular}
+	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 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 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
+	dohtml doc/*.html || die
+
+	cd "${BD}"
+	emake DESTDIR="${D}" install || die
+
+	# 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."
+
+	# Move to /etc per #370451 and ensure unique id is generated
+	[[ -e ${ROOT}/var/lib/dbus/machine-id ]] && \
+		mv -vf "${ROOT}"/var/lib/dbus/machine-id "${ROOT}"/etc/machine-id
+	dbus-uuidgen --ensure="${ROOT}"/etc/machine-id
+}