Pull CXXFLAGS patch as it keeps the SID plugin from building at all.

(Portage version: 2.1.1_rc1-r2)
 (Signed Manifest commit)

2 files changed, 12 insertions, 59 deletions

diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 941df194b18d..d6b8eec9dc3e 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -9,10 +9,6 @@ AUX 1.1.1-remove-15instrument-magic.diff 1168 RMD160 ceccb606ac171c5d42ab02a50ed
 MD5 88cb889d4b67a0701a82ea72de630d86 files/1.1.1-remove-15instrument-magic.diff 1168
 RMD160 ceccb606ac171c5d42ab02a50edebd8f885605c7 files/1.1.1-remove-15instrument-magic.diff 1168
 SHA256 add25e7833dedb6e5ebb5fb3c913b6b2742d36b9544bbf76d1bd34f940ec96cc files/1.1.1-remove-15instrument-magic.diff 1168
-AUX 1.1.2-cxxflags.diff 2025 RMD160 d7202a7ed2e8149b7131d3516f2f8e1476177d3c SHA1 975d2f2490c5147251b853c9d1e15c97ff6414fb SHA256 51a7e4d4adaaa1601cdff1c6de4395d903e68b4a770c6cfa68b74e0fe965858a
-MD5 54df0e643da58dcaa3d1bea1ac8cb195 files/1.1.2-cxxflags.diff 2025
-RMD160 d7202a7ed2e8149b7131d3516f2f8e1476177d3c files/1.1.2-cxxflags.diff 2025
-SHA256 51a7e4d4adaaa1601cdff1c6de4395d903e68b4a770c6cfa68b74e0fe965858a files/1.1.2-cxxflags.diff 2025
 DIST audacious-1.1.0.tgz 3365149 RMD160 5825caacd093dabadd16d1f37d7225490e1ce1c9 SHA1 443c68b185381d3ad6c7f053e17aa5345bbc5ba1 SHA256 ac2fcba9020d4ae38c578d9494f99761cddd153b0281570b538d7d3a6af6a4f8
 DIST audacious-1.1.1.tgz 3387162 RMD160 852a2af9ad71fcb9480f32d0581c4864aeaece17 SHA1 89246f0232e6e4d98419268e395a9fc4a40a6ed9 SHA256 11f0079bfedb01ff7248c32065cca7706d0eba75dd3035a0770ed9c42b94b887
 DIST audacious-1.1.2.tgz 3394364 RMD160 920cb247dc1e583364cfac9cc8f1f0c39c37550e SHA1 25087f081054807aa48e3415aae0e1679667a392 SHA256 54f8f9e10e9a20a0a77e9d063708cd4bd572576ea9b36b9b1bb3ea3cbeaa1a81
@@ -29,14 +25,14 @@ EBUILD audacious-1.1.1.ebuild 2644 RMD160 90995eecb27ca934a4fb7c9ca083853f79dd5e
 MD5 9e44c5f7aed278543f5f22efe8e120d0 audacious-1.1.1.ebuild 2644
 RMD160 90995eecb27ca934a4fb7c9ca083853f79dd5e60 audacious-1.1.1.ebuild 2644
 SHA256 af57fe161b17fc538e6a6c70c8136e5b78f19c3043e0e2a71182079d8def7c49 audacious-1.1.1.ebuild 2644
-EBUILD audacious-1.1.2.ebuild 2764 RMD160 5309bfc4976e2d9783dc4c7715bd9de09fd2347c SHA1 ddda2a00491e8abbc689e7ff13f864a0d20322c4 SHA256 ffaec07185d289daa2eb4587e42abd11c19bd5f77b299984a16637ff13d7fe9c
-MD5 542f1cd74ee5824af0c31d2c07495296 audacious-1.1.2.ebuild 2764
-RMD160 5309bfc4976e2d9783dc4c7715bd9de09fd2347c audacious-1.1.2.ebuild 2764
-SHA256 ffaec07185d289daa2eb4587e42abd11c19bd5f77b299984a16637ff13d7fe9c audacious-1.1.2.ebuild 2764
-MISC ChangeLog 11781 RMD160 1225d664139dc5915178dba94e74cd9cc60f5c34 SHA1 a7c423d7024009622a6f376db2886083e95c59ee SHA256 2739c25d1f7d0c2c83b2d7cfd290d62d4187acfbf305c0054159cef3a1fea78d
-MD5 3791b232b5e11e8a6525a04b25956ec4 ChangeLog 11781
-RMD160 1225d664139dc5915178dba94e74cd9cc60f5c34 ChangeLog 11781
-SHA256 2739c25d1f7d0c2c83b2d7cfd290d62d4187acfbf305c0054159cef3a1fea78d ChangeLog 11781
+EBUILD audacious-1.1.2.ebuild 2724 RMD160 76796afd7cf25348dedb0a7779ad40eb60826af3 SHA1 f3ee253262b816c5770b911f1fd16c09ce5ff7b0 SHA256 400b51267b7e1eb1faddea86ba65df2f9e776a7854ef5670176570c57ebc069d
+MD5 20bd0199f0d4915fd525150a226dd27a audacious-1.1.2.ebuild 2724
+RMD160 76796afd7cf25348dedb0a7779ad40eb60826af3 audacious-1.1.2.ebuild 2724
+SHA256 400b51267b7e1eb1faddea86ba65df2f9e776a7854ef5670176570c57ebc069d audacious-1.1.2.ebuild 2724
+MISC ChangeLog 11955 RMD160 28b87cd753fb6092a41e464a73fd47b274172c0a SHA1 58a564347ba6c1836af22c58ea365bac0fca20f1 SHA256 3d589fda03f4843b35c3c10c13425585ef0a4ed1356fd8fc98c94c487fbc7f2e
+MD5 567e9a1d28478031b813125da3d85b03 ChangeLog 11955
+RMD160 28b87cd753fb6092a41e464a73fd47b274172c0a ChangeLog 11955
+SHA256 3d589fda03f4843b35c3c10c13425585ef0a4ed1356fd8fc98c94c487fbc7f2e ChangeLog 11955
 MISC metadata.xml 248 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d SHA1 4ea80510c4e90c385ac851b4f82c36b4f91d9402 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6
 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d metadata.xml 248
