Version bump, requested by ssuominen

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x30C46538

3 files changed, 267 insertions, 15 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 5dd9bafc1f41..fa6732cb45fa 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.458 2014/11/20 15:47:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.459 2014/11/25 15:39:51 williamh Exp $
+
+*dbus-1.8.12 (25 Nov 2014)
+
+  25 Nov 2014; William Hubbs <williamh@gentoo.org> +dbus-1.8.12.ebuild:
+  Version bump, requested by ssuominen
 
   20 Nov 2014; Agostino Sarubbo <ago@gentoo.org> dbus-1.8.10.ebuild:
   Stable for ia64, wrt bug #528900
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index a75ec4c74c50..3b1a90647793 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -4,25 +4,17 @@ Hash: SHA256
 AUX 80-dbus 341 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca1e07fd2 SHA512 fa019d903e5412d0c47dade4299995e9baa8b86d74ebc0b42967137762bc476628af57f8a6c354660fce731c33a49a66027cd8b5a25be4d898b7d1662c600e89 WHIRLPOOL 74e9e79b86fc4802f34737bb47c3a71919f35fb2375119cdcd7fd6dae2de201e006fb4e6a978addd2300f7075180d4b088a69fa60d2ce4d689b6239b4a1307b1
 AUX dbus.initd 1185 SHA256 98e37b8b6ed25004e48c5855d74c9361eea06d3fee13cefcc0ed10ccf452aa01 SHA512 7983e77015b46c204b10948a1fcedaae53a75848919961eb1ef8878bfa11c933256642c0e3f59163e72374ce1bd33b0338c787ce067c0982fcdf8a798b922a15 WHIRLPOOL 62ef5b9191a2bd3410c53ed63015e9968789f448e5959de2ebc2404bc13ce99c333546bf1eb335f826ef7ea143f70a53c2ecffd81b4e35fa51ba2e2bdf68879f
 DIST dbus-1.8.10.tar.gz 1864902 SHA256 10bf87fdb68815edd01d53885101dbcdd80dacad7198912cca61a4fa22dfaf8e SHA512 e6c3ad81a6f6eb966a39ee5612513809fb74b411e001ea0987ab91e3f6492d506527dca39263d2dfced726a7341a284a189ca588ee1525894ac751eee68878aa WHIRLPOOL 6b50b3296cfe3db9195541d35a7bdf88e74d1b65aa846e63e1885396b1515ac1f93e1ee6ac579db762033538f002a3a2bf12491af0b9810f20f0560beb49cb13
+DIST dbus-1.8.12.tar.gz 1864609 SHA256 c91428f28d2925ba32d34ffc824bfcf4d40d5e1e67befc4bcf2202f0a862501e SHA512 360168df98476eb42830350195520f09d44ec50f5f7cf4727cc92b8a98189ae25047fdc409c7a7f13b4384d82b103957301e17e143f094fb3ca9c5a5ed2ef48b WHIRLPOOL 907f18325b019fb8fb2cdee6f580a9c2b5d5ba2da2a2548e1aac5853c515051a585bf5c2590e5a943c97860a9020acdfa6fb820b53d8fadd89f991518ad66d71
 DIST dbus-1.8.8.tar.gz 1864881 SHA256 dfab263649a979d0fff64a30cac374891a8e9940350e41f3bbd7679af32bd1fd SHA512 99e7e05347666e95f3ccaf3f19500b59a5e509cdb9489c11f47ed4f139d3bc8e21adcf48cbb5c4f0de1661e831d60634eb7b6b76cc080d32091b63c732ebe391 WHIRLPOOL 3905352dfc2f922b599dfe7bd650258b16b489802b1c39b0be03bcfbe56c6d89b39f51f1b6d2d851dd23705aa068f40ade856001fadcca885bd3e81cf6e51199
 EBUILD dbus-1.8.10.ebuild 7188 SHA256 49b84d05716a7958e868ed33a4cb488eb33cb6daad3c9b6384b89de640366be9 SHA512 d0a185ce25ab58d90ca3c09be7f5c738081e6fcfa61d94eb9985da04ed9bc5a4d35111e138489fa13bf6c65dd284d605e80508357b6329f449267c35a668ea2b WHIRLPOOL 576d51c96e3b92152ab52d29d3c01317760edfefa1e3f4ed0fbfa98ec24bb7adf8bcc1e7cb59809478a08c8c750095509b035c161d0fcc9b3cab78f5dce7ff52
