First release on the 2.5 branch; no longer masked. Add dependency on libguess as suggested by Mathieu Zhang in bug #335461. Remove old ebuilds.

(Portage version: 2.1.9.46/cvs/Linux x86_64)

6 files changed, 12 insertions, 256 deletions

diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index 2970e92c9822..29be06c91908 100644
--- a/media-sound/audacious/ChangeLog
+++ b/media-sound/audacious/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/audacious
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.226 2011/04/11 22:31:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.227 2011/04/16 20:37:02 chainsaw Exp $
+
+*audacious-2.5.0 (16 Apr 2011)
+
+  16 Apr 2011; Tony Vroon <chainsaw@gentoo.org> -audacious-2.2.ebuild,
+  -audacious-2.4.1.ebuild, -audacious-2.4.2.ebuild, -audacious-2.4.3.ebuild,
+  -audacious-2.5_alpha1.ebuild, +audacious-2.5.0.ebuild:
+  First release on the 2.5 branch; no longer masked. Add dependency on libguess
+  as suggested by Mathieu Zhang in bug #335461. Remove old ebuilds.
 
   11 Apr 2011; Jeroen Roovers <jer@gentoo.org> audacious-2.4.4.ebuild:
   Stable for HPPA (bug #361267).
diff --git a/media-sound/audacious/audacious-2.2.ebuild b/media-sound/audacious/audacious-2.2.ebuild
deleted file mode 100644
index 0a6ff72d8899..000000000000
--- a/media-sound/audacious/audacious-2.2.ebuild
+++ /dev/null
@@ -1,67 +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/audacious/audacious-2.2.ebuild,v 1.15 2011/03/24 07:20:31 ssuominen Exp $
-
-EAPI=1
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz
-	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc"
-IUSE="altivec chardet nls libsamplerate session sse2"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.16
-	>=dev-libs/libmcs-0.7.1-r2
-	>=dev-libs/libmowgli-0.7.0
-	dev-libs/libxml2
-	>=x11-libs/cairo-1.2.6
-	>=x11-libs/gtk+-2.14:2
-	>=x11-libs/pango-1.8.0
-	libsamplerate? ( media-libs/libsamplerate )
-	session? ( x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0
-	nls? ( dev-util/intltool )"
-
-PDEPEND=">=media-plugins/audacious-plugins-2.2"
-
-src_compile() {
-	# D-Bus is a mandatory dependency, remote control,
-	# session management and some plugins depend on this.
-	# Building without D-Bus is *unsupported* and a USE-flag
-	# will not be added due to the bug reports that will result.
-	# Bugs #197894, #199069, #207330, #208606
-	# Disabling XSPF playlists would make startup *very* slow as
-	# all plugins will then have to re-probed each time.
-	econf \
-		--enable-dbus \
-		--enable-xspf \
-		$(use_enable altivec) \
-		$(use_enable chardet) \
-		$(use_enable nls) \
-		$(use_enable session sm) \
-		$(use_enable sse2) \
-		$(use_enable libsamplerate samplerate) \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins "${WORKDIR}"/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-2.4.1.ebuild b/media-sound/audacious/audacious-2.4.1.ebuild
deleted file mode 100644
index 66d6c721872a..000000000000
--- a/media-sound/audacious/audacious-2.4.1.ebuild
+++ /dev/null
@@ -1,62 +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/audacious/audacious-2.4.1.ebuild,v 1.2 2011/03/24 07:20:31 ssuominen Exp $
-
-EAPI=1
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz
-	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="altivec chardet nls session sse2"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.16
-	>=dev-libs/libmcs-0.7.1-r2
-	>=dev-libs/libmowgli-0.7.0
-	dev-libs/libxml2
-	>=x11-libs/cairo-1.2.6
-	>=x11-libs/gtk+-2.14:2
-	>=x11-libs/pango-1.8.0
-	session? ( x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0
-	nls? ( dev-util/intltool )"
-
-PDEPEND=">=media-plugins/audacious-plugins-2.4.1"
-
-src_compile() {
-	# D-Bus is a mandatory dependency, remote control,
-	# session management and some plugins depend on this.
-	# Building without D-Bus is *unsupported* and a USE-flag
-	# will not be added due to the bug reports that will result.
-	# Bugs #197894, #199069, #207330, #208606
-	econf \
-		--enable-dbus \
-		$(use_enable altivec) \
-		$(use_enable chardet) \
-		$(use_enable nls) \
-		$(use_enable session sm) \
-		$(use_enable sse2) \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins "${WORKDIR}"/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-2.4.2.ebuild b/media-sound/audacious/audacious-2.4.2.ebuild
deleted file mode 100644
index ec5c269ecc40..000000000000
--- a/media-sound/audacious/audacious-2.4.2.ebuild
+++ /dev/null
@@ -1,62 +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/audacious/audacious-2.4.2.ebuild,v 1.2 2011/03/24 07:20:31 ssuominen Exp $
-
-EAPI=1
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz
-	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="altivec chardet nls session sse2"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.16
-	>=dev-libs/libmcs-0.7.1-r2
-	>=dev-libs/libmowgli-0.7.0
-	dev-libs/libxml2
-	>=x11-libs/cairo-1.2.6
-	>=x11-libs/gtk+-2.14:2
-	>=x11-libs/pango-1.8.0
-	session? ( x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0
-	nls? ( dev-util/intltool )"
-
-PDEPEND=">=media-plugins/audacious-plugins-2.4.2"
-
-src_compile() {
-	# D-Bus is a mandatory dependency, remote control,
-	# session management and some plugins depend on this.
-	# Building without D-Bus is *unsupported* and a USE-flag
-	# will not be added due to the bug reports that will result.
-	# Bugs #197894, #199069, #207330, #208606
-	econf \
-		--enable-dbus \
-		$(use_enable altivec) \
-		$(use_enable chardet) \
-		$(use_enable nls) \
-		$(use_enable session sm) \
-		$(use_enable sse2) \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins "${WORKDIR}"/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-2.4.3.ebuild b/media-sound/audacious/audacious-2.4.3.ebuild
deleted file mode 100644
index ead8bd323c77..000000000000
--- a/media-sound/audacious/audacious-2.4.3.ebuild
+++ /dev/null
@@ -1,62 +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/audacious/audacious-2.4.3.ebuild,v 1.2 2011/03/24 07:20:31 ssuominen Exp $
-
-EAPI=1
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz
-	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="altivec chardet nls session sse2"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.16
-	>=dev-libs/libmcs-0.7.1-r2
-	>=dev-libs/libmowgli-0.7.0
-	dev-libs/libxml2
-	>=x11-libs/cairo-1.2.6
-	>=x11-libs/gtk+-2.14:2
-	>=x11-libs/pango-1.8.0
-	session? ( x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0
-	nls? ( dev-util/intltool )"
-
-PDEPEND=">=media-plugins/audacious-plugins-2.4.3"
-
-src_compile() {
-	# D-Bus is a mandatory dependency, remote control,
-	# session management and some plugins depend on this.
-	# Building without D-Bus is *unsupported* and a USE-flag
-	# will not be added due to the bug reports that will result.
-	# Bugs #197894, #199069, #207330, #208606
-	econf \
-		--enable-dbus \
-		$(use_enable altivec) \
-		$(use_enable chardet) \
-		$(use_enable nls) \
-		$(use_enable session sm) \
-		$(use_enable sse2) \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins "${WORKDIR}"/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-2.5_alpha1.ebuild b/media-sound/audacious/audacious-2.5.0.ebuild
index 2cbe71dd8183..889dce9824d0 100644
--- a/media-sound/audacious/audacious-2.5_alpha1.ebuild
+++ b/media-sound/audacious/audacious-2.5.0.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/audacious/audacious-2.5_alpha1.ebuild,v 1.2 2011/03/24 07:20:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-2.5.0.ebuild,v 1.1 2011/04/16 20:37:02 chainsaw Exp $
 
 EAPI=3
 
@@ -28,9 +28,10 @@ RDEPEND=">=dev-libs/dbus-glib-0.60
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9.0
+	chardet? ( app-i18n/libguess )
 	nls? ( dev-util/intltool )"
 
-PDEPEND=">=media-plugins/audacious-plugins-2.5_alpha1"
+PDEPEND=">=media-plugins/audacious-plugins-2.5.0"
 
 src_configure() {
 	# D-Bus is a mandatory dependency, remote control,