Version bump, remove old

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

7 files changed, 24 insertions, 365 deletions

diff --git a/media-sound/xnoise/ChangeLog b/media-sound/xnoise/ChangeLog
index b59c2aa4b862..de6dba2aa251 100644
--- a/media-sound/xnoise/ChangeLog
+++ b/media-sound/xnoise/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/xnoise
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xnoise/ChangeLog,v 1.14 2011/10/14 16:46:23 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xnoise/ChangeLog,v 1.15 2011/12/18 10:26:44 angelos Exp $
+
+*xnoise-0.1.30 (18 Dec 2011)
+
+  18 Dec 2011; Christoph Mende <angelos@gentoo.org> +xnoise-0.1.30.ebuild,
+  -files/xnoise-0.1.29-disable-deprecated.patch, -xnoise-0.1.28.ebuild,
+  -xnoise-0.1.29.ebuild, metadata.xml, xnoise-9999.ebuild:
+  Version bump, remove old
 
 *xnoise-0.1.29 (14 Oct 2011)
 
diff --git a/media-sound/xnoise/Manifest b/media-sound/xnoise/Manifest
index 041912e1f4e9..8d0dd8842a18 100644
--- a/media-sound/xnoise/Manifest
+++ b/media-sound/xnoise/Manifest
@@ -1,8 +1,5 @@
-AUX xnoise-0.1.29-disable-deprecated.patch 9056 RMD160 a02b4af9c961d7e2994ca5cf66d64e901aa52f12 SHA1 91cbc7bfee55c4788c99aef0f286c26dcdd8dc7f SHA256 940f34cf1232b2d7a7b71bad055db7cbb53b0c75f7690943b70bbda19968f455
-DIST xnoise-0.1.28.tar.bz2 897182 RMD160 0948814394a359d15dbe41e83a34a85f73d2df95 SHA1 0da3f31fc575380899f0688315ebda07a2d72320 SHA256 ceecd822f4b6bdab2b88613c5e6eab2b82f9f19910de1f51ca84c8f290f41c76
-DIST xnoise-0.1.29.tar.bz2 998626 RMD160 f4f3af1973e4eff62841cc53a513b176061f1094 SHA1 3b37c1678cbee2a22c1f68231b32f8e5aeaae152 SHA256 dabd1d736204929e9a9389fe3afee19fdee74c82078856d0721d5329d07cd63b
-EBUILD xnoise-0.1.28.ebuild 1602 RMD160 8a6451a33c96e7970a3469c5e8b3294ef51db1d0 SHA1 4201762214a34864bb58ed4a5b9a105281228d21 SHA256 7bc0fe76a53d0587fa4e06b240c99fe066cf57188814ab7ba1404ff370884578
-EBUILD xnoise-0.1.29.ebuild 1703 RMD160 ce74551c2ee8c57c2e68326e8bbdcbb81ab2dd27 SHA1 7f4faec2336d009b0340b279d86bd572f26e5732 SHA256 95d91f6fc0caaaf1504bd772c082409005bc1ddc01d7663f193e250491c4faa3
-EBUILD xnoise-9999.ebuild 1756 RMD160 46c6f03a21b61cc0fa96554fbeb2c1b14a73be35 SHA1 ba76191e349d6ce75fdc9dc11179f2e8db46ce7b SHA256 5305949bd0efee81fcaf21a8340e2eb28071faa1d3cf81224d99dcf664ba3df9
-MISC ChangeLog 2213 RMD160 a8e03b9e2d71d00164139411b2efe010b26e9340 SHA1 7776cb498fab22b22aab4193dbb29facb5822b04 SHA256 70131823dc3cfa396aaa28596f5b963a27dd2fca4322f6dc26508f9d426d6716
-MISC metadata.xml 401 RMD160 201e1e7f96beb67a9938c39b2aef2a4eaa138d85 SHA1 b875d409088f64e68643b54ac8b446364d18c1ab SHA256 f78e0e4e25c27ab05eb5b9cccd613b86c1d25320bc923c8a46c74e75cbcaa21c
+DIST xnoise-0.1.30.tar.bz2 1047052 RMD160 68af32414f73c28c9c8375347875820a5bd070c7 SHA1 697644b9bed3d774dd1fe94a52aae4e619fe2f4b SHA256 fdc121bf567a88a6f62bc01ccba2c39402f53417d0b22a6e5a369612b351c8f7
+EBUILD xnoise-0.1.30.ebuild 1581 RMD160 123345a5ee5d85a252da493f195dd0a2dd068f12 SHA1 f759340c1386b527035b2b22994f8af91c34fd83 SHA256 f1ac44360a9b212f1fb923a09e6b2b36c5a7ad472d1c67c1bb2d6b9ffb409a14
+EBUILD xnoise-9999.ebuild 1735 RMD160 124417a86346f1d1aaef02e0c405793543c1be8f SHA1 3d17544959fb502c44759dc960a20c8e97e077cc SHA256 36f75fdd5afe0c78a5ca288d3331a68bd54ae9e19269b7772fc8e63121b2275b
+MISC ChangeLog 2477 RMD160 9cc9b4dcb7be5ed1c0ebc477ef70b2e69bd32f6e SHA1 c8432905a1f1e627e19a978feaf09a7c60e5f4fd SHA256 8b55adecea39d684193ece2e88b0e83efb54f947a9eab5a907516d56ed1f82cc
+MISC metadata.xml 424 RMD160 c9f835239424efd90df70a6a4d875a8742dc4833 SHA1 961af11fc9903d01a98f9e1abe8d694e708ae8cf SHA256 1bbd0693966b4366611dd32d3a8be124be6825d5da68668b37599f767ddf0df9
diff --git a/media-sound/xnoise/files/xnoise-0.1.29-disable-deprecated.patch b/media-sound/xnoise/files/xnoise-0.1.29-disable-deprecated.patch
deleted file mode 100644
index 0a7922705764..000000000000
--- a/media-sound/xnoise/files/xnoise-0.1.29-disable-deprecated.patch
+++ /dev/null
@@ -1,272 +0,0 @@
-diff --git a/libxnoise/Makefile.am b/libxnoise/Makefile.am
-index 64ca834..5fe8b03 100644
---- a/libxnoise/Makefile.am
-+++ b/libxnoise/Makefile.am
-@@ -13,12 +13,6 @@ INCLUDES = \
-     -DPLUGINSDIR=\"$(libdir)/xnoise\" \
-     -DLICENSEDIR=\"$(datadir)/xnoise/license/\" \
-     -DLOCALE_DIR=\"${datarootdir}/locale\" \
--    -DGIO_DISABLE_DEPRECATED=1 \
--    -DGDK_DISABLE_DEPRECATED=1 \
--    -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
--    -DG_DISABLE_DEPRECATED=1 \
--    -DPANGO_DISABLE_DEPRECATED=1 \
--    -DGSEAL_ENABLE=1 \
-     $(NULL)
- 
- libxnoise_hdir = $(includedir)/xnoise
-diff --git a/plugins/chartlyrics/Makefile.am b/plugins/chartlyrics/Makefile.am
-index 391c876..db0754d 100644
---- a/plugins/chartlyrics/Makefile.am
-+++ b/plugins/chartlyrics/Makefile.am
-@@ -13,12 +13,6 @@ INCLUDES = \
-     -include $(CONFIG_HEADER) \
-     $(LIBXML_CFLAGS) \
-     $(LIBSOUP_CFLAGS) \
--    -DGIO_DISABLE_DEPRECATED=1 \
--    -DGDK_DISABLE_DEPRECATED=1 \
--    -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
--    -DG_DISABLE_DEPRECATED=1 \
--    -DPANGO_DISABLE_DEPRECATED=1 \
--    -DGSEAL_ENABLE=1 \
-     -I$(top_srcdir)/libxnoise \
-     $(NULL)
- 
-diff --git a/plugins/cyclic-save-state/Makefile.am b/plugins/cyclic-save-state/Makefile.am
-index e9ce77b..acebba8 100644
---- a/plugins/cyclic-save-state/Makefile.am
-+++ b/plugins/cyclic-save-state/Makefile.am
-@@ -12,12 +12,6 @@ INCLUDES = \
-     -DLOCALE_DIR=\"${datarootdir}/locale\" \
-     -include $(CONFIG_HEADER) \
-     -I$(top_srcdir)/libxnoise \
--    -DGIO_DISABLE_DEPRECATED=1 \
--    -DGDK_DISABLE_DEPRECATED=1 \
--    -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
--    -DG_DISABLE_DEPRECATED=1 \
--    -DPANGO_DISABLE_DEPRECATED=1 \
--    -DGSEAL_ENABLE=1 \
-     $(NULL)
- 
- libCyclicSaveStatedir = $(libdir)/xnoise
-diff --git a/plugins/databaseLyrics/Makefile.am b/plugins/databaseLyrics/Makefile.am
-index 35abdff..ac72fc0 100644
---- a/plugins/databaseLyrics/Makefile.am
-+++ b/plugins/databaseLyrics/Makefile.am
-@@ -12,12 +12,6 @@ INCLUDES = \
-     -DLOCALE_DIR=\"${datarootdir}/locale\" \
-     -include $(CONFIG_HEADER) \
-     -I$(top_srcdir)/libxnoise \
--    -DGIO_DISABLE_DEPRECATED=1 \
--    -DGDK_DISABLE_DEPRECATED=1 \
--    -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
--    -DG_DISABLE_DEPRECATED=1 \
--    -DPANGO_DISABLE_DEPRECATED=1 \
--    -DGSEAL_ENABLE=1 \
-     $(NULL)
- 
- libDatabaseLyricsdir = $(libdir)/xnoise
-diff --git a/plugins/lastfmCovers/Makefile.am b/plugins/lastfmCovers/Makefile.am
-index 3e2268b..468e4cf 100644
---- a/plugins/lastfmCovers/Makefile.am
-+++ b/plugins/lastfmCovers/Makefile.am
-@@ -14,12 +14,6 @@ INCLUDES = \
-     -I$(top_srcdir)/libxnoise \
-     $(LIBXML_CFLAGS) \
-     $(LIBSOUP_CFLAGS) \
--    -DGIO_DISABLE_DEPRECATED=1 \
--    -DGDK_DISABLE_DEPRECATED=1 \
--    -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
--    -DG_DISABLE_DEPRECATED=1 \
--    -DPANGO_DISABLE_DEPRECATED=1 \
--    -DGSEAL_ENABLE=1 \
-     $(NULL)
- 
- libLastfmCoversdir = $(libdir)/xnoise
-diff --git a/plugins/lyricwiki/Makefile.am b/plugins/lyricwiki/Makefile.am
-index 520295e..662a78e 100644
---- a/plugins/lyricwiki/Makefile.am
-+++ b/plugins/lyricwiki/Makefile.am
-@@ -14,12 +14,6 @@ INCLUDES = \
-     -I$(top_srcdir)/libxnoise \
-     $(LIBXML_CFLAGS) \
-     $(LIBSOUP_CFLAGS) \
--    -DGIO_DISABLE_DEPRECATED=1 \
--    -DGDK_DISABLE_DEPRECATED=1 \
--    -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
--    -DG_DISABLE_DEPRECATED=1 \
--    -DPANGO_DISABLE_DEPRECATED=1 \
--    -DGSEAL_ENABLE=1 \
-     $(NULL)
- 
- libLyricwikidir = $(libdir)/xnoise
-diff --git a/plugins/mediakeys/Makefile.am b/plugins/mediakeys/Makefile.am
-index 35ed5b9..9a27ed0 100644
---- a/plugins/mediakeys/Makefile.am
-+++ b/plugins/mediakeys/Makefile.am
-@@ -15,12 +15,6 @@ INCLUDES = \
-     -I$(top_srcdir)/libxnoise \
-     $(X11_CFLAGS) \
-     $(GDKX11_CFLAGS) \
--    -DGIO_DISABLE_DEPRECATED=1 \
--    -DGDK_DISABLE_DEPRECATED=1 \
--    -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
--    -DG_DISABLE_DEPRECATED=1 \
--    -DPANGO_DISABLE_DEPRECATED=1 \
--    -DGSEAL_ENABLE=1 \
-     $(NULL)
- 
- libmediakeysdir = $(libdir)/xnoise
-diff --git a/plugins/mpris/Makefile.am b/plugins/mpris/Makefile.am
-index 9184cc5..4693a9d 100644
---- a/plugins/mpris/Makefile.am
-+++ b/plugins/mpris/Makefile.am
-@@ -13,12 +13,6 @@ INCLUDES = \
-     -DLOCALE_DIR=\"${datarootdir}/locale\" \
-     -include $(CONFIG_HEADER) \
-     -I$(top_srcdir)/libxnoise \
--    -DGIO_DISABLE_DEPRECATED=1 \
--    -DGDK_DISABLE_DEPRECATED=1 \
--    -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
--    -DG_DISABLE_DEPRECATED=1 \
--    -DPANGO_DISABLE_DEPRECATED=1 \
--    -DGSEAL_ENABLE=1 \
-     $(NULL)
- 
- libmprisdir = $(libdir)/xnoise
-diff --git a/plugins/mpris_one/Makefile.am b/plugins/mpris_one/Makefile.am
-index fda4024..b781be9 100644
---- a/plugins/mpris_one/Makefile.am
-+++ b/plugins/mpris_one/Makefile.am
-@@ -13,12 +13,6 @@ INCLUDES = \
-     -DLOCALE_DIR=\"${datarootdir}/locale\" \
-     -include $(CONFIG_HEADER) \
-     -I$(top_srcdir)/libxnoise \
--    -DGIO_DISABLE_DEPRECATED=1 \
--    -DGDK_DISABLE_DEPRECATED=1 \
--    -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
--    -DG_DISABLE_DEPRECATED=1 \
--    -DPANGO_DISABLE_DEPRECATED=1 \
--    -DGSEAL_ENABLE=1 \
-     $(NULL)
- 
- libmprisonedir = $(libdir)/xnoise
-diff --git a/plugins/notifications/Makefile.am b/plugins/notifications/Makefile.am
-index 2b59597..4f6c6d8 100644
---- a/plugins/notifications/Makefile.am
-+++ b/plugins/notifications/Makefile.am
-@@ -14,12 +14,6 @@ INCLUDES = \
-     -include $(CONFIG_HEADER) \
-     -I$(top_srcdir)/libxnoise \
-     $(LIBNOTIFY_CFLAGS) \
--    -DGIO_DISABLE_DEPRECATED=1 \
--    -DGDK_DISABLE_DEPRECATED=1 \
--    -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
--    -DG_DISABLE_DEPRECATED=1 \
--    -DPANGO_DISABLE_DEPRECATED=1 \
--    -DGSEAL_ENABLE=1 \
-     $(NULL)
- 
- libnotificationsdir = $(libdir)/xnoise
-diff --git a/plugins/notifications2/Makefile.am b/plugins/notifications2/Makefile.am
-index 1292a3a..e3d21e8 100644
---- a/plugins/notifications2/Makefile.am
-+++ b/plugins/notifications2/Makefile.am
-@@ -14,12 +14,6 @@ INCLUDES = \
-     -include $(CONFIG_HEADER) \
-     -I$(top_srcdir)/libxnoise \
-     $(LIBNOTIFY_CFLAGS) \
--    -DGIO_DISABLE_DEPRECATED=1 \
--    -DGDK_DISABLE_DEPRECATED=1 \
--    -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
--    -DG_DISABLE_DEPRECATED=1 \
--    -DPANGO_DISABLE_DEPRECATED=1 \
--    -DGSEAL_ENABLE=1 \
-     $(NULL)
- 
- libnotificationsdir = $(libdir)/xnoise
-diff --git a/plugins/soundmenu/Makefile.am b/plugins/soundmenu/Makefile.am
-index 0a7b129..1dff689 100644
---- a/plugins/soundmenu/Makefile.am
-+++ b/plugins/soundmenu/Makefile.am
-@@ -14,12 +14,6 @@ INCLUDES = \
-     -include $(CONFIG_HEADER) \
-     -I$(top_srcdir)/libxnoise \
-     $(LIBINDICATE_CFLAGS) \
--    -DGIO_DISABLE_DEPRECATED=1 \
--    -DGDK_DISABLE_DEPRECATED=1 \
--    -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
--    -DG_DISABLE_DEPRECATED=1 \
--    -DPANGO_DISABLE_DEPRECATED=1 \
--    -DGSEAL_ENABLE=1 \
-     $(NULL)
- 
- libsoundmenudir = $(libdir)/xnoise
-diff --git a/plugins/soundmenu2/Makefile.am b/plugins/soundmenu2/Makefile.am
-index 7abb524..8630152 100644
---- a/plugins/soundmenu2/Makefile.am
-+++ b/plugins/soundmenu2/Makefile.am
-@@ -13,12 +13,6 @@ INCLUDES = \
-     -DLOCALE_DIR=\"${datarootdir}/locale\" \
-     -include $(CONFIG_HEADER) \
-     -I$(top_srcdir)/libxnoise \
--    -DGIO_DISABLE_DEPRECATED=1 \
--    -DGDK_DISABLE_DEPRECATED=1 \
--    -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
--    -DG_DISABLE_DEPRECATED=1 \
--    -DPANGO_DISABLE_DEPRECATED=1 \
--    -DGSEAL_ENABLE=1 \
-     $(NULL)
- 
- libsoundmenu2dir = $(libdir)/xnoise
-diff --git a/plugins/testplugin/Makefile.am b/plugins/testplugin/Makefile.am
-index 38a5600..6df31ec 100644
---- a/plugins/testplugin/Makefile.am
-+++ b/plugins/testplugin/Makefile.am
-@@ -11,12 +11,6 @@ INCLUDES = \
-     -DDATADIR='"$(datadir)"' \
-     -DLOCALE_DIR=\"${datarootdir}/locale\" \
-     -include $(CONFIG_HEADER) \
--    -DGIO_DISABLE_DEPRECATED=1 \
--    -DGDK_DISABLE_DEPRECATED=1 \
--    -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
--    -DG_DISABLE_DEPRECATED=1 \
--    -DPANGO_DISABLE_DEPRECATED=1 \
--    -DGSEAL_ENABLE=1 \
-     -I$(top_srcdir)/libxnoise \
-     $(NULL)
- 
-diff --git a/plugins/titleToDecoration/Makefile.am b/plugins/titleToDecoration/Makefile.am
-index 2977da9..fa3eac9 100644
---- a/plugins/titleToDecoration/Makefile.am
-+++ b/plugins/titleToDecoration/Makefile.am
-@@ -12,12 +12,6 @@ INCLUDES = \
-     -DLOCALE_DIR=\"${datarootdir}/locale\" \
-     -include $(CONFIG_HEADER) \
-     -I$(top_srcdir)/libxnoise \
--    -DGIO_DISABLE_DEPRECATED=1 \
--    -DGDK_DISABLE_DEPRECATED=1 \
--    -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
--    -DG_DISABLE_DEPRECATED=1 \
--    -DPANGO_DISABLE_DEPRECATED=1 \
--    -DGSEAL_ENABLE=1 \
-     $(NULL)
- 
- libTitleToDecorationdir = $(libdir)/xnoise
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 21336ee..cef49f6 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -12,12 +12,6 @@ INCLUDES = \
-     -I$(top_srcdir)/libxnoise \
-     $(XNOISE_CFLAGS) \
-     -DLOCALE_DIR=\"${datarootdir}/locale\" \
--    -DGIO_DISABLE_DEPRECATED=1 \
--    -DGDK_DISABLE_DEPRECATED=1 \
--    -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
--    -DG_DISABLE_DEPRECATED=1 \
--    -DPANGO_DISABLE_DEPRECATED=1 \
--    -DGSEAL_ENABLE=1 \
-     $(NULL)
- 
- xnoise_SOURCES = \
diff --git a/media-sound/xnoise/metadata.xml b/media-sound/xnoise/metadata.xml
index f897551a43d1..f7249835ce5c 100644
--- a/media-sound/xnoise/metadata.xml
+++ b/media-sound/xnoise/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Christoph Mende</name>
 	</maintainer>
 	<use>
