Actually link in the inline FLAC library, from upstream bug #830. Explicitly block...

Package-Manager: portage-2.1.2-r14

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index 841c4c347a6c2783bb2f3137117efd722769d37a..c0b58962d5d93698dc35e33b5042a7734348a594 100644 (file)
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/audacious-plugins
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.36 2007/03/03 21:46:04 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.37 2007/03/04 15:56:45 chainsaw Exp $
+
+*audacious-plugins-1.3.0-r1 (04 Mar 2007)
+
+  04 Mar 2007; Tony Vroon <chainsaw@gentoo.org>
+  +files/1.3.0-unscrew-flac.patch, -audacious-plugins-1.3.0_rc2.ebuild,
+  +audacious-plugins-1.3.0-r1.ebuild:
+  Actually link in the inline FLAC library, from upstream bug #830. Explicitly
+  block ugly plugins from the 1.2 branch as they will fail, closes bug
+  #168883.
 
   03 Mar 2007; Tony Vroon <chainsaw@gentoo.org>
   audacious-plugins-1.3.0.ebuild:

diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 2d228c95aa738879635496fe3da52a7d40a95d55..3c272ccc66bc3ee0a6f7afcb54f1eb9e0f707fea 100644 (file)
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.3.0-unscrew-flac.patch 350 RMD160 6c9624ef91dff052f7db92cfc0effd032fe924b1 SHA1 b03bcc3dd1116c1279ac7dc14cf779ca4fff7378 SHA256 c40cf4c174827ebcee51edca2a9b58470b13d7caafe324b8751c3f87e50b6d52
+MD5 ca30b5bb51c12493a0b48e53cce76094 files/1.3.0-unscrew-flac.patch 350
+RMD160 6c9624ef91dff052f7db92cfc0effd032fe924b1 files/1.3.0-unscrew-flac.patch 350
+SHA256 c40cf4c174827ebcee51edca2a9b58470b13d7caafe324b8751c3f87e50b6d52 files/1.3.0-unscrew-flac.patch 350
 AUX 1.3.0_rc2-freebsd-portability.patch 1833 RMD160 dcee94df3a8b069056a6b0e98c0b3f6b201de6e3 SHA1 a9f2fcd7fbe6d3bc8399a814a64a8f4f19669e56 SHA256 5be60aca440dbe53d7ca25c517a80ee1e648179e174d7f3977c9f22ac01f755e
 MD5 2e3ac6898331f492fec0fbc663cb727e files/1.3.0_rc2-freebsd-portability.patch 1833
 RMD160 dcee94df3a8b069056a6b0e98c0b3f6b201de6e3 files/1.3.0_rc2-freebsd-portability.patch 1833
@@ -9,7 +13,6 @@ DIST audacious-plugins-1.2.0.tgz 2113254 RMD160 3522f0d0916206238c94137b4fa07a77
 DIST audacious-plugins-1.2.1.tgz 2104064 RMD160 18be48dc1fa412a45845d307b7322fa53982ca0b SHA1 14fd90c2fba30929b08fc55c37965447a7167f95 SHA256 b49c88dfda3124aab7924098ff8632df8a783cb08887835bffe20d3bddc3dda7
 DIST audacious-plugins-1.2.2.tgz 2178529 RMD160 b986bb1e12fd0b3c5f0e1dde994781fb556a1d3c SHA1 300888007539fe8bcdb7fd474a7466b7f09371a2 SHA256 0422cdb510c9f7c90ceb206b4f7317e3b7ea8a66809f78976a1231d2fc073049
 DIST audacious-plugins-1.2.5.tgz 2339867 RMD160 ce102649e5cf15239bcab5a204d368869dbe851d SHA1 daa5df222e982f1a56115c455c1289b21f48f264 SHA256 29d812db9a17ef50dc38db9ac354ab2ba31047829a0c1316a549177328ffb6c3
