Security cleanup for bug #539482
authorKristian Fiskerstrand <k_f@gentoo.org>
Sat, 28 Feb 2015 22:22:23 +0000 (22:22 +0000)
committerKristian Fiskerstrand <k_f@gentoo.org>
Sat, 28 Feb 2015 22:22:23 +0000 (22:22 +0000)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xFED5002857C1ABFA!

sys-apps/dbus/ChangeLog
sys-apps/dbus/Manifest
sys-apps/dbus/dbus-1.8.10.ebuild [deleted file]
sys-apps/dbus/dbus-1.8.12.ebuild [deleted file]

index c9079beed18c7f9af5a69e815cd9375851880ed1..053186f2fed916af95622f716491f516647f8675 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.473 2015/02/24 10:56:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.474 2015/02/28 22:22:15 k_f Exp $
+
+  28 Feb 2015; Kristian Fiskerstrand <k_f@gentoo.org> -dbus-1.8.10.ebuild,
+  -dbus-1.8.12.ebuild:
+  Security cleanup for bug #539482
 
   24 Feb 2015; Agostino Sarubbo <ago@gentoo.org> dbus-1.8.16.ebuild:
   Stable for alpha, wrt bug #539482
index 6ec488ac90c2296fc17120460ce4b333106eafcc..e17241a44ef9f2ad92a821d561eebd9e471d40f3 100644 (file)
@@ -3,28 +3,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.16.tar.gz 1866436 SHA256 7f795268efd343ff0498786acb35097564390d40b1b6158daf1b4f742b522b07 SHA512 79e0fb21912fe5644e1babf96fc2a64595edef6524ef50d54f6beb8cd0f1224b8484a52a7815494b40bd00bf048176002ab35443c0bb6bd04abdc3c60599f1d5 WHIRLPOOL 5e992caf51c0fb24885099b957ce01205a249118c5db27c5161e6d45ae85a889d7f26d32dfa03a207025e87e233f74c6cffd09a5ccc44d4e598d3d535b8d4247
-EBUILD dbus-1.8.10.ebuild 7186 SHA256 993f3c088c84fa4f74056fcc3fd5053b40ca5d093664dc41430a9358fade6ac8 SHA512 ca7d89c1bbcc7488a239fe4598a301315b800f7b6a0e2942d43f621bfe9774944850f93f0f074ed14f22c8d001a0f97d7f6fa6787a1ec873f1771dbd290122d4 WHIRLPOOL d422610ef684dfc7b8835499a30910fb10816c18e7fa140de1481c27eb34f02aa8af80775fd7f9cf6fb30f451d4bc8938835ebcf120421c7a5265661866cb440
-EBUILD dbus-1.8.12.ebuild 7199 SHA256 060af66a2c2093d01f8e123c9b322e199ec11315b58173071ce2ed5059f47b2a SHA512 b6e8a0bb3ebac676dc08a63b9678e277c204ba0a58682e57a4e0a119f9f389db877d6f77545c82553205f91f28f564218e6012a4452e008ed5091be964c37707 WHIRLPOOL 198d1a75374364cd2465e849ed875fda03523372aea2c41f4206e3ebc8ff3a5f0b3b115c943ba794dc28dd129f9b965644d95d74358feb7f808abe5772464f0d
 EBUILD dbus-1.8.16.ebuild 7186 SHA256 bedf4fc8bee6876373aa1a127a1233dcd988c30b68821f2d53d7283766723eea SHA512 dc694532415f9bc08ec62bcda349978a068dc2139137d39d0dc5b956dffe5e636bb41e8b30d2af2841c92e7f1f28aa21ce6b9c4dae3209c904f592ab18621a37 WHIRLPOOL 9ca7d7b877b44fe0e596931a8a03af380d1c2d32accf708e538e432aa08f7892287654cd85d7ac69a2681d691b1d08ca41b0558bb8d382022c3ac3d3d7b93eb3