-		<flag name="cover">Enable support for cover art fetching</flag>
+		<flag name="lastfm">Enable support for lastfm cover art fetching and scrobbling</flag>
 		<flag name="lyrics">Enable support for lyrics fetching</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/xnoise/xnoise-0.1.29.ebuild b/media-sound/xnoise/xnoise-0.1.29.ebuild
deleted file mode 100644
index 5a2c5eeffdf4..000000000000
--- a/media-sound/xnoise/xnoise-0.1.29.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xnoise/xnoise-0.1.29.ebuild,v 1.1 2011/10/14 16:46:23 angelos Exp $
-
-EAPI=4
-inherit autotools eutils fdo-mime gnome2-utils
-
-DESCRIPTION="A media player for Gtk+ with a slick GUI, great speed and lots of
-features"
-HOMEPAGE="http://www.xnoise-media-player.com/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cover libnotify +lyrics"
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-libs/glib-2.26:2
-	dev-libs/libunique:1
-	dev-libs/libxml2:2
-	media-libs/gst-plugins-base:0.10
-	media-libs/gstreamer:0.10
-	media-libs/taglib
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	cover? ( net-libs/libsoup:2.4 )
-	libnotify? ( x11-libs/libnotify )
-	lyrics? ( net-libs/libsoup:2.4 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-disable-deprecated.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-soundmenu \
-		--enable-soundmenu2 \
-		$(use_enable cover lastfm-covers) \
-		$(use_enable libnotify notifications) \
-		$(use_enable lyrics leoslyrics) \
-		$(use_enable lyrics lyricsfly) \
-		$(use_enable lyrics lyricwiki) \
-		$(use_enable lyrics chartlyrics)
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -exec rm -rf {} + || die
-	rm -rf "${ED}"/usr/share/${PN}/license || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/xnoise/xnoise-0.1.28.ebuild b/media-sound/xnoise/xnoise-0.1.30.ebuild
index 3712cebd34e5..3ac1238b0540 100644
--- a/media-sound/xnoise/xnoise-0.1.28.ebuild
+++ b/media-sound/xnoise/xnoise-0.1.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xnoise/xnoise-0.1.28.ebuild,v 1.1 2011/09/23 18:19:33 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xnoise/xnoise-0.1.30.ebuild,v 1.1 2011/12/18 10:26:44 angelos Exp $
 
 EAPI=4
 inherit fdo-mime gnome2-utils
@@ -13,7 +13,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+cover libnotify +lyrics"
+IUSE="+lastfm libnotify +lyrics"
 
 RDEPEND="dev-db/sqlite:3
 	>=dev-libs/glib-2.26:2
@@ -25,7 +25,7 @@ RDEPEND="dev-db/sqlite:3
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:2
-	cover? ( net-libs/libsoup:2.4 )
+	lastfm? ( net-libs/libsoup:2.4 )
 	libnotify? ( x11-libs/libnotify )
 	lyrics? ( net-libs/libsoup:2.4 )"
 DEPEND="${RDEPEND}
@@ -39,7 +39,7 @@ src_configure() {
 	econf \
 		--disable-soundmenu \
 		--enable-soundmenu2 \
-		$(use_enable cover lastfm-covers) \
+		$(use_enable lastfm) \
 		$(use_enable libnotify notifications) \
 		$(use_enable lyrics leoslyrics) \
 		$(use_enable lyrics lyricsfly) \
@@ -49,7 +49,7 @@ src_configure() {
 
 src_install() {
 	default
-	find "${ED}" -type f -name "*.la" -exec rm -rf {} + || die
+	find "${ED}" -type f -name "*.la" -delete || die
 	rm -rf "${ED}"/usr/share/${PN}/license || die
 }
 
diff --git a/media-sound/xnoise/xnoise-9999.ebuild b/media-sound/xnoise/xnoise-9999.ebuild
index 1b0109c4cad2..46e80bd1f8d0 100644
--- a/media-sound/xnoise/xnoise-9999.ebuild
+++ b/media-sound/xnoise/xnoise-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xnoise/xnoise-9999.ebuild,v 1.4 2011/07/08 16:31:16 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xnoise/xnoise-9999.ebuild,v 1.5 2011/12/18 10:26:44 angelos Exp $
 
 EAPI=4
 inherit fdo-mime gnome2-utils mercurial
@@ -13,7 +13,7 @@ EHG_REPO_URI="https://xnoise.googlecode.com/hg/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+cover libnotify +lyrics"
+IUSE="+lastfm libnotify +lyrics"
 
 RDEPEND="dev-db/sqlite:3
 	>=dev-libs/glib-2.26:2
@@ -25,7 +25,7 @@ RDEPEND="dev-db/sqlite:3
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:2
-	cover? ( net-libs/libsoup:2.4 )
+	lastfm? ( net-libs/libsoup:2.4 )
 	libnotify? ( x11-libs/libnotify )
 	lyrics? ( net-libs/libsoup:2.4 )"
 DEPEND="${RDEPEND}
@@ -47,7 +47,7 @@ src_configure() {
 	econf \
 		--disable-soundmenu \
 		--enable-soundmenu2 \
-		$(use_enable cover lastfm-covers) \
+		$(use_enable lastfm) \
 		$(use_enable libnotify notifications) \
 		$(use_enable lyrics leoslyrics) \
 		$(use_enable lyrics lyricsfly) \
@@ -57,7 +57,7 @@ src_configure() {
 
 src_install() {
 	default
-	find "${ED}" -type f -name "*.la" -exec rm -rf {} + || die
+	find "${ED}" -type f -name "*.la" -delete || die
 	rm -rf "${ED}"/usr/share/${PN}/license || die
 }