-DIST audacious-plugins-1.3.0-rc2.tgz 2812648 RMD160 d5764e474c1c79dc14780071b400086092443a17 SHA1 fc69dcb3a770d0cfacd6d99d4ed964015c295cd4 SHA256 5bf3bc0258161336f3ba43756228f6d82a3f2527fde7e6f7b91c6d40ce0b488c
 DIST audacious-plugins-1.3.0.tgz 2902694 RMD160 01e9567ec0830ff9d8d002f7b7586e57535d17f7 SHA1 94210d33f4267bafce0269041a362ccd88d69044 SHA256 03af577608aac62d66b5d12d116826e571ea9cf5e018209ed0acbb3f855efba6
 EBUILD audacious-plugins-1.2.0-r1.ebuild 2469 RMD160 16d1d58df7b7c5ad7749e19035f8fb40715f5783 SHA1 71a78aa4fbc1a4d21608faeba186bd764ce3a7cb SHA256 994e754fc0a7562affbed81c4d2e8ab30cf0ea440d26726cd9d06fb0ab51df65
 MD5 1b0d9ca30c1a94139f8e9538d871236b audacious-plugins-1.2.0-r1.ebuild 2469
@@ -27,18 +30,18 @@ EBUILD audacious-plugins-1.2.5.ebuild 2568 RMD160 521fc4c589a924fdaa7180dc1fbff5
 MD5 7751900d04a6e5a79ba83dadc4394512 audacious-plugins-1.2.5.ebuild 2568
 RMD160 521fc4c589a924fdaa7180dc1fbff5685428ab1c audacious-plugins-1.2.5.ebuild 2568
 SHA256 7156f28d3e570c75109ebc8a35efe55d6c26a50274b0f8644fbcf9a1f870e32d audacious-plugins-1.2.5.ebuild 2568
+EBUILD audacious-plugins-1.3.0-r1.ebuild 3314 RMD160 198226451eaf6854167f507bd192bde0f3ec401c SHA1 68462a7a3ed9429ccb7c835dd1206638cc8ded32 SHA256 41107155965b415d697b763a158c8bc4e755d16b7dcfbd3a80e83d44cef750aa
+MD5 3382bcd9bb0bc86b3e823c43f16e2856 audacious-plugins-1.3.0-r1.ebuild 3314
+RMD160 198226451eaf6854167f507bd192bde0f3ec401c audacious-plugins-1.3.0-r1.ebuild 3314
+SHA256 41107155965b415d697b763a158c8bc4e755d16b7dcfbd3a80e83d44cef750aa audacious-plugins-1.3.0-r1.ebuild 3314
 EBUILD audacious-plugins-1.3.0.ebuild 3190 RMD160 12e4741c0aad11ea8c80d2a527d432166a71fee5 SHA1 fc097c73d4ed68c9fd355fe6dfe752549efe014e SHA256 42f1c9879d1002a59aacebfd4c52764ebd7a132407994df1b2091171fd11fe84
 MD5 a034e86d250220387636faf849b431e9 audacious-plugins-1.3.0.ebuild 3190
 RMD160 12e4741c0aad11ea8c80d2a527d432166a71fee5 audacious-plugins-1.3.0.ebuild 3190
 SHA256 42f1c9879d1002a59aacebfd4c52764ebd7a132407994df1b2091171fd11fe84 audacious-plugins-1.3.0.ebuild 3190
