Third release on the 2.4 branch. Locale-encoded strings are now converted to UTF-8 properly.

(Portage version: 2.1.9.25/cvs/Linux x86_64)

4 files changed, 13 insertions, 68 deletions

diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index 520b9ec4e402..aa2ad12c8115 100644
--- a/media-sound/audacious/ChangeLog
+++ b/media-sound/audacious/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/audacious
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.217 2010/11/09 19:51:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.218 2010/12/07 23:26:03 chainsaw Exp $
+
+*audacious-2.4.2 (07 Dec 2010)
+
+  07 Dec 2010; <chainsaw@gentoo.org> audacious-2.2.ebuild,
+  -audacious-2.3.ebuild, -audacious-2.4_rc3.ebuild, +audacious-2.4.2.ebuild:
+  Third release on the 2.4 branch. Locale-encoded strings are now converted to
+  UTF-8 properly.
 
   09 Nov 2010; Jeroen Roovers <jer@gentoo.org> audacious-2.4.0.ebuild:
   Stable for HPPA (bug #297894).
diff --git a/media-sound/audacious/audacious-2.2.ebuild b/media-sound/audacious/audacious-2.2.ebuild
index 7b0aba07e87c..4b5911ad3e28 100644
--- a/media-sound/audacious/audacious-2.2.ebuild
+++ b/media-sound/audacious/audacious-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.12 2010/03/01 19:06:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-2.2.ebuild,v 1.13 2010/12/07 23:26:03 chainsaw Exp $
 
 MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
@@ -11,7 +11,7 @@ SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="ppc sparc"
 IUSE="altivec chardet nls libsamplerate session sse2"
 
 RDEPEND=">=dev-libs/dbus-glib-0.60
diff --git a/media-sound/audacious/audacious-2.3.ebuild b/media-sound/audacious/audacious-2.4.2.ebuild
index 46993d52565f..019c242308f4 100644
--- a/media-sound/audacious/audacious-2.3.ebuild
+++ b/media-sound/audacious/audacious-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-2.3.ebuild,v 1.1 2010/04/06 20:08:15 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-2.4.2.ebuild,v 1.1 2010/12/07 23:26:03 chainsaw Exp $
 
 MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
@@ -12,7 +12,7 @@ SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz
 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 debug nls session sse2"
+IUSE="altivec chardet nls session sse2"
 
 RDEPEND=">=dev-libs/dbus-glib-0.60
 	>=dev-libs/glib-2.16
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9.0
 	nls? ( dev-util/intltool )"
 
-PDEPEND=">=media-plugins/audacious-plugins-2.3"
+PDEPEND=">=media-plugins/audacious-plugins-2.4.2"
 
 src_compile() {
 	# D-Bus is a mandatory dependency, remote control,
@@ -40,7 +40,6 @@ src_compile() {
 		--enable-dbus \
 		$(use_enable altivec) \
 		$(use_enable chardet) \
-		$(use_enable debug) \
 		$(use_enable nls) \
 		$(use_enable session sm) \
 		$(use_enable sse2) \
diff --git a/media-sound/audacious/audacious-2.4_rc3.ebuild b/media-sound/audacious/audacious-2.4_rc3.ebuild
deleted file mode 100644
index 62bd81393cc4..000000000000
--- a/media-sound/audacious/audacious-2.4_rc3.ebuild
+++ /dev/null
@@ -1,61 +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/audacious/audacious-2.4_rc3.ebuild,v 1.1 2010/08/23 22:14:59 chainsaw Exp $
-
-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 debug 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
-	>=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_rc3"
-
-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 debug) \
-		$(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
-}