Version bump wrt #484702 by "teidakankan"

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 210 insertions, 10 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index cd0db37ab026..38b53700a3c0 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.392 2013/08/24 11:46:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.393 2013/09/22 16:20:25 ssuominen Exp $
+
+*dbus-1.6.14 (22 Sep 2013)
+
+  22 Sep 2013; Samuli Suominen <ssuominen@gentoo.org> +dbus-1.6.14.ebuild:
+  Version bump wrt #484702 by "teidakankan"
 
   24 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> -dbus-1.6.10.ebuild,
   -dbus-1.6.8-r1.ebuild, -dbus-1.6.8.ebuild:
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 007c54bb4e5f..caf8ea48e5b6 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -5,17 +5,19 @@ AUX 80-dbus 341 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca
 AUX dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch 1320 SHA256 ab3398f4fb46ec9a134581a825180422b2b8f5e8dd250bca3127c31a39d923a7 SHA512 e8cac05a0291f24fc3cd82cfd504a78b1d356a9ee613e226c3b16ccbfd8251afb036d4fb9da372a066e5bc9417fddbc3f10b68713620c4fd798069fdd8f6dbf8 WHIRLPOOL 9e30cbcba7ebe13cdc8a9e3ad0bb7d3d6e667dfba23a6cedfbacbbed34f6eb15bc6f0dcb42392f0c1a23ac891f0d820759f4201b8bac9b51d4241e74bed5ca2d
 AUX dbus.initd 1185 SHA256 98e37b8b6ed25004e48c5855d74c9361eea06d3fee13cefcc0ed10ccf452aa01 SHA512 7983e77015b46c204b10948a1fcedaae53a75848919961eb1ef8878bfa11c933256642c0e3f59163e72374ce1bd33b0338c787ce067c0982fcdf8a798b922a15 WHIRLPOOL 62ef5b9191a2bd3410c53ed63015e9968789f448e5959de2ebc2404bc13ce99c333546bf1eb335f826ef7ea143f70a53c2ecffd81b4e35fa51ba2e2bdf68879f
 DIST dbus-1.6.12.tar.gz 1933805 SHA256 f67a7abfd6d045c1e9eba2bba4199d301836bc0c6e8a727c765913aba780ee92 SHA512 860f3c86268857662bc397cd6fd0c163dfe38c77c28525c47226e22d890ec3c2df724f887f55f65a60b729e8eb5dce91ce8ecd045391d88acb1884b8dbf33c71 WHIRLPOOL 248872ad9636f60d5b4e19b5876ec1b675db02e7c755f19f3a1966aedcdeb834a092d6e678fe1ea7e06a4b5e33d2ac31739c12093c6aee8dea8147fd0d22716a
+DIST dbus-1.6.14.tar.gz 1946612 SHA256 5676011d5714682062c4cb0cdd3365c15025809bc26ddbec3e4edeea7867f56c SHA512 6c1070b95b509ae9245d7c04543ce938484ed1f81afdaccb65f1c71b396c8036c62a00afff56b618325c300834096e27e5afe58e53b7e4096dae42daf9034b5a WHIRLPOOL a67befaf2304c4efc71e1ddadf9280e748d1f1646a0734c3dac9fe4ec9c4f850b0a9b2f72ffbad4cb2389d0336622006c605b70acc716a85bd535ca22da02cab
 EBUILD dbus-1.6.12.ebuild 5192 SHA256 cd99facf8417cfa959ac2ffc26827908567bb7d4904a18d5324222348db3f33e SHA512 8fe5e1855ee89ef69f04f65d3329e36ceaf7c9f9e3e93ee2266f1116d62e16189f503e8a223c4a8e59475bed2373a0246e7a4986dc1448f7a916b4e584850aa9 WHIRLPOOL b11ffeac4cc939bd2f9904a888648be49806193cd5f2fdba124855c73845217715148f48d27b3629734e2f1b774500e23882593280c2c91fb317c1bacbb8d061