-EBUILD audacious-plugins-1.3.0_rc2.ebuild 3310 RMD160 a1e9babcbc8a68f5f615b224a545efc0c6905a73 SHA1 f6ab4b9256f7167ed461bca8c4b27931e9410d7d SHA256 9c1f69abed51414dd4ea4cd41d3d513f3639e02398d0cb223ddc8ce11bfe3761
-MD5 1827d127c337eebfb3becbd0c3c78a8d audacious-plugins-1.3.0_rc2.ebuild 3310
-RMD160 a1e9babcbc8a68f5f615b224a545efc0c6905a73 audacious-plugins-1.3.0_rc2.ebuild 3310
-SHA256 9c1f69abed51414dd4ea4cd41d3d513f3639e02398d0cb223ddc8ce11bfe3761 audacious-plugins-1.3.0_rc2.ebuild 3310
-MISC ChangeLog 8399 RMD160 fb3964e543000e4e04b8cccfbc1bd3bcb9b722b3 SHA1 8a64d726e7c05c981e6a615500e3014dcecbda56 SHA256 11c9da3c2152c1f9c85bab8ebfcccc4acf5c04f46be595b88d14dcace8446501
-MD5 bc48f8ada3342f4770b2318fcadf0958 ChangeLog 8399
-RMD160 fb3964e543000e4e04b8cccfbc1bd3bcb9b722b3 ChangeLog 8399
-SHA256 11c9da3c2152c1f9c85bab8ebfcccc4acf5c04f46be595b88d14dcace8446501 ChangeLog 8399
+MISC ChangeLog 8762 RMD160 29e8df7fea13bd221260d8bfb3bb9fbe802db7d8 SHA1 bbf77c792cbfa0e42361cc3b1b19dd46a46f5832 SHA256 1dc1677e87fdc14e7f1fcd32197f8de284341902fb28a3264fb44a3fd627dc97
+MD5 5f123ba383b52c389791f7f4a7d800d0 ChangeLog 8762
+RMD160 29e8df7fea13bd221260d8bfb3bb9fbe802db7d8 ChangeLog 8762
+SHA256 1dc1677e87fdc14e7f1fcd32197f8de284341902fb28a3264fb44a3fd627dc97 ChangeLog 8762
 MISC metadata.xml 248 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d SHA1 4ea80510c4e90c385ac851b4f82c36b4f91d9402 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6
 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d metadata.xml 248
@@ -58,13 +61,13 @@ SHA256 9587f8a2b5e6993a28518c5c58744d0bd58cff6dbd7931dc3ea9dd0cfefdc8e9 files/di
 MD5 e3d0d2c92730d8a3193204b5512af835 files/digest-audacious-plugins-1.3.0 265
 RMD160 f41f3cd195e10980429441485aba63d3d0c1f50a files/digest-audacious-plugins-1.3.0 265
 SHA256 94a12421238b57b68924413ebb083f2d9e37741c499e950a2b7ac58e94cd0cce files/digest-audacious-plugins-1.3.0 265
-MD5 c4648397bfe86b81df78345719a9c607 files/digest-audacious-plugins-1.3.0_rc2 277
-RMD160 6b049921d7d5f13d84ec4a76ff1bd2c08f41d2b9 files/digest-audacious-plugins-1.3.0_rc2 277
-SHA256 1b66564d781ee69f5846506681801d69a7fcf9d9d844401f605a0e3596586ade files/digest-audacious-plugins-1.3.0_rc2 277
+MD5 e3d0d2c92730d8a3193204b5512af835 files/digest-audacious-plugins-1.3.0-r1 265
+RMD160 f41f3cd195e10980429441485aba63d3d0c1f50a files/digest-audacious-plugins-1.3.0-r1 265
+SHA256 94a12421238b57b68924413ebb083f2d9e37741c499e950a2b7ac58e94cd0cce files/digest-audacious-plugins-1.3.0-r1 265
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF6fBAp5vW4rUFj5oRAtf7AJ9kapYXph5EVqIpSEkd0w0M6/pLowCePbfd
-vdf5BGcQEgmulR/mbGhRi9Q=
-=ZV9/
+iD8DBQFF6usKp5vW4rUFj5oRApiVAJ9yzjFjrsx5pniiY45H1Op3moAPfwCff7oI
+HnkknVwwrEF7sU20pBg3IRE=
+=DfKo
 -----END PGP SIGNATURE-----

diff --git a/media-plugins/audacious-plugins/audacious-plugins-1.3.0_rc2.ebuild b/media-plugins/audacious-plugins/audacious-plugins-1.3.0-r1.ebuild
similarity index 89%
rename from media-plugins/audacious-plugins/audacious-plugins-1.3.0_rc2.ebuild
rename to media-plugins/audacious-plugins/audacious-plugins-1.3.0-r1.ebuild
index c5e6208c7ba8a58812faffa43840afdd1bcab4ea..2492e0d0b6a04cc29e5459a9fb2edfb2d5599eb3 100644 (file)
--- a/media-plugins/audacious-plugins/audacious-plugins-1.3.0_rc2.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-1.3.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-1.3.0_rc2.ebuild,v 1.1 2007/02/27 15:28:04 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-1.3.0-r1.ebuild,v 1.1 2007/03/04 15:56:45 chainsaw Exp $
 
-inherit eutils flag-o-matic autotools
+inherit eutils flag-o-matic
 
 MY_P=${P/_/-}
 S=${WORKDIR}/${MY_P}
