Remove old development versions. Superceded by 1.8.0.

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

7 files changed, 8 insertions, 384 deletions

diff --git a/media-sound/banshee/ChangeLog b/media-sound/banshee/ChangeLog
index b1642928c457..22d783ac85c8 100644
--- a/media-sound/banshee/ChangeLog
+++ b/media-sound/banshee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/banshee
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.121 2010/09/30 09:19:33 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.122 2010/09/30 09:32:53 ford_prefect Exp $
+
+  30 Sep 2010; Arun Raghavan <ford_prefect@gentoo.org>
+  -banshee-1.7.4.ebuild, -files/banshee-1.7.4-fix-collisions.patch,
+  -files/banshee-1.7.4-fix-gdu-build.patch, -banshee-1.7.5.ebuild,
+  -files/banshee-1.7.5-fix-collisions.patch:
+  Remove old development versions. Superceded by 1.8.0.
 
 *banshee-1.8.0 (30 Sep 2010)
 
diff --git a/media-sound/banshee/Manifest b/media-sound/banshee/Manifest
index aac9dcff80dd..68d31a8b4147 100644
--- a/media-sound/banshee/Manifest
+++ b/media-sound/banshee/Manifest
@@ -1,19 +1,12 @@
 AUX banshee-1.4.2-metadata-writefail.patch 5701 RMD160 3985a02b7f4e9013951d75090051ff4d8991916d SHA1 28ab88d8eb12801d4b2a2a9186c71c2904e88525 SHA256 179608931a113a660965689cdf077e066952b0c125c9648befbbe3bd07c13399
 AUX banshee-1.4.3-CVE-2009-1175.patch 2985 RMD160 c149b8783431a4673b2f2a330a2f5059f7a210d0 SHA1 78841e5dce317fb3e16cc10f4e1b9b6f7ac2b825 SHA256 d8678cadb3c62f809bb977ad2563877d05c33a86ff4c315fe9d89d2c80c82feb
-AUX banshee-1.7.4-fix-collisions.patch 1445 RMD160 521bfb2dc511763413542395543e325d647fa887 SHA1 e4b5aeb828bc8dd5ec0d66e19dbae7c54c771c2c SHA256 5b17dc22d1b71fd9e9397133b1d3fef80d86a978ff0982fdb8bb59f5bbdccf60
-AUX banshee-1.7.4-fix-gdu-build.patch 606 RMD160 74078193fb1a399c2e0b57991953626c5a0ccfbe SHA1 d0addadab6481760fe46db826901d11a0b94233f SHA256 2bcc36a9b532a87cfcaaabb1ef7886123483eba0cb94dfba5dd6fcde181b1dd8
 AUX banshee-1.7.4-make-webkit-optional.patch 2151 RMD160 70ad41d04763a5023f9863809f3e35c77f103ada SHA1 6acad219469ee67ada7a89508fb639922db12e22 SHA256 5f5ceea4e09dd9f9dca776b9775d6998faa641c7daa8968241b9bbddd6f72ecf
-AUX banshee-1.7.5-fix-collisions.patch 644 RMD160 b14c91b132b6deba98d8e193c850694f3fa5da98 SHA1 b83003dcc57377179787e3541719b262df1a44f4 SHA256 5fab8a52a61554afb1c2c00b408a46d72834fb86ca9f214a61f1aeed20514382
 DIST banshee-1-1.4.3.tar.bz2 2415388 RMD160 06a76574efaa6bc0740d5c656dcbb2334ee84e73 SHA1 3b137c1efe3eb8881da2e86210104eb292a7c560 SHA256 8abe54b17c6755b7b6f617c8470ba5e84c94a96b86af9aac1031080646e142d1
 DIST banshee-1-1.6.1.tar.bz2 3171776 RMD160 1fccab76a155bc04deac7bfc2278aeb8be387cdc SHA1 cf96ad0ed634d92652054a371883ecc427015384 SHA256 ff7f79a8b86a819cffe0ff88aa9f8ab9ea3e2fcc540f3c6e82bf150a505cacd0
