From bbc303a4589851ac8dbe037e3cb606b8160cfe31 Mon Sep 17 00:00:00 2001
From: Roy Marples <uberlord@gentoo.org>
Date: Fri, 23 Feb 2007 11:00:28 +0000
Subject: [PATCH] Bump for a non bash init script. Package-Manager:
 portage-2.1.2-r10

---
 sys-apps/dbus/ChangeLog                  |   8 +-
 sys-apps/dbus/Manifest                   |  33 +++----
 sys-apps/dbus/dbus-1.0.2-r1.ebuild       | 114 +++++++++++++++++++++++
 sys-apps/dbus/files/dbus.init-1.0        |   6 +-
 sys-apps/dbus/files/digest-dbus-1.0.2-r1 |   3 +
 5 files changed, 142 insertions(+), 22 deletions(-)
 create mode 100644 sys-apps/dbus/dbus-1.0.2-r1.ebuild
 create mode 100644 sys-apps/dbus/files/digest-dbus-1.0.2-r1

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 4287c6d27ef4..56dbd8e9bacd 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,12 @@
 # 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.184 2007/02/09 22:27:05 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.185 2007/02/23 11:00:28 uberlord Exp $
+
+*dbus-1.0.2-r1 (23 Feb 2007)
+
+  23 Feb 2007; Roy Marples <uberlord@gentoo.org> files/dbus.init-1.0,
+  +dbus-1.0.2-r1.ebuild:
+  Bump for a non bash init script.
 
   09 Feb 2007; Alexander H. Færøy <eroyf@gentoo.org> dbus-1.0.2.ebuild:
   Stable on MIPS; bug #154522
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index e41562cdfb2d..209c71773fe8 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
@@ -45,10 +42,10 @@ 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
-AUX dbus.init-1.0 1167 RMD160 97f6d6009ccd33eb70f3e8d107e4266891759dd1 SHA1 7bd1cfb8f3b45bdf3afd31611617c35f70c4e137 SHA256 a134b06d487393754ec85eb1e518199ebfa3e6f55e828a87ecd48b7d5f612c64
-MD5 ad71d8440c5377ec086a20b69fa79d1a files/dbus.init-1.0 1167
-RMD160 97f6d6009ccd33eb70f3e8d107e4266891759dd1 files/dbus.init-1.0 1167
-SHA256 a134b06d487393754ec85eb1e518199ebfa3e6f55e828a87ecd48b7d5f612c64 files/dbus.init-1.0 1167
+AUX dbus.init-1.0 1163 RMD160 bc29ffaf1790abe4e8d66972682a21eb2c88b6fd SHA1 39cff17bfb2dda0f2c7464ff79a533bc7515ad09 SHA256 6bfc1e66ae829fd71b5a2bf4a84d4a9ff80a7a2a506eebec40fdf7c63cab72e7
+MD5 e670890a1ee473f32d635d8edebfbf43 files/dbus.init-1.0 1163
+RMD160 bc29ffaf1790abe4e8d66972682a21eb2c88b6fd files/dbus.init-1.0 1163
+SHA256 6bfc1e66ae829fd71b5a2bf4a84d4a9ff80a7a2a506eebec40fdf7c63cab72e7 files/dbus.init-1.0 1163
 DIST dbus-0.61.tar.gz 1735729 RMD160 67306e1a632c1986460e8ead311ae642447cdcc3 SHA1 fdddc695dad64974fb4138fcb04a77a66f1f47f8 SHA256 45a6b655c0fdfffdabc49857cb19d1ea0c9a8923f76e5c165e01e18ce98da0ec
 DIST dbus-0.62.tar.gz 1737361 RMD160 d653b25726ec96eb324761ebf9efb4a50d1590c0 SHA1 45acea9bd19902791c6dbd8620256caf9d74a667 SHA256 884cc2083add655df57acc7bb144c61e9beeabf08ef76fa86929a58d7bc96707
 DIST dbus-1.0.2.tar.gz 1400278 RMD160 d5eddfb058c4c026d4a9f091ad90abcc6e54861a SHA1 2870efd6ea0b5b0d14e52195f560238a74bb1e0e SHA256 8a004125f58512a69575f21f105aead0d1217fce9cb54cbafeac06b4be28c6ca
@@ -60,14 +57,18 @@ EBUILD dbus-0.62-r2.ebuild 4313 RMD160 95afe9990f1924bcc3a5d5e4e82fe2cac80c308e
 MD5 44647ced0d5949384dc7239a8537c24e dbus-0.62-r2.ebuild 4313
 RMD160 95afe9990f1924bcc3a5d5e4e82fe2cac80c308e dbus-0.62-r2.ebuild 4313
 SHA256 96f83f7c163a20301c8f1e652daf44300f5d749e8ad297946ea262477fbf1f03 dbus-0.62-r2.ebuild 4313
