bump to mark stable (contradictio in terminis)

4 files changed, 160 insertions, 23 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index d07668b0e0d4..aa83946267c2 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.31 2005/02/08 05:04:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.32 2005/02/09 22:53:09 foser Exp $
+
+*dbus-0.23-r3 (09 Feb 2005)
+
+  09 Feb 2005; foser <foser@gentoo.org> dbus-0.23-r3.ebuild :
+  Bump to remove mono dep (still ~arch :/) so we can mark stable
 
   07 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
   +files/dbus-0.23-pyexecdir.patch, dbus-0.23-r2.ebuild:
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index ba80ec1a5426..a9196afd1896 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,32 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 40b9483d4e9dd11a2b9446183ac3ea78 dbus-0.22-r1.ebuild 2860
 MD5 081b6d3af8939f80d4654048c47d99bc dbus-0.22-r2.ebuild 3220
-MD5 213654f1fac483bd4221675c772972a6 dbus-0.22-r3.ebuild 3247
-MD5 5b5bcd9c1a432b2c8157b0004a073f72 metadata.xml 224
 MD5 7ee805daac6b0f53d1320a2f2130a70c dbus-0.23-r1.ebuild 2845
-MD5 381a13c23a003d3044ff4b478c9fc17a dbus-0.23-r2.ebuild 3227
+MD5 585eecc913d66d58f7abcdad80818fe6 dbus-0.23-r3.ebuild 3244
+MD5 40b9483d4e9dd11a2b9446183ac3ea78 dbus-0.22-r1.ebuild 2860
+MD5 213654f1fac483bd4221675c772972a6 dbus-0.22-r3.ebuild 3247
 MD5 d4cf345c7920fcaad13d2e150824e1ed ChangeLog 4525
+MD5 5b5bcd9c1a432b2c8157b0004a073f72 metadata.xml 224
 MD5 5ad50ae94f784548fc0d6f1364ce23bb files/dbus 544
-MD5 0bbcecc888e29256a5b9a8b1b110099c files/dbus-0.22-bus_driver_know_thyself.patch 1373
-MD5 89670f39c616e08e472a236ed9079b34 files/dbus-0.22-mono_bindings.patch 5122
-MD5 0c8ee5b60e0dd01baea0e398f7ee5559 files/dbus-0.22-mono_service_owner.patch 905
-MD5 032a780f5d3dd0c743f2b932424fd39c files/dbus-0.22-python_int64.patch 5448
-MD5 03e75c073a6db22f85e5c58b795a6e42 files/dbus-0.22-qt.patch 2191
 MD5 db2189cd44431086b05de29565090861 files/dbus-0.23-qt.patch 816
+MD5 032a780f5d3dd0c743f2b932424fd39c files/dbus-0.22-python_int64.patch 5448
+MD5 403b7724a698be1509916991e87224a4 files/dbus-0.23-pyexecdir.patch 1131
+MD5 768e500cfda89809161576ea2080a7aa files/dbus-0.23-dbus_session_connect.patch 1185
 MD5 b0cc4f0bb3505fb083602b48c09f25a6 files/digest-dbus-0.22-r1 62
 MD5 b0cc4f0bb3505fb083602b48c09f25a6 files/digest-dbus-0.22-r2 62
 MD5 b0cc4f0bb3505fb083602b48c09f25a6 files/digest-dbus-0.22-r3 62
 MD5 b683f990bc7207366b4dac487a8d1416 files/digest-dbus-0.23-r1 62
-MD5 768e500cfda89809161576ea2080a7aa files/dbus-0.23-dbus_session_connect.patch 1185
-MD5 f3ab25d85c77b7f859d4d2cefc787aef files/dbus-0.23-fd_set.patch 293
 MD5 b683f990bc7207366b4dac487a8d1416 files/digest-dbus-0.23-r2 62
