Version bump.

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

3 files changed, 204 insertions, 9 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index babf72d878be..5c28fae95b00 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.352 2012/09/22 11:16:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.353 2012/09/29 16:26:19 ssuominen Exp $
+
+*dbus-1.6.8 (29 Sep 2012)
+
+  29 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> +dbus-1.6.8.ebuild:
+  Version bump.
 
 *dbus-1.6.4-r1 (22 Sep 2012)
 
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 10bd05259f99..a3809436dd85 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -12,22 +12,24 @@ DIST dbus-1.4.20.tar.gz 1895099 SHA256 103bdcd261a13140730b5fa69f56a98ab5c89ba3f
 DIST dbus-1.6.0.tar.gz 1925858 SHA256 f0dda7e5f1c4a5bac4c690c602fbd7dce67907b967fa6986466e022c31e055ee SHA512 1011bf1bf43e795cfd39a5d2d092bbae8b4679d9f9a6a6565d9ca0246c484d7fb413c7f7e64c39e532741140d214393847b7db1c6a8d50cacd42ccbbff6ff0ba WHIRLPOOL 033f6b5e89c1696c1d3fd696972330656ed43e7ea0e462075d92b2c220aed23dab0be9299e9a70969d98cdb8da103d303dbe11ef27698a06f8ba6ba132121dbf
 DIST dbus-1.6.2.tar.gz 1927211 SHA256 2bf210e549fbf801fef32ba132284bcd10021d1d9e52fc29097fe1333b54c2ea SHA512 c53b3cc2251ccf88918f8080a922a10d6cb755900a78978df8ba5c19e100c94adafb8e0790d9a753c20d81e1fb5fda5d02b52653acedc5dddb60d8f65c061d7c WHIRLPOOL 02f4e046d345d604ffd11ec60bbf40ae4dcd15c6dfb9afbc61c3e93979ac2547f4e957378d475b989490daaf37074a1bae088f57e4df6258c745d43ec43b96e2
 DIST dbus-1.6.4.tar.gz 1927446 SHA256 5fba6b7a415d761a843fb8e0aee72db61cf13057a9ef8cdc795e5d369dc74cf1 SHA512 eaa9098e3cbbbf3b5cb7abd0906819f27b633afe1376213f2ffd6edd8ddfa0250678f0d9cf161846696a08ed1e9479a42ba4e1a6f0b6b934f7a4f4c0ff3ff8f6 WHIRLPOOL f5a6bf2f2db69764ef3081dc8b4f69d91e2c612d169afbf030489560a571ca8e7a6430631e406fccb027abe98834fd03d7e32277513351b2b724145064b6a6c4
+DIST dbus-1.6.8.tar.gz 1929630 SHA256 fc1370ef38abeeb13f55c905ec002e60705fb0bfde3b8d21c8d6eb8056c11bac SHA512 eb26f1dfb6c6e3757a408a98e0f4012eda926e2f8ee7a2356ebd567a2e4a7d96effca7cec6e6b4f9e7bc578cbdd7b703d00158343a260859aff0718c76f296b0 WHIRLPOOL b614da2bc57376c8ad626ed2469e9a2cfcf7a2debba97187728048ad73e0c5075b290766d088e470b266fcad3e3cf2ec2c9c8477f1f7c5a232f1f74cadc83c1a
 EBUILD dbus-1.4.16.ebuild 4862 SHA256 d720ed6cb761da0579c55283e3e84a91af391cc4fe8063963e05dc5a8f4631eb SHA512 9d36054e8adcd30b1df45a6c02f94aa7ce1a84f587ed149fb7ae47364bc18a2182308cfc7ea6408da7c79e8f1bd554d68692853355a6941aab4976526bd9c57b WHIRLPOOL 0a902446327060348a786b7809f88de9b428d5f91b34cb045d41b892dee83603abea77a7395c9dcddb953d97e9781ffc955108dcc31f5d4c819183d747e20c1c
 EBUILD dbus-1.4.20.ebuild 4991 SHA256 8a4e0409946c9733a91aea1a005fcb878a3b8eea323083699c58416702ccb0c1 SHA512 747db1a7593d2160977775e79a20c657ece3baf9141720151c7b9295cd1bd9bd27c4d5b56b4d199cd391d894e1fc66c5a3dc4dc28d71d433b7ef1c78cc8756d7 WHIRLPOOL 5400811f6ba2bb4224b6dbbd7fd7aef554428a721c6b20dbaee5d3fd500fffa6120db43c87797719ca1a7844ba3b5ad7f1110197e1b02145e2ccaed8e4407ea1
 EBUILD dbus-1.6.0.ebuild 5025 SHA256 743bcffdaaa69d3828ca651ab408a450c4ccd0a92f4b1f1af497aa075cfeb87f SHA512 3b89a8ec300f685e63e1cdaf4144daeca3154a75a7cf1c0ba2259784cad96d474ff23c4c0f4de58dd115a7d5c30c71f460988e1958fee3558ee82d67c67841c9 WHIRLPOOL 27833077cb782b8a756095c90b702a3c17b5288fb74c7e9c60cf5c5e73522f494474e51f0b2748396838ce80d2449eff3af5e3acb799519e4c0b194848be9051
 EBUILD dbus-1.6.2.ebuild 5107 SHA256 ee630ec439ffe1c7ad829f1f3987f6ece1f832ed497a4d63c8917ab8a8b5dec1 SHA512 b696cd9cf603185ada9bbf05a5729368b3fc96c029c478c9a071fbbfef6f9ca850700d84777f651d1b35d29a80d7dd131d31e3f07f6eeecada3cf0d520b52e3b WHIRLPOOL cb534aebb77db51e5d16f2e441beb1382f005cfad0e061c12403285574f6afc27f37d48d3a625ac170360affb55ec73d60d1283e0d7c59e770dd8f945030b4cd
 EBUILD dbus-1.6.4-r1.ebuild 5093 SHA256 2bbcbfb8f94ca95afed880c5bd91c14ec524c0db476a470cdef1f59590b9d12f SHA512 964cb5dfc0e39218fb2b06ce0fb75feabcf65b7ac487ad6e1bcb82ea5ded9c018f2843ebe8d4b89c0bc6f217dfa5d987efef31dda3de79a9fc84010db99edef8 WHIRLPOOL a73e55a949c90e8a28d3ff5721490258bcf9f57fb5143efcc59ebb8f9697682d5b45fe53e515d7f1161857065fe4dd8bbda9944e4e2a9c08442818d643a6e96b
 EBUILD dbus-1.6.4.ebuild 5138 SHA256 37286ec98b30133cc41075d9e1da582d21e8c52bd6c257895895b68e487d4185 SHA512 62faea772e1f58b41b49e18c11a12260b693d6c8a4d07dbbd9b0c5b3e4a87afb185beb826dbce82b7c27e3bb76e542c4c90fa6c2015a4c3db3f2bc74c61f8f98 WHIRLPOOL 37e3e9eff26d1db42e34d4ce2ceb7df88e30558aee4d9c53c8dd1359c0013fa7f1d3e952f6f2559dd665a0dc201119bc4ce8fe56c1cafd14341a452de5767940
