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