Dropped keepdir on /var/run/dbus as the init.d script already ensures this path exist...

Package-Manager: portage-2.1.10.11/cvs/Linux i686

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 7b53c47b3ed0c25a0f9010b84f83008cf9a025e6..e660702c19ad4f21966191bb79fc55f6a553c58f 100644 (file)
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,12 @@
 # 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.308 2011/10/19 00:52:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.309 2011/10/20 20:46:36 axs Exp $
+
+*dbus-1.4.16-r1 (20 Oct 2011)
+
+  20 Oct 2011; Ian Stakenvicius <axs@gentoo.org> +dbus-1.4.16-r1.ebuild:
+  Dropped keepdir on /var/run/dbus as the init.d script already ensures this
+  path exists (bug 387897)
 
   19 Oct 2011; Jeroen Roovers <jer@gentoo.org> dbus-1.4.16.ebuild:
   Stable for HPPA (bug #387257).

diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 25e8a46aec407a2ee6b2f0ef9e5e7f2f006ea178..59e2dbc3f029227e72425cfe93fb9bbfddb1e83a 100644 (file)
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 80-dbus 341 RMD160 3b7f55906289d91a1f0ed87edec7902ddac076c5 SHA1 df1f96934fbe164dc4f4e2e4d4b4cdeaf8cef2b5 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca1e07fd2
 AUX dbus-1.4.0-asneeded.patch 3696 RMD160 360f21c06d268116884ed441e7b91478829f1be5 SHA1 a15445bcc5d811276c681b543d0bcd14df9db32f SHA256 f785afd7943b3220ebcf2603b1c059a2dec46bdbfba376e60d8373ba3f933562
@@ -7,13 +7,14 @@ AUX dbus.init-1.0 1176 RMD160 1ad53e5859c94794b4dfcb0455bb63a0b858b83b SHA1 85a2
 DIST dbus-1.4.12.tar.gz 1878025 RMD160 4c5c718117ebf453844743f6d3c3525d7593d722 SHA1 6288a0826fe02d02ddbe62af03c9401501e69cc2 SHA256 da3c97fd546610558d588799e27c4fa81101e754acbcd34747a42c131f30dbe7
 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.16-r1.ebuild 4808 RMD160 e4aa5370c62f3f1cca880cc209546cd2c9f7f5ba SHA1 d5e1b778e6fc315b5cc584ca04d3db3876b35f2e SHA256 7a5be834f81f2c9415a8cab49804125099a24a60ce87ed7d24a985c28eba1e00
 EBUILD dbus-1.4.16.ebuild 4867 RMD160 2be4441b53e54f66162022942b2f08b5861b3a5f SHA1 0aba0660f5abb32626939375145a811a83b704cf SHA256 6a3445d514d00e69eac7ccaa73735dfeb3ebb7094c556d0d34cab2732da626e7
-MISC ChangeLog 45939 RMD160 aa2ebdbd930e76ebc867f3f2cf29af58e84e9e07 SHA1 5fc2f9b7067ec73e4ca28c7a88631274d47d87c5 SHA256 d13aa0403ff65af9c433ae5e0f68fdfddc3daf3054bdab9b8141da637bcef8ce
+MISC ChangeLog 46148 RMD160 6405855f2b97a9acf422d284b688cd80da102e94 SHA1 a7285312d00cedf738b915ae5d834c8fb7c8b24b SHA256 ec3c681d140c2e6742eff4747a79993f8a1f0650bdab2e64acebb9f8341c50d0
 MISC metadata.xml 244 RMD160 244bfcdb5c3c5eab051189d8adf5e572866b8c64 SHA1 580ce8a447f3237ea98b1d289b440bc89245e89b SHA256 552982cb042dce6d0051aef928f3cca7553e6d7327e0556f97f9e6e52e651b6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6eH24ACgkQVWmRsqeSphPfLwCcCmLqP9Re8O5++lbsmyRM2JSl
-jDcAn2hzjh5Sj9q+lVo7CYKfvCYVU8sK
-=CqkJ
+iF4EAREIAAYFAk6giKcACgkQAJxUfCtlWe3ZgAEAmPouM5eJLoOwlP044hg7PkO2
+tQ7eNzBFHfwQN8E/NoEA/0nY39NwSvWVuQKf3z2cyzQbpP1GVTKsYYuFsJCAQDWB
+=0zu1
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/dbus/dbus-1.4.16-r1.ebuild b/sys-apps/dbus/dbus-1.4.16-r1.ebuild
new file mode 100644 (file)
index 0000000..a2b1be6
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.4.16-r1.ebuild
@@ -0,0 +1,188 @@
+# 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-r1.ebuild,v 1.1 2011/10/20 20:46:36 axs 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)
+               --disable-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
+               --docdir=/usr/share/doc/${PF}
+               --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 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
+
+       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
+}