Depend on taglib unconditionally as configure.ac wants us to. Closes bug #134542.

Package-Manager: portage-2.1.1_pre1-r2

3 files changed, 21 insertions, 17 deletions

diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index 0c935fe3ffc4..38108a40bd43 100644
--- a/media-sound/audacious/ChangeLog
+++ b/media-sound/audacious/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/audacious
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.48 2006/06/23 21:04:24 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.49 2006/06/25 01:07:27 chainsaw Exp $
+
+  25 Jun 2006; Tony Vroon <chainsaw@gentoo.org>
+  audacious-1.1.0_beta2-r1.ebuild:
+  Depend on taglib unconditionally as configure.ac wants us to. Closes bug
+  #134542.
 
   23 Jun 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   audacious-1.0.0-r1.ebuild:
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 8d81e819d64f..66727104e959 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -26,18 +26,18 @@ EBUILD audacious-1.1.0_beta1.ebuild 2693 RMD160 cf007e5816b3511de37e9a587184e814
 MD5 52543e695bb143d0a822295f0dcb4c13 audacious-1.1.0_beta1.ebuild 2693
 RMD160 cf007e5816b3511de37e9a587184e8147b92c86d audacious-1.1.0_beta1.ebuild 2693
 SHA256 bd256f4d791df65ee6d2729b04506e1e12596aeb40dc701dc7768d664433ad07 audacious-1.1.0_beta1.ebuild 2693
-EBUILD audacious-1.1.0_beta2-r1.ebuild 2778 RMD160 fc532752a1656cb493ccd8aafd75ad95daef02c8 SHA1 0acc8f9cfecd19b8f5f20308629346e4f708f73e SHA256 0eee0a7842763af862b472e41667c2157907f6a5f5022b95b2390c4716c9c23f
-MD5 dc3c1ae5d2d732fdb11c64a6009ce038 audacious-1.1.0_beta2-r1.ebuild 2778
-RMD160 fc532752a1656cb493ccd8aafd75ad95daef02c8 audacious-1.1.0_beta2-r1.ebuild 2778
-SHA256 0eee0a7842763af862b472e41667c2157907f6a5f5022b95b2390c4716c9c23f audacious-1.1.0_beta2-r1.ebuild 2778
+EBUILD audacious-1.1.0_beta2-r1.ebuild 2747 RMD160 f44d0ad9baf80371b8161a51102a14f9141df551 SHA1 8fc89ddc8acd4dc52e283dabc8d8e039e8b5ebb1 SHA256 abc198e16489879533c0d49f28bbadf32b687a7a88ce4c15f7c0ff04856f748d
+MD5 e7af1082cbb2bbcb8322d9e8c9e96ffd audacious-1.1.0_beta2-r1.ebuild 2747
+RMD160 f44d0ad9baf80371b8161a51102a14f9141df551 audacious-1.1.0_beta2-r1.ebuild 2747
+SHA256 abc198e16489879533c0d49f28bbadf32b687a7a88ce4c15f7c0ff04856f748d audacious-1.1.0_beta2-r1.ebuild 2747
 EBUILD audacious-1.1.0_beta2.ebuild 2695 RMD160 159fd699f81f5c85e5031be908be5a3afbf85566 SHA1 af42fa9aa96445b3993a6acdb24b31788717bdde SHA256 ee0782fef95ad55c9a5696632a70b2d62bb2e037770f3911bf42a01f6145373c
 MD5 e92aaae75dd85c6319575d6221b1af5f audacious-1.1.0_beta2.ebuild 2695
 RMD160 159fd699f81f5c85e5031be908be5a3afbf85566 audacious-1.1.0_beta2.ebuild 2695
 SHA256 ee0782fef95ad55c9a5696632a70b2d62bb2e037770f3911bf42a01f6145373c audacious-1.1.0_beta2.ebuild 2695