@@ -54,9 +50,9 @@ MD5 c6fde6ad566e03c50022dae6ec667b70 files/digest-audacious-1.1.2 500
 RMD160 c7ee4f2471187e573ee773a6e6013cd02574af32 files/digest-audacious-1.1.2 500
 SHA256 9123102dc3acec65b5306acae63aa0e41673098cc8f7cdbeb04754dcde769bd4 files/digest-audacious-1.1.2 500
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5rc1 (GNU/Linux)
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFE9PeDkT4lNIS36YERArzSAKCWRC1QE+nOg8a3r6AKNmJcwxMoQgCdFXam
-G5akx0NapEqfHRtFKcoI9zs=
-=O0bM
+iD8DBQFE9asxp5vW4rUFj5oRAvGaAKCFKIfvNkXXOPZXrWZ/XFWSBKoZRgCgncXg
+74o4ePWB1tZ3t3AtbZH0lFQ=
+=XDGY
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacious/files/1.1.2-cxxflags.diff b/media-sound/audacious/files/1.1.2-cxxflags.diff
deleted file mode 100644
index 4a1a28aa0a98..000000000000
--- a/media-sound/audacious/files/1.1.2-cxxflags.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: Plugins/Input/sid/Makefile.in
-===================================================================
---- Plugins/Input/sid/Makefile.in       (revision 2124)
-+++ Plugins/Input/sid/Makefile.in       (working copy)
-@@ -10,7 +10,7 @@ EXTRA_DIST = xmms-sid-logo.xpm
- 
- # Generals
- CFLAGS   += -fPIC -DPIC -D_REENTRANT $(PLUGIN_CFLAGS) $(SIDPLAY1_INCLUDES) $(SIDPLAY2_INCLUDES) $(BUILDERS_INCLUDES) $(GTK_CFLAGS) -I../../../intl -I../../..
--CXXFLAGS = $(CFLAGS)
-+CXXLAGS  += -fPIC -DPIC -D_REENTRANT $(PLUGIN_CFLAGS) $(SIDPLAY1_INCLUDES) $(SIDPLAY2_INCLUDES) $(BUILDERS_INCLUDES) $(GTK_CFLAGS) -I../../../intl -I../../..
- 
- # Generated libraries
- 
-Index: Plugins/Input/modplug/gui/Makefile.in
-===================================================================
---- Plugins/Input/modplug/gui/Makefile.in       (revision 2124)
-+++ Plugins/Input/modplug/gui/Makefile.in       (working copy)
-@@ -1,8 +1,8 @@
- include ../../../../mk/rules.mk
- include ../../../../mk/objective.mk
- 
--CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../../intl -I../../../..
--CXXFLAGS += $(CFLAGS)
-+CFLAGS   += -fPIC -DPIC $(GTK_CFLAGS) -I../../../../intl -I../../../..
-+CXXFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../../intl -I../../../..
- 
- OBJECTIVE_LIBS_NOINST = libgui.a
- SOURCES = main.cpp support.cpp interface.cpp callbacks.cpp
-Index: Plugins/Input/mpg123/Makefile.in
-===================================================================
---- Plugins/Input/mpg123/Makefile.in    (revision 2124)
-+++ Plugins/Input/mpg123/Makefile.in    (working copy)
-@@ -13,8 +13,7 @@ SOURCES = mpg123.c configure.c fileinfo.
- 
- OBJECTS = ${SOURCES:.c=.o} tag_c_hacked.o
- 
--CFLAGS += -UPSYCHO -fPIC -DPIC $(GTK_CFLAGS) $(TAGLIB_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
--
--CXXFLAGS = $(CFLAGS)
-+CFLAGS   += -UPSYCHO -fPIC -DPIC $(GTK_CFLAGS) $(TAGLIB_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
-+CXXFLAGS += -UPSYCHO -fPIC -DPIC $(GTK_CFLAGS) $(TAGLIB_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
- 
- LIBADD = -ltag_c $(GTK_LIBS) $(TAGLIB_LIBS)