Version bump.

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

3 files changed, 204 insertions, 9 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index ece26c1d5ccc..4a9df18bf4ec 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.340 2012/05/29 15:21:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.341 2012/06/06 10:45:04 ssuominen Exp $
+
+*dbus-1.6.0 (06 Jun 2012)
+
+  06 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> +dbus-1.6.0.ebuild:
+  Version bump.
 
 *dbus-1.5.12-r1 (29 May 2012)
 
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 4f78e44705ad..4efb9ffab327 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -10,22 +10,24 @@ DIST dbus-1.4.16.tar.gz 1889465 RMD160 8a63492090acd717e6a58f63026181e78ae089f0
 DIST dbus-1.4.18.tar.gz 1893155 RMD160 cca7fd10a0e958ee5ada0bc0a591f567242dd959 SHA1 7586cea68193ba9df6c03d2731b8c675ca2bd52c SHA256 b5e0c3bd37fa0ca5e86e8d17c375d754de6cd5c1d46d5f2158a36ddd51de18cf
 DIST dbus-1.4.20.tar.gz 1895099 RMD160 c0e88ab6bf6afe93a243a42d26f3b6c03e7892cd SHA1 9761eca23c0e6ea4ad822d92748703f9a0f58858 SHA256 103bdcd261a13140730b5fa69f56a98ab5c89ba3f0116ea62fcfd639520d5aaf
 DIST dbus-1.5.12.tar.gz 1925770 RMD160 f65bccf6a22ce2e05df4e7388c064b54256ce7fa SHA1 3140ea452337d664dbe6d30f0d990c756d101694 SHA256 5d3e09a831259ca64b15357cfa1c60a5a7ab06ef469d5b82c2308de9cadf1094
+DIST dbus-1.6.0.tar.gz 1925858 RMD160 d34b85203515cffe981d4dd1c05f3f4014df614e SHA1 9bfc971ff4cafa2741050d53a98cc7bfdc56880a SHA256 f0dda7e5f1c4a5bac4c690c602fbd7dce67907b967fa6986466e022c31e055ee
 EBUILD dbus-1.4.16-r2.ebuild 4845 RMD160 11a3fb19b611d6de43113b516b48797a5205a3f9 SHA1 7cfcd8f4729a0ebfa4b6921fe799a133b443ac51 SHA256 3907a11e3c0f029694f6453578275048f7397ba4b94383aa8249ca58d391fe78
 EBUILD dbus-1.4.16.ebuild 4866 RMD160 d63951e0c261abab562a87c6fb5f8d4a2d6c445a SHA1 b223ab0f416af8875c801a2ed7da84bbe180c5ff SHA256 36a2c944cd2350a3efbd89dbe3fbcab573379ccdc533312cc04277f828308260
 EBUILD dbus-1.4.18.ebuild 4708 RMD160 71f5d4696faa659db32b79b045662c9f52cb8e29 SHA1 0391f36b665430ac6cdc7400f6ff55afbce3abc0 SHA256 0a8516a43d346d036ced7b6dad3b869553fce6cfee5ac3283cba2fe147b2b707
 EBUILD dbus-1.4.20.ebuild 4998 RMD160 63d945ae94c83721113390a9d06a4e34d1b280a4 SHA1 6acbf44ae719016ef7baaa3b1d054afc056896e7 SHA256 aa500f213e51615111b2758cf41ca6ebfe698665f31c472fd8c6a7b888c5d39f
 EBUILD dbus-1.5.12-r1.ebuild 5021 RMD160 2ad390863fe6902df1c2d2ea6c852cf7e40549f2 SHA1 9f18fc3c2de35d6b0fe5ab732d85a95f00736d59 SHA256 56bfe3001e0b2ed7f80cc2dad0719765a3527bdf40c572f1cc552a8e94b1c80e
 EBUILD dbus-1.5.12.ebuild 4921 RMD160 6a2e1a374f93223f1945eff8135b029d49b7e41d SHA1 ec56a2e5341ceb4d61701ad30209706a69e99820 SHA256 f3fed59126f67178441db464af3fee97ad248f623c03a6a0e8bb321a9337e897
-MISC ChangeLog 50524 RMD160 2f066e2d26bdd4947d7602d8c23cb3347b7f640f SHA1 488ca92617619ac285bd8f42b9a2423892adfd8f SHA256 9d1e7b7597a7623781b2238252f3ea7ddf4b94bf7d5a1d206acec49133bc9657
+EBUILD dbus-1.6.0.ebuild 5025 RMD160 7def0af8a7a06e168063cd030c6c04b7931a79d9 SHA1 ae3974254816e169ebeb66c4a5bd82d3c899b3cc SHA256 743bcffdaaa69d3828ca651ab408a450c4ccd0a92f4b1f1af497aa075cfeb87f
+MISC ChangeLog 50642 RMD160 b57ceca13b0d96bd3f941834c4985b07a476652b SHA1 16cb52aeed3eeead5bb68fed4678e2d68ff43022 SHA256 a6cf72194a2ce6eda6cf65ac8f274699e8c5d212682b24be072a180235f3e7d5
 MISC metadata.xml 342 RMD160 8bf3f4bd6851d805afa364a4269170d7fad0d3d9 SHA1 e08553006779cbdea6aadb15a9280bdf4cb62e2b SHA256 5db8eac45a8872150729ee08297c2a19468336c3b9412e9f8e64ca2a2f5406c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPxOiZAAoJEEdUh39IaPFNZ40H/iGEQtH7alda0iFXGs38DDR3
-uDMRgUxYDespP9EpF+RG8HfRKumtu9ExTujYRtSq9C3fDCRwk7bHJE2aSzhsGrnU
-AFxQU+wTTHYtFOLhx95ote8W0mKHwAY7QIQDkmj8Q7LvfoSSHczIXHEICtTnCpqS
-Pr0w9xl+n+jhCr22UVnB5QyLKDHzTB37mYRfmNnLKwWSGgy2T+1ExUoAqWuPrtcz
-Tl5JspDvd+TF4Amih8aNPewTCmS7Qm/BXD0WMssfR42aHAsJEeO9IgYb4H5ziPJP
-/8WytZT2JWOt1HDTuVQJhdjZQ1VeSC6HCPKd1ljhDikVQdpTHfwtRav2aMWjZoA=
-=iNZC
+iQEcBAEBAgAGBQJPzzPGAAoJEEdUh39IaPFNwPQH/0Mlt53FB7akPtLBgyEXFqrp
+Oti0TbwkWuAWOiVFjOzpZM1/I3q9u2HIZorgNIdmZ1g6le7D6tv1JtapR3lAdgVM
+FG/+SXX9digc6r7mtczGtjuQQ+KOQV9l3m28zkOK72rz4oH65a7XJ0+Ut12j5t0e
+7ujdH1IIjRS8JNGV5lcAHCv7twpXkR5u5nNNhxjeBZb/WbUarHIaCuqUqUIhxCQf
+FQo3StzPzvjXCuefnrEeE4hngD5q2Ulcg8Mnr9Mkc0YQeVn2ggeXiqv21HbXHaIz
+2ZwtOggMhjxu1ZZ48HI4YNwOXzlUIKrxXDS0S+RqPZ/N9kFAbnT3BTtx8TAg2j8=
+=w5cB
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.6.0.ebuild b/sys-apps/dbus/dbus-1.6.0.ebuild
new file mode 100644
index 000000000000..445f64c3a625
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.6.0.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.0.ebuild,v 1.1 2012/06/06 10:45:04 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-32 )
+	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
+
+	find "${ED}" -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."
+
+	# 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
+}