Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys-apps/dbus/ChangeLog9
-rw-r--r--sys-apps/dbus/Manifest38
-rw-r--r--sys-apps/dbus/dbus-0.62-r1.ebuild6
-rw-r--r--sys-apps/dbus/dbus-0.95.ebuild10
-rw-r--r--sys-apps/dbus/files/dbus-0.95-pass-context.patch11
5 files changed, 55 insertions, 19 deletions
diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 97a064aab277..ee44482965a8 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-apps/dbus
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.143 2006/11/05 09:07:13 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.144 2006/11/05 17:54:22 cardoe Exp $
+
+ 05 Nov 2006; Doug Goldstein <cardoe@gentoo.org>
+ +files/dbus-0.95-pass-context.patch, dbus-0.62-r1.ebuild,
+ dbus-0.95.ebuild:
+ Apply patch from FreeDesktop.org bug #8298 for FreeBSD support. Removed an
+ unnecessary patch and comment from 0.62 since we switched to expat from
+ libxml.
*dbus-0.95 (05 Nov 2006)
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index f882ea9e6466..461688ad0b50 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX 30-dbus 243 RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 SHA1 35ee3a5d3db9c7e372603ce916e17a41edd01d36 SHA256 a8e8fec9769cc5d46df8216f7d1e1f9df422c4e46f293fd70d4b017fb01d959d
MD5 d14e59575f04e55d21a04907b6fd9f3c files/30-dbus 243
RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 files/30-dbus 243
@@ -30,6 +33,10 @@ AUX dbus-0.61-qt-disabling.patch 501 RMD160 a7c1af95cc8dd455387eefad00fa90d86015
MD5 1d1c73d8eea0a6f4ffe70c8091409ad0 files/dbus-0.61-qt-disabling.patch 501
RMD160 a7c1af95cc8dd455387eefad00fa90d86015bbda files/dbus-0.61-qt-disabling.patch 501
SHA256 acfd9f175223cb2679d37b941cae9d54adbd494be3c0f4f7be7e004c0bd02a20 files/dbus-0.61-qt-disabling.patch 501
+AUX dbus-0.95-pass-context.patch 359 RMD160 112d44b65ee7abe1a267957da72ed306ba8dbec6 SHA1 843c41e5c1a7adb2fd1aa5211d8cc0c0d2c7659a SHA256 3bb25a75a3dcba4f586087c09e3acbfc7b30e6f9a77573f5b0a1f0c4347ca4aa
+MD5 04a52ac49915ed26c6dadf615986c667 files/dbus-0.95-pass-context.patch 359
+RMD160 112d44b65ee7abe1a267957da72ed306ba8dbec6 files/dbus-0.95-pass-context.patch 359
+SHA256 3bb25a75a3dcba4f586087c09e3acbfc7b30e6f9a77573f5b0a1f0c4347ca4aa files/dbus-0.95-pass-context.patch 359
AUX dbus.init-0.61 1377 RMD160 a6287fbad2c0b4532c7527895684aef82df46566 SHA1 6b3aee70b21ecd3dcbfe7df15e579e82f3415953 SHA256 c1dd746e70ec6e1a0d04ae39308f6341833ae4db2a2d0fc65e156279ff5eb5d4
MD5 791bda1b16e54eba80a07d873dc97763 files/dbus.init-0.61 1377
RMD160 a6287fbad2c0b4532c7527895684aef82df46566 files/dbus.init-0.61 1377
@@ -46,22 +53,22 @@ EBUILD dbus-0.61-r1.ebuild 4176 RMD160 6b872a427b30aa833a3b31094bb18ea784db4f70
MD5 cbb340c4f87dd24ff5eac66e37c9c3b1 dbus-0.61-r1.ebuild 4176
RMD160 6b872a427b30aa833a3b31094bb18ea784db4f70 dbus-0.61-r1.ebuild 4176
SHA256 765a76fddace527bb6daf6c44c932e64fa6e78deda6cdc3292b96ec5c4264c90 dbus-0.61-r1.ebuild 4176
-EBUILD dbus-0.62-r1.ebuild 4186 RMD160 e4130b3c9f6014cbd18308cb14e5cfc8cb2a3235 SHA1 3100cc3cb9550bb7209669486d9df8c79d319c0b SHA256 152ed31bcf176f1bc497c5ee85c030b404af6699ae1b5182190f19ae09d73c52
-MD5 ab6a396569b25df316c4379f3477eb33 dbus-0.62-r1.ebuild 4186
-RMD160 e4130b3c9f6014cbd18308cb14e5cfc8cb2a3235 dbus-0.62-r1.ebuild 4186
-SHA256 152ed31bcf176f1bc497c5ee85c030b404af6699ae1b5182190f19ae09d73c52 dbus-0.62-r1.ebuild 4186
+EBUILD dbus-0.62-r1.ebuild 4067 RMD160 14de9a0c850248115583da204b247dde4c830a6d SHA1 9aecd39627ed586ca259a90b749d339dda9bd911 SHA256 da122e5c5dcc3c82cca49c2c0b7074914d234b26354b0c11169d655f8ffe5ed0
+MD5 c05436fe1dab52891b991135c4565eb4 dbus-0.62-r1.ebuild 4067
+RMD160 14de9a0c850248115583da204b247dde4c830a6d dbus-0.62-r1.ebuild 4067
+SHA256 da122e5c5dcc3c82cca49c2c0b7074914d234b26354b0c11169d655f8ffe5ed0 dbus-0.62-r1.ebuild 4067
EBUILD dbus-0.94.ebuild 2792 RMD160 e4b4a9dce755ae5d7f4901e9831fc29ece619361 SHA1 7b35022a529a245b7f2d8057eafb375ac72f3208 SHA256 0fb07937e0fe0f1ff912858e0b324858fc25c4923d8e22ac0cb1824f70b60f8e
MD5 f652b5e0d0c1d9eee890a6fbe31fa03c dbus-0.94.ebuild 2792
RMD160 e4b4a9dce755ae5d7f4901e9831fc29ece619361 dbus-0.94.ebuild 2792
SHA256 0fb07937e0fe0f1ff912858e0b324858fc25c4923d8e22ac0cb1824f70b60f8e dbus-0.94.ebuild 2792
-EBUILD dbus-0.95.ebuild 2996 RMD160 a840419b44a4afca168bc2f4329cec3a4baca1d0 SHA1 83ca3a1196ad53af858f91afebfea05c1194d6b0 SHA256 7dea21deff097595fce94040d96eafc81fd685184942febca46563b7baeb6824
-MD5 c400b71069fad01ff96da76a22ceeb90 dbus-0.95.ebuild 2996
-RMD160 a840419b44a4afca168bc2f4329cec3a4baca1d0 dbus-0.95.ebuild 2996
-SHA256 7dea21deff097595fce94040d96eafc81fd685184942febca46563b7baeb6824 dbus-0.95.ebuild 2996
-MISC ChangeLog 21258 RMD160 30016fd265f1d342b07a2da18d5ab1c21fe5bb52 SHA1 ae6201b209f01bd08aab410e76c87823c05fd4ca SHA256 683df658d8e798a8c27254d3c68c847ee798cb9d255721b7ef8e6ccfe5178533
-MD5 f594f3e80e5b8479491e01d3e0b22b76 ChangeLog 21258
-RMD160 30016fd265f1d342b07a2da18d5ab1c21fe5bb52 ChangeLog 21258
-SHA256 683df658d8e798a8c27254d3c68c847ee798cb9d255721b7ef8e6ccfe5178533 ChangeLog 21258
+EBUILD dbus-0.95.ebuild 3103 RMD160 4ac25d9fbad985b2772d217efe6307ea62ca63d2 SHA1 80e2d2cdc81bd5594b91fc30db690beebafd3eb9 SHA256 602ad68a3741b4521c82d0363503e980cab37a7f71cefb1a8da096b5a826362d
+MD5 f8ba93a1a382bdc25b076ad17644e90e dbus-0.95.ebuild 3103
+RMD160 4ac25d9fbad985b2772d217efe6307ea62ca63d2 dbus-0.95.ebuild 3103
+SHA256 602ad68a3741b4521c82d0363503e980cab37a7f71cefb1a8da096b5a826362d dbus-0.95.ebuild 3103
+MISC ChangeLog 21551 RMD160 a15e87dc388f06db4378a9dd8d4bb9c9ee08bd49 SHA1 9f514a82e293c84cdefc9be0c26c7b44c40a3026 SHA256 a417032d2b1892ac6e89b01a532a2af336f3e229de1f8ceb7abd2f9f8d09c39d
+MD5 a1d64128af50c63ee46c0489d1346e75 ChangeLog 21551
+RMD160 a15e87dc388f06db4378a9dd8d4bb9c9ee08bd49 ChangeLog 21551
+SHA256 a417032d2b1892ac6e89b01a532a2af336f3e229de1f8ceb7abd2f9f8d09c39d ChangeLog 21551
MISC metadata.xml 222 RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc SHA1 d2b55bed5d827913edafe6777b37d03c352d9adf SHA256 3b1bdb4611693b7a059584a994f3760dce2f37a048d4c2c55c1756e17519e1cf
MD5 d854e952b3179d33b2ece377ce9980f3 metadata.xml 222
RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc metadata.xml 222
@@ -78,3 +85,10 @@ SHA256 abb5588b3a444812e46f36cc37ab335cb2c1f86529336221777a27b8c536f626 files/di
MD5 f418913d22cc4c6633a44c4649f5d458 files/digest-dbus-0.95 232
RMD160 7f7c4719b67b16cbb7d86603a0c261c852d16064 files/digest-dbus-0.95 232
SHA256 a250cd964bf893bee5e7ef96605aa48578057245500e7c89165ca72ac4de3f1d files/digest-dbus-0.95 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFTiUzoeSe8B0zEfwRAn8aAKCE2vJXiZyM8gLlXEqkuWTfVhv82ACeOp5P
+C1hGZZechSt1dED6wuPyozE=
+=fQ8m
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-0.62-r1.ebuild b/sys-apps/dbus/dbus-0.62-r1.ebuild
index 6da64eb0e08d..16f4a389fe2f 100644
--- a/sys-apps/dbus/dbus-0.62-r1.ebuild
+++ b/sys-apps/dbus/dbus-0.62-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.62-r1.ebuild,v 1.5 2006/11/03 02:14:41 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.62-r1.ebuild,v 1.6 2006/11/05 17:54:22 cardoe Exp $
WANT_AUTOCONF=2.5
inherit eutils mono python multilib debug qt3 autotools
@@ -23,7 +23,6 @@ RDEPEND=">=dev-libs/glib-2.6
qt4? ( =x11-libs/qt-4.1* )
selinux? ( sys-libs/libselinux )
>=dev-libs/expat-1.95.8"
- # expat code now sucks.. libxml2 is the default
DEPEND="${RDEPEND}
dev-util/pkgconfig
@@ -42,9 +41,6 @@ src_unpack() {
#fix mono-tools depend
epatch "${FILESDIR}"/${PN}-0.61-mono-tools-update.diff
- #fix libxml dep
- epatch "${FILESDIR}"/${PN}-0.61-libxml-dep.patch
-
eautoreconf
}
diff --git a/sys-apps/dbus/dbus-0.95.ebuild b/sys-apps/dbus/dbus-0.95.ebuild
index 4974a9cee9ca..3c5f6edb9252 100644
--- a/sys-apps/dbus/dbus-0.95.ebuild
+++ b/sys-apps/dbus/dbus-0.95.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.95.ebuild,v 1.1 2006/11/05 07:07:26 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.95.ebuild,v 1.2 2006/11/05 17:54:22 cardoe Exp $
WANT_AUTOCONF=2.5
inherit eutils multilib debug autotools
@@ -24,6 +24,14 @@ DEPEND="${RDEPEND}
doc? ( app-doc/doxygen
app-text/xmlto )"
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ #Fix for FreeBSD
+ epatch "${FILESDIR}"/${P}-pass-context.patch
+}
+
src_compile() {
local myconf=""
diff --git a/sys-apps/dbus/files/dbus-0.95-pass-context.patch b/sys-apps/dbus/files/dbus-0.95-pass-context.patch
new file mode 100644
index 000000000000..1e5612198c19
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-0.95-pass-context.patch
@@ -0,0 +1,11 @@
+--- /home/drizzt/dbus-0.95/bus/bus.c.old 2006-11-04 20:41:44 +0000
++++ /home/drizzt/dbus-0.95/bus/bus.c 2006-11-04 20:41:57 +0000
+@@ -517,7 +517,7 @@
+ /* Watch all conf directories */
+ _dbus_list_foreach (bus_config_parser_get_conf_dirs (parser),
+ (DBusForeachFunction) bus_watch_directory,
+- NULL);
++ context);
+
+ return TRUE;
+ }