Use dbus-sharp and dbus-glib-sharp instead of ndesk-dbus as pointed out by compnerd. Should hopefully go

to portage soon.

svn path=/; revision=8

11 files changed, 278 insertions, 68 deletions

diff --git a/dev-dotnet/dbus-glib-sharp/Manifest b/dev-dotnet/dbus-glib-sharp/Manifest
new file mode 100644
index 0000000..8ae3690
--- /dev/null
+++ b/dev-dotnet/dbus-glib-sharp/Manifest
@@ -0,0 +1,12 @@
+AUX include.mk 628 RMD160 1068695efe0cedc4cd292e6a6c40df63dd7b73b9 SHA1 682f920a5ae586c4ce4f18f080c63e564ea5dfdb SHA256 f884a5a6d9d6749a53c7ef5f33c6bc670a2170cc381014935f97b9a6ee21dadf
+MD5 a5067139d4fcb355f58141694aceeb00 files/include.mk 628
+RMD160 1068695efe0cedc4cd292e6a6c40df63dd7b73b9 files/include.mk 628
+SHA256 f884a5a6d9d6749a53c7ef5f33c6bc670a2170cc381014935f97b9a6ee21dadf files/include.mk 628
+DIST dbus-sharp-glib-0.3.tar.gz 6050 RMD160 bb63505db17006ccd3467497fa24899af59d2d7a SHA1 d15c96950516acc0f4a74c2fd7529ee890a0dbb2 SHA256 a8a0e92fa358b879552556f254c43694e9bf791f586558a7aa905ef0267991ef
+EBUILD dbus-glib-sharp-0.3.ebuild 2067 RMD160 ae13e57eac92a1aa97e9cc1a1f4735dae4e1baf4 SHA1 339351a6009cae39219484540ab11a818b8151c2 SHA256 225f7757629c77c9cf11c08d845caf96ced8057dcdfc27ad80fb1bcc2873915a
+MD5 670f99ec3297968c61b6fbf83fc0743f dbus-glib-sharp-0.3.ebuild 2067
+RMD160 ae13e57eac92a1aa97e9cc1a1f4735dae4e1baf4 dbus-glib-sharp-0.3.ebuild 2067
+SHA256 225f7757629c77c9cf11c08d845caf96ced8057dcdfc27ad80fb1bcc2873915a dbus-glib-sharp-0.3.ebuild 2067
+MD5 ef6e75ef55cdb8c186ec6d4d32fe1534 files/digest-dbus-glib-sharp-0.3 253
+RMD160 90f5e09917ae5a3bfd5ffc11a15ef205120e2a03 files/digest-dbus-glib-sharp-0.3 253
+SHA256 e87852d85c13eda5ad580b73d2f1b7bb24b94dd7b50e83e138b6565a0b539930 files/digest-dbus-glib-sharp-0.3 253
diff --git a/dev-dotnet/dbus-glib-sharp/dbus-glib-sharp-0.3.ebuild b/dev-dotnet/dbus-glib-sharp/dbus-glib-sharp-0.3.ebuild
new file mode 100644
index 0000000..8c7eb2c
--- /dev/null
+++ b/dev-dotnet/dbus-glib-sharp/dbus-glib-sharp-0.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit mono multilib
+
+MY_PN="dbus-sharp-glib"
+
+DESCRIPTION="glib integration for DBus-Sharp"
+HOMEPAGE="http://www.ndesk.org/DBusSharp"
+SRC_URI="http://www.ndesk.org/archive/dbus-sharp/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="AS-IS"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=dev-lang/mono-1.2.4
+		 >=dev-dotnet/dbus-sharp-0.4.2"
+DEPEND="${RDEPEND}
+		>=dev-util/pkgconfig-0.19"
+
+S="${WORKDIR}/dbus-sharp-glib-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	cp "${FILESDIR}/include.mk" .
+
+	sed -i -e '/^DBUS_SHARP_PREFIX/s:\.\./dbus-sharp::'	\
+		   -e '/^include/s:\$(DBUS_SHARP_PREFIX):..:'	\
+		   -e 's:NDesk.DBus.dll::'						\
+		   glib/Makefile 								\
+	|| die 'sed failed'
+}
+
+src_compile() {
+	if ! use debug ; then
+		sed -i -e '/^CSC_DEBUGFLAGS/s:-debug::'		\
+			   -e '/^MONO_DEBUGFLAGS/s:-debug::'	\
+			   include.mk							\
+		|| die 'sed failed'
+	fi
+
+	sed -i -e 's:prefix=.*:prefix=/usr:'					\
+		   -e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):"	\
+		   include.mk										\
+	|| die 'sed failed'
+
+	sed -e 's:@prefix@:/usr:' 								\
+		-e "/^libdir/s:lib$:$(get_libdir):"					\
+		-e '/^Libs:/s:/lib/:/:'								\
+		ndesk-dbus-glib-1.0.pc.in > ndesk-dbus-glib-1.0.pc	\
+	|| die 'sed failed'
+
+	emake CSFLAGS=$(pkg-config --libs ndesk-dbus-1.0) DESTDIR="${D}" || die "make failed"
+}
+
+src_install() {
+	# Install the library
+	emake -C glib DESTDIR="${D}" prefix=/usr install || die "install failed"
+
+	if use debug ; then
+		local ver=$(gacutil -l NDesk.DBus.GLib | awk '/Version=/ { v=substr($0, match($0, /Version=/) + 8); sub(/,.*/, "", v); print v; }')
+		local key=$(gacutil -l NDesk.DBus.GLib | awk '/PublickeyToken=/ { print substr($0, match($0, /PublicKeyToken=/) + 15); }')
+
+		insinto /usr/$(get_libdir)/mono/gac/NDesk.DBus.Glib/${gac_location}/
+		doins ${S}/glib/NDesk.DBus.GLib.dll.mdb
+	fi
+
+	# Install the pkgfile
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${S}/ndesk-dbus-glib-1.0.pc || die 'install failed'
+
+	dodoc README
+}
diff --git a/dev-dotnet/dbus-glib-sharp/files/digest-dbus-glib-sharp-0.3 b/dev-dotnet/dbus-glib-sharp/files/digest-dbus-glib-sharp-0.3
new file mode 100644
index 0000000..36ca880
--- /dev/null
+++ b/dev-dotnet/dbus-glib-sharp/files/digest-dbus-glib-sharp-0.3
@@ -0,0 +1,3 @@
+MD5 319d423fa3dfe8bfddba69e2b7c58df8 dbus-sharp-glib-0.3.tar.gz 6050
+RMD160 bb63505db17006ccd3467497fa24899af59d2d7a dbus-sharp-glib-0.3.tar.gz 6050
+SHA256 a8a0e92fa358b879552556f254c43694e9bf791f586558a7aa905ef0267991ef dbus-sharp-glib-0.3.tar.gz 6050
diff --git a/dev-dotnet/dbus-glib-sharp/files/include.mk b/dev-dotnet/dbus-glib-sharp/files/include.mk
new file mode 100644
index 0000000..5793b41
--- /dev/null
+++ b/dev-dotnet/dbus-glib-sharp/files/include.mk
@@ -0,0 +1,22 @@
+#CSC_DEBUGFLAGS=-debug -d:TRACE
+CSC_DEBUGFLAGS=-debug
+CSC=gmcs $(CSC_DEBUGFLAGS)
+MONO_DEBUGFLAGS=--debug
+RUNTIME=mono $(MONO_DEBUGFLAGS)
+GACUTIL=gacutil
+GACUTIL_FLAGS=-root $(DESTDIR)$(prefix)/lib
+#this isn't great
+prefix=$(shell dirname `which gacutil`)/..
+
+#%.exe:
+%.exe %.dll %.module:
+	$(CSC) $(CSFLAGS) -out:$@ -t:$(TARGET) $(addprefix -pkg:,$(PKGS)) $(addprefix -r:,$(REFS)) $(addprefix -r:,$(filter %.dll,$^)) $(addprefix -addmodule:,$(filter %.module,$^)) $(addprefix -keyfile:,$(filter %.snk,$^)) $(filter %.cs,$^)
+
+%.exe: TARGET = exe
+
+%.dll: TARGET = library
+
+%.module: TARGET = module
+
+#$(MODULE)_SOURCES := foo.cs
+
diff --git a/dev-dotnet/dbus-sharp/Manifest b/dev-dotnet/dbus-sharp/Manifest
new file mode 100644
index 0000000..c44e69d
--- /dev/null
+++ b/dev-dotnet/dbus-sharp/Manifest
@@ -0,0 +1,16 @@
+DIST dbus-sharp-0.4.2.tar.gz 40942 RMD160 c7626e986fc51a39885f7628a2d2c571a664d4dd SHA1 9e7222f07854a42263114cfb70e9456f88cf7bac SHA256 8ccfda50f1987ee9f801e17a90cf31fb9f319bf6ce342a2d99e38eca5bdbb618
+DIST dbus-sharp-0.5.2.tar.gz 44348 RMD160 69f71f52074a5212e27bece2988b3f5c68242728 SHA1 61c5379090cbef4e24f4cf1ad2c106f829d6eae5 SHA256 8a7465b2a8d540f29700a0e21011728f43a9eb8f5a60edf200e234705878ae2d
+EBUILD dbus-sharp-0.4.2.ebuild 1872 RMD160 010a55434712f00e2020d6af51c67bf87a4411e5 SHA1 fc7f0d725a03aa78330fc3f1e7325ceb8538abb1 SHA256 7a7510db195ad7ad8272789bbf3ba5d71ffae1fe0ac42be98fa2c1a88567b99c
+MD5 1871e7dd8ccb02f2db5e93044b62f1a3 dbus-sharp-0.4.2.ebuild 1872
+RMD160 010a55434712f00e2020d6af51c67bf87a4411e5 dbus-sharp-0.4.2.ebuild 1872
+SHA256 7a7510db195ad7ad8272789bbf3ba5d71ffae1fe0ac42be98fa2c1a88567b99c dbus-sharp-0.4.2.ebuild 1872
+EBUILD dbus-sharp-0.5.2.ebuild 1877 RMD160 4e0132a3b7cf0b9b426e0d941b96e98dd436072c SHA1 e7260b80fa9d3059db90529ed864ffe9cb4de1a8 SHA256 c52d655c70b95bf56a37f5085c0e6b8ea6ec00fecd64ff7139eeebff59af4470
+MD5 05443a6df812bb5b2182e2d6c187fd7b dbus-sharp-0.5.2.ebuild 1877
+RMD160 4e0132a3b7cf0b9b426e0d941b96e98dd436072c dbus-sharp-0.5.2.ebuild 1877
+SHA256 c52d655c70b95bf56a37f5085c0e6b8ea6ec00fecd64ff7139eeebff59af4470 dbus-sharp-0.5.2.ebuild 1877
+MD5 601cef1b443c23798c06f0766bf38c7d files/digest-dbus-sharp-0.4.2 247
+RMD160 c1a2f46e95d1f7bb915043a438a69b5a947f95a2 files/digest-dbus-sharp-0.4.2 247
+SHA256 9ebdae8843654b8ae621a9aec20d8abe657eaf764bdd45f7aeac230ed2ac848a files/digest-dbus-sharp-0.4.2 247
+MD5 736ad016541c3f0ca7be5051d5ded85f files/digest-dbus-sharp-0.5.2 247
+RMD160 03841040d2d3faae9588472e15e7a83ffcf7debc files/digest-dbus-sharp-0.5.2 247
+SHA256 a77c86be923a0f863afdbcc2a99410b1e68e30d704043f42bbb77069b4a6dc3b files/digest-dbus-sharp-0.5.2 247
diff --git a/dev-dotnet/dbus-sharp/dbus-sharp-0.4.2.ebuild b/dev-dotnet/dbus-sharp/dbus-sharp-0.4.2.ebuild
new file mode 100644
index 0000000..f402d30
--- /dev/null
+++ b/dev-dotnet/dbus-sharp/dbus-sharp-0.4.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit mono multilib
+
+DESCRIPTION="Managed D-Bus Implemenation .NET"
+HOMEPAGE="http://www.ndesk.org/DBusSharp"
+SRC_URI="http://www.ndesk.org/archive/dbus-sharp/${P}.tar.gz"
+
+LICENSE="AS-IS"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND=">=dev-lang/mono-1.2.4"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	if ! use debug ; then
+		sed -i -e '/^CSC_DEBUGFLAGS/s:-debug::'		\
+			   -e '/^MONO_DEBUGFLAGS/s:-debug::'	\
+			   include.mk							\
+		|| die 'sed failed'
+	fi
+
+	sed -i -e 's:prefix=.*:prefix=/usr:'					\
+		   -e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):"	\
+		   include.mk										\
+	|| die 'sed failed'
+
+	sed -e 's:@prefix@:/usr:' 						\
+		-e "/^libdir/s:lib$:$(get_libdir):"			\
+		ndesk-dbus-1.0.pc.in > ndesk-dbus-1.0.pc	\
+	|| die 'sed failed'
+
+	emake DESTDIR="${D}" || die "make failed"
+}
+
+src_install() {
+	# Install the library
+	emake -C src DESTDIR="${D}" prefix=/usr install || die "install failed"
+
+	if use debug ; then
+		local ver=$(gacutil -l NDesk.DBus | gawk '/Version=/ { v=substr($0, match($0, /Version=/) + 8); sub(/,.*/, "", v); print v; }')
+		local key=$(gacutil -l NDesk.DBus | gawk '/PublickeyToken=/ { print substr($0, match($0, /PublicKeyToken=/) + 15); }')
+
+		insinto /usr/$(get_libdir)/mono/gac/NDesk.DBus/${ver}_${key}/
+		doins ${S}/src/NDesk.DBus.dll.mdb
+	fi
+
+	# Install the pkgfile
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${S}/ndesk-dbus-1.0.pc || die "install failed"
+
+	# Install dbus-monitor
+	insinto /usr/$(get_libdir)/${PN}-1.0/
+	doins ${S}/tools/dbus-monitor.exe
+	use debug && doins ${S}/tools/dbus-monitor.exe.mdb
+
+	cat << EOF > ${S}/dbus-monitor
+#!/bin/sh
+exec mono \$MONO_EXTRA_ARGS /usr/$(get_libdir)/${PN}-1.0/dbus-monitor.exe "\$@"
+EOF
+
+	exeinto /usr/bin/
+	doexe ${S}/dbus-monitor
+
+	dodoc README
+}
diff --git a/dev-dotnet/dbus-sharp/dbus-sharp-0.5.2.ebuild b/dev-dotnet/dbus-sharp/dbus-sharp-0.5.2.ebuild
new file mode 100644
index 0000000..fed73c7
--- /dev/null
+++ b/dev-dotnet/dbus-sharp/dbus-sharp-0.5.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit mono multilib
+
+DESCRIPTION="Managed D-Bus Implementation for .NET"
+HOMEPAGE="http://www.ndesk.org/DBusSharp"
+SRC_URI="http://www.ndesk.org/archive/dbus-sharp/${P}.tar.gz"
+
+LICENSE="AS-IS"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND=">=dev-lang/mono-1.2.4"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	if ! use debug ; then
+		sed -i -e '/^CSC_DEBUGFLAGS/s:-debug::'		\
+			   -e '/^MONO_DEBUGFLAGS/s:-debug::'	\
+			   include.mk							\
+		|| die 'sed failed'
+	fi
+
+	sed -i -e 's:prefix=.*:prefix=/usr:'					\
+		   -e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):"	\
+		   include.mk										\
+	|| die 'sed failed'
+
+	sed -e 's:@prefix@:/usr:' 						\
+		-e "/^libdir/s:lib$:$(get_libdir):"			\
+		ndesk-dbus-1.0.pc.in > ndesk-dbus-1.0.pc	\
+	|| die 'sed failed'
+
+	emake DESTDIR="${D}" || die "make failed"
+}
+
+src_install() {
+	# Install the library
+	emake -C src DESTDIR="${D}" prefix=/usr install || die "install failed"
+
+	if use debug ; then
+		local ver=$(gacutil -l NDesk.DBus | gawk '/Version=/ { v=substr($0, match($0, /Version=/) + 8); sub(/,.*/, "", v); print v; }')
+		local key=$(gacutil -l NDesk.DBus | gawk '/PublickeyToken=/ { print substr($0, match($0, /PublicKeyToken=/) + 15); }')
+
+		insinto /usr/$(get_libdir)/mono/gac/NDesk.DBus/${ver}_${key}/
+		doins ${S}/src/NDesk.DBus.dll.mdb
+	fi
+
+	# Install the pkgfile
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${S}/ndesk-dbus-1.0.pc || die "install failed"
+
+	# Install dbus-monitor
+	insinto /usr/$(get_libdir)/${PN}-1.0/
+	doins ${S}/tools/dbus-monitor.exe
+	use debug && doins ${S}/tools/dbus-monitor.exe.mdb
+
+	cat << EOF > ${S}/dbus-monitor
+#!/bin/sh
+exec mono \$MONO_EXTRA_ARGS /usr/$(get_libdir)/${PN}-1.0/dbus-monitor.exe "\$@"
+EOF
+
+	exeinto /usr/bin/
+	doexe ${S}/dbus-monitor
+
+	dodoc README
+}
diff --git a/dev-dotnet/dbus-sharp/files/digest-dbus-sharp-0.4.2 b/dev-dotnet/dbus-sharp/files/digest-dbus-sharp-0.4.2
new file mode 100644
index 0000000..e93ebc6
--- /dev/null
+++ b/dev-dotnet/dbus-sharp/files/digest-dbus-sharp-0.4.2
@@ -0,0 +1,3 @@
+MD5 b858011c167c6bc318dcb4d6383996be dbus-sharp-0.4.2.tar.gz 40942
+RMD160 c7626e986fc51a39885f7628a2d2c571a664d4dd dbus-sharp-0.4.2.tar.gz 40942
+SHA256 8ccfda50f1987ee9f801e17a90cf31fb9f319bf6ce342a2d99e38eca5bdbb618 dbus-sharp-0.4.2.tar.gz 40942
diff --git a/dev-dotnet/dbus-sharp/files/digest-dbus-sharp-0.5.2 b/dev-dotnet/dbus-sharp/files/digest-dbus-sharp-0.5.2
new file mode 100644
index 0000000..520746a
--- /dev/null
+++ b/dev-dotnet/dbus-sharp/files/digest-dbus-sharp-0.5.2
@@ -0,0 +1,3 @@
+MD5 86312f99721a97dc8028343d477fd4be dbus-sharp-0.5.2.tar.gz 44348
+RMD160 69f71f52074a5212e27bece2988b3f5c68242728 dbus-sharp-0.5.2.tar.gz 44348
+SHA256 8a7465b2a8d540f29700a0e21011728f43a9eb8f5a60edf200e234705878ae2d dbus-sharp-0.5.2.tar.gz 44348
diff --git a/dev-dotnet/ndesk-dbus/ndesk-dbus-0.5.2.ebuild b/dev-dotnet/ndesk-dbus/ndesk-dbus-0.5.2.ebuild
deleted file mode 100644
index 62d16f2..0000000
--- a/dev-dotnet/ndesk-dbus/ndesk-dbus-0.5.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit mono multilib
-
-MY_PN="dbus-sharp"
-MY_P="${MY_PN}-${PV}"
-GLIB_PV="0.3"
-GLIB_PN="${MY_PN}-glib"
-GLIB_P="${GLIB_PN}-${GLIB_PV}"
-GLIB_S="${WORKDIR}/${GLIB_P}"
-
-DESCRIPTION="a C# implementation of D-Bus."
-HOMEPAGE="http://www.ndesk.org/DBusSharp"
-SRC_URI="http://www.ndesk.org/archive/${MY_PN}/${MY_P}.tar.gz
-	glib? ( http://www.ndesk.org/archive/${MY_PN}/${GLIB_P}.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="glib"
-
-DEPEND=">=dev-lang/mono-1.1"
-RDEPEND="${DEPEND}
-	sys-apps/dbus
-	glib? ( >=dev-libs/glib-2.0 )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -e "s:@prefix@:/usr:" ${PN}-1.0.pc.in > ${PN}-1.0.pc || die "sed failed"
-	use glib && sed -e "s:@prefix@:/usr:" \
-		${GLIB_S}/${PN}-glib-1.0.pc.in > ${GLIB_S}/${PN}-glib-1.0.pc \
-		|| die "sed failed"
-}
-
-src_compile() {
-	emake || die "emake install failed"
-
-	if use glib ; then
-		emake -C ${GLIB_S} DBUS_SHARP_PREFIX=${S} || die "emake failed"
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" prefix=/usr install || die "emake install failed"
-	dodoc README COPYING
-
-	use glib && emake -C ${GLIB_S}/glib DESTDIR="${D}" prefix=/usr \
-			DBUS_SHARP_PREFIX=${S} install || die "emake installfailed"
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}-1.0.pc
-	use glib && doins ${GLIB_S}/${PN}-glib-1.0.pc
-}
diff --git a/dev-dotnet/notify-sharp/notify-sharp-0.4.0.ebuild b/dev-dotnet/notify-sharp/notify-sharp-0.4.0.ebuild
index 61516e3..3cf983c 100644
--- a/dev-dotnet/notify-sharp/notify-sharp-0.4.0.ebuild
+++ b/dev-dotnet/notify-sharp/notify-sharp-0.4.0.ebuild
@@ -15,20 +15,12 @@ IUSE="doc"
 
 RDEPEND=">=dev-lang/mono-1.1.13
 	>=dev-dotnet/gtk-sharp-2.6
-	>=dev-dotnet/ndesk-dbus-0.4"
+	>=dev-dotnet/dbus-sharp-0.4
+	>=dev-dotnet/dbus-glib-sharp-0.3"
 
 DEPEND="${RDEPEND}
 	doc? ( dev-util/monodoc)"
 	
-pkg_setup() {
-
-	if ! built_with_use dev-dotnet/ndesk-dbus glib; then
-		eerror "We need ndesk-dbus-glib"
-		eerror "Please recompile dev-dotnet/ndesk-dbus with USE=\"glib\""
-		die
-	fi
-}
-
 src_compile() {
 	export GACUTIL_FLAGS="-root ${D}/usr/$(get_libdir) -gacdir /usr/$(get_libdir) -package ${PN}-${SLOT}"