-MD5 403b7724a698be1509916991e87224a4 files/dbus-0.23-pyexecdir.patch 1131
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCCEiPArHZZzCEUG0RAs3QAJ9QdRUf4tli0fZKfc7toRMM7/kAvwCfRxED
-ZHupdq5b1wZl3dMEm3n9MIM=
-=HA47
------END PGP SIGNATURE-----
+MD5 b683f990bc7207366b4dac487a8d1416 files/digest-dbus-0.23-r3 62
+MD5 0c8ee5b60e0dd01baea0e398f7ee5559 files/dbus-0.22-mono_service_owner.patch 905
+MD5 89670f39c616e08e472a236ed9079b34 files/dbus-0.22-mono_bindings.patch 5122
+MD5 0bbcecc888e29256a5b9a8b1b110099c files/dbus-0.22-bus_driver_know_thyself.patch 1373
+MD5 03e75c073a6db22f85e5c58b795a6e42 files/dbus-0.22-qt.patch 2191
+MD5 f3ab25d85c77b7f859d4d2cefc787aef files/dbus-0.23-fd_set.patch 293
diff --git a/sys-apps/dbus/dbus-0.23-r3.ebuild b/sys-apps/dbus/dbus-0.23-r3.ebuild
new file mode 100644
index 000000000000..804312201821
--- /dev/null
+++ b/sys-apps/dbus/dbus-0.23-r3.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.23-r3.ebuild,v 1.1 2005/02/09 22:53:09 foser Exp $
+
+# because of the experimental nature debug by default
+inherit debug eutils mono python multilib
+
+# FIXME : fix docs
+#IUSE="X gtk qt python mono doc xml2"
+IUSE="X gtk qt python xml2"
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to eachother"
+HOMEPAGE="http://dbus.freedesktop.org/"
+SRC_URI="http://dbus.freedesktop.org/releases/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 AFL-2.1 )"
+KEYWORDS="x86 ~ppc ~amd64 ~ppc64 ~ia64"
+
+RDEPEND=">=dev-libs/glib-2
+	xml2? ( >=dev-libs/libxml2-2.6 )
+	!xml2? ( dev-libs/expat )
+	X? ( virtual/x11 )
+	gtk? ( >=x11-libs/gtk+-2 )
+	python? ( >=dev-lang/python-2.2
+		>=dev-python/pyrex-0.9 )
+	qt? ( >=x11-libs/qt-3 )"
+#	!ppc64? (
+#		mono? ( >=dev-dotnet/mono-0.95 )
+#	)
+
+
+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 )
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-qt.patch
+	# fix security issue (#80601)
+	epatch ${FILESDIR}/${P}-dbus_session_connect.patch
+	# add missing include (#78617)
+	epatch ${FILESDIR}/${P}-fd_set.patch
+
+	# It stupidly tries to install python stuff to platform-independent
+	# libdir
+	epatch ${FILESDIR}/dbus-0.23-pyexecdir.patch
+
+	# Don't rerun auto*
+	sleep 1
+	touch ${S}/python/Makefile.in
+	sleep 1
+	touch ${S}/configure
+}
+
+src_compile() {
+
+	local myconf
+
+	if use xml2; then
+		myconf="--with-xml=libxml";
+	else
+		myconf="--with-xml=expat";
+	fi
+
+	econf \
+		`use_with X x` \
+		`use_enable gtk` \
+		`use_enable qt` \
+		`use_enable python` \
+		--disable-mono \
+		--enable-glib \
+		--enable-verbose-mode \
+		--enable-checks \
+		--enable-asserts \
+		--with-system-pid-file=/var/run/dbus.pid \
+		--with-system-socket=/var/lib/dbus/system_bus_socket \
+		--with-session-socket-dir=/tmp \
+		--disable-doxygen-docs \
+		--disable-xml-docs \
+		--disable-mono-docs \
+		${myconf} \
+		|| die
+
+#		`use_enable mono` \
+#		`use_enable doc doxygen-docs` \
+#		`use_enable doc xml-docs` \
+
+	# do not build the mono examples, they need gtk-sharp
+	touch ${S}/mono/example/{bus-listener,echo-{server,client}}.exe
+
+	# this gets around a lib64 sandbox bug. note that this addpredict is
+	# added automatically by sandbox.c for lib.
+	addpredict /usr/lib64/python2.3/
+	addpredict /usr/lib64/python2.2/
+	addpredict /usr/lib64/python2.1/
+
+	emake || die
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+
+	# initscript
+	exeinto /etc/init.d/
+	doexe ${FILESDIR}/dbus
+
+	# needs to exist for the system socket
+	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 doc/*html
+
+}
+
+pkg_preinst() {
+
+	enewgroup messagebus || die "Problem adding messagebus group"
+	enewuser messagebus -1 /bin/false /dev/null messagebus || die "Problem adding messagebus user"
+
+}
+
+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/digest-dbus-0.23-r3 b/sys-apps/dbus/files/digest-dbus-0.23-r3
new file mode 100644
index 000000000000..729896ce139d
--- /dev/null
+++ b/sys-apps/dbus/files/digest-dbus-0.23-r3
@@ -0,0 +1 @@
+MD5 56a6a06144bd349f21afbd4cc386a60f dbus-0.23.tar.gz 1280646