Fix up dbus deps wrt bug 183696. Fix quoting and remove old versions.

(Portage version: 2.1.3_rc6)

8 files changed, 13 insertions, 145 deletions

diff --git a/media-sound/last-exit/ChangeLog b/media-sound/last-exit/ChangeLog
index 42ccb15534ee..05a24da2a0fe 100644
--- a/media-sound/last-exit/ChangeLog
+++ b/media-sound/last-exit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/last-exit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/last-exit/ChangeLog,v 1.11 2007/04/10 20:09:52 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/last-exit/ChangeLog,v 1.12 2007/07/01 10:26:19 drac Exp $
+
+  01 Jul 2007; Samuli Suominen <drac@gentoo.org> -last-exit-1.0.ebuild,
+  -last-exit-2.0.ebuild, -last-exit-3.0.ebuild, last-exit-4.0.ebuild:
+  Fix up dbus deps wrt bug 183696. Fix quoting and remove old versions.
 
   10 Apr 2007; Steev Klimaszewski <steev@gentoo.org>
   +files/last-exit-4.0-decimal_parse.patch, last-exit-4.0.ebuild:
diff --git a/media-sound/last-exit/files/digest-last-exit-1.0 b/media-sound/last-exit/files/digest-last-exit-1.0
deleted file mode 100644
index 99743bbb4314..000000000000
--- a/media-sound/last-exit/files/digest-last-exit-1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ed579d0358624ebee677d24f25be0273 last-exit-1.0.tar.bz2 303878
-RMD160 2ca6d91f888f6d3191f4db6ff77b13f42d646020 last-exit-1.0.tar.bz2 303878
-SHA256 36f042025dd308f9aead81af3da8d0e6fdb72f8201298ac6a6a7a03ed7288a23 last-exit-1.0.tar.bz2 303878
diff --git a/media-sound/last-exit/files/digest-last-exit-2.0 b/media-sound/last-exit/files/digest-last-exit-2.0
deleted file mode 100644
index 53d141b4b4be..000000000000
--- a/media-sound/last-exit/files/digest-last-exit-2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 85e31cbf8827284422d9328a71d777f2 last-exit-2.0.tar.bz2 318424
-RMD160 1cf9a7752c380180b4a26bb4e734c7208871e5e9 last-exit-2.0.tar.bz2 318424
-SHA256 65406ed4afb47b3287e77d5cc856c784f52b233d85dbc2047fcf880f9f3b41ff last-exit-2.0.tar.bz2 318424
diff --git a/media-sound/last-exit/files/digest-last-exit-3.0 b/media-sound/last-exit/files/digest-last-exit-3.0
deleted file mode 100644
index 94718f6225a4..000000000000
--- a/media-sound/last-exit/files/digest-last-exit-3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ddd3de15655264a2a5368fcf5c00584b last-exit-3.tar.bz2 327056
-RMD160 0cf1c83307d946f7e4ea9dd460376bcf970b91bb last-exit-3.tar.bz2 327056
-SHA256 267d8d2bc91c745aad17ef89f35e299b826fee8fdbe7b926b040b5b7dfb98ccc last-exit-3.tar.bz2 327056
diff --git a/media-sound/last-exit/last-exit-1.0.ebuild b/media-sound/last-exit/last-exit-1.0.ebuild
deleted file mode 100644
index bd4dc02af1cd..000000000000
--- a/media-sound/last-exit/last-exit-1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/last-exit/last-exit-1.0.ebuild,v 1.2 2006/10/31 00:58:18 cardoe Exp $
-
-inherit mono gnome2 eutils
-
-DESCRIPTION="Gnome/GTK+ alternative to the last.fm player"
-HOMEPAGE="http://www.o-hand.com/~iain/last-exit/"
-SRC_URI="http://www.o-hand.com/~iain/last-exit/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=">=gnome-base/gconf-2.0
-		>=x11-libs/gtk+-2.6
-		>=media-libs/gstreamer-0.10
-		>=media-libs/gst-plugins-base-0.10
-		>=media-plugins/gst-plugins-mad-0.10
-		>=media-plugins/gst-plugins-gconf-0.10
-		>=media-plugins/gst-plugins-gnomevfs-0.10
-		>=dev-lang/mono-1.0
-		>=dev-dotnet/gtk-sharp-1.9.2
-		>=dev-dotnet/gnome-sharp-1.9.2
-		>=dev-dotnet/glade-sharp-1.9.2
-		>=dev-dotnet/gconf-sharp-1.9.2"
-
-pkg_setup() {
-	G2CONF="${G2CONF} \
-	--disable-schemas-install"
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	einfo "You will unfortunately, need to restart X for this to work properly."
-}
diff --git a/media-sound/last-exit/last-exit-2.0.ebuild b/media-sound/last-exit/last-exit-2.0.ebuild
deleted file mode 100644
index 04649fea287b..000000000000
--- a/media-sound/last-exit/last-exit-2.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/last-exit/last-exit-2.0.ebuild,v 1.4 2006/10/31 00:58:18 cardoe Exp $
-
-inherit mono gnome2 eutils
-
-DESCRIPTION="Gnome/GTK+ alternative to the last.fm player"
-HOMEPAGE="http://www.o-hand.com/~iain/last-exit/"
-SRC_URI="http://www.o-hand.com/~iain/last-exit/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=gnome-base/gconf-2.0
-		>=x11-libs/gtk+-2.6
-		>=media-libs/gstreamer-0.10
-		>=media-libs/gst-plugins-base-0.10
-		>=media-plugins/gst-plugins-mad-0.10
-		>=media-plugins/gst-plugins-gconf-0.10
-		>=media-plugins/gst-plugins-gnomevfs-0.10
-		>=dev-lang/mono-1.0
-		>=dev-dotnet/gtk-sharp-1.9.2
-		>=dev-dotnet/gnome-sharp-1.9.2
-		>=dev-dotnet/glade-sharp-1.9.2
-		>=dev-dotnet/gconf-sharp-1.9.2
-		|| ( >=dev-libs/dbus-glib-0.71 <sys-apps/dbus-0.90 )"
-
-pkg_setup() {
-	G2CONF="${G2CONF} \
-	--disable-schemas-install"
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	einfo "You will unfortunately, need to restart X for this to work properly."
-}
diff --git a/media-sound/last-exit/last-exit-3.0.ebuild b/media-sound/last-exit/last-exit-3.0.ebuild
deleted file mode 100644
index 7deee571c769..000000000000
--- a/media-sound/last-exit/last-exit-3.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/last-exit/last-exit-3.0.ebuild,v 1.2 2006/10/31 00:58:18 cardoe Exp $
-
-inherit mono gnome2 eutils
-
-DESCRIPTION="Gnome/GTK+ alternative to the last.fm player"
-HOMEPAGE="http://www.o-hand.com/~iain/last-exit/"
-SRC_URI="http://www.o-hand.com/~iain/last-exit/${PN}-3.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=gnome-base/gconf-2.0
-		>=x11-libs/gtk+-2.6
-		>=media-libs/gstreamer-0.10
-		>=media-libs/gst-plugins-base-0.10
-		>=media-plugins/gst-plugins-mad-0.10
-		>=media-plugins/gst-plugins-gconf-0.10
-		>=media-plugins/gst-plugins-gnomevfs-0.10
-		>=dev-lang/mono-1.0
-		>=dev-dotnet/gtk-sharp-1.9.2
-		>=dev-dotnet/gnome-sharp-1.9.2
-		>=dev-dotnet/glade-sharp-1.9.2
-		>=dev-dotnet/gconf-sharp-1.9.2
-		|| ( >=dev-libs/dbus-glib-0.71 <sys-apps/dbus-0.90 )"
-
-S=${WORKDIR}/"${PN}-3"
-
-pkg_setup() {
-	G2CONF="${G2CONF} \
-	--disable-schemas-install"
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	elog "You will unfortunately, need to restart X for this to work properly."
-}
diff --git a/media-sound/last-exit/last-exit-4.0.ebuild b/media-sound/last-exit/last-exit-4.0.ebuild
index 97382c131574..96b6ea651736 100644
--- a/media-sound/last-exit/last-exit-4.0.ebuild
+++ b/media-sound/last-exit/last-exit-4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/last-exit/last-exit-4.0.ebuild,v 1.5 2007/04/10 20:09:52 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/last-exit/last-exit-4.0.ebuild,v 1.6 2007/07/01 10:26:19 drac Exp $
 
 inherit mono gnome2 eutils autotools
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND=">=gnome-base/gconf-2.0
+RDEPEND=">=gnome-base/gconf-2.0
 		>=x11-libs/gtk+-2.6
 		>=media-libs/gstreamer-0.10
 		>=media-libs/gst-plugins-base-0.10
@@ -25,25 +25,25 @@ DEPEND=">=gnome-base/gconf-2.0
 		>=dev-dotnet/gnome-sharp-1.9.2
 		>=dev-dotnet/glade-sharp-1.9.2
 		>=dev-dotnet/gconf-sharp-1.9.2
-		|| ( >=dev-libs/dbus-glib-0.71 <sys-apps/dbus-0.90 )"
+		>=dev-libs/dbus-glib-0.71"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/"${PN}-4"
+S="${WORKDIR}"/${PN}-4
 
 pkg_setup() {
-	G2CONF="${G2CONF} \
-	--disable-schemas-install"
+	G2CONF="${G2CONF} --disable-schemas-install"
 }
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-dbus-sharp-parallel-build-fix.patch
 	epatch "${FILESDIR}"/${PN}-4.0-decimal_parse.patch
 	eautoreconf
 }
 
 src_install() {
-	make DESTDIR="${D}" install
+	emake DESTDIR="${D}" install
 }
 
 pkg_postinst() {