+EBUILD dbus-1.8.12.ebuild 7199 SHA256 060af66a2c2093d01f8e123c9b322e199ec11315b58173071ce2ed5059f47b2a SHA512 b6e8a0bb3ebac676dc08a63b9678e277c204ba0a58682e57a4e0a119f9f389db877d6f77545c82553205f91f28f564218e6012a4452e008ed5091be964c37707 WHIRLPOOL 198d1a75374364cd2465e849ed875fda03523372aea2c41f4206e3ebc8ff3a5f0b3b115c943ba794dc28dd129f9b965644d95d74358feb7f808abe5772464f0d
 EBUILD dbus-1.8.8.ebuild 7073 SHA256 1f090e4f6c4eba4fb7ab6fb0d6b5b5afafae66799682ff41bff21d53c6d48d6b SHA512 d0cf98e3f40b8b5720d6968a2c9ab93cf195600e1a07291a712c973bb637334cea01a219474e7afdd0863c251f0e09e3ce6922fa192e43683635d91ec0211907 WHIRLPOOL ce9a152d1f24b46ac24320d758bac34e621a71953de58ebf2a9f221d46266eaeb309b99d5cbb633dab5f75dc9a848877ee53de148242cb30f00b5eafc105d439
-MISC ChangeLog 65463 SHA256 74900dbda74af341f5b27c468893842a0bff177e192da343e1bd5dad8a918fb8 SHA512 1d7ebbc60daff3f1ba130201ec29d00efbbf805343f78544bc1604ba34788f4cce0e854d5862981b86e6fb41e3effc17b43441b62ccd9e4507db0709c1d8405f WHIRLPOOL 10bac68e0d54b5fd1cc403648a5d4d271a1d11b79c49e8052c49ea7ad3c7e0e241c774fe9d15bb095ce14c6e429a8ed3e6eea9b4fd103c1e14193bd2fe395b80
+MISC ChangeLog 65608 SHA256 a6a4108f1312bc8541a78fc19d215e066e6351ad9fde90213e470752e273dd39 SHA512 acafcec0bde6325f8b7c055687c10616a8f56e53ed8cfa66a6cb6dfcde26632b6d24a958a295cd232dc8850fae9c38059e9e96f11bfb0cb763c2195756b53950 WHIRLPOOL 4891cd6573d1cacc5f86de17415e7d823fa76892797f83d9172fdd01769bbe816e2df2d45388224be93acfbdfee9eeab07327e48014852bcf74a5ae9a68f0be8
 MISC metadata.xml 427 SHA256 d8fc8fedafc547578a85222cb60fb7eff3740c8ce101b22ba75aa3e5028135ce SHA512 2f8f64ded5050e87ce679d944dcf9c9a801ea03ee14471ab0702f10339f3f995701c313bfe10e7ab01f1bc784f04a5e6efbb29ea0b44513b9b3e384370956dc5 WHIRLPOOL 7a2add023434038b287c141213c2caf2adcc7ff5bcfb8025b2db0163bedd436fea64dd0e1a072f00232722738705fdc1f367e758d108373146d6fbea8803d5b2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUbg0wAAoJELp701BxlEWfN/IQAK5TlrFyJAzRuP/Fin8jufi3
