Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/dbus: dbus-1.6.18-r1.ebuild dbus-1.8.0.ebuild ChangeLog
Date: Mon, 28 Apr 2014 17:43:06
Message-Id: 20140428174302.BC18C2004B@flycatcher.gentoo.org
1 mgorny 14/04/28 17:43:02
2
3 Modified: dbus-1.6.18-r1.ebuild dbus-1.8.0.ebuild ChangeLog
4 Log:
5 Replace multilib_build_binaries with multilib_is_native_abi, in order to put an end to the confusion introduced by having two functions, the proper one suggesting it is just for binaries.
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
8
9 Revision Changes Path
10 1.14 sys-apps/dbus/dbus-1.6.18-r1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.6.18-r1.ebuild?rev=1.14&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.6.18-r1.ebuild?rev=1.14&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.6.18-r1.ebuild?r1=1.13&r2=1.14
15
16 Index: dbus-1.6.18-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.6.18-r1.ebuild,v
19 retrieving revision 1.13
20 retrieving revision 1.14
21 diff -u -r1.13 -r1.14
22 --- dbus-1.6.18-r1.ebuild 14 Mar 2014 22:13:56 -0000 1.13
23 +++ dbus-1.6.18-r1.ebuild 28 Apr 2014 17:43:02 -0000 1.14
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2014 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.6.18-r1.ebuild,v 1.13 2014/03/14 22:13:56 mattst88 Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.6.18-r1.ebuild,v 1.14 2014/04/28 17:43:02 mgorny Exp $
29
30 EAPI=5
31 PYTHON_COMPAT=( python2_7 )
32 @@ -111,7 +111,7 @@
33 "$(systemd_with_unitdir)"
34 )
35
36 - if multilib_build_binaries; then
37 + if multilib_is_native_abi; then
38 docconf=(
39 $(use_enable doc xml-docs) \
40 $(use_enable doc doxygen-docs)
41 @@ -137,7 +137,7 @@
42 einfo "Running configure in ${BUILD_DIR}"
43 ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
44
45 - if multilib_build_binaries && use test; then
46 + if multilib_is_native_abi && use test; then
47 mkdir "${TBD}"
48 cd "${TBD}"
49 einfo "Running configure in ${TBD}"
50 @@ -150,7 +150,7 @@
51 }
52
53 multilib_src_compile() {
54 - if multilib_build_binaries; then
55 + if multilib_is_native_abi; then
56 # after the compile, it uses a selinuxfs interface to
57 # check if the SELinux policy has the right support
58 use selinux && addwrite /selinux/access
59 @@ -158,7 +158,7 @@
60 einfo "Running make in ${BUILD_DIR}"
61 emake
62
63 - if multilib_build_binaries && use test; then
64 + if multilib_is_native_abi && use test; then
65 cd "${TBD}"
66 einfo "Running make in ${TBD}"
67 emake
68 @@ -174,7 +174,7 @@
69 }
70
71 multilib_src_install() {
72 - if multilib_build_binaries; then
73 + if multilib_is_native_abi; then
74 emake DESTDIR="${D}" install
75 else
76 emake DESTDIR="${D}" install-pkgconfigDATA
77
78
79
80 1.6 sys-apps/dbus/dbus-1.8.0.ebuild
81
82 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.8.0.ebuild?rev=1.6&view=markup
83 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.8.0.ebuild?rev=1.6&content-type=text/plain
84 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.8.0.ebuild?r1=1.5&r2=1.6
85
86 Index: dbus-1.8.0.ebuild
87 ===================================================================
88 RCS file: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.0.ebuild,v
89 retrieving revision 1.5
90 retrieving revision 1.6
91 diff -u -r1.5 -r1.6
92 --- dbus-1.8.0.ebuild 26 Feb 2014 19:21:07 -0000 1.5
93 +++ dbus-1.8.0.ebuild 28 Apr 2014 17:43:02 -0000 1.6
94 @@ -1,6 +1,6 @@
95 # Copyright 1999-2014 Gentoo Foundation
96 # Distributed under the terms of the GNU General Public License v2
97 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.0.ebuild,v 1.5 2014/02/26 19:21:07 ssuominen Exp $
98 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.0.ebuild,v 1.6 2014/04/28 17:43:02 mgorny Exp $
99
100 EAPI=5
101 PYTHON_COMPAT=( python2_7 )
102 @@ -107,7 +107,7 @@
103 "$(systemd_with_unitdir)"
104 )
105
106 - if multilib_build_binaries; then
107 + if multilib_is_native_abi; then
108 docconf=(
109 --enable-xml-docs
110 $(use_enable doc doxygen-docs)
111 @@ -128,7 +128,7 @@
112 einfo "Running configure in ${BUILD_DIR}"
113 ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
114
115 - if multilib_build_binaries && use test; then
116 + if multilib_is_native_abi && use test; then
117 mkdir "${TBD}"
118 cd "${TBD}"
119 einfo "Running configure in ${TBD}"
120 @@ -141,7 +141,7 @@
121 }
122
123 multilib_src_compile() {
124 - if multilib_build_binaries; then
125 + if multilib_is_native_abi; then
126 # after the compile, it uses a selinuxfs interface to
127 # check if the SELinux policy has the right support
128 use selinux && addwrite /selinux/access
129 @@ -149,7 +149,7 @@
130 einfo "Running make in ${BUILD_DIR}"
131 emake
132
133 - if multilib_build_binaries && use test; then
134 + if multilib_is_native_abi && use test; then
135 cd "${TBD}"
136 einfo "Running make in ${TBD}"
137 emake
138 @@ -165,7 +165,7 @@
139 }
140
141 multilib_src_install() {
142 - if multilib_build_binaries; then
143 + if multilib_is_native_abi; then
144 emake DESTDIR="${D}" install
145 else
146 emake DESTDIR="${D}" install-pkgconfigDATA
147
148
149
150 1.415 sys-apps/dbus/ChangeLog
151
152 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?rev=1.415&view=markup
153 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?rev=1.415&content-type=text/plain
154 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?r1=1.414&r2=1.415
155
156 Index: ChangeLog
157 ===================================================================
158 RCS file: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v
159 retrieving revision 1.414
160 retrieving revision 1.415
161 diff -u -r1.414 -r1.415
162 --- ChangeLog 15 Mar 2014 08:27:43 -0000 1.414
163 +++ ChangeLog 28 Apr 2014 17:43:02 -0000 1.415
164 @@ -1,6 +1,12 @@
165 # ChangeLog for sys-apps/dbus
166 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
167 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.414 2014/03/15 08:27:43 ssuominen Exp $
168 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.415 2014/04/28 17:43:02 mgorny Exp $
169 +
170 + 28 Apr 2014; Michał Górny <mgorny@g.o> dbus-1.6.18-r1.ebuild,
171 + dbus-1.8.0.ebuild:
172 + Replace multilib_build_binaries with multilib_is_native_abi, in order to put
173 + an end to the confusion introduced by having two functions, the proper one
174 + suggesting it is just for binaries.
175
176 15 Mar 2014; Samuli Suominen <ssuominen@g.o> -dbus-1.6.12.ebuild,
177 -dbus-1.6.14.ebuild, -dbus-1.6.16.ebuild, -dbus-1.6.18.ebuild: