new release, lots of fixes, cleanout older versions

10 files changed, 135 insertions, 142 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 5f9a1ca30788..a3080c021567 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.6 2004/02/17 22:46:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.7 2004/04/07 14:26:18 foser Exp $
+
+*dbus-0.21 (07 Apr 2004)
+
+  07 Apr 2004; foser <foser@gentoo.org> dbus-0.21.ebuild :
+  Overhaul of the whole ebuild, lots of cleanups.
+  Fixed deps (#43806)
+  Fixed api doc building & installation
+  Added init script & postinst note (#46101)
+  Added myself as maintainer for this package to metadat
 
   17 Feb 2004; Aron Griffis <agriffis@gentoo.org> dbus-0.20.ebuild:
   Remove all KEYWORDS other than ~x86, since none of the support stuff (i.e.
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 161648103022..87699e6f2626 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,6 +1,5 @@
-MD5 8f3f0654255875bf6d875b999349b650 dbus-0.20.ebuild 2065
-MD5 577fb4c4d0487d0594e448f3f1425ee8 ChangeLog 1137
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 14e61a9c75f56af534ef8a383313258e dbus-0.13.ebuild 1017
-MD5 6362e2007025b8f3f227a9bc323d37f2 files/digest-dbus-0.20 62
-MD5 5f0f13fe666e2c46dc24c88d2f6a81bb files/digest-dbus-0.13 61
+MD5 091ca910daf9f04aa59f115097efde15 dbus-0.21.ebuild 2015
+MD5 5ca8b801a9da01e618afe926b7a83ff2 ChangeLog 1434
+MD5 5b5bcd9c1a432b2c8157b0004a073f72 metadata.xml 224
+MD5 8292d4c6b5b6d76df28dcbc7a7c9d5a0 files/dbus 525
+MD5 64365d4941d258c6147e3d28e8bfb2c1 files/digest-dbus-0.21 62
diff --git a/sys-apps/dbus/dbus-0.13.ebuild b/sys-apps/dbus/dbus-0.13.ebuild
deleted file mode 100644
index 93128331b77c..000000000000
--- a/sys-apps/dbus/dbus-0.13.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.13.ebuild,v 1.3 2004/02/17 22:46:07 agriffis Exp $
-
-IUSE="doc"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A message bus system"
-HOMEPAGE="http://www.freedesktop.org/software/dbus/"
-SRC_URI="http://www.freedesktop.org/software/dbus/releases/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Academic"
-KEYWORDS="~x86"
-
-DEPEND="dev-libs/glib
-	dev-libs/libxml2
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen
-		app-text/openjade )"
-#	qt? ( x11-libs/qt )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	econf \
-		--enable-glib \
-		`use_enable doc docs`\
-		--disable-qt \
-		--with-initscripts=redhat || die
-
-	# Qt bindings are currently broken -- I have this info from an email from
-	# Zack Rusin <zack@kde.org>
-	#	`use_enable qt` \
-	make || die
-}
-
-src_install() {
-	einstall || die
-	keepdir /var/lib/run/dbus
-
-	dodoc AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README
-}
diff --git a/sys-apps/dbus/dbus-0.20.ebuild b/sys-apps/dbus/dbus-0.20.ebuild
deleted file mode 100644
index d9c8dccaf40f..000000000000
--- a/sys-apps/dbus/dbus-0.20.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.20.ebuild,v 1.3 2004/02/17 22:46:07 agriffis Exp $
-
-IUSE="doc xml mono gtk X qt gtk python"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A message bus system"
-HOMEPAGE="http://www.freedesktop.org/software/dbus/"
-SRC_URI="http://www.freedesktop.org/software/dbus/releases/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Academic"
-KEYWORDS="~x86"
-
-DEPEND="
-	dev-libs/glib
-	dev-libs/libxml2
-	dev-util/pkgconfig
-	X? ( x11-base/xfree )
-	qt? ( >=x11-libs/qt-3.2.3 )
-	doc? ( app-doc/doxygen
-		app-text/openjade
-		xml? ( app-text/xmlto )
-	)
-	gtk? ( >=x11-libs/gtk+-2.2.1
-	mono? ( dev-dotnet/mono )
-		>=x11-libs/gtk+-1.2.10-r10 )
-	python? ( dev-python/pyrex )"
-
-src_compile() {
-	local myconf
-
-	if use doc
-	then
-		myconf="${myconf} --enable-doxygen-docs"
-
-		if use xml
-		then
-			myconf="${myconf} --enable-xml-docs"
-		else
-			myconf="${myconf} --disable-xml-docs"
-		fi
-	else
-		myconf="${myconf} --disable-doxygen-docs --disable-xml-docs"
-	fi
-
-	econf \
-		`use_with X x` \
-		`use_enable gtk` \
-		--enable-glib \
-		--enable-checks \
-		--disable-qt \
-		--disable-python \
-		--with-xml=expat \
-		--with-initscripts=redhat \
-		${myconf} || die
-
-	# java/gcj will require portage to know about use information in the
-	# dependency (in this case gcc)
-
-	# python bindings are broken
-
-	# mono bindings a little muddled -- being looked into
-	# James William Dumay <i386@sauceage.org>
-		#`use_enable mono` \
-	# Expat used as XML Parser because libxml breaks build -- being looked into
-	# James William Dumay <i386@sauceage.org>
-
-	# checks API is sane (--enable-checks)
-	# James William Dumay <i386@sauceage.org>
-
-	# Qt bindings are currently broken -- I have this info from an email from
-	# Zack Rusin <zack@kde.org>
-		#use_enable qt \
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	keepdir /var/lib/run/dbus
-	keepdir /usr/lib/dbus-1.0/services
-
-	dosed "s:${T}:/tmp:" /etc/dbus-1/session.conf
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README
-}
diff --git a/sys-apps/dbus/dbus-0.21.ebuild b/sys-apps/dbus/dbus-0.21.ebuild
new file mode 100644
index 000000000000..70722ad7c779
--- /dev/null
+++ b/sys-apps/dbus/dbus-0.21.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.21.ebuild,v 1.1 2004/04/07 14:26:19 foser Exp $
+
+# because of the experimental nature debug by default
+inherit debug
+
+IUSE="X gtk qt python doc"
+
+DESCRIPTION="A message bus system"
+HOMEPAGE="http://www.freedesktop.org/software/dbus/"
+SRC_URI="http://www.freedesktop.org/software/dbus/releases/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Academic"
+KEYWORDS="~x86"
+
+RDEPEND=">=dev-libs/glib-2
+	dev-libs/expat
+	X? ( virtual/x11 )
+	qt? ( >=x11-libs/qt-3 )
+	gtk? ( >=x11-libs/gtk+-2 )
+	python? ( >=dev-lang/python-2.2
+		dev-python/pyrex )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen
+		app-text/xmlto )"
+
+# needs gcj, we have no neat way of knowing if it was enabled
+#	java? ( sys-devel/gcc )
+# mono seems broken
+#	mono? ( dev-dotnet/mono )
+
+src_compile() {
+
+	# libxml2 support is broken
+	econf \
+		`use_enable X x` \
+		`use_enable gtk` \
+		`use_enable qt` \
+		`use_enable python` \
+		--enable-glib \
+		--enable-verbose-mode \
+		--enable-checks \
+		--enable-asserts \
+		--with-xml=expat \
+		--with-system-pid-file=/var/run/dbus.pid \
+		--with-system-socket=/var/lib/dbus/system_bus_socket \
+		`use_enable doc doxygen-docs` \
+		`use_enable doc xml-docs` \
+		|| die
+
+	emake || die
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+
+	# initscript
+	exeinto /etc/init.d/
+	doexe ${FILESDIR}/dbus
+
+	# needs to exist for the system socket
+	dodir /var/lib/dbus
+
+#	keepdir /usr/lib/dbus-1.0/services
+
+	if [ -n "`use doc`" ] ; then
+		cd ${S}
+		doxygen Doxyfile
+		dodir /usr/share/man/man3
+		mv ${S}/doc/api/man/man3/* ${D}/usr/share/man/man3
+		dodir /usr/share/doc
+		mv ${S}/doc/api ${D}/usr/share/doc
+	fi
+
+	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO doc/*html
+
+}
+
+pkg_postinst() {
+
+	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"
+
+}
diff --git a/sys-apps/dbus/files/dbus b/sys-apps/dbus/files/dbus
new file mode 100644
index 000000000000..261d890ea3ef
--- /dev/null
+++ b/sys-apps/dbus/files/dbus
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus,v 1.1 2004/04/07 14:26:19 foser Exp $
+
+start() {
+
+	ebegin "Starting D-BUS system messagebus"
+
+	start-stop-daemon --start --exec /usr/bin/dbus-daemon-1 -- --system
+
+	eend $?
+
+}
+
+stop() {
+
+	ebegin "Stopping D-BUS system messagebus"
+
+	start-stop-daemon --stop --pidfile /var/run/dbus.pid 
+	rm /var/run/dbus.pid
+
+	eend $?
+
+}
diff --git a/sys-apps/dbus/files/digest-dbus-0.13 b/sys-apps/dbus/files/digest-dbus-0.13
deleted file mode 100644
index 3cfdee7847ea..000000000000
--- a/sys-apps/dbus/files/digest-dbus-0.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b7f29a4b581445a1290df84d1fbb31ee dbus-0.13.tar.gz 994063
diff --git a/sys-apps/dbus/files/digest-dbus-0.20 b/sys-apps/dbus/files/digest-dbus-0.20
deleted file mode 100644
index a4f4ab08e7e8..000000000000
--- a/sys-apps/dbus/files/digest-dbus-0.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8ebff3cb4beec993e9160ff844e0411c dbus-0.20.tar.gz 1163142
diff --git a/sys-apps/dbus/files/digest-dbus-0.21 b/sys-apps/dbus/files/digest-dbus-0.21
new file mode 100644
index 000000000000..0a1658ed1cfb
--- /dev/null
+++ b/sys-apps/dbus/files/digest-dbus-0.21
@@ -0,0 +1 @@
+MD5 311229d60154334ee3f908badc56747d dbus-0.21.tar.gz 1152107
diff --git a/sys-apps/dbus/metadata.xml b/sys-apps/dbus/metadata.xml
index 96a2d586367d..315a90535e5c 100644
--- a/sys-apps/dbus/metadata.xml
+++ b/sys-apps/dbus/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<maintainer>
+	<email>foser@gentoo.org</email>
+</maintainer>
 </pkgmetadata>