-6/RjGdQed/4LMs28vtHHUhoT6Ag19oQCUZcplsdSzJ3WUYl12y+LvGnkj2OxwIRi
-pjNzkvx9eGna1xoDLJETe9RJHRwygJJsrJlnEeR+fiz7MkstERDS/cXGzKxvfLrp
-hP/ZSIEZE7U0XwePy29sVj6eVBfZoX+Jezhqffj21d+jJqHM1lanEfUQbrfuNFR4
-S03QGlnCSj5BVaYCq1kHPE5kqdaQHA335fe37lVsi0AzJLmFApQNyBuV9H/tEJ3e
-j7D6pntz7Vkj1EKRLZbRjaqd63anj4jkcJzzC0ykX5A8yll3SZO6mZk1/A2SxkVQ
-Yc8uZeJJ0qf6tZUINRjZCBUkDPpOuiGUMxoYCIRPtXsqIuuKTzjR0xDM7VBi9um8
-UFE2lH0m2xXuq+3GiL0yIvL5FM3g6LL2d0oXbiD2bidL11NRNXcTToYiU1vLu8gS
-sqrlwlx8XM5LEYrS4yUZvuMXSUmzs+29EPWb1gGbcL0hC6SFeP6W8Eu/6Tjj4Hpl
-CuJ1plscDqDaLqrF1Pr1NUmrTmpfU61RR2Gcf2FGZBbr9ouMJYqGQ3IS1XoNVlBU
-/3mLAMvEodG+fnNFeRYdqhOJPLIUWN4wbl4TgdloOLYdJBRXjFsXidcXqNu8jiDE
-jet3D2A46R3vs+inR4e1
-=TQbp
+iEYEAREIAAYFAlR0os4ACgkQblQW9DDEZTiuHQCgleM72HsvY7dq7KHRt2FeTbtU
+jsgAoLoXzg3o1dxHpBK/S5Ps4rQ6llsl
+=zfpm
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.8.12.ebuild b/sys-apps/dbus/dbus-1.8.12.ebuild
new file mode 100644
index 000000000000..c0306fb48518
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.8.12.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.12.ebuild,v 1.1 2014/11/25 15:39:51 williamh Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit autotools eutils linux-info flag-o-matic multilib-minimal python-any-r1 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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="debug doc selinux static-libs systemd test X"
+
+CDEPEND=">=dev-libs/expat-2
+	selinux? (
+		sys-libs/libselinux
+		)
+	systemd? ( sys-apps/systemd:0= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+		)
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r4
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${CDEPEND}
+	app-text/xmlto
+	app-text/docbook-xml-dtd:4.4
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		>=dev-libs/glib-2.24
+		${PYTHON_DEPS}
+		)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-dbus )
+"
+
+# out of sources build dir for make check
+TBD=${WORKDIR}/${P}-tests-build
+
+pkg_setup() {
+	enewgroup messagebus
+	enewuser messagebus -1 -1 -1 messagebus
+
+	use test && python-any-r1_pkg_setup
+
+	if use kernel_linux; then
+		CONFIG_CHECK="~EPOLL"
+		linux-info_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_user
+
+	# required for asneeded patch but also for bug 263909, cross-compile so
+	# don't remove eautoreconf
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local docconf myconf
+
+	# so we can get backtraces from apps
+	case ${CHOST} in
+		*-mingw*)
+			# error: unrecognized command line option '-rdynamic' wrt #488036
+			;;
+		*)
+			append-flags -rdynamic
+			;;
+	esac
+
+	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
+	# not on an SELinux profile.
+	myconf=(
+		--localstatedir="${EPREFIX}/var"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--htmldir="${EPREFIX}/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-session-socket-dir="${EPREFIX}"/tmp
+		--with-system-pid-file="${EPREFIX}"/var/run/dbus.pid
+		--with-system-socket="${EPREFIX}"/var/run/dbus/system_bus_socket
+		--with-dbus-user=messagebus
+		$(use_with X x)
+		"$(systemd_with_unitdir)"
+		)
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf+=(
+			--enable-launchd
+			--with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
+		)
+	fi
+
+	if multilib_is_native_abi; then
+		docconf=(
+			--enable-xml-docs
+			$(use_enable doc doxygen-docs)
+		)
+	else
+		docconf=(
+			--disable-xml-docs
+			--disable-doxygen-docs
+		)
+		myconf+=(
+			--disable-selinux
+			--disable-libaudit
+			--disable-systemd
+			--without-x
+
+			# expat is used for the daemon only
+			# fake the check for multilib library build
+			ac_cv_lib_expat_XML_ParserCreate_MM=yes
+		)
+	fi
+
+	einfo "Running configure in ${BUILD_DIR}"
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
+
+	if multilib_is_native_abi && use test; then
+		mkdir "${TBD}" || die
+		cd "${TBD}" || die
+		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
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		# after the compile, it uses a selinuxfs interface to
+		# check if the SELinux policy has the right support
+		use selinux && addwrite /selinux/access
+
+		einfo "Running make in ${BUILD_DIR}"
+		emake
+
+		if use test; then
+			einfo "Running make in ${TBD}"
+			emake -C "${TBD}"
+		fi
+	else
+		emake -C dbus libdbus-1.la
+	fi
+}
+
+src_test() {
+	DBUS_VERBOSE=1 Xemake -j1 -C "${TBD}" check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+	else
+		emake DESTDIR="${D}" install-pkgconfigDATA
+		emake DESTDIR="${D}" -C dbus \
+			install-libLTLIBRARIES install-dbusincludeHEADERS \
+			install-nodist_dbusarchincludeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	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
+	# let the init script create the /var/run/dbus directory
+	rm -rf "${ED}"/var/run
+
+	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if [ "$(rc-config list default | grep dbus)" = "" ] ; then
+		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
+	fi
+
+	elog "Some applications require a session bus in addition to the system"
+	elog "bus. Please see \`man dbus-launch\` for more information."
+	elog
+
+	if [ "$(rc-status | grep dbus | grep started)" ] ; then
+		elog "You can restart D-Bus \`/etc/init.d/dbus restart\` to run"
+		elog "the new version of the daemon."
+	fi
+
+	# 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
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		local plist="org.freedesktop.dbus-session.plist"
+		elog
+		elog
+		elog "For MacOS/Darwin we now ship launchd support for dbus."
+		elog "This enables autolaunch of dbus at session login and makes"
+		elog "dbus usable under MacOS/Darwin."
+		elog
+		elog "The launchd plist file ${plist} has been"
+		elog "installed in ${EPREFIX}/Library/LaunchAgents."
+		elog "For it to be used, you will have to do all of the following:"
+		elog " + cd ~/Library/LaunchAgents"
+		elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
+		elog " + logout and log back in"
+		elog
+		elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
+		elog "specified and refused to start otherwise, then export the"
+		elog "the following to your environment:"
+		elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
+	fi
+}