Stripped DOS-style line endings from patch. Closes bug #145257.

Package-Manager: portage-2.1.1_rc1-r1

3 files changed, 58 insertions, 55 deletions

diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index a56a6cb0d483..2e216d88fee4 100644
--- a/media-sound/audacious/ChangeLog
+++ b/media-sound/audacious/ChangeLog
@@ -1,6 +1,9 @@
 # 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.64 2006/08/26 19:25:37 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.65 2006/08/27 21:03:49 chainsaw Exp $
+
+  27 Aug 2006; Tony Vroon <chainsaw@gentoo.org> files/1.1.2-cxxflags.diff:
+  Stripped DOS-style line endings from patch. Closes bug #145257.
 
   26 Aug 2006; Tony Vroon <chainsaw@gentoo.org> +files/1.1.2-cxxflags.diff,
   audacious-1.1.2.ebuild:
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 46fa84989638..d7e2595d69d9 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -9,10 +9,10 @@ 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 2066 RMD160 afef0cd660bf12deb4fa8c7bd0e0d340dff20f51 SHA1 014c3815eb3a67ae6a2db1371735faa49a3efee2 SHA256 2dc2d2809914c8954f41678c4c845939c83ddbdffc672edd7798b577bded73a8
-MD5 d093a5aa8da54793679768f2a21b60c0 files/1.1.2-cxxflags.diff 2066
-RMD160 afef0cd660bf12deb4fa8c7bd0e0d340dff20f51 files/1.1.2-cxxflags.diff 2066
-SHA256 2dc2d2809914c8954f41678c4c845939c83ddbdffc672edd7798b577bded73a8 files/1.1.2-cxxflags.diff 2066
+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
@@ -33,10 +33,10 @@ EBUILD audacious-1.1.2.ebuild 2766 RMD160 42e1bd1197690788f6e65c8b5fad9da0fc6e5f
 MD5 74d92bf586796abd0e0e9f75e0989c51 audacious-1.1.2.ebuild 2766
 RMD160 42e1bd1197690788f6e65c8b5fad9da0fc6e5fe9 audacious-1.1.2.ebuild 2766
 SHA256 adfa6927c5f1b4a0a144635f4a88ec5764f29516c16c2246d5120731ae315761 audacious-1.1.2.ebuild 2766
-MISC ChangeLog 11347 RMD160 a726ed844b8441490befc05c08f35aba110b449e SHA1 00f5197eb92fda2213e2ebb3fe6e7138a9c0d18e SHA256 0f71953e27e58af3a8ce175c37690d5baa4fe796f5375c4c5d83c5a7f5ef3447
-MD5 c1bc977560182832d3ab2af678759c71 ChangeLog 11347
-RMD160 a726ed844b8441490befc05c08f35aba110b449e ChangeLog 11347
-SHA256 0f71953e27e58af3a8ce175c37690d5baa4fe796f5375c4c5d83c5a7f5ef3447 ChangeLog 11347
+MISC ChangeLog 11489 RMD160 311639e35cadb3c3d2f01fb25f2e5347213a8426 SHA1 00ac4edfeb36bbd88e8b652ba8331d215b278c06 SHA256 ce7413ff69feec03067cd70908907e46bb3ad7996f5a4c1a66ea934c07c249ad
+MD5 9522468198dfd46921ee65417263d366 ChangeLog 11489
+RMD160 311639e35cadb3c3d2f01fb25f2e5347213a8426 ChangeLog 11489
+SHA256 ce7413ff69feec03067cd70908907e46bb3ad7996f5a4c1a66ea934c07c249ad ChangeLog 11489
 MISC metadata.xml 248 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d SHA1 4ea80510c4e90c385ac851b4f82c36b4f91d9402 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6
 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d metadata.xml 248
@@ -56,7 +56,7 @@ SHA256 9123102dc3acec65b5306acae63aa0e41673098cc8f7cdbeb04754dcde769bd4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFE8KA4p5vW4rUFj5oRAq/3AKC7TSBkoRMRNYybow9pYjyCg3cPAgCfR585
-u/2OrJqXREwMnFHv3M6sydA=
-=6GU5
+iD8DBQFE8gi6p5vW4rUFj5oRAm13AJ0bBPoUGmkXu01UKOxjTpPlw27MGACdHRLS
++W356NlvrIUKW1j2dDGhjG0=
+=m3VO
 -----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
index 4365bd047104..4a1a28aa0a98 100644
--- a/media-sound/audacious/files/1.1.2-cxxflags.diff
+++ b/media-sound/audacious/files/1.1.2-cxxflags.diff
@@ -1,43 +1,43 @@
-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)
\ No newline at end of file
+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)