Switching to expat from libxml2 since now libxml2 suffers from bitrot instead of expat. Removed old version.

Package-Manager: portage-2.1.2_pre1

3 files changed, 160 insertions, 1 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index f2e6eeff33a9..7dab84e881da 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.132 2006/08/23 22:30:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.133 2006/09/21 23:23:51 cardoe Exp $
+
+*dbus-0.62-r1 (21 Sep 2006)
+
+  21 Sep 2006; Doug Goldstein <cardoe@gentoo.org> -dbus-0.50-r2.ebuild,
+  +dbus-0.62-r1.ebuild:
+  Switching to expat from libxml2 since now libxml2 suffers from bitrot
+  instead of expat. Removed old version.
 
   23 Aug 2006; Jeroen Roovers <jer@gentoo.org> dbus-0.61-r1.ebuild:
   Stable for HPPA (bug #137325).
diff --git a/sys-apps/dbus/dbus-0.62-r1.ebuild b/sys-apps/dbus/dbus-0.62-r1.ebuild
new file mode 100644
index 000000000000..2d0b15336736
--- /dev/null
+++ b/sys-apps/dbus/dbus-0.62-r1.ebuild
@@ -0,0 +1,149 @@
+# 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.1 2006/09/21 23:23:51 cardoe Exp $
+
+WANT_AUTOCONF=2.5
+inherit eutils mono python multilib debug qt3 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/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 AFL-2.1 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+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 )
+	qt3? ( $(qt_min_version 3.3) )
+	qt4? ( >=x11-libs/qt-4.1.3 )
+	selinux? ( sys-libs/libselinux )
+	>=dev-libs/expat-1.95.8"
+	# expat code now sucks.. libxml2 is the default
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? (	app-doc/doxygen
+		app-text/xmlto
+		mono? ( >=dev-util/monodoc-1.1.10 ) )"
+
+pkg_setup() {
+	PKG_CONFIG_PATH="${QTDIR}/lib/pkgconfig"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	#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
+}
+
+src_compile() {
+	local myconf=""
+
+	# Only enable mono-docs if both mono and doc is defined
+	use mono && myconf="${myconf} $(use_enable doc mono-docs)"
+
+	hasq ${FEATURES} test && myconf="${myconf} --enable-tests=yes"
+
+	if use qt3; then
+		myconf="${myconf} --enable-qt3=${QTDIR} --with-qt3-moc=${QTDIR}/bin/moc "
+	else
+		myconf="${myconf} --disable-qt3 --without-qt3-moc"
+	fi
+
+	if use qt4; then
+		myconf="${myconf} --enable-qt --with-qt-moc=/usr/bin/moc"
+	else
+		myconf="${myconf} --disable-qt --without-qt-moc"
+	fi
+
+	econf \
+		$(use_with X x) \
+		$(use_enable gtk) \
+		$(use_enable python) \
+		$(use_enable mono) \
+		$(use_enable kernel_linux dnotify) \
+		--disable-gcj \
+		$(use_enable selinux) \
+		$(use_enable debug verbose-mode) \
+		$(use_enable debug asserts) \
+		--enable-glib \
+		--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"
+
+	# Don't build the mono examples, they require gtk-sharp
+	touch ${S}/mono/example/{bus-listener,echo-{server,client}}.exe
+
+	# 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
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# initscript
+	newinitd "${FILESDIR}"/dbus.init-0.61 dbus
+
+	# dbus X session script (#77504)
+	# FIXME : turns out to only work for GDM, better solution needed
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}"/30-dbus
+
+	# needs to exist for the system socket
+	keepdir /var/run/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_postrm() {
+	python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/dbus
+}
+
+pkg_postinst() {
+	python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/dbus
+
+	einfo "To start the DBUS system-wide messagebus by default"
+	einfo "you should add it to the default runlevel :"
+	einfo "\`rc-update add dbus default\`"
+	echo
+	einfo "Currently have it installed and running?"
+	einfo "Run etc-update and then run the following:"
+	einfo "\`/etc/init.d/dbus reload\`"
+}
diff --git a/sys-apps/dbus/files/digest-dbus-0.62-r1 b/sys-apps/dbus/files/digest-dbus-0.62-r1
new file mode 100644
index 000000000000..34d498e01b3c
--- /dev/null
+++ b/sys-apps/dbus/files/digest-dbus-0.62-r1
@@ -0,0 +1,3 @@
+MD5 ba7692f63d0e9f1ef06703dff56cb650 dbus-0.62.tar.gz 1737361
+RMD160 d653b25726ec96eb324761ebf9efb4a50d1590c0 dbus-0.62.tar.gz 1737361
+SHA256 884cc2083add655df57acc7bb144c61e9beeabf08ef76fa86929a58d7bc96707 dbus-0.62.tar.gz 1737361