@@ -18,8 +18,9 @@ IUSE="aac adplug alsa arts chardet esd flac jack lirc mad modplug musepack nls o
 
 RDEPEND="app-arch/unzip
        dev-libs/libxml2
+       media-libs/libsamplerate
        net-misc/curl
-       >=media-sound/audacious-1.3.0_rc2
+       >=media-sound/audacious-1.3.0
        >=x11-libs/gtk+-2.6
        >=gnome-base/libglade-2.3.1
        >=media-libs/libsdl-1.2.5
@@ -28,10 +29,7 @@ RDEPEND="app-arch/unzip
        alsa? ( >=media-libs/alsa-lib-1.0.9_rc2 )
        arts? ( kde-base/arts )
        esd? ( >=media-sound/esound-0.2.30 )
-       flac? ( >=media-libs/libvorbis-1.0
-               || ( ~media-libs/flac-1.1.2
-                    ~media-libs/flac-1.1.3 )
-             )
+       flac? ( >=media-libs/libvorbis-1.0 )
        jack? ( >=media-libs/bio2jack-0.4
                media-libs/libsamplerate
                media-sound/jack-audio-connection-kit )
@@ -51,7 +49,9 @@ RDEPEND="app-arch/unzip
 
 DEPEND="${RDEPEND}
        nls? ( dev-util/intltool )
-       >=dev-util/pkgconfig-0.9.0"
+       >=dev-util/pkgconfig-0.9.0
+       !media-plugins/audacious-docklet
+       !=media-plugins/audacious-plugins-ugly-1.2.0"
 
 mp3_warning() {
        if ! useq mad ; then
@@ -64,8 +64,7 @@ mp3_warning() {
 src_unpack() {
        unpack ${A}
        cd ${S}
-       epatch ${FILESDIR}/${PV}-freebsd-portability.patch
-       eautoconf
+       epatch ${FILESDIR}/${PV}-unscrew-flac.patch
 }
 
 src_compile() {

diff --git a/media-plugins/audacious-plugins/files/1.3.0-unscrew-flac.patch b/media-plugins/audacious-plugins/files/1.3.0-unscrew-flac.patch
new file mode 100644 (file)
index 0000000..7f3e3b0
--- /dev/null
+++ b/media-plugins/audacious-plugins/files/1.3.0-unscrew-flac.patch
@@ -0,0 +1,11 @@
+--- trunk/src/flac/plugin_common/Makefile      2007/02/25 00:17:26     1530
++++ trunk/src/flac/plugin_common/Makefile      2007/03/04 09:50:27     1656
+@@ -1,7 +1,7 @@
+ include ../../../mk/rules.mk
+ include ../../../mk/init.mk
+ 
+-CFLAGS += $(PICFLAGS) -I.. -I../../..
++CFLAGS += $(PICFLAGS) -I.. -I../../.. -I../libflac
+ 
+ OBJECTIVE_LIBS_NOINST = libplugin_common.a
+ 

diff --git a/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0-r1 b/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0-r1
new file mode 100644 (file)
index 0000000..32dbdb5
--- /dev/null
+++ b/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0-r1
@@ -0,0 +1,3 @@
+MD5 b36b91f89a223a127ff67589d7497db8 audacious-plugins-1.3.0.tgz 2902694
+RMD160 01e9567ec0830ff9d8d002f7b7586e57535d17f7 audacious-plugins-1.3.0.tgz 2902694
+SHA256 03af577608aac62d66b5d12d116826e571ea9cf5e018209ed0acbb3f855efba6 audacious-plugins-1.3.0.tgz 2902694

diff --git a/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0_rc2 b/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0_rc2
deleted file mode 100644 (file)
index 0c73ec4..0000000
--- a/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2081e834023c444748df557c46816318 audacious-plugins-1.3.0-rc2.tgz 2812648
-RMD160 d5764e474c1c79dc14780071b400086092443a17 audacious-plugins-1.3.0-rc2.tgz 2812648
-SHA256 5bf3bc0258161336f3ba43756228f6d82a3f2527fde7e6f7b91c6d40ce0b488c audacious-plugins-1.3.0-rc2.tgz 2812648