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

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

5 files changed, 27 insertions, 74 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/Manifest b/media-sound/audacious/Manifest
index 431cf23d2886..3ee66a105e04 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,13 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST audacious-2.2.tgz 1581717 RMD160 a8a3eb32f802ff45030971fceb21915386157177 SHA1 7b946830028f0d8a985107974094cd91b12b0259 SHA256 f15af7a90085e7be86f7f876a8e74a5ba03385880a165c4b2033944219213bea
-DIST audacious-2.3.tgz 1564114 RMD160 b86e28795e0fb959feade6714a103e431b5c51e0 SHA1 a7041650c54b6db68d0f3b3cf68f61fc7f841f34 SHA256 b19b3a75d4bac535231a77b6f993519b599a9619ac46c4d5627fd2bc8337416f
-DIST audacious-2.4-rc3.tgz 1432063 RMD160 b2e5df04611781d2e5a17503f9eb445cf30bf6b9 SHA1 182cc2bc879eca70749974f40a3e3e9e2f1daae9 SHA256 f531d472fa853e6f534e87d8489978248b7ab61f1a437eac7852688ef1bb1e46
 DIST audacious-2.4.0.tgz 1346549 RMD160 80868a21e436d05692300578274031557a2bd3c7 SHA1 4166d718ca5f3c5a39daea688e9a46975112e2c0 SHA256 f2a2d45b9cb8fc24c1c55aef72a3a397a9a35776c18a94532b1bd3238577d5d8
 DIST audacious-2.4.1.tgz 1344307 RMD160 37395b1bd43202a458e18c5be58e0c29c7e773b0 SHA1 e231be40fa5ec6a9ed9ac700798bda06c43c4ab4 SHA256 2c75e2365c6e1cf7cf9a563dd4db90cf75b85be3d6f22dd948c69bea9d4bb2da
+DIST audacious-2.4.2.tgz 1344152 RMD160 72677dcab2bc7098a3bd8c017d0261e0394fdfcb SHA1 a5875a52ae47213a900ef1ded8fe0db3cbd0efc7 SHA256 602c1421775ef8f88c0e22139ca6f63c76159e762ac2c36c5dd2fe13ac03ad0d
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 SHA1 e97ebbf204e0d1b150265f9e67f0ed54d779e110 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1
-EBUILD audacious-2.2.ebuild 1976 RMD160 a8b6bcad06b31ebb3d6eafe1543153928951e9cd SHA1 52fefe4c3a892359c81c890ab730fd0e40b3e61d SHA256 7770c47575fe03a502b751b4532a7e171f5775a95bebc28442a1cc3b7a8f3aaa
-EBUILD audacious-2.3.ebuild 1781 RMD160 5e2ed8f36627e833cdf4421dae88b08fd5648d11 SHA1 d040ee232315e5f8b46e9731144ed53eb0cb7cf6 SHA256 40687dd1ae0c50c71f98bdb79923a1db8f5d6125a8142df632a89324f9f3a42c
+EBUILD audacious-2.2.ebuild 1894 RMD160 40d3d149b2a49cb851907a369c4106ad3e5ca8d7 SHA1 e65d12b06728a1a267b4ebf3bfe60e3f39be7f43 SHA256 b97c18d809d5be1f4f6838a796d059365149388ee331a04e406c35dc1ebc1e5c
 EBUILD audacious-2.4.0.ebuild 1775 RMD160 62526536eb6e29aae8d2a889f1ae7eef3664e88f SHA1 70c0f0fb9de8b00f8f3e71c3fe4f9b401edee1f4 SHA256 b73e8ed7e8cd73363505719011415bc610d5116c6b8d611196cffae501c08ec0
 EBUILD audacious-2.4.1.ebuild 1755 RMD160 9c5908fa796f613f69165c15dc38b43ce57c5aa8 SHA1 21a388ebea87643d0599ecf5633f9b0a21077ff9 SHA256 16acd26485cffa40a3f03a2839a9bdcce39f9a71a3c5e5170c69c975b05f8230
-EBUILD audacious-2.4_rc3.ebuild 1789 RMD160 83f38619e647c34d1bd848a9bb63caf12a2268df SHA1 f7c42140447dcdcd7983657dee5632cec9a7bc9a SHA256 2f9efdd066bc4f9a59fa1a91c844e57a666ebc6f74d8943788302a708d8b99c6
-MISC ChangeLog 37625 RMD160 f9ec2e2ef6d37e3aaf4d6a7f6f56832395be5595 SHA1 a32550923dfa5a3275d6d097e4abfb7a8e8be0a6 SHA256 a0e9cc4ff7bca3caaee6596ea7ae6c33f0d1334446fcc47fc8003cb0bbf7df22
+EBUILD audacious-2.4.2.ebuild 1755 RMD160 63675f3a88ef047dfe926f2b09c0a2a32ecd9703 SHA1 a932b7dda9abc58b5e631b6a166cb8360402593f SHA256 5a9d54db1024fcfcb2f5ef7bbcfdcfc67626cc4ad6fe7fdaa7b6bc14e1a1e227
+MISC ChangeLog 37896 RMD160 c197f64faa1b0836d9121d73d3c419da346899a1 SHA1 fe5a3901e47c721024ef694cd2dc5f1c4ae90f16 SHA256 982a8e2039d9f9d9f1f0d9dc2a35600fa34f9a74e87538c4fd6b1a9b77feb68c
 MISC metadata.xml 363 RMD160 fba132fb7596814a0d7e42330a5703dc4afa32dc SHA1 2a77afacfd9e5628bd59bfc6332320302d3a6387 SHA256 cc833502f2ab5b13e4b22684d0f7bec07804c3aa2daccaee913297853e6e5b07
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkz+wp8ACgkQp5vW4rUFj5rp+ACeMO1DdnJA0uUDBsN63LSUTXzG
+keoAnR1LOcOHlvnic3QkJ1lyvZWg7zxp
+=KyXQ
+-----END PGP SIGNATURE-----
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
-}