-MISC ChangeLog 67103 SHA256 88d123e332b198de8a2e08dd0149911461da118d427bd304232a60269cced227 SHA512 efdd3809b6f956d61820e29fd2d24dfb59abdec888b508b1a4c09688d0daad7ff191fe9027fec3eb058f29fbe95339a1f4cf72dd4c721e546ea58376c63825de WHIRLPOOL fa9c8148da7d369ef04bb177ab7e68160340b8b4747bcd9141f5a8500e2c59486d9d08fa9307077b33f8e7040df63c17777915ab1c8030a9cf13da62e7bf99a3
+MISC ChangeLog 67237 SHA256 a05527666dacc752e1b320bb0cca202b1bf1edddbfb8b7528bf7908ce9eb7e02 SHA512 e3954c747c7bcc07295798a7e0e33621a2fc5f31b299735e53cfecebc1aad8ce0d06a05fe068366e4d450e616e6dc5f728f2e965d60bced695e608c2d9f99155 WHIRLPOOL 3afbbfc7761707e4c75d97bf94cc483ac65c0d3a12ce5e866e284f9f1c47ad708c6577ecb49e1bf5e422e8935fe131f0e32fa5e0c53530265847296bc6a56183
 MISC metadata.xml 427 SHA256 d8fc8fedafc547578a85222cb60fb7eff3740c8ce101b22ba75aa3e5028135ce SHA512 2f8f64ded5050e87ce679d944dcf9c9a801ea03ee14471ab0702f10339f3f995701c313bfe10e7ab01f1bc784f04a5e6efbb29ea0b44513b9b3e384370956dc5 WHIRLPOOL 7a2add023434038b287c141213c2caf2adcc7ff5bcfb8025b2db0163bedd436fea64dd0e1a072f00232722738705fdc1f367e758d108373146d6fbea8803d5b2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU7Fj8AAoJELp701BxlEWf1fkP/1FKJ92AcPlpgekdAFQ69nYM
-SeJUghM9aQ/KI1nqMi8auKDOcTL8PBOuwPb2ZcSV3kVSJbtok2Sdxq5LZJtLogno
-6158zT88U6R1kMJPz5pZLSEVHY5jSr5x6QMabp8Rdz4cG4JgHTz83Ay85asCj2A+
-+FuNMd/tVW4jZKjHttXhdzun0v4UjFKq7BsMTLOATM9XcNKovQpf0gqLHJRDiNnv
-YWQI9rBycNu5boMasZqKbLJGnYIwg0VJWVUJu7NrBj1lddHQhB4RGMd/3bj5ott0
-5pRqJ7OK+pF7aWZjVyUFH5FZq81pnOQSqtCv7AY1JuttoYmRaURS7xxAdqOmj+vj
-NefVclgRoa3+Qn9zInBqTg87bHsImi7AjUhaT8JoelMydeWK+2O4aHqDqVjdCbu0
-2yqtGow/308F7PkrkIu2Cr5kLFK86wxukpK/SSuUOe7JeLhbzcd7/YWGX+TrbIoi
-j1uFE3Yv2OlaFRFRsNyBwzr2cBvRtfl7lEsY/79xiGY9rV1TRvrTOD/umxfuRwU+
-gg3RYBmChb/X8/E8A1kYgV62SIbXpsZhvhxsxidNf7pLb1w3aMr0XsYc3CA583IO
-S4k7ISgxF+5JzQcZ8ggAekyuKSJYP/MVHHsOvkxl6E1dq+mJe1MwEgVac/LoZNia
-NvRrS4cUXvSiRlaS0+p/
-=OgDM
+iQEcBAEBCAAGBQJU8j+YAAoJEP7VAChXwav6JocIAIaWWZ62ro/YWxRQInS362cs
+XPnYTm5FWo2p/Ri8W75fGJ7Tg9OBRYpspEKef2JwDLSMp+1KimfaB+SphGiHLGwO
+T0c/2XcZ8607efsMX0xNd4jdUOZz+ExHyqYXdA0+B0L3HhLrpDOSDMlB6UypdmAQ
+5KlfavB7x4uewa+G15WNBZgvdE0JhWlVmJ1tT2mO+mXGkoZNlZezocgfbc45HNJK
+bZMU4HGFrfSIirH7Ul2f5GKCufhSu0o0iVJ4TcqCVUckzBr+mMkutRqLFKS85kEq
+RHjTDbGT0tVPfdPu8/v+TZnDmNBpcQZOzyxMYkj5fDoMo/IkyUyqgaNT1MDFmak=
+=H8KV
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.8.10.ebuild b/sys-apps/dbus/dbus-1.8.10.ebuild
deleted file mode 100644 (file)
index a59beba..0000000
+++ /dev/null
@@ -1,255 +0,0 @@
-# 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.10.ebuild,v 1.11 2014/12/03 09:57:36 ago 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
-}
diff --git a/sys-apps/dbus/dbus-1.8.12.ebuild b/sys-apps/dbus/dbus-1.8.12.ebuild
deleted file mode 100644 (file)
index c0306fb..0000000
+++ /dev/null
@@ -1,255 +0,0 @@
-# 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
-}