-MISC ChangeLog 8278 RMD160 23a7636e65e8fcb628c3559a0d5600cae3e917e4 SHA1 c4c9b0dcc7b3c28342585bd858f72b3a86e1993e SHA256 717c8bd3ba5f5f17ef8d07908b9af13d11e21674827cff70604b7d62c382904f
-MD5 11d4bdd4837aa625efb190d77d4fed6a ChangeLog 8278
-RMD160 23a7636e65e8fcb628c3559a0d5600cae3e917e4 ChangeLog 8278
-SHA256 717c8bd3ba5f5f17ef8d07908b9af13d11e21674827cff70604b7d62c382904f ChangeLog 8278
+MISC ChangeLog 8448 RMD160 5aae93adfcc70b8d6cd189ceb5712fe61b88d270 SHA1 ca6b72528ddcbc282c876338051a64a3655e08a1 SHA256 f35a9614d6d317e79bcd075eb087fd284cd01c1554c500a636d83a3a347e3e17
+MD5 64a008e63734feb1426d16e199983b98 ChangeLog 8448
+RMD160 5aae93adfcc70b8d6cd189ceb5712fe61b88d270 ChangeLog 8448
+SHA256 f35a9614d6d317e79bcd075eb087fd284cd01c1554c500a636d83a3a347e3e17 ChangeLog 8448
 MISC metadata.xml 248 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d SHA1 4ea80510c4e90c385ac851b4f82c36b4f91d9402 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6
 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d metadata.xml 248
@@ -61,9 +61,9 @@ MD5 fda6b7c74a82df4001029522d377da32 files/digest-audacious-1.1.0_beta2-r1 512
 RMD160 d2e4c4cef31cf9c56dbc974997e4fbd58043eff9 files/digest-audacious-1.1.0_beta2-r1 512
 SHA256 37f8959c66ef14ec5b987a742ac13b19ff1eee4ff3f660afbf04833233eec106 files/digest-audacious-1.1.0_beta2-r1 512
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEnFdoKRy60XGEcJIRApKCAJ4nO0GBYa696rMnmRzcugM3Tzh8EwCfQ0HW
-l0u5x2PTSUdjgIi5Cn4HEtI=
-=iUbt
+iD8DBQFEneHVp5vW4rUFj5oRAnBYAJ0TvlqNp/5F+0C6LjY7O4+Kcqdq1wCfcLnc
+QylD/kdZajFJl9BpbHSpHnY=
+=kqtT
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacious/audacious-1.1.0_beta2-r1.ebuild b/media-sound/audacious/audacious-1.1.0_beta2-r1.ebuild
index 9fef71e83acf..aa1ebb3d98c7 100644
--- a/media-sound/audacious/audacious-1.1.0_beta2-r1.ebuild
+++ b/media-sound/audacious/audacious-1.1.0_beta2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-1.1.0_beta2-r1.ebuild,v 1.1 2006/06/15 16:07:00 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-1.1.0_beta2-r1.ebuild,v 1.2 2006/06/25 01:07:27 chainsaw Exp $
 
 inherit flag-o-matic
 
@@ -19,6 +19,7 @@ IUSE="aac alsa arts esd flac gnome jack lirc mmx modplug mp3 musepack nls oss si
 RDEPEND="app-arch/unzip
 	net-misc/curl
 	media-libs/musicbrainz
+	media-libs/taglib
 	>=x11-libs/gtk+-2.6
 	>=gnome-base/libglade-2.3.1
 	>=dev-cpp/libbinio-1.4
@@ -33,9 +34,7 @@ RDEPEND="app-arch/unzip
 		media-sound/jack-audio-connection-kit )
 	lirc? ( app-misc/lirc )
 	modplug? ( media-libs/libmodplug )
-	musepack? ( media-libs/libmpcdec
-		    media-libs/taglib )
-	mp3? ( media-libs/taglib )
+	musepack? ( media-libs/libmpcdec )
 	sid? ( media-libs/libsidplay )
 	sndfile? ( media-libs/libsndfile )
 	timidity? ( media-sound/timidity++ )