Unix line endings to make patch-2.5.9 happy, thanks to Alexis Ballier.

Package-Manager: portage-2.2_rc61/cvs/Linux i686

3 files changed, 52 insertions, 48 deletions

diff --git a/www-plugins/gecko-mediaplayer/ChangeLog b/www-plugins/gecko-mediaplayer/ChangeLog
index e488da743224..581f7a5430f7 100644
--- a/www-plugins/gecko-mediaplayer/ChangeLog
+++ b/www-plugins/gecko-mediaplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-plugins/gecko-mediaplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.27 2010/01/22 14:25:11 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.28 2010/01/22 18:08:17 jer Exp $
+
+  22 Jan 2010; Jeroen Roovers <jer@gentoo.org>
+  files/gecko-mediaplayer-0.9.8_p347-xulrunner-detection.patch:
+  Unix line endings to make patch-2.5.9 happy, thanks to Alexis Ballier.
 
   22 Jan 2010; Ben de Groot <yngwin@gentoo.org>
   gecko-mediaplayer-0.9.8_p347.ebuild,
diff --git a/www-plugins/gecko-mediaplayer/Manifest b/www-plugins/gecko-mediaplayer/Manifest
index 8e641c18f68b..9c45eb027270 100644
--- a/www-plugins/gecko-mediaplayer/Manifest
+++ b/www-plugins/gecko-mediaplayer/Manifest
@@ -1,11 +1,11 @@
 AUX gecko-mediaplayer-0.9.6-xul.patch 687 RMD160 f31e072487afa241cd35d9649b5284c7ead24167 SHA1 25ce0ce8b1b1f33c4dc5ba5be8118b120c53553f SHA256 a618947606fd92efa779d6939146c2e5b6b49541c1f6520f1d34a4a2ca40f856
 AUX gecko-mediaplayer-0.9.8-asneeded.patch 3787 RMD160 afcfb3d75fdfadab10903b622d386921651096a9 SHA1 a8f0dcbe369c2bfbbf0d3ebfcdf01d2f6d18aada SHA256 0ac9d19b1e44195b19a3c0afde58bf3b150b65b07d1f9055655c9d2bb6df4ea1
-AUX gecko-mediaplayer-0.9.8_p347-xulrunner-detection.patch 1836 RMD160 8de663362775dc62540840e24ae636fd84f5b045 SHA1 3b36bce7877996379b1ada74aab457699004ea47 SHA256 b81ae81f2e03cd5c38b87a7133f4dd02e8bb13781aca8e7ef8502f8dbbb56cf3
+AUX gecko-mediaplayer-0.9.8_p347-xulrunner-detection.patch 1791 RMD160 94c6790279b6e9f48000d52dbeb7c1b5fb746aca SHA1 2137864b2f93515eed6be5b109d75c2a421a7576 SHA256 e7ad7d53969cd6c49ce71326a8c759096134feb6248cf318eedf89efd45fd881
 DIST gecko-mediaplayer-0.9.6.tar.gz 389598 RMD160 d50463aeec54ac25404b915f7e659e41b2070e5c SHA1 8de13d93a92729ad9ea2e9e0ccaa1f019c7a44ac SHA256 27fba7e5c1ff53d7b88742a40e85d045a25b9da05b6e3d77fd9de4b4c39687a0
 DIST gecko-mediaplayer-0.9.8.tar.gz 257788 RMD160 46ae679d112f7853b58268de7d6e5a4444a4797d SHA1 a1f90176c0447374ac6518f1eb23984bc2a88ae3 SHA256 a51ebf00021b1d5d43837edebd0fb28d8f6d2626111c4c391e8b0f6515004aa1
 DIST gecko-mediaplayer-r347.tar.bz2 207434 RMD160 75b1ca46b2170aca7ec1a9b5177f37ed0a538ec0 SHA1 c556ffb11dcd893e63e7fa7ccd963b51e14e6c46 SHA256 46155b01f8c1af03db93dd85464f01562d5231d21fd4082b6b8f2451cd78de41
 EBUILD gecko-mediaplayer-0.9.6.ebuild 1341 RMD160 440b0015de715bf32ecad0b0408834f0bde06109 SHA1 77df1397664c6ce9fbd71abc700f2813ef87ced1 SHA256 2043db79bbeb558b3b716743493c0a7674f9dac853db609a41a63db5de24042f
 EBUILD gecko-mediaplayer-0.9.8.ebuild 1573 RMD160 0b6f2bc227f7ce8668b8b2e8bf6aded2a92c83a8 SHA1 a6d51fb17f5f845e35be4f60002565a71a9f697a SHA256 036a0537f500f86afb7489eb9551810c961364ec1322ba1e8e4c00a7b1f59857
 EBUILD gecko-mediaplayer-0.9.8_p347.ebuild 1556 RMD160 0b862c5f11f35c6701a8e39bb7e3cb41c3a0ac63 SHA1 8b8a7583a77d9676342dbbea3c9105ced499183f SHA256 719c5aa052f479db5efead720dbdffc13f58b0e96d61153dde79829f17c823d2
