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

Package-Manager: portage-2.1.3_rc6

9 files changed, 21 insertions, 177 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/Manifest b/media-sound/last-exit/Manifest
index 795047638068..1cb7cdcbf6b6 100644
--- a/media-sound/last-exit/Manifest
+++ b/media-sound/last-exit/Manifest
@@ -6,43 +6,19 @@ AUX last-exit-dbus-sharp-parallel-build-fix.patch 586 RMD160 3945ac7ee88253e054a
 MD5 79e3f291627681ce6928aa184c217182 files/last-exit-dbus-sharp-parallel-build-fix.patch 586
 RMD160 3945ac7ee88253e054a871584ddbedd510ad8d8a files/last-exit-dbus-sharp-parallel-build-fix.patch 586
 SHA256 ff341f480e8ed4c422aa91a14248a302151e362e4da21732e91b2eed6fb09033 files/last-exit-dbus-sharp-parallel-build-fix.patch 586
-DIST last-exit-1.0.tar.bz2 303878 RMD160 2ca6d91f888f6d3191f4db6ff77b13f42d646020 SHA1 7af6cdd2985dbb60e0bca76922795a416bf74f4f SHA256 36f042025dd308f9aead81af3da8d0e6fdb72f8201298ac6a6a7a03ed7288a23
-DIST last-exit-2.0.tar.bz2 318424 RMD160 1cf9a7752c380180b4a26bb4e734c7208871e5e9 SHA1 5f0a92b15c09150a82f51c47f637bbf9e2667e94 SHA256 65406ed4afb47b3287e77d5cc856c784f52b233d85dbc2047fcf880f9f3b41ff
-DIST last-exit-3.tar.bz2 327056 RMD160 0cf1c83307d946f7e4ea9dd460376bcf970b91bb SHA1 8af831595d08f4e05ff0a0997d1aafdaa4322f63 SHA256 267d8d2bc91c745aad17ef89f35e299b826fee8fdbe7b926b040b5b7dfb98ccc
 DIST last-exit-4.tar.bz2 374462 RMD160 a1b1ab948f2380d37d01b9d6828e21f2636a1692 SHA1 0411e2a6bda5734849c3020c34af3c777ba1cb7b SHA256 9ff9656ed6b98bbbe82cfe6ff58a42a722b9546ffab189424ee1f3b7182c9a0e
