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