Version bump wrt #384293 by "ScytheMan"

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

3 files changed, 208 insertions, 16 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 7103584302b7..a8144c7f524e 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,11 @@
 # 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.301 2011/09/23 12:45:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.302 2011/09/26 21:04:55 ssuominen Exp $
+
+*dbus-1.4.16 (26 Sep 2011)
+
+  26 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> +dbus-1.4.16.ebuild:
+  Version bump wrt #384293 by "ScytheMan"
 
   23 Sep 2011; Lars Wendler <polynomial-c@gentoo.org> files/dbus.init-1.0:
   non-maintainer commit: Fixed warnings in init script (bug #381883).
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 4c2fe62355fd..b70dee551df9 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,29 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 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 1176 RMD160 1ad53e5859c94794b4dfcb0455bb63a0b858b83b SHA1 85a284e2f714f0b9e7f77d74be4325e2ac088e54 SHA256 2db2b6ea36854997f93ee0d0dfc470a1d1c792d355944a1272ba45b219ab61dd
 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.16.tar.gz 1889465 RMD160 8a63492090acd717e6a58f63026181e78ae089f0 SHA1 d6e6538cfc1ed71992f6786a6da55d815d995b5b SHA256 1d8ee6262f8cc2148f06578eee522c755ba0896206b3464ca9bdc84f411b29c6
 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
-MISC ChangeLog 45090 RMD160 1cfd8e82262cb157f36e097d432bfa29ae55e4b4 SHA1 e9cb8ae2e6ba9217122ce88e6e5c470043e12229 SHA256 c4fa83e4c3c61b60a48d8deee1958844c4f15ce0473f1bb17c7e5da65b0c566a
+EBUILD dbus-1.4.16.ebuild 4879 RMD160 1ed9dc59b59ec4d896aa94e02585c2c8294c9b27 SHA1 09ace0c93b3196780c1e76d9cabdf012aaa0c911 SHA256 106a43d9a6c6b3e473a793b5f5c3bdfcc72ff5ef525d8cdfea5eb172fb320e35
+MISC ChangeLog 45233 RMD160 811fe100190ab2dd659896621629100e8a2424de SHA1 d35f6ab980a60bfff37319664c0802e58b4a0763 SHA256 a75a8191cbfb1e5bcecbe108672448ba7f2ae64dd844c971929e6d6ce76c2051
 MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOfH9UAAoJEPiazRVxLXTFZZwQAKqivVasERLJnCZIREPJ4/Ao
-fC8306JyremAWFtt5xpLBGw/rCAaDpDuLeHhb7XvFUjD6eA8AigJx+jWc3kyLEdj
-GxX1om/hcInWDoDLaDpgj7hm3mJkmLBTtQyY7pah5z42SZd5p7OZ/M6xauVkBmNU
-wa8HYRrONo+oaYiFuAkifF3i40YzOjIuwg2QRPmUGgEM+1Egm+6lPkOMtuRbUYQ8
-HiYO97dzvNahF9D7it3Ax0r7D6CBV0muoY9hFp1n4THozIckdRE9YHXv4KmnWjOH
-VrWXWPyX9/r+ipHt3Al9gB+koXaTFygyTbgGZXaSb/ndph4LjoQwLYj8yxNCH95R
-I5bhDJtYOtmcjvha5fp0wzcW7hbTwml59Y+HYptHhmQGpCznSqcccY1MioZkdZY/
-bTdcnJw0048cH7VSEeCZ/rWcbL0/HhZvaHDaEjq7/y1BFQo1dsDxDh511fI6itPS
-kska4rNw/XcDDKj5EQmnikkk9FKD9tO2O5HbfxoTx++8mAbgfJfDu2oYEkKW5SGr
-nkBtHexyxPWJA5ErgiMnnHGh9HE7d67QvadFB5i7p0BWsgUov+A2CcKOSyQ1KjK5
-Iha8UXk6QzcghRhgN//zitl/W/nkf6SCWtS6a/QVccr2tfnPA+w1e2Ue3zbgg3ep
-t+aUFkPcSsT8sl2/VbmG
-=tyMP
+iQEcBAEBAgAGBQJOgOksAAoJEEdUh39IaPFNroEH/jSohat8J7nzK67RuwOEuCD6
+N5T3wF1rTLbD/3Rsd9ii8bhEYCi2PrWCaXF9uUKWRXOSbzpVjeeMWsiQVkf3rRBu
+CM+4EaDU/OZsbHYKMq3oJTMsSDtWfsXiFYmGaKxYN/UZWQCmld7YXW4ijJGZmi3P
+iKpqnaIycDmJOgou6AE+zoBHzr0iKyitp5N1shc6Ly2eeQ84cdtwRhnVt/JXMjiy
+s1lgw2xurktO71nfqKV/m33XmlSsn+Rgr5qcDlzqN21kMDOmrMnaJQLQ/4nnX/fc
+u7JUkTphGDC3aWHwJtAGf1yE3PbTqCIGNPyJKUpoT892ROV7h7oByXRXUsMTci0=
+=l0w+
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.4.16.ebuild b/sys-apps/dbus/dbus-1.4.16.ebuild
new file mode 100644
index 000000000000..edc515368985
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.4.16.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.16.ebuild,v 1.1 2011/09/26 21:04:55 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="--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
+		$(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 circ
+		has_version dev-libs/dbus-glib && circ="--enable-modular-tests"
+
+		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 asserts) \
+			${circ}
+	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
+}