-MISC ChangeLog 6007 RMD160 7673533514d9fc57e55773a0d0519dc0d19ad5ce SHA1 97c810f2f8f443681193b84748b8c0c99d5734f2 SHA256 52203b88790bdc8fa2622b4ee6ece0147f3de8cb4c18b7fb39eb1507ac0af16c
+MISC ChangeLog 6189 RMD160 0891ef06f20565e0fb21e60f9d10a5e521138270 SHA1 ac4d9bd3f327a92f6af732a6ac0466f83e656dcf SHA256 33c40389849be2269bf375884b97edbb08909c48c65170261954d38e6e68c4d7
 MISC metadata.xml 228 RMD160 3071d739d8e15041d594882afdfc434453568466 SHA1 06e3ee83b7a5a910d2d63ea77afb2e5a292606f6 SHA256 060670a1a67923937e4bf55598ae59368d5e716b0b618dedaf12b15f45e8e234
diff --git a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.8_p347-xulrunner-detection.patch b/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.8_p347-xulrunner-detection.patch
index 96b881e9a67a..4eb0b757e222 100644
--- a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.8_p347-xulrunner-detection.patch
+++ b/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.8_p347-xulrunner-detection.patch
@@ -1,46 +1,46 @@
---- gecko-mediaplayer-r347/configure.in-orig	2010-01-22 08:08:06.672212390 -0600

-+++ gecko-mediaplayer-r347/configure.in	2010-01-22 08:09:11.427185920 -0600

-@@ -40,6 +40,21 @@

- 	],

-         [])

- 

-+

-+if test "$GECKO_CFLAGS" = ""; then

-+PKG_CHECK_MODULES(GECKO, [libxul < 1.9.2],[ AC_MSG_NOTICE([libxul < 1.9.2 found])

-+    ],[AC_MSG_WARN([libxul < 1.9.2 not found, trying another])])

-+fi

-+if test "$GECKO_CFLAGS" = ""; then

-+PKG_CHECK_MODULES(GECKO, [libxul >= 1.9.2],[ AC_DEFINE([HAVE_NEW_XULRUNNER],[1],[Define to 1 if using libxul 1.9.2 or higher]) AC_MSG_NOTICE([libxul >= 1.9.2 found])

-+    ],[AC_MSG_NOTICE([libxul >= 1.9.2 not found, trying another])])

-+fi

-+

-+if test "$GECKO_CFLAGS" = ""; then

-+PKG_CHECK_MODULES(GECKO, [libxul-unstable],[

-+    ],[AC_MSG_WARN([libxul-unstable not found, trying another])])

-+fi

-+

- if test "$GECKO_CFLAGS" = ""; then

- PKG_CHECK_MODULES(GECKO, [mozilla-plugin mozilla-xpcom],[

-     ],[AC_MSG_WARN([mozilla-plugin not found, trying another])])

-@@ -61,21 +76,6 @@

- fi

- 

- if test "$GECKO_CFLAGS" = ""; then

