version bump

6 files changed, 95 insertions, 46 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 1fee70cb351a..1ecd68dcd23a 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.4 2003/11/15 05:46:00 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.5 2003/12/05 03:07:48 seemant Exp $
+
+*dbus-0.20 (04 Dec 2003)
+
+  04 Dec 2003; Seemant Kulleen <seemant@gentoo.org> dbus-0.12.ebuild,
+  dbus-0.20.ebuild:
+  version bump. Ebuild provided by: James Dumay <i386@sauceage.org> in bug
+  #35301
 
   14 Nov 2003; Seemant Kulleen <seemant@gentoo.org> dbus-0.13.ebuild:
   qt disabled, because the bindings are broken currently
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 538bdac25bfc..8baa84b5a540 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,6 +1,6 @@
-MD5 4b7162a1f5dd152d8f5b24dedbf1db01 dbus-0.20.ebuild 1643
+MD5 8d607188186ee889afc84d7cddbf4c13 dbus-0.20.ebuild 2030
 MD5 c3a1382f3250f601cfbc6a1c00566bda dbus-0.13.ebuild 1016
-MD5 f277db03b25f32d24e1c9a2e1a6d2285 ChangeLog 748
+MD5 cf752a5625edb2ba2aa3127b29a01370 ChangeLog 949
 MD5 e6543624c262cae90cc830cde90ad3ae metadata.xml 165
 MD5 5f0f13fe666e2c46dc24c88d2f6a81bb files/digest-dbus-0.13 61
 MD5 6362e2007025b8f3f227a9bc323d37f2 files/digest-dbus-0.20 62
diff --git a/sys-apps/dbus/dbus-0.12.ebuild b/sys-apps/dbus/dbus-0.12.ebuild
deleted file mode 100644
index c09d809f9d2b..000000000000
--- a/sys-apps/dbus/dbus-0.12.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.12.ebuild,v 1.1 2003/09/12 14:19:13 seemant Exp $
-
-IUSE="qt 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 qt` \
-		`use_enable doc docs`\
-		--with-initscripts=redhat || die
-	emake || 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
new file mode 100644
index 000000000000..80a9149a86d3
--- /dev/null
+++ b/sys-apps/dbus/dbus-0.20.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2003 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.1 2003/12/05 03:07:49 seemant 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 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~amd64 ~ia64"
+
+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
+
+	dodoc AUTHORS ChangeLog HACKING NEWS README
+}
diff --git a/sys-apps/dbus/files/digest-dbus-0.12 b/sys-apps/dbus/files/digest-dbus-0.12
deleted file mode 100644
index feb9a107ed55..000000000000
--- a/sys-apps/dbus/files/digest-dbus-0.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7d55a9fa3bd7fbb11120ea3ac9380620 dbus-0.12.tar.gz 992661
diff --git a/sys-apps/dbus/files/digest-dbus-0.20 b/sys-apps/dbus/files/digest-dbus-0.20
new file mode 100644
index 000000000000..a4f4ab08e7e8
--- /dev/null
+++ b/sys-apps/dbus/files/digest-dbus-0.20
@@ -0,0 +1 @@
+MD5 8ebff3cb4beec993e9160ff844e0411c dbus-0.20.tar.gz 1163142