-MISC ChangeLog 57098 SHA256 0c6821a5e9255f7127b1992212152b2873c956acc29ffd675240a5f95019ca61 SHA512 4f3d390efe7f7b8acc5a2f748921a2319505156f4629addd0446db83f039ed38b484c848e5f2507eae6710d5b0196e15b31009d565f6345c66aba249935e645e WHIRLPOOL 86b601532d2f902950f620da7c915936377475dd8f0c8a67a34e81704c1ea580cf3f305389f2a9d38ee9b9932246aa6ff75cd9c8ef9f55458a7e6fdc07482dc0
+EBUILD dbus-1.6.14.ebuild 5208 SHA256 c025094ec32771bf7fae724766762bdac4067762de655e7eed90b0865f1e9d5f SHA512 076e751485ca178eb2b936d21f02bded05dff733dc8a80970dc0de772a3cb5df539242de3e65a83fa06aad30acdb62b2dd777c586cb0b8bb9ba3f7d6bc0d0307 WHIRLPOOL b0a9045d16a98fde049100002fb28bc530de1d0084f8e34f7cf498e12b12e4a5be9a21b22272132bbfdb86e39105e406739e45458ccf1b1de4772c4d91609815
+MISC ChangeLog 57246 SHA256 c50759f551cc97dce21769c4705c0535252b1fffe2248fdea5642bc5c994e99a SHA512 611e14fddee33445b7fc001a05892b09b07c7f8b369d2ce1f69a4e1fae2f51dc4a6bc7f3b4dbfdab06159c48179101e2fac581388aa546a171159df6ae56a5c0 WHIRLPOOL e8b730bc421d57998d3d180cfccd719fa571f2841b28e57875da13a54826f8a9d2916f39b23d810a2083ebd059c01b5d9c12098aecc0cdccaead13c93e1d35c0
 MISC metadata.xml 427 SHA256 d8fc8fedafc547578a85222cb60fb7eff3740c8ce101b22ba75aa3e5028135ce SHA512 2f8f64ded5050e87ce679d944dcf9c9a801ea03ee14471ab0702f10339f3f995701c313bfe10e7ab01f1bc784f04a5e6efbb29ea0b44513b9b3e384370956dc5 WHIRLPOOL 7a2add023434038b287c141213c2caf2adcc7ff5bcfb8025b2db0163bedd436fea64dd0e1a072f00232722738705fdc1f367e758d108373146d6fbea8803d5b2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSGJ0AAAoJEEdUh39IaPFNIeQH/io54jQ/RBgVAHq+sLHJf3v2
-AnzKBigfjJkLHkgqxAgGkeuquG5U08UVvakeqT/KveI2262WMKIQ5ZRxqYVek6Hl
-pjMEJ+UJCvG5ruGrmDmelEfjqeWVfLLbmwSr+cTW8m5K8qeVOM8RIZnoIEFH5D8W
-DmbqvH9W8kgBdyIHmmz6kNnI4o9fijvhkD3SxPPL4B97AoHTx7oYN/VZdnJCJT+K
-wVQC6zIXfLfQsp9zdjJwTSA0bG/SdL4AGzeTcd92jP6+DleSwk+tQ8Tiv6Qq8xpg
-H6dYUbbh9VpSwZHbOlsByxFzcqhjNHI13CIoVOnJOKyxIX1PFl/sjeBWLnAFlQY=
-=ZyCd
+iQEcBAEBCAAGBQJSPxiMAAoJEEdUh39IaPFNoscIAJjphaPZv/y7FAt7tOH0Zgds
+j9nQcVp+zNbRGadTHl2+zyJ0aLvdEpVTqsl8HOZA8ul/todehprRsMbyNIMhh7N/
+WWOyMKWdHhNOO1PPrHgB2vQdNLI5w631es8+L7hU0YI6I+ciE59YZvhaVDRyji8+
++TQuB0DwL44dRP/Q7AIWgR0o6ZVTnwhzpbN7vpr+YJBGuccbpQQpfhUE4tGYY7By
+8NtRO26Xne5hUuR2sD/OfpsGJr2jKQsXi2Dt/abX85y/YdrJU1OHbBYrjXWQDz1j
+dxvApSDjjdchnnBTRVDrfDE1vC7INbKHa+1QJMzLPQao9mbMB5II4MyHMmhgGhQ=
+=Hpng
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.6.14.ebuild b/sys-apps/dbus/dbus-1.6.14.ebuild
new file mode 100644
index 000000000000..466a1ec05159
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.6.14.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.6.14.ebuild,v 1.1 2013/09/22 16:20:25 ssuominen Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit autotools eutils linux-info flag-o-matic 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+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 )
+	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
+		${PYTHON_DEPS}
+		)"
+
+# 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
+
+	use test && python-any-r1_pkg_setup
+
+	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=(
+		--disable-silent-rules
+		--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-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() {
+	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
+		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."
+	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
+}