More minor bugfixes trickling down from 3.0 development. Clean up older ebuilds as they are not stabilisation targets.

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

5 files changed, 24 insertions, 131 deletions

diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index efcbb9a72fa7..74bc563f150e 100644
--- a/media-sound/audacious/ChangeLog
+++ b/media-sound/audacious/ChangeLog
@@ -1,6 +1,13 @@
 # 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.233 2011/06/29 22:48:35 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.234 2011/07/15 13:29:00 chainsaw Exp $
+
+*audacious-2.5.4 (15 Jul 2011)
+
+  15 Jul 2011; Tony Vroon <chainsaw@gentoo.org> -audacious-2.5.0.ebuild,
+  -audacious-2.5.1.ebuild, -audacious-2.5.2.ebuild, +audacious-2.5.4.ebuild:
+  More minor bugfixes trickling down from 3.0 development. Clean up older
+  ebuilds as they are not stabilisation targets.
 
 *audacious-2.5.3 (29 Jun 2011)
 
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index f0a22fbdf253..fdc89a355291 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,13 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST audacious-2.4.4.tgz 1344519 RMD160 75c960b158b3b6367cca4a7da65d98d8a35a13d9 SHA1 697b2cc217cef9785cf7ec0c4ee617bc174fbe98 SHA256 76f84038a0360da80aeaddd1ec23e5a55fee5a120abffce97c4609958cdb30e8
-DIST audacious-2.5.0.tgz 1224598 RMD160 240a997caa88f0b9ffa81ded9ca66fdf66cf4b6d SHA1 df76909c83a69b42197dab0702e0846295eceb1f SHA256 a4d7f6897df91f2d76bb6f388fc47d0d4aa1443fdb8dcf7a0c5debf80360c900
-DIST audacious-2.5.1.tgz 1227443 RMD160 99d4f8a3d3bfb8523f27c3222e52c6413c786f0c SHA1 886e1cde03069b3dee15a6df04e3e8f5934018f1 SHA256 5f2aead4959db5918efde06fee64f8ae528f5c2dc737d38595ea26e1cae112dd
-DIST audacious-2.5.2.tar.bz2 868777 RMD160 852028cbdcfa763cb9a2a3c88c4cffbaab77ecdd SHA1 2abea05d5f16c8d5d819f4d057305afb951b65c2 SHA256 6f9ffa4e1b4467c5a5e070b563e27b7082a7b87d5472788a5c8027bb9d7beaba
 DIST audacious-2.5.3.tar.gz 1218754 RMD160 fd764a8d8a76ac66ba03958eaec3eca899ddb5d2 SHA1 b40f140ebeb5d767bd865945b7eb5527c265beb7 SHA256 bff71308c133a706c08ca80a6208f6a22b0b05cd0189b62993062d6fea851e46
+DIST audacious-2.5.4.tar.gz 1221134 RMD160 40c4482a0ed35c76e214180cf5c3a308b4d83d7a SHA1 6374b09690fba540b82f7fbaa9a4d763c5ea7d79 SHA256 47bc36010e84c2c9638537a42a8451743d55a699bf85c614f3b913596f6e2fcd
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 SHA1 e97ebbf204e0d1b150265f9e67f0ed54d779e110 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1
 EBUILD audacious-2.4.4.ebuild 1761 RMD160 26538d3751242ced3ab13cc0b7311279453af931 SHA1 634cea8403b0cb84779153a3fad24d0e83304ff4 SHA256 a78092e6ae76bc34a04214b3b6bb7d66768c9e1fef9180840c5dc8d22ab971e1
-EBUILD audacious-2.5.0.ebuild 1761 RMD160 814e87a7b1735a71f3258acc5a02c9dbb5287237 SHA1 3ed654fc5af66b7543c701e89a936e5bbab33ad2 SHA256 7f56045059deb5b1364899f94e50198774d6397d8f26f4f7afc95df8ef8efec6
-EBUILD audacious-2.5.1.ebuild 1761 RMD160 d37a9ee97b7985439f03c6456abb4ea0a4b173b6 SHA1 a2f385c2f39906d101966e77c9ff5e79245f977e SHA256 d47f9cd7cc8d22731b2478471a0e3218b040d6692cafddadb3479f8b8c039991
-EBUILD audacious-2.5.2.ebuild 1765 RMD160 b1fec02f5e0fb93382af6a909622dba5f30c32ce SHA1 1a472f714562c927f6878e28bf9de00c9571e202 SHA256 a6020edd55cde01b21f9aeb09ee16b4cd43b36cdcea68eea33ab155c4b54b99c
 EBUILD audacious-2.5.3.ebuild 1764 RMD160 b89f27f8125514e32cd88532acdb04e400af09de SHA1 51b98a5feef2b8431ec486bfff8c336af1f32ca3 SHA256 444efeeb0d1ce73ed3246378551e050b844e79c5bd4a933ce04682a11909e8f7