-EBUILD last-exit-1.0.ebuild 1104 RMD160 c02cc2794dcc6bd5f04e61fb4ffdc1795f5e990f SHA1 8fac1ed0a7e8109aa5d32d4611a823e1dd32a6ab SHA256 1c482ca1e5eba93e87d4e991b981153401c3fab61385b962981d9984ba283adc
-MD5 0a4a5a70809bc5dedb1814dbd9d0947d last-exit-1.0.ebuild 1104
-RMD160 c02cc2794dcc6bd5f04e61fb4ffdc1795f5e990f last-exit-1.0.ebuild 1104
-SHA256 1c482ca1e5eba93e87d4e991b981153401c3fab61385b962981d9984ba283adc last-exit-1.0.ebuild 1104
-EBUILD last-exit-2.0.ebuild 1166 RMD160 ee644e8e2a65707a19a8567e51b3c57824b54292 SHA1 d7555b7ec8d538aa4ba843d846773e13e9739dff SHA256 2929853c5680058312e046609bd28e11f2fb870aaf266ce38ee46c5741f16809
-MD5 79889dbf7f42dd9096db5a5506699625 last-exit-2.0.ebuild 1166
-RMD160 ee644e8e2a65707a19a8567e51b3c57824b54292 last-exit-2.0.ebuild 1166
-SHA256 2929853c5680058312e046609bd28e11f2fb870aaf266ce38ee46c5741f16809 last-exit-2.0.ebuild 1166
-EBUILD last-exit-3.0.ebuild 1197 RMD160 b8d77c76c69c97b43fcf7f8e3fc5ce72011788a8 SHA1 faf7888be28a56fc8595d755e1effe39f2369273 SHA256 13aff948d1acf1b621ec6f21600df85f76e8f2b3f81f40cccccdd605640138c1
-MD5 2ab119b84d63c6b7c8d1bf313f73d623 last-exit-3.0.ebuild 1197
-RMD160 b8d77c76c69c97b43fcf7f8e3fc5ce72011788a8 last-exit-3.0.ebuild 1197
-SHA256 13aff948d1acf1b621ec6f21600df85f76e8f2b3f81f40cccccdd605640138c1 last-exit-3.0.ebuild 1197
-EBUILD last-exit-4.0.ebuild 1375 RMD160 2db66a774be03141faa1d23bd623fdc7ff3cadd8 SHA1 9307ed7d54caab24732d3b43ddefeaae76e8939b SHA256 a6acc0d8529610b61e7ccf4bdb9794115b05b0568cf5bc7f3286544e5a844a7e
-MD5 b714667f48f5d0ac773489bd066099ad last-exit-4.0.ebuild 1375
-RMD160 2db66a774be03141faa1d23bd623fdc7ff3cadd8 last-exit-4.0.ebuild 1375
-SHA256 a6acc0d8529610b61e7ccf4bdb9794115b05b0568cf5bc7f3286544e5a844a7e last-exit-4.0.ebuild 1375
-MISC ChangeLog 2523 RMD160 e9f8623e7d40c74063d5c1f5a85dd6ec403dfb94 SHA1 269476466f5c8fbf67cf85ce2394b21976d7c8c6 SHA256 d76c7d8ad3dfa3f30b86ce61a0ba8286774d674c20cd975d12c8f2134c87e530
-MD5 ec4e03ba0798fff909a667688b3e769b ChangeLog 2523
-RMD160 e9f8623e7d40c74063d5c1f5a85dd6ec403dfb94 ChangeLog 2523
-SHA256 d76c7d8ad3dfa3f30b86ce61a0ba8286774d674c20cd975d12c8f2134c87e530 ChangeLog 2523
+EBUILD last-exit-4.0.ebuild 1368 RMD160 68c24988728304225d5717331d55140e52ef9e05 SHA1 10b4ce38d0b66452b4dfb1b4f3672e0a477c78e2 SHA256 816812d60576652d133a3333e8bcc49760a7f3b1825d0a0b4e0b7127583c1c76
+MD5 491e54f07bfb6c10764b326cbe610c11 last-exit-4.0.ebuild 1368
+RMD160 68c24988728304225d5717331d55140e52ef9e05 last-exit-4.0.ebuild 1368
+SHA256 816812d60576652d133a3333e8bcc49760a7f3b1825d0a0b4e0b7127583c1c76 last-exit-4.0.ebuild 1368
+MISC ChangeLog 2737 RMD160 5917289c6696d4954a0d4ebdbbf454e55a4c5ac3 SHA1 234e42f5f54b00f4e69d8371715863c34e8f6875 SHA256 421bcfa5e0fe4409abf170ab3d6adefb7306bee901198202c34479bf798781b1
+MD5 1e561a68427499f6f9f15533319b4866 ChangeLog 2737
+RMD160 5917289c6696d4954a0d4ebdbbf454e55a4c5ac3 ChangeLog 2737
+SHA256 421bcfa5e0fe4409abf170ab3d6adefb7306bee901198202c34479bf798781b1 ChangeLog 2737
 MISC metadata.xml 251 RMD160 26d5f0572eecf641028766a7952d0ebd2be9a082 SHA1 9091becf5e6887d0984b1b4d645ca6b84d959bee SHA256 985a5f02fda97e0187aace287bbfe72efd548d10cb286eb6661fce2be0da889f
 MD5 82470e6820b9ac091331548b3260f2d8 metadata.xml 251
 RMD160 26d5f0572eecf641028766a7952d0ebd2be9a082 metadata.xml 251
 SHA256 985a5f02fda97e0187aace287bbfe72efd548d10cb286eb6661fce2be0da889f metadata.xml 251
-MD5 825cbab60c7616ba2fab44b197b74835 files/digest-last-exit-1.0 244
-RMD160 6e31974809eedf0a5532025fd6ab83e6525cf4fc files/digest-last-exit-1.0 244
-SHA256 14c22e3111dba3245a452bf90ff721c2733a230b648d3f48aa02b7c9f74ee27d files/digest-last-exit-1.0 244
-MD5 22fc515387dee34200bc80e86de851d8 files/digest-last-exit-2.0 244
-RMD160 e4e2fba5913f91bda8638e97fc54e63668561dbe files/digest-last-exit-2.0 244
-SHA256 09b266b9197f5a01cc91f9dc634e6a88d0ad5eb91d13118bf1c04bb44375bee3 files/digest-last-exit-2.0 244
-MD5 28cf5a94a94950b9824e2bc29c51d686 files/digest-last-exit-3.0 238
-RMD160 90c8070546acc4aa3fc3d4ceda9fe849c68ecd12 files/digest-last-exit-3.0 238
-SHA256 9024ddbe2e3d11e61c6f75d1920eb9c3c4621d775345ad77c45291085767dda0 files/digest-last-exit-3.0 238
 MD5 04401f117311490fbd80358fecb13c46 files/digest-last-exit-4.0 238
 RMD160 e815908e7f59cbfacc2efc8cc7e42ef1bd333873 files/digest-last-exit-4.0 238
 SHA256 4820ad9b9f766558ee1e55caecc1f6b1fba80d19504fc87d5822291cbb52e6ec files/digest-last-exit-4.0 238
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() {