-DIST banshee-1-1.7.4.tar.bz2 3165043 RMD160 df074848d3a74077da3ccadcd44de00f060eacdd SHA1 423568c817ae16235831f977f38208226770dcfe SHA256 3fa3963ec6cdfa93d0d6e71cf271fbcb077cce8fe6f6e5ee33b8cf89389021bb
-DIST banshee-1-1.7.5.tar.bz2 3239155 RMD160 c2f979bcdfe4c81b50b3b1e488c85a9b5c0854d2 SHA1 70945cf56b411ec5faad59fccdafb5754d83ec85 SHA256 fc2971d7785da580b5325f365a63317660d0448726c5061d8cf8fcd728340174
 DIST banshee-1-1.8.0.tar.bz2 3231763 RMD160 4568f84a8b2c2453a4b051d794c357a19c62d616 SHA1 cbd0f2828b54f05df6d88993c7770c0b6fc9ccde SHA256 321a5ee45c0e6b0df0e7767512ad5466773fb53dc0aaef491db0ec68377896af
 DIST banshee-1.4.2-musicbrainz-fix.patch.bz2 14078 RMD160 185e306fe4705c2d317b6dbbaa11d69b4c52b4ca SHA1 a98a56346c8a3134959c3533ecae72a3979ef392 SHA256 d238408dce5eec001c0ff77dec3097c43414c4d897b456a45451a0a7e8975dbb
 EBUILD banshee-1.4.3-r2.ebuild 3309 RMD160 2de0e84578b83272f55db8dec9454edbbd0b5f0e SHA1 0f77c4b424e8db1bd3f33d8abe7992e30b0a26aa SHA256 5d03b328cade2d5ea824c58a56346e10e756a8c3f652a71f61236a2425105447
 EBUILD banshee-1.6.1.ebuild 3665 RMD160 058d1e6f40dd4fe4210fdd8d858b01d8b484bd66 SHA1 d316b6d0d0c52a84dde2e58eaef3cab508715732 SHA256 ae4e606bca0456d316bb78aa6798d69b00453d66d4652b83328bc7c1ff4504fb
-EBUILD banshee-1.7.4.ebuild 4185 RMD160 82bda0e2ad38fb7a7acb3c42a1d64981b819c74d SHA1 ebf38a91f7e7e0a21d5ca1edc903c231ad7c8d5f SHA256 0c88903e6306f28a0b58551251ff460cf6ac266234fdb27449d4aaf04af2ad12
-EBUILD banshee-1.7.5.ebuild 4319 RMD160 8c0ca53bcb744933888a19c77d9e71de4d2d97b5 SHA1 08efda4ea72eddede783f8dbb4dd6a87915a8952 SHA256 8850b5b4dea7049004413c28b721760b5e60991d20fe2af551a713f9b4c35e62
 EBUILD banshee-1.8.0.ebuild 4269 RMD160 cb016e93843b08547005a3a8d5f882d62a278eb9 SHA1 22a668e8c5fb842a03a9ff317408367d58952b73 SHA256 99460dc11ee5c5c22a16a3a511f33411f844dd74e4e774ce7eb5a2da41087e40
-MISC ChangeLog 23271 RMD160 9a3960972c43454fb50751b0ec2c94abce024ffb SHA1 7db335ab2caaf98b3a3699956c2939ed994fb955 SHA256 05143f1b282c223b58b2dcd6b4b9a5feedc0410c3264983cc872d70868320a1d
+MISC ChangeLog 23563 RMD160 fa4b07d732f5dd2f81f442dc21ab73503ad80c85 SHA1 9e5872b4e9299858f5c256f073c895048814f729 SHA256 f388559dca3ebf533ff7324de8f9bcc9ba97581e08afb5f5ebf61e93a7070620
 MISC metadata.xml 820 RMD160 9196a8a47cff605fdc5a5cc5b0c39bb75dc1e445 SHA1 5b7dfcfac9be40a16e4952234fec096e7c70ce4d SHA256 3dcc4776c1d5214000a78022d63657a95d137899eaad3e6dce38567464681cc7