+EBUILD dbus-1.0.2-r1.ebuild 3235 RMD160 025269c87cd607414a083c3d32635ca06dbda6c8 SHA1 dde69b8f24e5d67770ea90b80af21a503836b1b7 SHA256 eb4048d29c33743dc83b4b7c47632a9eb981427b624d511494eb343e05a2c289
+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.ebuild 3230 RMD160 36e4b2a8ef3c00b76e5c557815710921910aa93f SHA1 938162b511e2df541cdfca0862c9dedfff29d3e5 SHA256 9ab01db20f0291c8c36eec99d6a5fa3b60529abdaea01a07929a247eb97638d1
 MD5 eb4c781604a8772e9055449a8b0dc7c4 dbus-1.0.2.ebuild 3230
 RMD160 36e4b2a8ef3c00b76e5c557815710921910aa93f dbus-1.0.2.ebuild 3230
 SHA256 9ab01db20f0291c8c36eec99d6a5fa3b60529abdaea01a07929a247eb97638d1 dbus-1.0.2.ebuild 3230
-MISC ChangeLog 27327 RMD160 4810bfefb3f795c5c13c86d04f1527e39486d25d SHA1 cbbab66ed8de2071ad0b8fd734d68c7305d68784 SHA256 686f069ade41cc7521a8eebde58e190dfcbb0962c8983ca585e11f2ca86afa69
-MD5 eb403ce5b8fb6b2f0b4e2339eac51293 ChangeLog 27327
-RMD160 4810bfefb3f795c5c13c86d04f1527e39486d25d ChangeLog 27327
-SHA256 686f069ade41cc7521a8eebde58e190dfcbb0962c8983ca585e11f2ca86afa69 ChangeLog 27327
+MISC ChangeLog 27491 RMD160 ffa6532e84e316e3ae447e846698468a5ae10666 SHA1 a1813e46c8747c402e3eb3bb7c728283a2d45e5d SHA256 04f25c7f08235eaad7c095404ee94fb808691690524e797db2f10e81712627b7
+MD5 dd8157035369384948db771be37d5850 ChangeLog 27491
+RMD160 ffa6532e84e316e3ae447e846698468a5ae10666 ChangeLog 27491
+SHA256 04f25c7f08235eaad7c095404ee94fb808691690524e797db2f10e81712627b7 ChangeLog 27491
 MISC metadata.xml 222 RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc SHA1 d2b55bed5d827913edafe6777b37d03c352d9adf SHA256 3b1bdb4611693b7a059584a994f3760dce2f37a048d4c2c55c1756e17519e1cf
 MD5 d854e952b3179d33b2ece377ce9980f3 metadata.xml 222
 RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc metadata.xml 222
@@ -81,10 +82,6 @@ SHA256 b249fe2b3ac0467d861e39cc171543bac5f489ec77b22ccf68b9ef09a8c68bbe files/di
 MD5 497fe5e3a5dfd951a073118e2de14adb files/digest-dbus-1.0.2 235
 RMD160 a4e31868ed956d2fcdcd55cc71c7758d9d2bda8c files/digest-dbus-1.0.2 235
 SHA256 f398ccc18d90f59f55f826046878cb5dd08b0b1abe1c5fd016b6dacb54891b88 files/digest-dbus-1.0.2 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD4DBQFFzPUV6Xxn2nLwtdQRAuq8AJQLr90dkCCWAZiJ9lqtGFmjZKGyAJ0REBQL
