From 7a3e45f29cfad8c1a2fbbc6ff6b69d53b88f6681 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Tue, 20 Jun 2006 14:54:42 +0000 Subject: [PATCH] Unfortunately genstef was wrong and didn't speak to anyone before making the change that he did. Now he understand it, switching back. Package-Manager: portage-2.1.1_pre1-r1 --- sys-apps/dbus/ChangeLog | 6 +++++- sys-apps/dbus/Manifest | 18 +++++++++--------- sys-apps/dbus/dbus-0.62.ebuild | 8 ++++---- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog index 26e6fb258845..05769b0c4232 100644 --- a/sys-apps/dbus/ChangeLog +++ b/sys-apps/dbus/ChangeLog @@ -1,6 +1,10 @@ # 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.115 2006/06/20 06:34:09 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.116 2006/06/20 14:54:42 cardoe Exp $ + + 20 Jun 2006; dbus-0.62.ebuild: + Unfortunately genstef was wrong and didn't speak to anyone before making the + change that he did. Now he understand it, switching back. 20 Jun 2006; Stefan Schweizer dbus-0.62.ebuild: qt3 -> qt, fix digest diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest index 8e15eb1f9940..11123e3826b2 100644 --- a/sys-apps/dbus/Manifest +++ b/sys-apps/dbus/Manifest @@ -98,7 +98,7 @@ AUX dbus.init-0.61 1377 RMD160 a6287fbad2c0b4532c7527895684aef82df46566 SHA1 6b3 MD5 791bda1b16e54eba80a07d873dc97763 files/dbus.init-0.61 1377 RMD160 a6287fbad2c0b4532c7527895684aef82df46566 files/dbus.init-0.61 1377 SHA256 c1dd746e70ec6e1a0d04ae39308f6341833ae4db2a2d0fc65e156279ff5eb5d4 files/dbus.init-0.61 1377 -DIST dbus-0.23.4.tar.gz 1288374 RMD160 94c6ed261cbf41695b7cc15c99ef929868f8645d SHA256 44caee8d5fb3293c22def4d58a6a85e52786e1eb0f89a339b16e6d50773fd3a1 +DIST dbus-0.23.4.tar.gz 1288374 RMD160 94c6ed261cbf41695b7cc15c99ef929868f8645d SHA1 57ea3dd1a0ef520b1f891932e7ccd6b8d59eaca9 SHA256 44caee8d5fb3293c22def4d58a6a85e52786e1eb0f89a339b16e6d50773fd3a1 DIST dbus-0.50.tar.gz 1610305 RMD160 a80be17d1c117a7c218bf3a78d0a8fbae134bd91 SHA256 3a8375c935f0c7b87cdd25f0408da963836fdce23390bb1b81cc6bd6ee7951c5 DIST dbus-0.60.tar.gz 1674899 RMD160 035e0de53c2917b6e4b53a43026191d6de39a5f7 SHA256 32ff1b1c7388cd2bfd4a23d4b9f460b2265579f1e097f0d4c0261c7e00adf8a8 DIST dbus-0.61.tar.gz 1735729 RMD160 67306e1a632c1986460e8ead311ae642447cdcc3 SHA1 fdddc695dad64974fb4138fcb04a77a66f1f47f8 SHA256 45a6b655c0fdfffdabc49857cb19d1ea0c9a8923f76e5c165e01e18ce98da0ec @@ -131,14 +131,14 @@ EBUILD dbus-0.61.ebuild 3998 RMD160 8729028e40c215820ac1a36d63c8fab1a0e54115 SHA MD5 783e674e9642fb13381a8f98de6cee52 dbus-0.61.ebuild 3998 RMD160 8729028e40c215820ac1a36d63c8fab1a0e54115 dbus-0.61.ebuild 3998 SHA256 6a783ebf6be369e4657d76ebdb57bfb04d77a71396b37aa4c3d9606480e38541 dbus-0.61.ebuild 3998 -EBUILD dbus-0.62.ebuild 3911 RMD160 46d7ae9cccb54017dd1641cc1ed70cc28ee18777 SHA1 14ec420a3a5cf898f097830457ab0f884ae998f2 SHA256 8a8e30480bd45f0045d8f3e529eb1d6cc6df6e004d6d8ff053cc859ca7481c42 -MD5 8a4fd20be9ea71e4b2caaec62ca51dd6 dbus-0.62.ebuild 3911 -RMD160 46d7ae9cccb54017dd1641cc1ed70cc28ee18777 dbus-0.62.ebuild 3911 -SHA256 8a8e30480bd45f0045d8f3e529eb1d6cc6df6e004d6d8ff053cc859ca7481c42 dbus-0.62.ebuild 3911 -MISC ChangeLog 16802 RMD160 5364ccf50047a2e82e11e03af48fdbba4453c29b SHA1 c08abc84a9ba8a120ab605dbef3a42a81dfca077 SHA256 3dcaddbcc73f4985baf743e95802693e28c37511af32375edd79784ae4f236d6 -MD5 bbae87bf81b280c545222c6780de96de ChangeLog 16802 -RMD160 5364ccf50047a2e82e11e03af48fdbba4453c29b ChangeLog 16802 -SHA256 3dcaddbcc73f4985baf743e95802693e28c37511af32375edd79784ae4f236d6 ChangeLog 16802 +EBUILD dbus-0.62.ebuild 3913 RMD160 f7fc34ca91d86d844bc460a2de26ebc106eb2782 SHA1 4d5d85831f5259f11828e8e3ba14ffce1282f59b SHA256 6e9dd5ee0f1e1815a269517d85c16fb166f8d8d85030d674e66fd6c84066f03c +MD5 2c8e0d446e130826179ae8527817c969 dbus-0.62.ebuild 3913 +RMD160 f7fc34ca91d86d844bc460a2de26ebc106eb2782 dbus-0.62.ebuild 3913 +SHA256 6e9dd5ee0f1e1815a269517d85c16fb166f8d8d85030d674e66fd6c84066f03c dbus-0.62.ebuild 3913 +MISC ChangeLog 16993 RMD160 54a7b50d68b61bd53b4da6c83f737d000329a8de SHA1 fb1bfdec943587aa5b423f605f21e4c5a8dc0174 SHA256 8e7e2d6744c60c3159a5e5701e9f54442717987ba3ae80ba08e80b8100c58245 +MD5 1d4188ffac315dfcf493dc046f976526 ChangeLog 16993 +RMD160 54a7b50d68b61bd53b4da6c83f737d000329a8de ChangeLog 16993 +SHA256 8e7e2d6744c60c3159a5e5701e9f54442717987ba3ae80ba08e80b8100c58245 ChangeLog 16993 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.ebuild b/sys-apps/dbus/dbus-0.62.ebuild index f92c8f21adc9..c4a44027face 100644 --- a/sys-apps/dbus/dbus-0.62.ebuild +++ b/sys-apps/dbus/dbus-0.62.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.ebuild,v 1.3 2006/06/20 06:34:09 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.62.ebuild,v 1.4 2006/06/20 14:54:42 cardoe Exp $ inherit eutils mono python multilib debug qt3 autotools @@ -11,14 +11,14 @@ SRC_URI="http://dbus.freedesktop.org/releases/${P}.tar.gz" SLOT="0" LICENSE="|| ( GPL-2 AFL-2.1 )" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc gtk mono python qt qt4 selinux X" +IUSE="doc gtk mono python qt3 qt4 selinux X" RDEPEND=">=dev-libs/glib-2.6 X? ( || ( ( x11-libs/libXt x11-libs/libX11 ) virtual/x11 ) ) gtk? ( >=x11-libs/gtk+-2.6 ) mono? ( >=dev-lang/mono-0.95 ) python? ( >=dev-lang/python-2.4 >=dev-python/pyrex-0.9.3-r2 ) - qt? ( $(qt_min_version 3.3) ) + qt3? ( $(qt_min_version 3.3) ) qt4? ( >=x11-libs/qt-4.1.0 ) selinux? ( sys-libs/libselinux ) >=dev-libs/libxml2-2.6.21" @@ -53,7 +53,7 @@ src_compile() { # Only enable mono-docs if both mono and doc is defined use mono && myconf="${myconf} $(use_enable doc mono-docs)" - if use qt; then + if use qt3; then myconf="${myconf} --enable-qt3=${QTDIR} --with-qt3-moc=${QTDIR}/bin/moc " else myconf="${myconf} --disable-qt3 --without-qt3-moc" -- 2.26.2