-MISC ChangeLog 52369 SHA256 7d08b79e5fe526c7c6dee02bebe0635b78a0d934ecece98906c568bb924684b6 SHA512 3476db7f72eb3955134fb35285d1528cdf90ebda8d09167174ee884e8fea77423d811e2ef2ea33558e604080eaf626d528b70b7d79bfcc3675e6abee639ffde3 WHIRLPOOL 6fceb12ba7e97927e5cebee3bf21e07ac57efcc1d603b2092fc9cd9fd370dfaeb367684faff5d92d6faa0d079847e4773168ab8d96181648f39fdb27d5eb200f
+EBUILD dbus-1.6.8.ebuild 5003 SHA256 2baa1d1ac4d833eff9cb875c6c1938d5231fdc5f8d804e4d4f1299b391c9fa54 SHA512 683b5ec6e68ba9f09d5aee702cda523c85f63ecc5816041660cdda97ca32eddc23bdf2ae584e91bb422f48a0b450492d10650acc8885f0463e06485d26abcf21 WHIRLPOOL a1e00422799ea0bd703f860567bb4208e0bc13fea0d4c903ca9add05e29b4445ba048d57a2d636a8f3a75b9e7d2cfd0d213721de7a5861f5789956389a3f9a91
+MISC ChangeLog 52487 SHA256 1b6ed4d0681ce6fb100d7ac7689efdc74146e4732ecced01a5687f6a446e7dfd SHA512 0a89cb6938f22c36d2eb59bf3d110738d10edea8a8e85a813a2bba2293b85a717dd459efffe61bb93a14aadf878e0a2ba77a6965953f110947356288b6f8bcb9 WHIRLPOOL a2dae562edfc2b090144b0376c542feb85ebcb107f7da494afc44d5fed4be0350cb51311dfb71a8d178a02bb91007038a7fb314725a077820b2be305afb7fb4e
 MISC metadata.xml 342 SHA256 5db8eac45a8872150729ee08297c2a19468336c3b9412e9f8e64ca2a2f5406c3 SHA512 01e10de9adb42a26339a096215305853c646c23c533df70ad044f92109d2138efe86465b00462d649f1d0e8ea1896320e09a571fcbe95318c5df9024d8f65b19 WHIRLPOOL 303cd9e4e6451ddf37da658766c877b960942f8a170948b60e6f4b1d72e7d3df5f4b4bf4fb92016caacaa611198e77aefaeedd5d3706c538b0bd0b5c086fabba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQXZ1jAAoJEEdUh39IaPFN+RkH/jUNLQkScVMdb1GBjn8x68qB