-daUkRiyVpEInmbkIomgHag==
-=2nZS
------END PGP SIGNATURE-----
+MD5 497fe5e3a5dfd951a073118e2de14adb files/digest-dbus-1.0.2-r1 235
+RMD160 a4e31868ed956d2fcdcd55cc71c7758d9d2bda8c files/digest-dbus-1.0.2-r1 235
+SHA256 f398ccc18d90f59f55f826046878cb5dd08b0b1abe1c5fd016b6dacb54891b88 files/digest-dbus-1.0.2-r1 235
diff --git a/sys-apps/dbus/dbus-1.0.2-r1.ebuild b/sys-apps/dbus/dbus-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..a37326774e54
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.0.2-r1.ebuild
@@ -0,0 +1,114 @@
+# 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-r1.ebuild,v 1.1 2007/02/23 11:00:28 uberlord Exp $
+
+inherit eutils multilib autotools
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
+HOMEPAGE="http://dbus.freedesktop.org/"
+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"
+
+RDEPEND="X? ( x11-libs/libXt x11-libs/libX11 )
+	selinux? ( sys-libs/libselinux )
+	>=dev-libs/expat-1.95.8
+	!<sys-apps/dbus-0.91"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? (	app-doc/doxygen
+		app-text/xmlto )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# fix dnotify issue with not detecting created files
+	epatch "${FILESDIR}"/${PN}-1.0.1-fixfilecreation.patch
+}
+
+src_compile() {
+	local myconf=""
+
+	hasq test ${FEATURES} && myconf="${myconf} --enable-tests=yes"
+
+	econf \
+		$(use_with X x) \
+		$(use_enable kernel_linux dnotify) \
+		$(use_enable kernel_FreeBSD kqueue) \
+		$(use_enable selinux) \
+		$(use_enable debug verbose-mode) \
+		$(use_enable debug asserts) \
+		--with-xml=expat \
+		--with-system-pid-file=/var/run/dbus.pid \
+		--with-system-socket=/var/run/dbus/system_bus_socket \
+		--with-session-socket-dir=/tmp \
+		--with-dbus-user=messagebus \
+		--localstatedir=/var \
+		$(use_enable doc doxygen-docs) \
+		--disable-xml-docs \
+		${myconf} \
+		|| die "econf failed"
+
+	# after the compile, it uses a selinuxfs interface to
+	# check if the SELinux policy has the right support
+	use selinux && addwrite /selinux/access
+
+	emake || die "make failed"
+}
+
+src_test() {
+	DBUS_VERBOSE=1 make check || die "make check failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# initscript
+	newinitd "${FILESDIR}"/dbus.init-1.0 dbus
+
+	# 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
+
+	# needs to exist for the system socket
+	keepdir /var/run/dbus
+	# needs to exist for machine id
+	keepdir /var/lib/dbus
+
+	keepdir /usr/lib/dbus-1.0/services
+	keepdir /usr/share/dbus-1/services
+
+	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
+	if use doc; then
+		dohtml doc/*html
+	fi
+}
+
+pkg_preinst() {
+	enewgroup messagebus || die "Problem adding messagebus group"
+	enewuser messagebus -1 "-1" -1 messagebus || die "Problem adding messagebus user"
+}
+
+pkg_postinst() {
+	elog "To start the D-Bus system-wide messagebus by default"
+	elog "you should add it to the default runlevel :"
+	elog "\`rc-update add dbus default\`"
+	elog
+	elog "If dbus is already installed and running,"
+	elog "run etc-update and then run the following:"
+	elog "\`/etc/init.d/dbus reload\`"
+	elog "This will cause it to reload it's configs but"
+	elog "*not* run the newest version you just installed."
+	elog "You must tell it to restart for that to happen,"
+	elog "however not all apps can handle a D-Bus restart."
+	elog
+	ewarn
+	ewarn "You MUST run 'revdep-rebuild' after emerging this package"
+	ewarn
+}
diff --git a/sys-apps/dbus/files/dbus.init-1.0 b/sys-apps/dbus/files/dbus.init-1.0
index ba0f4e71c23c..086aa2132b60 100644
--- a/sys-apps/dbus/files/dbus.init-1.0
+++ b/sys-apps/dbus/files/dbus.init-1.0
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.init-1.0,v 1.2 2007/01/08 13:10:21 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.init-1.0,v 1.3 2007/02/23 11:00:28 uberlord Exp $
 
 opts="reload"
 
@@ -16,7 +16,7 @@ start() {
 	/usr/bin/dbus-uuidgen --ensure
 
 	# We need to test if /var/run/dbus exists, since script will fail if it does not
-	[[ ! -e /var/run/dbus ]] && mkdir /var/run/dbus 
+	[ ! -e /var/run/dbus ] && mkdir /var/run/dbus 
 
 	start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon -- --system
 	eend $?
@@ -32,7 +32,7 @@ stop() {
 
 	eend ${retval}
 
-	[[ -S /var/run/dbus/system_bus_socket ]] && rm -f /var/run/dbus/system_bus_socket
+	[ -S /var/run/dbus/system_bus_socket ] && rm -f /var/run/dbus/system_bus_socket
 
 	return ${retval}
 }
diff --git a/sys-apps/dbus/files/digest-dbus-1.0.2-r1 b/sys-apps/dbus/files/digest-dbus-1.0.2-r1
new file mode 100644
index 000000000000..55bc8dd8333d
--- /dev/null
+++ b/sys-apps/dbus/files/digest-dbus-1.0.2-r1
@@ -0,0 +1,3 @@
+MD5 0552a9b54beb4a044951b7cdbc8fc855 dbus-1.0.2.tar.gz 1400278
+RMD160 d5eddfb058c4c026d4a9f091ad90abcc6e54861a dbus-1.0.2.tar.gz 1400278
+SHA256 8a004125f58512a69575f21f105aead0d1217fce9cb54cbafeac06b4be28c6ca dbus-1.0.2.tar.gz 1400278
-- 
2.26.2