diff options
| author |   Saleem Abdulrasool <compnerd@gentoo.org> | 2007-01-05 18:41:48 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@gentoo.org> | 2007-01-05 18:41:48 +0000 |
| commit | cd554cd8d733c35c4ce3ead7d1fa2e3b9fbb3025 (patch) | |
| tree | f14ac848c83b46132b6cae185716f4a64e966c40 | |
| parent | Bump dep of gnome-keyring to force an upgrade, even though older versions are... (diff) | |
| download | historical-cd554cd8d733c35c4ce3ead7d1fa2e3b9fbb3025.tar.gz historical-cd554cd8d733c35c4ce3ead7d1fa2e3b9fbb3025.tar.bz2 historical-cd554cd8d733c35c4ce3ead7d1fa2e3b9fbb3025.zip | |
fix up debug codepaths, disable qt4 on mips
Package-Manager: portage-2.1.2_rc4-r5
| -rw-r--r-- | sys-apps/dbus/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/dbus/Manifest | 16 | ||||
| -rw-r--r-- | sys-apps/dbus/dbus-0.62-r2.ebuild | 12 |
3 files changed, 22 insertions, 11 deletions
diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog index 819b63c927b5..d2834b2b1d95 100644 --- a/sys-apps/dbus/ChangeLog +++ b/sys-apps/dbus/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/dbus # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.173 2007/01/05 03:50:46 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.174 2007/01/05 18:41:48 compnerd Exp $ + + 05 Jan 2007; Saleem Abdulrasool <compnerd@gentoo.org> dbus-0.62-r2.ebuild: + fix up debug codepaths for qt bindings (bug #160112), disable qt4 on mips 05 Jan 2007; Doug Goldstein <cardoe@gentoo.org> dbus-0.61-r1.ebuild, dbus-0.62-r2.ebuild, dbus-1.0.2.ebuild: diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest index c8b54d058dcd..869da29b37f3 100644 --- a/sys-apps/dbus/Manifest +++ b/sys-apps/dbus/Manifest @@ -53,18 +53,18 @@ EBUILD dbus-0.61-r1.ebuild 4123 RMD160 5cfc36fcd3cf7e83218a276477b9b4271482fe88 MD5 79aa42a974dac49d063509a7e21ce3fe dbus-0.61-r1.ebuild 4123 RMD160 5cfc36fcd3cf7e83218a276477b9b4271482fe88 dbus-0.61-r1.ebuild 4123 SHA256 fc3095cb3b9c6989ad5cf9fb8ec8e6cf5d47bed68b996a436cbfc0a0ba307bb5 dbus-0.61-r1.ebuild 4123 -EBUILD dbus-0.62-r2.ebuild 4214 RMD160 cfebec714b3108fb8eb8bb8751ac3f52fbb8d814 SHA1 7b4c789a5d8450eedbd0a4e4f0890c4bbf4ac2bb SHA256 a1191459c45bf35015fd2b8829f361ff1d45ead6a92422d56642fe3ef73cd52a -MD5 192c022ecd6116aeb9648f72b959e9f9 dbus-0.62-r2.ebuild 4214 -RMD160 cfebec714b3108fb8eb8bb8751ac3f52fbb8d814 dbus-0.62-r2.ebuild 4214 -SHA256 a1191459c45bf35015fd2b8829f361ff1d45ead6a92422d56642fe3ef73cd52a dbus-0.62-r2.ebuild 4214 +EBUILD dbus-0.62-r2.ebuild 4363 RMD160 d23eea036b6c69af8ee23278f2c723682e6932f7 SHA1 403d71fc3a70365e269566ba8aa9e3fcf1426a93 SHA256 8a8ebcdcd554f27c6433c2389456fd45b1f37afdd165b2b0947690f1ed7ece70 +MD5 3414c6b46c648264c79a79210d5d3676 dbus-0.62-r2.ebuild 4363 +RMD160 d23eea036b6c69af8ee23278f2c723682e6932f7 dbus-0.62-r2.ebuild 4363 +SHA256 8a8ebcdcd554f27c6433c2389456fd45b1f37afdd165b2b0947690f1ed7ece70 dbus-0.62-r2.ebuild 4363 EBUILD dbus-1.0.2.ebuild 3263 RMD160 6572b33f5a27718c6ee181264fdbad8ab506cf4f SHA1 befba4abc03b6bb9344cd7d80f3ad996fd627ccb SHA256 056457961e0f0703fe1f66a9590cf39e1b50064a73cce2ac43a6c9266682c140 MD5 145c6fbdc1e34a35b0ff58f1812a1b96 dbus-1.0.2.ebuild 3263 RMD160 6572b33f5a27718c6ee181264fdbad8ab506cf4f dbus-1.0.2.ebuild 3263 SHA256 056457961e0f0703fe1f66a9590cf39e1b50064a73cce2ac43a6c9266682c140 dbus-1.0.2.ebuild 3263 -MISC ChangeLog 25952 RMD160 5f5f3f0513ade46980c5530ff67f5fe909baab6d SHA1 d10d53b77c78c5a43a71a4d4bc34ea73efc5e4b8 SHA256 f9ce64fe1860166cc0aa34f530f14a9d2bd1b0b85274f1c2bcb872ff0eed4121 -MD5 023ddf1d3db79f6bbefa62775198933b ChangeLog 25952 -RMD160 5f5f3f0513ade46980c5530ff67f5fe909baab6d ChangeLog 25952 -SHA256 f9ce64fe1860166cc0aa34f530f14a9d2bd1b0b85274f1c2bcb872ff0eed4121 ChangeLog 25952 +MISC ChangeLog 26108 RMD160 8c369d7c5224eff2a1c9832a61ff5429e62ab328 SHA1 ac34a8b49e2f12aa94d38334cbad53868d053458 SHA256 5c491ab550484f150f94b1a61944fe090f7fc8fa673f715bf976117ca35f6276 +MD5 ac190e00f1e8a0ada035eb932d91ce7a ChangeLog 26108 +RMD160 8c369d7c5224eff2a1c9832a61ff5429e62ab328 ChangeLog 26108 +SHA256 5c491ab550484f150f94b1a61944fe090f7fc8fa673f715bf976117ca35f6276 ChangeLog 26108 MISC metadata.xml 222 RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc SHA1 d2b55bed5d827913edafe6777b37d03c352d9adf SHA256 3b1bdb4611693b7a059584a994f3760dce2f37a048d4c2c55c1756e17519e1cf MD5 d854e952b3179d33b2ece377ce9980f3 metadata.xml 222 RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc metadata.xml 222 diff --git a/sys-apps/dbus/dbus-0.62-r2.ebuild b/sys-apps/dbus/dbus-0.62-r2.ebuild index 2cb539f73d21..dc89ac876f2c 100644 --- a/sys-apps/dbus/dbus-0.62-r2.ebuild +++ b/sys-apps/dbus/dbus-0.62-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.62-r2.ebuild,v 1.10 2007/01/05 03:50:46 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.62-r2.ebuild,v 1.11 2007/01/05 18:41:48 compnerd Exp $ WANT_AUTOCONF=2.5 inherit eutils mono python multilib qt3 autotools flag-o-matic @@ -20,7 +20,7 @@ RDEPEND=">=dev-libs/glib-2.6 mono? ( >=dev-lang/mono-0.95 ) python? ( >=dev-lang/python-2.4 >=dev-python/pyrex-0.9.3-r2 ) qt3? ( $(qt_min_version 3.3) ) - qt4? ( =x11-libs/qt-4.1* ) + !mips? ( qt4? ( =x11-libs/qt-4.1* ) ) selinux? ( sys-libs/libselinux ) >=dev-libs/expat-1.95.8" @@ -58,12 +58,20 @@ src_compile() { if use qt3; then myconf="${myconf} --enable-qt3=${QTDIR} --with-qt3-moc=${QTDIR}/bin/moc " + + if use debug ; then + myconf="${myconf} --enable-qt-debug" + fi else myconf="${myconf} --disable-qt3 --without-qt3-moc" fi if use qt4; then myconf="${myconf} --enable-qt --with-qt-moc=/usr/bin/moc" + + if use debug ; then + myconf="${myconf} --enable-qt-debug" + fi else myconf="${myconf} --disable-qt --without-qt-moc" fi |