diff --git a/media-sound/banshee/banshee-1.7.4.ebuild b/media-sound/banshee/banshee-1.7.4.ebuild
deleted file mode 100644
index 355a80619e5d..000000000000
--- a/media-sound/banshee/banshee-1.7.4.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-1.7.4.ebuild,v 1.2 2010/09/05 09:49:14 ford_prefect Exp $
-
-EAPI=2
-
-inherit eutils autotools mono gnome2-utils fdo-mime versionator
-
-GVER=0.10.7
-
-DESCRIPTION="Import, organize, play, and share your music using a simple and powerful interface."
-HOMEPAGE="http://banshee-project.org"
-
-#BANSHEE_V2=$(get_version_component_range 2)
-#[[ $((${BANSHEE_V2} % 2)) -eq 0 ]] && RELTYPE=stable || RELTYPE=unstable
-#SRC_URI="http://download.banshee-project.org/${PN}/${RELTYPE}/${PV}/${PN}-1-${PV}.tar.bz2"
-SRC_URI="http://download.banshee-project.org/${PN}/unstable/${PV}/${PN}-1-${PV}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+aac +cdda boo daap doc +encode ipod karma mtp podcast test web youtube"
-
-# Hal is required until upstream bug 612616 is solved
-RDEPEND=">=dev-lang/mono-2.4.3
-	gnome-base/gnome-settings-daemon
-	x11-themes/gnome-icon-theme
-	sys-apps/dbus
-	sys-apps/hal
-	>=dev-dotnet/gtk-sharp-2.12
-	>=dev-dotnet/gconf-sharp-2.24.0
-	>=dev-dotnet/notify-sharp-0.4.0_pre20080912-r1
-	>=media-libs/gstreamer-0.10.21-r3
-	>=media-libs/gst-plugins-base-0.10.25.2
-	>=media-libs/gst-plugins-bad-${GVER}
-	>=media-libs/gst-plugins-good-${GVER}
-	>=media-libs/gst-plugins-ugly-${GVER}
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
-	>=media-plugins/gst-plugins-gnomevfs-${GVER}
-	>=media-plugins/gst-plugins-gconf-${GVER}
-	cdda? (
-		|| (
-			>=media-plugins/gst-plugins-cdparanoia-${GVER}
-			>=media-plugins/gst-plugins-cdio-${GVER}
-		)
-	)
-	media-libs/musicbrainz:1
-	>=dev-dotnet/dbus-glib-sharp-0.4.1
-	>=dev-dotnet/dbus-sharp-0.6.1a
-	>=dev-dotnet/mono-addins-0.4[gtk]
-	>=dev-dotnet/taglib-sharp-2.0.3.7
-	>=dev-db/sqlite-3.4
-	karma? ( >=media-libs/libkarma-0.1.0-r1 )
-	aac? ( >=media-plugins/gst-plugins-faad-${GVER} )
-	boo? (
-		>=dev-lang/boo-0.8.1
-	)
-	daap? (
-		>=dev-dotnet/mono-zeroconf-0.8.0-r1
-	)
-	doc? (
-		virtual/monodoc
-		>=app-text/gnome-doc-utils-0.17.3
-	)
-	encode? (
-		>=media-plugins/gst-plugins-lame-${GVER}
-		>=media-plugins/gst-plugins-taglib-${GVER}
-	)
-	ipod? (
-		>=dev-dotnet/ipod-sharp-0.8.5
-		>=dev-dotnet/podsleuth-0.6.7
-	)
-	mtp? (
-		media-libs/libmtp
-	)
-	web? (
-		>=net-libs/webkit-gtk-1.2.2
-		>=net-libs/libsoup-2.26:2.4
-		>=net-libs/libsoup-gnome-2.26:2.4
-	)
-	youtube? (
-		>=dev-dotnet/google-gdata-sharp-1.4
-	)"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-S=${WORKDIR}/${PN}-1-${PV}
-
-src_prepare () {
-	# Fix intltool b0rkage similar to
-	# https://bugzilla.gnome.org/show_bug.cgi?id=577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
-
-	epatch "${FILESDIR}/${P}-fix-gdu-build.patch"
-	epatch "${FILESDIR}/${P}-make-webkit-optional.patch"
-	epatch "${FILESDIR}/${P}-fix-collisions.patch"
-	AT_M4DIR="-I build/m4/banshee -I build/m4/shamrock -I build/m4/shave" \
-		eautoreconf
-}
-
-src_configure() {
-	# Disable gio till gtk-sharp-beans and gio-sharp are in-tree
-	# Ditto gst-sharp
-	local myconf="--disable-dependency-tracking --disable-static
-		--enable-gnome --enable-schemas-install
-		--with-gconf-schema-file-dir=/etc/gconf/schemas
-		--with-vendor-build-id=Gentoo/${PN}/${PVR}
-		--enable-gapless-playback
-		--disable-gio --disable-gst-sharp
-		--disable-torrent
-		--disable-shave"
-
-	econf \
-		$(use_enable doc docs) \
-		$(use_enable doc user-help) \
-		$(use_enable boo) \
-		$(use_enable mtp) \
-		$(use_enable daap) \
-		$(use_enable ipod) \
-		$(use_enable podcast) \
-		$(use_enable karma) \
-		$(use_enable web webkit) \
-		$(use_enable youtube) \
-		${myconf}
-}
-
-src_compile() {
-	emake MCS=/usr/bin/gmcs
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install efailed"
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If ${PN} doesn't play some format, please check your"
-	ewarn "USE flags on media-plugins/gst-plugins-meta"
-	ewarn
-
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/banshee/banshee-1.7.5.ebuild b/media-sound/banshee/banshee-1.7.5.ebuild
deleted file mode 100644
index 87a38e82614c..000000000000
--- a/media-sound/banshee/banshee-1.7.5.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-1.7.5.ebuild,v 1.1 2010/09/05 11:49:39 ford_prefect Exp $
-
-EAPI=2
-
-inherit eutils autotools mono gnome2-utils fdo-mime versionator
-
-GVER=0.10.7
-
-DESCRIPTION="Import, organize, play, and share your music using a simple and powerful interface."
-HOMEPAGE="http://banshee-project.org"
-
-#BANSHEE_V2=$(get_version_component_range 2)
-#[[ $((${BANSHEE_V2} % 2)) -eq 0 ]] && RELTYPE=stable || RELTYPE=unstable
-#SRC_URI="http://download.banshee-project.org/${PN}/${RELTYPE}/${PV}/${PN}-1-${PV}.tar.bz2"
-SRC_URI="http://download.banshee-project.org/${PN}/unstable/${PV}/${PN}-1-${PV}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+aac +cdda boo daap doc +encode ipod karma mtp podcast test web youtube"
-
-# Hal is required until upstream bug 612616 is solved
-RDEPEND=">=dev-lang/mono-2.4.3
-	gnome-base/gnome-settings-daemon
-	x11-themes/gnome-icon-theme
-	sys-apps/dbus
-	sys-apps/hal
-	>=dev-dotnet/gtk-sharp-2.12
-	>=dev-dotnet/gconf-sharp-2.24.0
-	>=dev-dotnet/notify-sharp-0.4.0_pre20080912-r1
-	>=media-libs/gstreamer-0.10.21-r3
-	>=media-libs/gst-plugins-base-0.10.25.2
-	>=media-libs/gst-plugins-bad-${GVER}
-	>=media-libs/gst-plugins-good-${GVER}
-	>=media-libs/gst-plugins-ugly-${GVER}
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
-	>=media-plugins/gst-plugins-gnomevfs-${GVER}
-	>=media-plugins/gst-plugins-gconf-${GVER}
-	cdda? (
-		|| (
-			>=media-plugins/gst-plugins-cdparanoia-${GVER}
-			>=media-plugins/gst-plugins-cdio-${GVER}
-		)
-	)
-	media-libs/musicbrainz:1
-	>=dev-dotnet/dbus-glib-sharp-0.4.1
-	>=dev-dotnet/dbus-sharp-0.6.1a
-	>=dev-dotnet/mono-addins-0.4[gtk]
-	>=dev-dotnet/taglib-sharp-2.0.3.7
-	>=dev-db/sqlite-3.4
-	karma? ( >=media-libs/libkarma-0.1.0-r1 )
-	aac? ( >=media-plugins/gst-plugins-faad-${GVER} )
-	boo? (
-		>=dev-lang/boo-0.8.1
-	)
-	daap? (
-		>=dev-dotnet/mono-zeroconf-0.8.0-r1
-	)
-	doc? (
-		virtual/monodoc
-		>=app-text/gnome-doc-utils-0.17.3
-	)
-	encode? (
-		>=media-plugins/gst-plugins-lame-${GVER}
-		>=media-plugins/gst-plugins-taglib-${GVER}
-	)
-	ipod? (
-		>=media-libs/libgpod-0.7.94[mono]
-	)
-	mtp? (
-		>=media-libs/libmtp-0.3.0
-	)
-	web? (
-		>=net-libs/webkit-gtk-1.2.2
-		>=net-libs/libsoup-2.26:2.4
-		>=net-libs/libsoup-gnome-2.26:2.4
-	)
-	youtube? (
-		>=dev-dotnet/google-gdata-sharp-1.4
-	)"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-S=${WORKDIR}/${PN}-1-${PV}
-
-src_prepare () {
-	# Fix intltool b0rkage similar to
-	# https://bugzilla.gnome.org/show_bug.cgi?id=577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
-
-	epatch "${FILESDIR}/${PN}-1.7.4-make-webkit-optional.patch"
-	epatch "${FILESDIR}/${P}-fix-collisions.patch"
-	AT_M4DIR="-I build/m4/banshee -I build/m4/shamrock -I build/m4/shave" \
-		eautoreconf
-}
-
-src_configure() {
-	# Disable gio till gtk-sharp-beans and gio-sharp are in-tree
-	# Disable gio-hardware till gudev-sharp and gkeyfile-sharp are around
-	# for a bit longer (when these are in, we can drop HAL)
-	# Ditto gst-sharp
-	local myconf="--disable-dependency-tracking --disable-static
-		--enable-gnome --enable-schemas-install
-		--with-gconf-schema-file-dir=/etc/gconf/schemas
-		--with-vendor-build-id=Gentoo/${PN}/${PVR}
-		--enable-gapless-playback
-		--disable-gio --disable-gst-sharp
-		--disable-gio_hardware --enable-hal
-		--disable-torrent
-		--disable-shave"
-
-	econf \
-		$(use_enable doc docs) \
-		$(use_enable doc user-help) \
-		$(use_enable boo) \
-		$(use_enable mtp) \
-		$(use_enable daap) \
-		$(use_enable ipod appledevice) --disable-ipod \
-		$(use_enable podcast) \
-		$(use_enable karma) \
-		$(use_enable web webkit) \
-		$(use_enable youtube) \
-		${myconf}
-}
-
-src_compile() {
-	emake MCS=/usr/bin/gmcs
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install efailed"
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If ${PN} doesn't play some format, please check your"
-	ewarn "USE flags on media-plugins/gst-plugins-meta"
-	ewarn
-
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/banshee/files/banshee-1.7.4-fix-collisions.patch b/media-sound/banshee/files/banshee-1.7.4-fix-collisions.patch
deleted file mode 100644
index 4322ecc1b967..000000000000
--- a/media-sound/banshee/files/banshee-1.7.4-fix-collisions.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urNp banshee-1-1.7.4.orig/data/desktop-files/Makefile.am banshee-1-1.7.4/data/desktop-files/Makefile.am
---- banshee-1-1.7.4.orig/data/desktop-files/Makefile.am	2010-08-29 12:47:14.119617115 +0530
-+++ banshee-1-1.7.4/data/desktop-files/Makefile.am	2010-08-29 12:56:42.166617090 +0530
-@@ -16,8 +16,8 @@ endif
- 
- @INTLTOOL_DESKTOP_RULE@
- 
--install-data-hook:
--	test "$(top_srcdir)" = "$(top_builddir)" && update-desktop-database $(DESTDIR)$(datadir)/applications || :
-+#install-data-hook:
-+#	test "$(top_srcdir)" = "$(top_builddir)" && update-desktop-database $(DESTDIR)$(datadir)/applications || :
- 
- EXTRA_DIST = \
- 	$(desktop_in_files) \
-diff -urNp banshee-1-1.7.4.orig/src/Extensions/Banshee.AmazonMp3/Makefile.am banshee-1-1.7.4/src/Extensions/Banshee.AmazonMp3/Makefile.am
---- banshee-1-1.7.4.orig/src/Extensions/Banshee.AmazonMp3/Makefile.am	2010-08-29 12:47:14.366617116 +0530
-+++ banshee-1-1.7.4/src/Extensions/Banshee.AmazonMp3/Makefile.am	2010-08-29 12:51:08.230617164 +0530
-@@ -22,9 +22,9 @@ mime_DATA = banshee-amz.xml
- bamz: bamz.in
- 	@echo '  GEN   $@'; sed 's,@bansheedir@,$(pkglibdir),g' < $< > $@
- 
--define EXTRA_INSTALL_DATA_HOOK
--	test "$(top_srcdir)" = "$(top_builddir)" && update-mime-database -V $(DESTDIR)$(datadir)/mime || :
--endef
-+#define EXTRA_INSTALL_DATA_HOOK
-+#	test "$(top_srcdir)" = "$(top_builddir)" && update-mime-database -V $(DESTDIR)$(datadir)/mime || :
-+#endef
- 
- include $(top_srcdir)/build/build.mk
- 
diff --git a/media-sound/banshee/files/banshee-1.7.4-fix-gdu-build.patch b/media-sound/banshee/files/banshee-1.7.4-fix-gdu-build.patch
deleted file mode 100644
index 83084b283b49..000000000000
--- a/media-sound/banshee/files/banshee-1.7.4-fix-gdu-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp banshee-1-1.7.4.orig/build/m4/shamrock/gnome-doc.m4 banshee-1-1.7.4/build/m4/shamrock/gnome-doc.m4
---- banshee-1-1.7.4.orig/build/m4/shamrock/gnome-doc.m4	2010-08-29 02:24:28.598617103 +0530
-+++ banshee-1-1.7.4/build/m4/shamrock/gnome-doc.m4	2010-08-29 11:07:22.709617074 +0530
-@@ -14,6 +14,8 @@ AC_DEFUN([SHAMROCK_CHECK_GNOME_DOC_UTILS
- 
- 	if test "x$enable_user_help" = "xyes"; then
-         GNOME_DOC_INIT([$1], enable_user_help=yes, enable_user_help=no)
-+    else
-+        AM_CONDITIONAL(ENABLE_SK, false)
-     fi
- 
- 	AM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, test "x$enable_user_help" = "xyes")
diff --git a/media-sound/banshee/files/banshee-1.7.5-fix-collisions.patch b/media-sound/banshee/files/banshee-1.7.5-fix-collisions.patch
deleted file mode 100644
index fdfd478dd2a5..000000000000
--- a/media-sound/banshee/files/banshee-1.7.5-fix-collisions.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urNp banshee-1-1.7.4.orig/data/desktop-files/Makefile.am banshee-1-1.7.4/data/desktop-files/Makefile.am
---- banshee-1-1.7.4.orig/data/desktop-files/Makefile.am	2010-08-29 12:47:14.119617115 +0530
-+++ banshee-1-1.7.4/data/desktop-files/Makefile.am	2010-08-29 12:56:42.166617090 +0530
-@@ -16,8 +16,8 @@ endif
- 
- @INTLTOOL_DESKTOP_RULE@
- 
--install-data-hook:
--	test "$(top_srcdir)" = "$(top_builddir)" && update-desktop-database $(DESTDIR)$(datadir)/applications || :
-+#install-data-hook:
-+#	test "$(top_srcdir)" = "$(top_builddir)" && update-desktop-database $(DESTDIR)$(datadir)/applications || :
- 
- EXTRA_DIST = \
- 	$(desktop_in_files) \