--PKG_CHECK_MODULES(GECKO, [libxul < 1.9.2],[ AC_MSG_NOTICE([libxul < 1.9.2 found])

--    ],[AC_MSG_WARN([libxul < 1.9.2 not found, trying another])])

--fi

--if test "$GECKO_CFLAGS" = ""; then

--PKG_CHECK_MODULES(GECKO, [libxul >= 1.9.2],[ AC_DEFINE([HAVE_NEW_XULRUNNER],[1],[Define to 1 if using libxul 1.9.2 or higher]) AC_MSG_NOTICE([libxul >= 1.9.2 found])

--    ],[AC_MSG_NOTICE([libxul >= 1.9.2 not found, trying another])])

--fi

--

--if test "$GECKO_CFLAGS" = ""; then

--PKG_CHECK_MODULES(GECKO, [libxul-unstable],[

--    ],[AC_MSG_WARN([libxul-unstable not found, trying another])])

--fi

--

--

--if test "$GECKO_CFLAGS" = ""; then

- PKG_CHECK_MODULES(GECKO, [iceape-plugin iceape-xpcom],[

-     ],[AC_MSG_WARN([iceape-plugin not found, trying another])])

+--- gecko-mediaplayer-r347/configure.in-orig	2010-01-22 08:08:06.672212390 -0600
++++ gecko-mediaplayer-r347/configure.in	2010-01-22 08:09:11.427185920 -0600
+@@ -40,6 +40,21 @@
+ 	],
+         [])
+ 
++
++if test "$GECKO_CFLAGS" = ""; then
++PKG_CHECK_MODULES(GECKO, [libxul < 1.9.2],[ AC_MSG_NOTICE([libxul < 1.9.2 found])
++    ],[AC_MSG_WARN([libxul < 1.9.2 not found, trying another])])
++fi
++if test "$GECKO_CFLAGS" = ""; then
++PKG_CHECK_MODULES(GECKO, [libxul >= 1.9.2],[ AC_DEFINE([HAVE_NEW_XULRUNNER],[1],[Define to 1 if using libxul 1.9.2 or higher]) AC_MSG_NOTICE([libxul >= 1.9.2 found])
++    ],[AC_MSG_NOTICE([libxul >= 1.9.2 not found, trying another])])
++fi
++
++if test "$GECKO_CFLAGS" = ""; then
++PKG_CHECK_MODULES(GECKO, [libxul-unstable],[
++    ],[AC_MSG_WARN([libxul-unstable not found, trying another])])
++fi
++
+ if test "$GECKO_CFLAGS" = ""; then
+ PKG_CHECK_MODULES(GECKO, [mozilla-plugin mozilla-xpcom],[
+     ],[AC_MSG_WARN([mozilla-plugin not found, trying another])])
+@@ -61,21 +76,6 @@
+ fi
+ 
+ if test "$GECKO_CFLAGS" = ""; then
+-PKG_CHECK_MODULES(GECKO, [libxul < 1.9.2],[ AC_MSG_NOTICE([libxul < 1.9.2 found])
+-    ],[AC_MSG_WARN([libxul < 1.9.2 not found, trying another])])
+-fi
+-if test "$GECKO_CFLAGS" = ""; then
+-PKG_CHECK_MODULES(GECKO, [libxul >= 1.9.2],[ AC_DEFINE([HAVE_NEW_XULRUNNER],[1],[Define to 1 if using libxul 1.9.2 or higher]) AC_MSG_NOTICE([libxul >= 1.9.2 found])
+-    ],[AC_MSG_NOTICE([libxul >= 1.9.2 not found, trying another])])
+-fi
+-
+-if test "$GECKO_CFLAGS" = ""; then
+-PKG_CHECK_MODULES(GECKO, [libxul-unstable],[
+-    ],[AC_MSG_WARN([libxul-unstable not found, trying another])])
+-fi
+-
+-
+-if test "$GECKO_CFLAGS" = ""; then
+ PKG_CHECK_MODULES(GECKO, [iceape-plugin iceape-xpcom],[
+     ],[AC_MSG_WARN([iceape-plugin not found, trying another])])
  fi
\ No newline at end of file