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.

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

7 files changed, 15 insertions, 277 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/Manifest b/media-sound/audacious/Manifest
index 9f5b9e56be12..a57be9984a17 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,27 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST audacious-2.2.tgz 1581717 RMD160 a8a3eb32f802ff45030971fceb21915386157177 SHA1 7b946830028f0d8a985107974094cd91b12b0259 SHA256 f15af7a90085e7be86f7f876a8e74a5ba03385880a165c4b2033944219213bea
 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 audacious-2.4.3.tgz 1344445 RMD160 2f0b9e398be22705640f432779c77105b0167801 SHA1 81fd26c9488c543beb4ba2900a667ed386e63ef3 SHA256 ea619d238b66f1e2018846880ec3971373013f82957f74c367310bdef3f4bc32
 DIST audacious-2.4.4.tgz 1344519 RMD160 75c960b158b3b6367cca4a7da65d98d8a35a13d9 SHA1 697b2cc217cef9785cf7ec0c4ee617bc174fbe98 SHA256 76f84038a0360da80aeaddd1ec23e5a55fee5a120abffce97c4609958cdb30e8
-DIST audacious-2.5-alpha1.tgz 1277452 RMD160 fb137ad0e63cd1f7b42bf9646de6c42f483f6486 SHA1 6753567da671e9cc1a6798bcd0da817c3aaba4ca SHA256 b2ae1fdf421395b63be5fe5276cace30e6163a62699d11ebc911e954adc56199
+DIST audacious-2.5.0.tgz 1224598 RMD160 240a997caa88f0b9ffa81ded9ca66fdf66cf4b6d SHA1 df76909c83a69b42197dab0702e0846295eceb1f SHA256 a4d7f6897df91f2d76bb6f388fc47d0d4aa1443fdb8dcf7a0c5debf80360c900
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 SHA1 e97ebbf204e0d1b150265f9e67f0ed54d779e110 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1
-EBUILD audacious-2.2.ebuild 1899 RMD160 a45bf3997a9b97de228969c3a4ef83ba6d45dd90 SHA1 23e0cf4decffda23d167f78af5d048891ec33cd9 SHA256 4ecc39b11c6f523c02cb9e403190bd51b45da9c760184e6a7d2bc48a2f2cda8c
 EBUILD audacious-2.4.0.ebuild 1790 RMD160 a3c73f62a148fa98d86f2166efbcc1b59f5104f3 SHA1 f7a4c3086ebd7f63e2bfeb08d636e13ca85f0b9d SHA256 3bb68ebeaf07ecc842ba83bad7b7a2b83e6d80112e2125c51565e34417f5040c
-EBUILD audacious-2.4.1.ebuild 1766 RMD160 3f0209d67b34b6b0e165e478a7d4f81ef57f7387 SHA1 7e974dbcc62c4137ca451d6bde55881f03f176ba SHA256 09f814f15acada0ecbdb5e20907fe469dd6317e2c59fc81da2cc8667aa83b5a4
-EBUILD audacious-2.4.2.ebuild 1766 RMD160 cf79de9a06a3e18e7a696b1fb66a08873520a6c1 SHA1 2bcba84b3623d7f041fe4d3639266dd54969a9e2 SHA256 1b2798dcdbe61023d0c77ce602c6969026666ac59009d91082b6ce2e99207fbe
-EBUILD audacious-2.4.3.ebuild 1766 RMD160 daed93138e1a67573c68bf77ec2482c911d5fc2a SHA1 181d10395f98f803bb71d9f57f7afbe9956655b1 SHA256 6c3c11c9df0434e60c6d91efbacd3f8169145fd18fab225800b2446f6912fcd9
 EBUILD audacious-2.4.4.ebuild 1759 RMD160 a925d784f62ce7276982887b737fa4928b8a7f18 SHA1 09b57f216f0f4d28cf2de9ef7304f12021cf98b3 SHA256 8d49bb856f045cb02d5687c65b3e0b693974b002a3cfc2fd58381f93a2782369
-EBUILD audacious-2.5_alpha1.ebuild 1740 RMD160 65698bf4184446244c687067d83179cd24823751 SHA1 65ed97077508494602f8508b1d5f168f52c3bcc5 SHA256 861dc168c7949ce0996cf9ba2e4d762bd0374e19e738c8644755c173e7e92170
-MISC ChangeLog 39333 RMD160 bf735b4224c6e97cf2ec001006ab7abb2f54671c SHA1 dd99795d70213e852cc57b46a290f4fef1099044 SHA256 dc8d0324a42b337ec3cde29f67efb974f6b4fd18c7b2630559ce46b8421f1b6a
+EBUILD audacious-2.5.0.ebuild 1761 RMD160 814e87a7b1735a71f3258acc5a02c9dbb5287237 SHA1 3ed654fc5af66b7543c701e89a936e5bbab33ad2 SHA256 7f56045059deb5b1364899f94e50198774d6397d8f26f4f7afc95df8ef8efec6
+MISC ChangeLog 39724 RMD160 b06a671bad59ae5afe72046a9be637b5b995aad6 SHA1 8dc26803468efd1c467c687f5ac6ee8b6cdc4175 SHA256 6ee581cffef63c17c0b64123b747c84c88c1f6764aa13b8d1566fb3f3ea15f77
 MISC metadata.xml 363 RMD160 fba132fb7596814a0d7e42330a5703dc4afa32dc SHA1 2a77afacfd9e5628bd59bfc6332320302d3a6387 SHA256 cc833502f2ab5b13e4b22684d0f7bec07804c3aa2daccaee913297853e6e5b07
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2jgV8ACgkQVWmRsqeSphMJZgCcDr3dhs+oH7SEgmxT6V7l7vWH
-IZoAn1AoLmhi7gqMKXnwprRo3gLaoK9j
-=cus+
------END PGP SIGNATURE-----
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,