Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/dbus/
Date: Tue, 11 Oct 2016 05:08:45
Message-Id: 1476162515.ca4800e4b81fd2c48483318a8310d304bad9a283.polynomial-c@gentoo
1 commit: ca4800e4b81fd2c48483318a8310d304bad9a283
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 11 05:08:35 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 11 05:08:35 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca4800e4
7
8 sys-apps/dbus: Removed old.
9
10 Package-Manager: portage-2.3.1
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-apps/dbus/Manifest | 1 -
14 sys-apps/dbus/dbus-1.8.20.ebuild | 252 ---------------------------------------
15 2 files changed, 253 deletions(-)
16
17 diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
18 index a8aa557..91be394 100644
19 --- a/sys-apps/dbus/Manifest
20 +++ b/sys-apps/dbus/Manifest
21 @@ -2,5 +2,4 @@ DIST dbus-1.10.10.tar.gz 1984077 SHA256 9d8f1d069ab4d1a0255d7b400ea3bcef4430c42e
22 DIST dbus-1.10.12.tar.gz 1984805 SHA256 210a79430b276eafc6406c71705e9140d25b9956d18068df98a70156dc0e475d SHA512 6616c7b2926a6fb6158d0a0a24d1b887173ca215a2f3185b95cc5f08df64fed1977e16c86c6ae530960453b6c585ae24ea4c9976e7537a45f9c6366c43baa52d WHIRLPOOL 9bd9ed70c4d9890dad09b2bcd07ee40ef472f1436cefe3bc89aaddbb183532939d6ce19da721a673a39f2e6b07e634b179190cec00e1a48fa2d9be6c830cc696
23 DIST dbus-1.10.8.tar.gz 1976732 SHA256 baf3d22baa26d3bdd9edc587736cd5562196ce67996d65b82103bedbe1f0c014 SHA512 becc6c27b81a716ca498f3cdce2dae9fe5b39d7d334f66a9eae7ae8ce6448ea8c5fdfc500138371992828693a2f8f3a503efb147e163103aa64eac9b4bcf9906 WHIRLPOOL 3b2276bbc606a3997dd95d831271b8b102f45e8fc5696d88886f1e7b72fd134413cd3d3dd1a2608dcdfdf8d4caefc94e634c90b278fccd7d74cc4cce44696d92
24 DIST dbus-1.8.16.tar.gz 1866436 SHA256 7f795268efd343ff0498786acb35097564390d40b1b6158daf1b4f742b522b07 SHA512 79e0fb21912fe5644e1babf96fc2a64595edef6524ef50d54f6beb8cd0f1224b8484a52a7815494b40bd00bf048176002ab35443c0bb6bd04abdc3c60599f1d5 WHIRLPOOL 5e992caf51c0fb24885099b957ce01205a249118c5db27c5161e6d45ae85a889d7f26d32dfa03a207025e87e233f74c6cffd09a5ccc44d4e598d3d535b8d4247
25 -DIST dbus-1.8.20.tar.gz 1871722 SHA256 5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a SHA512 d63c29267e0445e329dc811e72d7858847fbae260920fd359b1fa889f08dead2a8b380e372718994daa92a262af970d1fcc58034fbcb8ffb3026ab5f30f63067 WHIRLPOOL 9eaf3ab12396159e119cfe3435fc5d160440dab4c4abce4d506450f6db59b72e6e4feba43b1ee9fd304a8e514983186a8e61f3a1f0c917c2c72891f72167201e
26 DIST dbus-1.8.22.tar.gz 1894768 SHA256 19a52e5a42b2a2faf15a54745a098bb8cf55a76598fa4a0b8b6d886adcbe1d53 SHA512 e165ca07d0c1bc7a9e7e5e5541bb61fc24dccf52e762ce52e4c05c9a5a503bdcec6202171ca92789cde57121be360f40ac28b0ba5f9a7c23dbc4da4aec3627ff WHIRLPOOL b739a98b7be190f1ff5b40b8fe4e828e57519c8289a0806932d59037022be461806d28ec988d2766c82054fa066696c558e7d9371c12c2c9c66d6679f5e7a64f
27
28 diff --git a/sys-apps/dbus/dbus-1.8.20.ebuild b/sys-apps/dbus/dbus-1.8.20.ebuild
29 deleted file mode 100644
30 index af1fcdc..00000000
31 --- a/sys-apps/dbus/dbus-1.8.20.ebuild
32 +++ /dev/null
33 @@ -1,252 +0,0 @@
34 -# Copyright 1999-2015 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -# $Id$
37 -
38 -EAPI=5
39 -PYTHON_COMPAT=( python2_7 )
40 -
41 -inherit autotools eutils linux-info flag-o-matic python-any-r1 readme.gentoo systemd virtualx user multilib-minimal
42 -
43 -DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
44 -HOMEPAGE="https://dbus.freedesktop.org/"
45 -SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
46 -
47 -LICENSE="|| ( AFL-2.1 GPL-2 )"
48 -SLOT="0"
49 -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"
50 -IUSE="debug doc selinux static-libs systemd test X"
51 -
52 -CDEPEND="
53 - >=dev-libs/expat-2
54 - selinux? (
55 - sys-libs/libselinux
56 - )
57 - systemd? ( sys-apps/systemd:0= )
58 - X? (
59 - x11-libs/libX11
60 - x11-libs/libXt
61 - )
62 - abi_x86_32? (
63 - !<=app-emulation/emul-linux-x86-baselibs-20131008-r4
64 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
65 - )
66 -"
67 -DEPEND="${CDEPEND}
68 - app-text/xmlto
69 - app-text/docbook-xml-dtd:4.4
70 - virtual/pkgconfig
71 - doc? ( app-doc/doxygen )
72 - test? (
73 - >=dev-libs/glib-2.24:2
74 - ${PYTHON_DEPS}
75 - )
76 -"
77 -RDEPEND="${CDEPEND}
78 - selinux? ( sec-policy/selinux-dbus )
79 -"
80 -
81 -DOC_CONTENTS="
82 - Some applications require a session bus in addition to the system
83 - bus. Please see \`man dbus-launch\` for more information.
84 -"
85 -
86 -# out of sources build dir for make check
87 -TBD=${WORKDIR}/${P}-tests-build
88 -
89 -pkg_setup() {
90 - enewgroup messagebus
91 - enewuser messagebus -1 -1 -1 messagebus
92 -
93 - use test && python-any-r1_pkg_setup
94 -
95 - if use kernel_linux; then
96 - CONFIG_CHECK="~EPOLL"
97 - linux-info_pkg_setup
98 - fi
99 -}
100 -
101 -src_prepare() {
102 - # Tests were restricted because of this
103 - sed -i \
104 - -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
105 - -e '/"dispatch"/d' \
106 - bus/test-main.c || die
107 -
108 - epatch_user
109 -
110 - # required for asneeded patch but also for bug 263909, cross-compile so
111 - # don't remove eautoreconf
112 - eautoreconf
113 -}
114 -
115 -multilib_src_configure() {
116 - local docconf myconf
117 -
118 - # so we can get backtraces from apps
119 - case ${CHOST} in
120 - *-mingw*)
121 - # error: unrecognized command line option '-rdynamic' wrt #488036
122 - ;;
123 - *)
124 - append-flags -rdynamic
125 - ;;
126 - esac
127 -
128 - # libaudit is *only* used in DBus wrt SELinux support, so disable it, if
129 - # not on an SELinux profile.
130 - myconf=(
131 - --localstatedir="${EPREFIX}/var"
132 - --docdir="${EPREFIX}/usr/share/doc/${PF}"
133 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
134 - $(use_enable static-libs static)
135 - $(use_enable debug verbose-mode)
136 - --disable-asserts
137 - --disable-checks
138 - $(use_enable selinux)
139 - $(use_enable selinux libaudit)
140 - $(use_enable kernel_linux inotify)
141 - $(use_enable kernel_FreeBSD kqueue)
142 - $(use_enable systemd)
143 - --disable-embedded-tests
144 - --disable-modular-tests
145 - $(use_enable debug stats)
146 - --with-session-socket-dir="${EPREFIX}"/tmp
147 - --with-system-pid-file="${EPREFIX}"/var/run/dbus.pid
148 - --with-system-socket="${EPREFIX}"/var/run/dbus/system_bus_socket
149 - --with-dbus-user=messagebus
150 - $(use_with X x)
151 - "$(systemd_with_unitdir)"
152 - )
153 -
154 - if [[ ${CHOST} == *-darwin* ]]; then
155 - myconf+=(
156 - --enable-launchd
157 - --with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
158 - )
159 - fi
160 -
161 - if multilib_is_native_abi; then
162 - docconf=(
163 - --enable-xml-docs
164 - $(use_enable doc doxygen-docs)
165 - )
166 - else
167 - docconf=(
168 - --disable-xml-docs
169 - --disable-doxygen-docs
170 - )
171 - myconf+=(
172 - --disable-selinux
173 - --disable-libaudit
174 - --disable-systemd
175 - --without-x
176 -
177 - # expat is used for the daemon only
178 - # fake the check for multilib library build
179 - ac_cv_lib_expat_XML_ParserCreate_MM=yes
180 - )
181 - fi
182 -
183 - einfo "Running configure in ${BUILD_DIR}"
184 - ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
185 -
186 - if multilib_is_native_abi && use test; then
187 - mkdir "${TBD}" || die
188 - cd "${TBD}" || die
189 - einfo "Running configure in ${TBD}"
190 - ECONF_SOURCE="${S}" econf "${myconf[@]}" \
191 - $(use_enable test asserts) \
192 - $(use_enable test checks) \
193 - $(use_enable test embedded-tests) \
194 - $(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
195 - fi
196 -}
197 -
198 -multilib_src_compile() {
199 - if multilib_is_native_abi; then
200 - # after the compile, it uses a selinuxfs interface to
201 - # check if the SELinux policy has the right support
202 - use selinux && addwrite /selinux/access
203 -
204 - einfo "Running make in ${BUILD_DIR}"
205 - emake
206 -
207 - if use test; then
208 - einfo "Running make in ${TBD}"
209 - emake -C "${TBD}"
210 - fi
211 - else
212 - emake -C dbus libdbus-1.la
213 - fi
214 -}
215 -
216 -src_test() {
217 - DBUS_VERBOSE=1 Xemake -j1 -C "${TBD}" check
218 -}
219 -
220 -multilib_src_install() {
221 - if multilib_is_native_abi; then
222 - emake DESTDIR="${D}" install
223 - else
224 - emake DESTDIR="${D}" install-pkgconfigDATA
225 - emake DESTDIR="${D}" -C dbus \
226 - install-libLTLIBRARIES install-dbusincludeHEADERS \
227 - install-nodist_dbusarchincludeHEADERS
228 - fi
229 -}
230 -
231 -multilib_src_install_all() {
232 - newinitd "${FILESDIR}"/dbus.initd dbus
233 -
234 - if use X; then
235 - # dbus X session script (#77504)
236 - # turns out to only work for GDM (and startx). has been merged into
237 - # other desktop (kdm and such scripts)
238 - exeinto /etc/X11/xinit/xinitrc.d
239 - doexe "${FILESDIR}"/80-dbus
240 - fi
241 -
242 - # needs to exist for dbus sessions to launch
243 - keepdir /usr/share/dbus-1/services
244 - keepdir /etc/dbus-1/{session,system}.d
245 - # machine-id symlink from pkg_postinst()
246 - keepdir /var/lib/dbus
247 - # let the init script create the /var/run/dbus directory
248 - rm -rf "${ED}"/var/run
249 -
250 - dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
251 - readme.gentoo_create_doc
252 -
253 - prune_libtool_files --all
254 -}
255 -
256 -pkg_postinst() {
257 - readme.gentoo_print_elog
258 -
259 - # Ensure unique id is generated and put it in /etc wrt #370451 but symlink
260 - # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
261 - # dependencies with hardcoded paths (although the known ones got fixed already)
262 - dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id
263 - ln -sf "${EPREFIX}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
264 -
265 - if [[ ${CHOST} == *-darwin* ]]; then
266 - local plist="org.freedesktop.dbus-session.plist"
267 - elog
268 - elog
269 - elog "For MacOS/Darwin we now ship launchd support for dbus."
270 - elog "This enables autolaunch of dbus at session login and makes"
271 - elog "dbus usable under MacOS/Darwin."
272 - elog
273 - elog "The launchd plist file ${plist} has been"
274 - elog "installed in ${EPREFIX}/Library/LaunchAgents."
275 - elog "For it to be used, you will have to do all of the following:"
276 - elog " + cd ~/Library/LaunchAgents"
277 - elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
278 - elog " + logout and log back in"
279 - elog
280 - elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
281 - elog "specified and refused to start otherwise, then export the"
282 - elog "the following to your environment:"
283 - elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
284 - fi
285 -}