Keyworded ~sparc-fbsd.

Only install files in /etc/X11 if we USE X.
Fix QA warnings regaring kenerl_linux and kernel_FreeBSD.
Package-Manager: portage-2.1.3_rc7

3 files changed, 21 insertions, 24 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 270c2d1ede1e..98e8c604b28d 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,11 @@
 # 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.199 2007/06/05 14:59:09 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.200 2007/07/11 07:05:54 uberlord Exp $
+
+  11 Jul 2007; Roy Marples <uberlord@gentoo.org> dbus-1.0.2-r2.ebuild:
+  Keyworded ~sparc-fbsd.
+  Only install files in /etc/X11 if we USE X.
+  Fix QA warnings regaring kenerl_linux and kernel_FreeBSD.
 
   05 Jun 2007; Doug Goldstein <doug@gentoo.org> dbus-1.0.2-r2.ebuild:
   generate the machine-id during pkg_postinst() for users that only use a
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 292e69f319f5..001a9512435f 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,6 +1,3 @@
------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
@@ -18,14 +15,14 @@ EBUILD dbus-1.0.2-r1.ebuild 3235 RMD160 025269c87cd607414a083c3d32635ca06dbda6c8
 MD5 5fafc574a00c85a0af0bebbbcddf5e95 dbus-1.0.2-r1.ebuild 3235
 RMD160 025269c87cd607414a083c3d32635ca06dbda6c8 dbus-1.0.2-r1.ebuild 3235
 SHA256 eb4048d29c33743dc83b4b7c47632a9eb981427b624d511494eb343e05a2c289 dbus-1.0.2-r1.ebuild 3235
-EBUILD dbus-1.0.2-r2.ebuild 3345 RMD160 a784faee3b6e26f7802c4cd2bc52ed8ffff16a50 SHA1 30e8acd68c9c32d5803c9a92efb25d81918d00fe SHA256 71aeb5a8a74a351281cc75bf3def88734620c458156c645c990901d5dbc36648
-MD5 31bd65c4f1e351f1d594ba34448d1d53 dbus-1.0.2-r2.ebuild 3345
-RMD160 a784faee3b6e26f7802c4cd2bc52ed8ffff16a50 dbus-1.0.2-r2.ebuild 3345
-SHA256 71aeb5a8a74a351281cc75bf3def88734620c458156c645c990901d5dbc36648 dbus-1.0.2-r2.ebuild 3345
-MISC ChangeLog 29537 RMD160 8b62127f865bd9bb7676073f9b12a9aa8990a75b SHA1 c89e62720336575c9cfd5e89f2d6cc64cc4e67bd SHA256 3469850ebe111656c1a2f3e7180728c3ebb3ed89798d70002f02d5cec0e0e706
-MD5 d954a0fad4e97b232c2126d17d8d6b57 ChangeLog 29537
-RMD160 8b62127f865bd9bb7676073f9b12a9aa8990a75b ChangeLog 29537
-SHA256 3469850ebe111656c1a2f3e7180728c3ebb3ed89798d70002f02d5cec0e0e706 ChangeLog 29537
+EBUILD dbus-1.0.2-r2.ebuild 3410 RMD160 20a3ef3be71b4cc11dd18405a5412151c7718021 SHA1 cc5a0ded66095eb59525af5cbe6d97490b29b8de SHA256 c577d7abfac98323766581b38f0ad8e2b42f0b9823e09f48d1df5e8812e374de
+MD5 6850bcdf8dbe37eeed1025590bbba34d dbus-1.0.2-r2.ebuild 3410
+RMD160 20a3ef3be71b4cc11dd18405a5412151c7718021 dbus-1.0.2-r2.ebuild 3410
+SHA256 c577d7abfac98323766581b38f0ad8e2b42f0b9823e09f48d1df5e8812e374de dbus-1.0.2-r2.ebuild 3410
+MISC ChangeLog 29742 RMD160 ec580248de3f32d2839ef2051994cdacb24faf54 SHA1 89ad33031fce8fcb9126b366192be2aa92e75812 SHA256 027a093aaa8d3de00a3f446e6ef90da8347bac7b8cb1d609e4e28ecb3dc1ca68
+MD5 bd0fe5829cc87d65dd4d493bb1b0ab5c ChangeLog 29742
+RMD160 ec580248de3f32d2839ef2051994cdacb24faf54 ChangeLog 29742
+SHA256 027a093aaa8d3de00a3f446e6ef90da8347bac7b8cb1d609e4e28ecb3dc1ca68 ChangeLog 29742
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
 MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345
 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345
@@ -36,10 +33,3 @@ SHA256 f398ccc18d90f59f55f826046878cb5dd08b0b1abe1c5fd016b6dacb54891b88 files/di
 MD5 497fe5e3a5dfd951a073118e2de14adb files/digest-dbus-1.0.2-r2 235
 RMD160 a4e31868ed956d2fcdcd55cc71c7758d9d2bda8c files/digest-dbus-1.0.2-r2 235
 SHA256 f398ccc18d90f59f55f826046878cb5dd08b0b1abe1c5fd016b6dacb54891b88 files/digest-dbus-1.0.2-r2 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGfu0Sp/wUKkr7RBoRAp2WAKCCIqFP94yq8NpPMJUfpjstMsVT2ACgyqyX
-d41JEuaukpQ1S4fEWGj2jok=
-=70Lm
------END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.0.2-r2.ebuild b/sys-apps/dbus/dbus-1.0.2-r2.ebuild
index 755b12387c01..a59181a53bbc 100644
--- a/sys-apps/dbus/dbus-1.0.2-r2.ebuild
+++ b/sys-apps/dbus/dbus-1.0.2-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-1.0.2-r2.ebuild,v 1.14 2007/06/24 22:15:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.0.2-r2.ebuild,v 1.15 2007/07/11 07:05:54 uberlord Exp $
 
 inherit eutils multilib autotools flag-o-matic
 
@@ -10,8 +10,8 @@ SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="debug doc selinux X"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE="debug doc selinux X kernel_linux kernel_FreeBSD"
 
 RDEPEND="X? ( x11-libs/libXt x11-libs/libX11 )
 	selinux? ( sys-libs/libselinux
@@ -77,8 +77,10 @@ src_install() {
 	# dbus X session script (#77504)
 	# turns out to only work for GDM. has been merged into other desktop
 	# (kdm and such scripts)
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/30-dbus
+	if use X ; then
+		exeinto /etc/X11/xinit/xinitrc.d/
+		doexe "${FILESDIR}"/30-dbus
+	fi
 
 	# needs to exist for the system socket
 	keepdir /var/run/dbus