-MISC ChangeLog 40702 RMD160 c3ffc708fdf0c9bc92f1846f8b66785576c8d0f9 SHA1 bbba697cff03d2a6d3c4f80f606fd6fa642bc772 SHA256 173964b9fde52b7768b49bc994e3a7f252253d62d4271bd0b4e8d65db998f83b
+EBUILD audacious-2.5.4.ebuild 1764 RMD160 063c478b6790dc3d3ec47db3928a7e62c1e2078f SHA1 87a0659430a8c4566b21a8159d2b79dbecec835e SHA256 978fbda7d94d0725acbdcbda1628afa6d7b0b48b997d9094f3f84d4cb9e7caf0
+MISC ChangeLog 41008 RMD160 303112268825c763b581974ff742ac5e72a97630 SHA1 5f4604405bbe1c7290ad71d4ff354bd149dd7cff SHA256 97a45f87e6be7962dfcd38e4ab2c403eddc441cc6b8e81115a84a18d74075073
 MISC metadata.xml 363 RMD160 fba132fb7596814a0d7e42330a5703dc4afa32dc SHA1 2a77afacfd9e5628bd59bfc6332320302d3a6387 SHA256 cc833502f2ab5b13e4b22684d0f7bec07804c3aa2daccaee913297853e6e5b07
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4gQJEACgkQp5vW4rUFj5qcOACghXMwYg53EXDdcwZp03Kbl5Mx
+hpAAoKKA3wU+h4mu4Z6mw/v643EPxnNs
+=xiyr
+-----END PGP SIGNATURE-----
diff --git a/media-sound/audacious/audacious-2.5.0.ebuild b/media-sound/audacious/audacious-2.5.0.ebuild
deleted file mode 100644
index 889dce9824d0..000000000000
--- a/media-sound/audacious/audacious-2.5.0.ebuild
+++ /dev/null
@@ -1,60 +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.5.0.ebuild,v 1.1 2011/04/16 20:37:02 chainsaw Exp $
-
-EAPI=3
-
-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.9.50
-	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
-	chardet? ( app-i18n/libguess )
-	nls? ( dev-util/intltool )"
-
-PDEPEND=">=media-plugins/audacious-plugins-2.5.0"
-
-src_configure() {
-	# 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)
-}
-
-src_install() {
-	emake 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.2.ebuild b/media-sound/audacious/audacious-2.5.2.ebuild
deleted file mode 100644
index b865f0f4d4e0..000000000000
--- a/media-sound/audacious/audacious-2.5.2.ebuild
+++ /dev/null
@@ -1,60 +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.5.2.ebuild,v 1.1 2011/06/24 23:06:43 chainsaw Exp $
-
-EAPI=4
-
-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}.tar.bz2
-	 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.9.50
-	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
-	chardet? ( app-i18n/libguess )
-	nls? ( dev-util/intltool )"
-
-PDEPEND=">=media-plugins/audacious-plugins-2.5.2"
-
-src_configure() {
-	# 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)
-}
-
-src_install() {
-	emake 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.1.ebuild b/media-sound/audacious/audacious-2.5.4.ebuild
index 0f3b0e15cc3a..032e1d99577a 100644
--- a/media-sound/audacious/audacious-2.5.1.ebuild
+++ b/media-sound/audacious/audacious-2.5.4.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.1.ebuild,v 1.1 2011/06/06 13:58:44 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-2.5.4.ebuild,v 1.1 2011/07/15 13:29:00 chainsaw Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ 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
+SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.gz
 	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
 
 LICENSE="GPL-2"
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 	chardet? ( app-i18n/libguess )
 	nls? ( dev-util/intltool )"
 
-PDEPEND=">=media-plugins/audacious-plugins-2.5.1"
+PDEPEND=">=media-plugins/audacious-plugins-2.5.4"
 
 src_configure() {
 	# D-Bus is a mandatory dependency, remote control,