Version bump

(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)

4 files changed, 21 insertions, 74 deletions

diff --git a/media-sound/xnoise/ChangeLog b/media-sound/xnoise/ChangeLog
index 57494941f384..6fc61421b035 100644
--- a/media-sound/xnoise/ChangeLog
+++ b/media-sound/xnoise/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/xnoise
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xnoise/ChangeLog,v 1.22 2012/07/29 10:31:52 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xnoise/ChangeLog,v 1.23 2012/08/16 19:08:27 angelos Exp $
+
+*xnoise-0.2.5 (16 Aug 2012)
+
+  16 Aug 2012; Christoph Mende <angelos@gentoo.org> +xnoise-0.2.5.ebuild,
+  -xnoise-0.2.2.ebuild, -xnoise-0.2.3.ebuild, xnoise-9999.ebuild:
+  Version bump
 
 *xnoise-0.2.4 (29 Jul 2012)
 
diff --git a/media-sound/xnoise/xnoise-0.2.2.ebuild b/media-sound/xnoise/xnoise-0.2.2.ebuild
deleted file mode 100644
index b414c98bffde..000000000000
--- a/media-sound/xnoise/xnoise-0.2.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xnoise/xnoise-0.2.2.ebuild,v 1.1 2012/05/26 20:44:00 angelos Exp $
-
-EAPI=4
-inherit 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="mirror://github/shuerhaaken/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+lastfm libnotify +lyrics"
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-libs/glib-2.28:2
-	dev-libs/libxml2:2
-	media-libs/gst-plugins-base:0.10
-	media-libs/gstreamer:0.10
-	media-libs/taglib
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	lastfm? ( net-libs/libsoup:2.4 )
-	libnotify? ( x11-libs/libnotify )
-	lyrics? ( net-libs/libsoup:2.4 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-DOCS=( AUTHORS README )
-
-src_configure() {
-	econf \
-		$(use_enable lyrics lyricwiki) \
-		$(use_enable lastfm) \
-		$(use_enable libnotify notifications) \
-		--enable-soundmenu2 \
-		$(use_enable lyrics chartlyrics) \
-		$(use_enable lyrics azlyrics)
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || 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.2.3.ebuild b/media-sound/xnoise/xnoise-0.2.5.ebuild
index 02bd4213fec3..0ddb7262ffc6 100644
--- a/media-sound/xnoise/xnoise-0.2.3.ebuild
+++ b/media-sound/xnoise/xnoise-0.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xnoise/xnoise-0.2.3.ebuild,v 1.1 2012/07/12 13:51:35 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xnoise/xnoise-0.2.5.ebuild,v 1.1 2012/08/16 19:08:27 angelos Exp $
 
 EAPI=4
 inherit fdo-mime gnome2-utils
@@ -15,17 +15,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+lastfm libnotify +lyrics"
 
-RDEPEND="dev-db/sqlite:3
+RDEPEND="x11-libs/gtk+:3
 	>=dev-libs/glib-2.30:2
-	dev-libs/libxml2:2
-	media-libs/gst-plugins-base:0.10
 	media-libs/gstreamer:0.10
+	media-libs/gst-plugins-base:0.10
+	dev-db/sqlite:3
 	media-libs/taglib
 	x11-libs/cairo
-	x11-libs/gtk+:3
+	x11-libs/libX11
 	lastfm? ( net-libs/libsoup:2.4 )
 	libnotify? ( x11-libs/libnotify )
-	lyrics? ( net-libs/libsoup:2.4 )"
+	lyrics? ( net-libs/libsoup:2.4
+		dev-libs/libxml2:2 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
@@ -38,9 +39,12 @@ src_configure() {
 		$(use_enable lyrics lyricwiki) \
 		$(use_enable lastfm) \
 		$(use_enable libnotify notifications) \
+		--enable-mpris \
 		--enable-soundmenu2 \
+		--enable-mediakeys \
 		$(use_enable lyrics chartlyrics) \
-		$(use_enable lyrics azlyrics)
+		$(use_enable lyrics azlyrics) \
+		--disable-ubuntuone
 }
 
 src_install() {
diff --git a/media-sound/xnoise/xnoise-9999.ebuild b/media-sound/xnoise/xnoise-9999.ebuild
index 816639f8522b..235320dced07 100644
--- a/media-sound/xnoise/xnoise-9999.ebuild
+++ b/media-sound/xnoise/xnoise-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.10 2012/07/29 10:31:52 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xnoise/xnoise-9999.ebuild,v 1.11 2012/08/16 19:08:27 angelos Exp $
 
 EAPI=4
 inherit fdo-mime gnome2-utils git-2
@@ -51,7 +51,8 @@ src_configure() {
 		--enable-soundmenu2 \
 		--enable-mediakeys \
 		$(use_enable lyrics chartlyrics) \
-		$(use_enable lyrics azlyrics)
+		$(use_enable lyrics azlyrics) \
+		--disable-ubuntuone
 }
 
 src_install() {