commit:     5ae5588a4059163eddbe775f65fe5919a5b293cc
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  2 11:02:24 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar  2 12:15:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ae5588a

sys-apps/dbus: Bump to version 1.12.6

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-apps/dbus/Manifest           |   1 +
 sys-apps/dbus/dbus-1.12.6.ebuild | 274 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 275 insertions(+)

diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index b79be56a1d4..31933fe9810 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -2,3 +2,4 @@ DIST dbus-1.10.18.tar.gz 1986589 BLAKE2B 
95b8a04362e78001e723301e5f170e923bca8b7
 DIST dbus-1.10.24.tar.gz 1991358 BLAKE2B 
ffa82a26f156d5d5b5864cc675f2a24b103dcf5c73ac8a570e1e13f37f9d6b8c2aea2545b1a3979d3a94ce7a2ddda7280afde4ecd9b682d3d31355f82af217f7
 SHA512 
fc0b88b756affdb4fc7a62e84a6f7757121293afeadc38acf8aac48b6c2b82531e136a575be2ab503a39d7669cb7b609a021e20c1064e28c965c091e94c4f68c
 DIST dbus-1.12.2.tar.gz 2063143 BLAKE2B 
0618381befb7af7d4e0c2f1d9e32ee7ee70f17905783e414ab47acd7dcf5993329e430869a6cd9de33cc5919c880fed73eb1246d3ac2929c3d50d331efc92ca7
 SHA512 
523698ae543a4f1d9142898351ed38827882a3ca583ca7934676af48d09219ea562ae77d734cd142e5ca0d5e74f9e8d0fdeb1019592ca3524e2b690c6283f7cd
 DIST dbus-1.12.4.tar.gz 2067402 BLAKE2B 
621a9223c9d20a76415935d421a506100bbdf4852dc3c2a4f221750f739757a4945d60cb4a1f9032602f2993b868b502e7eb1835c8d2764666902c01daa01ba5
 SHA512 
ca9f7c76f705aca0f71366627fadf8b5c68992d5bcb6fae1746a8c14e9dc93c4492e80c63b6fd522b8753ec264df046e33482a5ce20be82adf181a6dd69b36a5
+DIST dbus-1.12.6.tar.gz 2068612 BLAKE2B 
3dbb05e899e511a636816393ebc28548cc2ecaabaa0c04737189a0812791da195708ee455d7b0439fc81eea113f4bd8fc64b1b9b93e9dac84664b9c51049e75c
 SHA512 
a0599329190e90d5982215138a19031028ed825f54c76c1ae13b54c2e4ddf14c949eacaac05c667db11bca13fb4bbdf8855fc9e15641cece55be1efde00c41ab

diff --git a/sys-apps/dbus/dbus-1.12.6.ebuild b/sys-apps/dbus/dbus-1.12.6.ebuild
new file mode 100644
index 00000000000..d53c2a80ec6
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.12.6.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit autotools ltprune linux-info flag-o-matic python-any-r1 
readme.gentoo-r1 systemd virtualx user multilib-minimal
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to 
each other"
+HOMEPAGE="https://dbus.freedesktop.org/";
+SRC_URI="https://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 ~amd64-linux ~arm-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="debug doc elogind selinux static-libs systemd test user-session X"
+
+#RESTRICT="test"
+
+REQUIRED_USE="
+       ?? ( elogind systemd )
+       test? ( debug )
+"
+
+CDEPEND="
+       >=dev-libs/expat-2.1.0
+       selinux? ( sys-libs/libselinux )
+       elogind? ( sys-auth/elogind )
+       systemd? ( sys-apps/systemd:0= )
+       X? (
+               x11-libs/libX11
+               x11-libs/libXt
+               )
+"
+DEPEND="${CDEPEND}
+       app-text/xmlto
+       app-text/docbook-xml-dtd:4.4
+       dev-libs/expat
+       sys-devel/autoconf-archive
+       virtual/pkgconfig
+       doc? ( app-doc/doxygen )
+       test? (
+               >=dev-libs/glib-2.40:2
+               ${PYTHON_DEPS}
+               )
+"
+RDEPEND="${CDEPEND}
+       selinux? ( sec-policy/selinux-dbus )
+"
+
+DOC_CONTENTS="
+       Some applications require a session bus in addition to the system
+       bus. Please see \`man dbus-launch\` for more information.
+"
+
+# out of sources build dir for make check
+TBD="${WORKDIR}/${P}-tests-build"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-enable-elogind.patch"
+)
+
+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
+
+       default
+
+       # required 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)
+               --disable-apparmor
+               $(use_enable kernel_linux inotify)
+               $(use_enable kernel_FreeBSD kqueue)
+               $(use_enable elogind)
+               $(use_enable systemd)
+               $(use_enable user-session)
+               --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-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+               --with-dbus-user=messagebus
+               $(use_with X x)
+       )
+
+       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-elogind
+                       --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 virtx emake -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-r1 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
+       readme.gentoo_create_doc
+
+       prune_libtool_files --all
+}
+
+pkg_postinst() {
+       readme.gentoo_print_elog
+
+       # 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 "${EPREFIX}"/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
+
+       if use user-session; then
+               ewarn "You have enabled user-session. Please note this can 
cause"
+               ewarn "bogus behaviors in several dbus consumers that are not 
prepared"
+               ewarn "for this dbus activation method yet."
+               ewarn
+               ewarn "See the following link for background on this change:"
+               ewarn 
"https://lists.freedesktop.org/archives/systemd-devel/2015-January/027711.html";
+               ewarn
+               ewarn "Known issues are tracked here:"
+               ewarn "https://bugs.gentoo.org/show_bug.cgi?id=576028";
+       fi
+}

Reply via email to