-VGCsbv4ztOgYVeVdLp3pCW5KceyQmO4kYR1urxIwzjSndS4HuGOv3NmgTy2R6Uda
-PeFgxWbqRATkSsvGVy/NzVdjld+N98OX1+OvJR1HHo7D3KgpBst/5s6K7dhnND3h
-luR89+q8u40vEDJiqgBdyfoiG4LSbPmNFDFqVvDoVayj2n4MykGFkJqCwOu3hUIj
-0kcqWdU0j3WM+SKcVjhhackIPlzul016Ocn0dNNXRFeLST2CTCFV+n1WGrCrWBtr
-GDeh+o0BAGloXjSH0jg62AQpMl/9RT9uWLLRrEznJ8BUPNGUNXTmazQiBVXLNeY=
-=H8uo
+iQEcBAEBCAAGBQJQZyB6AAoJEEdUh39IaPFNgOcH/3433+1hhRnTyjtRE9pl4xZj
+m7I130xy/9VJakhLFbrxShWemqucUf0040wETRhzmM2ha7uinXjBnOz9RLvml9H0
+EPVdRgeLAR1uU/FwE5xj4ij54DSK/mP1c4GeiFWMUkd+b95nYQ1WSGJ8U7d5VV9x
+iBgL10o6k32PCYbsUTiYyckVtGW8t7asFh7HP57V9EWvUI6LPdIeLx5qSBO1XTIT
+wIWybiRu/L8PlICwNA7lUm927TFYCRqXVW0VJmbifEBxEqElQ9oIfxe98EcNMz33
+xWIWqpGrTTnqLzfEduwa7uv3frxzKM9M9vOURJ3VbMQc73zDQiw8/Dfz99RY/1I=
+=VQ8s
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.6.8.ebuild b/sys-apps/dbus/dbus-1.6.8.ebuild
new file mode 100644
index 000000000000..a2a1a77fefa0
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.6.8.ebuild
@@ -0,0 +1,188 @@
+# 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.6.8.ebuild,v 1.1 2012/09/29 16:26:19 ssuominen Exp $
+
+EAPI=4
+inherit autotools eutils linux-info flag-o-matic python systemd virtualx user
+
+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="|| ( AFL-2.1 GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="debug doc selinux static-libs systemd test X"
+
+RDEPEND=">=dev-libs/expat-2
+	selinux? (
+		sec-policy/selinux-dbus
+		sys-libs/libselinux
+		)
+	systemd? ( >=sys-apps/systemd-44-r1 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+		)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+		)
+	test? (
+		>=dev-libs/glib-2.24
+		dev-lang/python:2.7
+		)"
+
+# 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
+
+	if use kernel_linux; then
+		CONFIG_CHECK="~EPOLL"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch
+
+	# 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
+
+	# required for asneeded patch but also for bug 263909, cross-compile so
+	# don't remove eautoreconf
+	eautoreconf
+}
+
+src_configure() {
+	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.
+	myconf=(
+		--localstatedir=/var
+		--docdir=/usr/share/doc/${PF}
+		--htmldir=/usr/share/doc/${PF}/html
+		$(use_enable static-libs static)
+		$(use_enable debug verbose-mode)
+		--disable-asserts
+		--disable-checks
+		$(use_enable selinux)
+		$(use_enable selinux libaudit)
+		$(use_enable kernel_linux inotify)
+		$(use_enable kernel_FreeBSD kqueue)
+		$(use_enable systemd)
+		--disable-embedded-tests
+		--disable-modular-tests
+		$(use_enable debug stats)
+		--with-xml=expat
+		--with-session-socket-dir=/tmp
+		--with-system-pid-file=/var/run/dbus.pid
+		--with-system-socket=/var/run/dbus/system_bus_socket
+		--with-dbus-user=messagebus
+		$(use_with X x)
+		"$(systemd_with_unitdir)"
+		)
+
+	mkdir "${BD}"
+	cd "${BD}"
+	einfo "Running configure in ${BD}"
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" \
+		$(use_enable doc xml-docs) \
+		$(use_enable doc doxygen-docs)
+
+	if use test; then
+		mkdir "${TBD}"
+		cd "${TBD}"
+		einfo "Running configure in ${TBD}"
+		ECONF_SOURCE="${S}" econf "${myconf[@]}" \
+			$(use_enable test asserts) \
+			$(use_enable test checks) \
+			$(use_enable test embedded-tests) \
+			$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
+	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
+
+	if use test; then
+		cd "${TBD}"
+		einfo "Running make in ${TBD}"
+		emake
+	fi
+}
+
+src_test() {
+	cd "${TBD}"
+	DBUS_VERBOSE=1 Xemake -j1 check
+}
+
+src_install() {
+	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
+		doexe "${FILESDIR}"/80-dbus
+	fi
+
+	# needs to exist for dbus sessions to launch
+	keepdir /usr/share/dbus-1/services
+	keepdir /etc/dbus-1/{session,system}.d
+	# machine-id symlink from pkg_postinst()
+	keepdir /var/lib/dbus
+
+	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
+
+	cd "${BD}"
+	emake DESTDIR="${D}" install
+
+	prune_libtool_files --all
+}
+
+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 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
+}