Removed old versions and orphan files. Moved all the patches into patch tarballs.

Package-Manager: portage-2.0.51.20-r5

34 files changed, 79 insertions, 1759 deletions

diff --git a/media-video/xine-ui/ChangeLog b/media-video/xine-ui/ChangeLog
index 062d08e497a5..0914d0425a71 100644
--- a/media-video/xine-ui/ChangeLog
+++ b/media-video/xine-ui/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-video/xine-ui
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.75 2005/04/22 17:55:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.76 2005/05/01 23:33:55 flameeyes Exp $
+
+  01 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/preserve-CFLAGS-0.9.23.diff, -files/preserve-CFLAGS-0.99.1.diff,
+  -files/preserve-CFLAGS-0.99.2.diff, -files/implicit-config.patch,
+  -files/preserve-CFLAGS.diff, -files/symlink-bug.patch,
+  -files/true-false.patch, -files/xine.desktop,
+  -files/xine-ui-configure.patch, -files/xine-ui-configure-checks.patch,
+  -files/xine-ui-gcc4.patch, -files/xine-ui-gentoo.diff,
+  -xine-ui-0.9.21-r1.ebuild, -xine-ui-0.9.22-r1.ebuild,
+  -xine-ui-0.9.22-r2.ebuild, -xine-ui-0.9.23-r1.ebuild,
+  xine-ui-0.9.23-r2.ebuild, xine-ui-0.99.1.ebuild, xine-ui-0.99.2.ebuild,
+  xine-ui-0.99.3_pre20041022.ebuild, xine-ui-0.99.3_pre20041022-r1.ebuild,
+  xine-ui-0.99.3.ebuild, xine-ui-0.99.3-r1.ebuild:
+  Removed old versions and orphan files. Moved all the patches into patch
+  tarballs.
 
   22 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
   +files/xine-ui-gcc4.patch, xine-ui-0.99.3-r1.ebuild:
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 41072543d649..1a24f7b8d8e4 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,37 +1,17 @@
-MD5 8f1862c4eb1a0848199eff5b86969922 ChangeLog 12213
+MD5 4d02fd43fc3724ea7d70f6316c60d78d ChangeLog 13042
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 871ab1252b5ad1b44a13cf76b370b3d1 xine-ui-0.9.21-r1.ebuild 1607
-MD5 51e8cc0f16c4ab4718f828bf618b00fe xine-ui-0.9.22-r1.ebuild 1446
-MD5 fa8489b4c41662c5d342f1139f19199a xine-ui-0.9.22-r2.ebuild 1460
-MD5 6b52e9fa34c8e32e831d1bcc585e53ed xine-ui-0.9.23-r1.ebuild 1425
-MD5 de6e684a0549e572e36cea492ac2daff xine-ui-0.9.23-r2.ebuild 1570
-MD5 7e1c68a1102e1f87b51f007419a53747 xine-ui-0.99.1.ebuild 1488
-MD5 01994eb77ebdb72cbe431b17d9b64f96 xine-ui-0.99.2.ebuild 1501
-MD5 70a157ab6270049660a92709afdbb8c6 xine-ui-0.99.3-r1.ebuild 1960
-MD5 00b711d4ba64bd1067623be007133d92 xine-ui-0.99.3.ebuild 1600
-MD5 6353bbca17064204c0883e78fcd14afe xine-ui-0.99.3_pre20041022-r1.ebuild 1549
-MD5 484aed56116df5fa32309a33dae2e8f4 xine-ui-0.99.3_pre20041022.ebuild 1340
-MD5 32aa0f3c22f337999efc35a1eff3cd94 files/digest-xine-ui-0.9.21-r1 67
-MD5 a40013de7a4c30965b9adb242f6d9203 files/digest-xine-ui-0.9.22-r1 67
-MD5 a40013de7a4c30965b9adb242f6d9203 files/digest-xine-ui-0.9.22-r2 67
-MD5 72e97c4b1f21cf5aa998c87b95c7b383 files/digest-xine-ui-0.9.23-r1 67
-MD5 72e97c4b1f21cf5aa998c87b95c7b383 files/digest-xine-ui-0.9.23-r2 67
-MD5 29e08b482a6684f4c984b5e7d62226ab files/digest-xine-ui-0.99.1 67
-MD5 0e95c6c5575292852c14b8dcfc86749a files/digest-xine-ui-0.99.2 67
-MD5 33e42eebdeb7c106871afc6cf9883489 files/digest-xine-ui-0.99.3 67
-MD5 33e42eebdeb7c106871afc6cf9883489 files/digest-xine-ui-0.99.3-r1 67
+MD5 ee836cee291fbb86648777f8d10209ac xine-ui-0.9.23-r2.ebuild 1547
+MD5 a4c9bef07c900a978da2d3f73111f23c xine-ui-0.99.1.ebuild 1594
+MD5 08d9c2edc383c947b3a5d0eae3d4e30a xine-ui-0.99.2.ebuild 1607
+MD5 18b76996fbec4649fedbceb09a030d96 xine-ui-0.99.3-r1.ebuild 1828
+MD5 12cf095534bc94b96eeeb5f33318d52a xine-ui-0.99.3.ebuild 1606
+MD5 e2c68280de83ee8fc986edbcbcb85183 xine-ui-0.99.3_pre20041022-r1.ebuild 1801
+MD5 ab41f1f42d2d6b2e11f7eb36e11741bd xine-ui-0.99.3_pre20041022.ebuild 1331
+MD5 d9842161404f6879c8c28f713de335f5 files/digest-xine-ui-0.9.23-r2 135
+MD5 8020c56fb573fb11cda2e56c109c2840 files/digest-xine-ui-0.99.1 135
+MD5 218ae2d4e0dde1f966f3522b86463738 files/digest-xine-ui-0.99.2 135
+MD5 609a90c35f25d57077d7e7eaf94aa509 files/digest-xine-ui-0.99.3 135
+MD5 609a90c35f25d57077d7e7eaf94aa509 files/digest-xine-ui-0.99.3-r1 135
 MD5 1c7ec60b24fe2cd95f8e352de316894b files/digest-xine-ui-0.99.3_pre20041022 79
 MD5 1c7ec60b24fe2cd95f8e352de316894b files/digest-xine-ui-0.99.3_pre20041022-r1 79
-MD5 2d9954f609edaa8124eb990dddd259e4 files/implicit-config.patch 1820
-MD5 f474df8e81130d6b495663ed56763180 files/preserve-CFLAGS-0.9.23.diff 5470
-MD5 471be882204018951e47491017432284 files/preserve-CFLAGS-0.99.1.diff 6424
-MD5 b517eaaa6a9cbd78f22a48fc55ba2940 files/preserve-CFLAGS-0.99.2.diff 7923
-MD5 93797247103115aaa2ec56d8de5a6ec7 files/preserve-CFLAGS.diff 5500
-MD5 24814788406be1e1ce09035b2c867399 files/symlink-bug.patch 4326
-MD5 daacb70d49e7ee5ca3c1593f10eea0bc files/true-false.patch 298
-MD5 9175202497674c66eeaf933435fdb0b0 files/xine-ui-configure-checks.patch 2822
-MD5 f9ec30bd10b5c9d431b5d382310fe87d files/xine-ui-configure.patch 336
 MD5 601b34bc4b9a6493bd43a38d67777d33 files/xine-ui-desktop-fixes.patch 1285
-MD5 eae093d61629b0d42b806e9e84814e79 files/xine-ui-gentoo.diff 5216
-MD5 92d5d365d60b97698c865beaede2b594 files/xine.desktop 296
-MD5 d4c5a18da739defdeb6c42c63d1be320 files/xine-ui-gcc4.patch 689
diff --git a/media-video/xine-ui/files/digest-xine-ui-0.9.21-r1 b/media-video/xine-ui/files/digest-xine-ui-0.9.21-r1
deleted file mode 100644
index 37622e3a35fa..000000000000
--- a/media-video/xine-ui/files/digest-xine-ui-0.9.21-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 18baa9fbef7a87d4094e46b02f85d46a xine-ui-0.9.21.tar.gz 2551466
diff --git a/media-video/xine-ui/files/digest-xine-ui-0.9.22-r1 b/media-video/xine-ui/files/digest-xine-ui-0.9.22-r1
deleted file mode 100644
index 99854b1aa067..000000000000
--- a/media-video/xine-ui/files/digest-xine-ui-0.9.22-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2a59480b11cb136862cafcbc56d3922e xine-ui-0.9.22.tar.gz 2637736
diff --git a/media-video/xine-ui/files/digest-xine-ui-0.9.22-r2 b/media-video/xine-ui/files/digest-xine-ui-0.9.22-r2
deleted file mode 100644
index 99854b1aa067..000000000000
--- a/media-video/xine-ui/files/digest-xine-ui-0.9.22-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2a59480b11cb136862cafcbc56d3922e xine-ui-0.9.22.tar.gz 2637736
diff --git a/media-video/xine-ui/files/digest-xine-ui-0.9.23-r1 b/media-video/xine-ui/files/digest-xine-ui-0.9.23-r1
deleted file mode 100644
index 6f5eb90bbc14..000000000000
--- a/media-video/xine-ui/files/digest-xine-ui-0.9.23-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 526c96a7c08d2913e6f328e347fe615f xine-ui-0.9.23.tar.gz 2798551
diff --git a/media-video/xine-ui/files/digest-xine-ui-0.9.23-r2 b/media-video/xine-ui/files/digest-xine-ui-0.9.23-r2
index 6f5eb90bbc14..2e8f6cd47a36 100644
--- a/media-video/xine-ui/files/digest-xine-ui-0.9.23-r2
+++ b/media-video/xine-ui/files/digest-xine-ui-0.9.23-r2
@@ -1 +1,2 @@
 MD5 526c96a7c08d2913e6f328e347fe615f xine-ui-0.9.23.tar.gz 2798551
+MD5 1beb038319661c8e37a4069b46f85f16 xine-ui-patches-0.tar.bz2 5970
diff --git a/media-video/xine-ui/files/digest-xine-ui-0.99.1 b/media-video/xine-ui/files/digest-xine-ui-0.99.1
index 60de83604041..776ef69ddde9 100644
--- a/media-video/xine-ui/files/digest-xine-ui-0.99.1
+++ b/media-video/xine-ui/files/digest-xine-ui-0.99.1
@@ -1 +1,2 @@
 MD5 6309b312e41b0caaf53746715d0eb580 xine-ui-0.99.1.tar.gz 2339506
+MD5 1beb038319661c8e37a4069b46f85f16 xine-ui-patches-0.tar.bz2 5970
diff --git a/media-video/xine-ui/files/digest-xine-ui-0.99.2 b/media-video/xine-ui/files/digest-xine-ui-0.99.2
index ffe18d8861a9..0be9402bd7c1 100644
--- a/media-video/xine-ui/files/digest-xine-ui-0.99.2
+++ b/media-video/xine-ui/files/digest-xine-ui-0.99.2
@@ -1 +1,2 @@
 MD5 4a4cf5cc68bf65e6845f501ea87fdf94 xine-ui-0.99.2.tar.gz 2374176
+MD5 1beb038319661c8e37a4069b46f85f16 xine-ui-patches-0.tar.bz2 5970
diff --git a/media-video/xine-ui/files/digest-xine-ui-0.99.3 b/media-video/xine-ui/files/digest-xine-ui-0.99.3
index 72b1cde75355..05af54e0eb17 100644
--- a/media-video/xine-ui/files/digest-xine-ui-0.99.3
+++ b/media-video/xine-ui/files/digest-xine-ui-0.99.3
@@ -1 +1,2 @@
 MD5 aa7805a93e511e3d67dc1bf09a71fcdd xine-ui-0.99.3.tar.gz 2610080
+MD5 831cc89e82107cf5289726e827d9a091 xine-ui-patches-1.tar.bz2 2323
diff --git a/media-video/xine-ui/files/digest-xine-ui-0.99.3-r1 b/media-video/xine-ui/files/digest-xine-ui-0.99.3-r1
index 72b1cde75355..05af54e0eb17 100644
--- a/media-video/xine-ui/files/digest-xine-ui-0.99.3-r1
+++ b/media-video/xine-ui/files/digest-xine-ui-0.99.3-r1
@@ -1 +1,2 @@
 MD5 aa7805a93e511e3d67dc1bf09a71fcdd xine-ui-0.99.3.tar.gz 2610080
+MD5 831cc89e82107cf5289726e827d9a091 xine-ui-patches-1.tar.bz2 2323
diff --git a/media-video/xine-ui/files/implicit-config.patch b/media-video/xine-ui/files/implicit-config.patch
deleted file mode 100644
index ccc1b37a6004..000000000000
--- a/media-video/xine-ui/files/implicit-config.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/xitk/config_wrapper.c	2004/01/25 03:19:14	1.16
-+++ src/xitk/config_wrapper.c	2004/03/16 21:13:27	1.17
-@@ -140,9 +140,18 @@
-  * Handle 'cfg:/' mrl style
-  */
- void config_mrl(char *mrl) {
-+  xine_cfg_entry_t entry;
-   char *key;
-   char *config;
-   char *_mrl;
-+  
-+  if (!xine_config_lookup_entry(gGui->xine, "misc.implicit_config", &entry) ||
-+      entry.type != XINE_CONFIG_TYPE_BOOL || !entry.num_value) {
-+    xine_info(_("You tried to change the configuration with a cfg: MRL.\n"
-+		"This is not allowed unless you enable the 'misc.implicit_config' setting "
-+		"after reading and understanding its help text."));
-+    return;
-+  }
- 
-   xine_strdupa(_mrl, mrl);
-   config = strchr(_mrl, '/');
-@@ -157,7 +166,6 @@
-       *str_value++ = '\0';
- 
-     if(str_value && strlen(str_value)) {
--      xine_cfg_entry_t entry;
-       
-       if(xine_config_lookup_entry(gGui->xine, key, &entry)) {
- 
---- src/fb/config_wrapper.c	2003/11/08 10:19:48	1.2
-+++ src/fb/config_wrapper.c	2004/03/18 14:40:44	1.4
-@@ -136,10 +136,19 @@
-  * Handle 'cfg:/' mrl style
-  */
- void config_mrl(const char *mrl) {
-+  xine_cfg_entry_t entry;
-   char *key;
-   char *config;
-   char *_mrl;
- 
-+  if (!xine_config_lookup_entry(fbxine.xine, "misc.implicit_config", &entry) ||
-+      entry.type != XINE_CONFIG_TYPE_BOOL || !entry.num_value) {
-+    fprintf(stderr, "You tried to change the configuration with a cfg: MRL.\n"
-+	    "This is not allowed unless you enable the 'misc.implicit_config' setting "
-+	    "after reading and understanding its help text.");
-+    return;
-+  }
-+
-   xine_strdupa(_mrl, mrl);
-   config = strchr(_mrl, '/');
-   
-@@ -153,7 +162,6 @@
-       *str_value++ = '\0';
- 
-     if(str_value && strlen(str_value)) {
--      xine_cfg_entry_t entry;
-       
-       if(xine_config_lookup_entry(fbxine.xine, key, &entry)) {
- 
diff --git a/media-video/xine-ui/files/preserve-CFLAGS-0.9.23.diff b/media-video/xine-ui/files/preserve-CFLAGS-0.9.23.diff
deleted file mode 100644
index df84781b0858..000000000000
--- a/media-video/xine-ui/files/preserve-CFLAGS-0.9.23.diff
+++ /dev/null
@@ -1,206 +0,0 @@
---- configure.org	2003-12-29 12:21:25.000000000 +0100
-+++ configure	2003-12-29 12:24:08.000000000 +0100
-@@ -19409,203 +19409,6 @@
-     ;;
- 
-   i?86*-*-linux* | i386-*-solaris* | i?86-* | k?-* | athlon-*)
--    if test "$GCC" = yes; then
--
--		echo "$as_me:$LINENO: checking if $CC supports \"-mcpu=i386\" flags" >&5
--echo $ECHO_N "checking if $CC supports \"-mcpu=i386\" flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS=""-mcpu=i386""
--    cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--        sarchopt="-mcpu"
--    else
--        echo "$as_me:$LINENO: checking if $CC supports \"-march=i386\" flags" >&5
--echo $ECHO_N "checking if $CC supports \"-march=i386\" flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS=""-march=i386""
--    cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--        sarchopt="-march"
--    else
--         echo "$as_me:$LINENO: result: ** no cpu optimization supports **" >&5
--echo "${ECHO_T}** no cpu optimization supports **" >&6
--	          sarchopt=no
--    fi
--    fi
--
--	        echo "$as_me:$LINENO: checking if $CC supports \"$sarchopt=athlon\" flags" >&5
--echo $ECHO_N "checking if $CC supports \"$sarchopt=athlon\" flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS=""$sarchopt=athlon""
--    cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--        k7cpu="athlon"
--    else
--        k7cpu="i686"
--    fi
--
--		CFLAGS="-O3 -pipe -fomit-frame-pointer $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions $CFLAGS"
--	DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
--
--
--	if test x"$sarchopt" != "xno"; then
--
--	    archopt_val=
--
--	    case "$host_alias" in
--	    i386-*) # *BSD return this even on a P III #-))
--		archopt_val=i386 ;;
--	    i486-*) # oh dear!
--		archopt_val=i486 ;;
--	    i586-*)
--		archopt_val=pentium ;;
--	    i686-*)
--		archopt_val=pentiumpro
--		if test x"$check_athlon" = "xyes"; then
--		    if test -f /proc/cpuinfo; then
--			modelname=`cat /proc/cpuinfo | grep "model\ name\	:" | sed -e 's/ //g' | cut -d':' -f2`
--			case "$modelname" in
--			*Athlon* | *Duron* | *K7*)
--			    archopt_val="$k7cpu" ;;
--			esac
--		    fi
--		fi
--		;;
--	    k6-*)
--		archopt_val=k6 ;;
--	    k7-*)
--		archopt_val=k7 ;;
--	    athlon-*)
--		archopt_val=athlon ;;
--	    esac
--
--	    if test x"$archopt_val" != x; then
--		CFLAGS="$sarchopt=$archopt_val $CFLAGS"
--		DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
--	    fi
--
--	fi
--
--    else
--		CFLAGS="-O $CFLAGS"
--	DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
--    fi
--
--
- cat >>confdefs.h <<\_ACEOF
- #define __i386__ 1
- _ACEOF
diff --git a/media-video/xine-ui/files/preserve-CFLAGS-0.99.1.diff b/media-video/xine-ui/files/preserve-CFLAGS-0.99.1.diff
deleted file mode 100644
index d03ee807fa96..000000000000
--- a/media-video/xine-ui/files/preserve-CFLAGS-0.99.1.diff
+++ /dev/null
@@ -1,230 +0,0 @@
---- configure	2004-04-17 00:12:00.000000000 +0200
-+++ configure.new	2004-06-07 11:52:06.518955539 +0200
-@@ -30005,227 +30005,6 @@
-     ;;
- 
-   i?86*-*-linux* | i386-*-solaris* | i?86-* | k?-* | athlon-*)
--    if test "$GCC" = yes; then
--
--		echo "$as_me:$LINENO: checking if $CC supports \"-mcpu=i386\" flags" >&5
--echo $ECHO_N "checking if $CC supports \"-mcpu=i386\" flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS=""-mcpu=i386""
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--        sarchopt="-mcpu"
--    else
--        echo "$as_me:$LINENO: checking if $CC supports \"-march=i386\" flags" >&5
--echo $ECHO_N "checking if $CC supports \"-march=i386\" flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS=""-march=i386""
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--        sarchopt="-march"
--    else
--         echo "$as_me:$LINENO: result: ** no cpu optimization supports **" >&5
--echo "${ECHO_T}** no cpu optimization supports **" >&6
--	          sarchopt=no
--    fi
--    fi
--
--	        echo "$as_me:$LINENO: checking if $CC supports \"$sarchopt=athlon\" flags" >&5
--echo $ECHO_N "checking if $CC supports \"$sarchopt=athlon\" flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS=""$sarchopt=athlon""
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--        k7cpu="athlon"
--    else
--        k7cpu="i686"
--    fi
--
--		CFLAGS="-O3 -pipe -fomit-frame-pointer $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions $CFLAGS"
--	DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
--
--
--	if test x"$sarchopt" != "xno"; then
--
--	    archopt_val=
--
--	    case "$host_alias" in
--	    i386-*) # *BSD return this even on a P III #-))
--		archopt_val=i386 ;;
--	    i486-*) # oh dear!
--		archopt_val=i486 ;;
--	    i586-*)
--		archopt_val=pentium ;;
--	    i686-*)
--		archopt_val=pentiumpro
--		if test x"$check_athlon" = "xyes"; then
--		    if test -f /proc/cpuinfo; then
--			modelname=`cat /proc/cpuinfo | grep "model\ name\	:" | sed -e 's/ //g' | cut -d':' -f2`
--			case "$modelname" in
--			*Athlon* | *Duron* | *K7*)
--			    archopt_val="$k7cpu" ;;
--			esac
--		    fi
--		fi
--		;;
--	    k6-*)
--		archopt_val=k6 ;;
--	    k7-*)
--		archopt_val=k7 ;;
--	    athlon-*)
--		archopt_val=athlon ;;
--	    esac
--
--	    if test x"$archopt_val" != x; then
--		CFLAGS="$sarchopt=$archopt_val $CFLAGS"
--		DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
--	    fi
--
--	fi
--
--    else
--		CFLAGS="-O $CFLAGS"
--	DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
--    fi
--
--
- cat >>confdefs.h <<\_ACEOF
- #define __i386__ 1
- _ACEOF
diff --git a/media-video/xine-ui/files/preserve-CFLAGS-0.99.2.diff b/media-video/xine-ui/files/preserve-CFLAGS-0.99.2.diff
deleted file mode 100644
index 34775f2933b7..000000000000
--- a/media-video/xine-ui/files/preserve-CFLAGS-0.99.2.diff
+++ /dev/null
@@ -1,310 +0,0 @@
-diff -ur xine-ui-0.99.2/configure xine-ui-0.99.2-patched/configure
---- xine-ui-0.99.2/configure	2004-07-04 18:26:08.000000000 +0200
-+++ xine-ui-0.99.2-patched/configure	2004-07-09 12:19:19.595146120 +0200
-@@ -28788,306 +28788,6 @@
-     ;;
- 
-   i?86-*-linux* | i386-*-solaris* | i?86-* | k?-* | athlon-* | pentium*)
--    if test "$GCC" = yes -o "${CC##*/}x" = "iccx" ; then
--
--      if test "$GCC" = yes ; then
--		echo "$as_me:$LINENO: checking if $CC supports \"-mtune=i386\" flags" >&5
--echo $ECHO_N "checking if $CC supports \"-mtune=i386\" flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS=""-mtune=i386""
--    cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--        sarchopt="-mtune"
--    else
--        echo "$as_me:$LINENO: checking if $CC supports \"-mcpu=i386\" flags" >&5
--echo $ECHO_N "checking if $CC supports \"-mcpu=i386\" flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS=""-mcpu=i386""
--    cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--        sarchopt="-mcpu"
--    else
--        echo "$as_me:$LINENO: checking if $CC supports \"-march=i386\" flags" >&5
--echo $ECHO_N "checking if $CC supports \"-march=i386\" flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS=""-march=i386""
--    cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--        sarchopt="-march"
--    else
--         echo "$as_me:$LINENO: result: ** no cpu optimization supports **" >&5
--echo "${ECHO_T}** no cpu optimization supports **" >&6
--	        sarchopt=no
--
--
--    fi
--
--    fi
--
--    fi
--
--	        echo "$as_me:$LINENO: checking if $CC supports \"$sarchopt=athlon\" flags" >&5
--echo $ECHO_N "checking if $CC supports \"$sarchopt=athlon\" flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS=""$sarchopt=athlon""
--    cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--        k7cpu="athlon"
--    else
--        k7cpu="i686"
--    fi
--
--		CFLAGS="-O3 -pipe -fomit-frame-pointer $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions $CFLAGS"
--
--	DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
--
--	if test x"$sarchopt" != "xno"; then
--
--	    archopt_val=
--
--	    case "$host_or_hostalias" in
--	    i386-*) # *BSD return this even on a P III #-))
--		archopt_val="i386" ;;
--	    i486-*) # oh dear!
--		archopt_val="i486" ;;
--	    i586-*)
--		archopt_val="pentium"
--                ;;
--	    pentium-mmx-*)
--		archopt_val="pentium-mmx"
--		;;
--	    pentiumpro-* | pentium2-* | i686-*)
--		archopt_val="pentiumpro"
--		if test x"$check_athlon" = "xyes"; then
--		    if test -f /proc/cpuinfo; then
--			modelname=`cat /proc/cpuinfo | grep "model\ name\	:" | sed -e 's/ //g' | cut -d':' -f2`
--			case "$modelname" in
--			*Athlon* | *Duron* | *K7*)
--			    archopt_val="$k7cpu"
--			    ;;
--			VIAEzra)
--			    archopt_val="c3"
--			    ;;
--			esac
--		    fi
--		fi
--		;;
--	    k6-2-* | k6-3-*)
--		archopt_val="k6-2"
--		;;
--	    k6-*)
--		archopt_val="k6"
--		;;
--	    pentium3-*)
--		archopt_val="pentium3"
--		;;
--	    pentium4-*)
--		archopt_val="pentium4"
--		;;
--	    athlon-4-* | athlon-xp-* | athlon-mp-*)
--		archopt_val="athlon-4"
--		;;
--	    k7-* | athlon-tbird-* | athlon-*)
--		archopt_val="athlon"
--		;;
--
--	    esac
--	    if test x"$archopt_val" != x; then
--		CFLAGS="$sarchopt=$archopt_val $CFLAGS"
--		DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
--	    fi
--
--	fi
--      else
--		CFLAGS="-unroll -ipo -ipo_obj -O3 $CFLAGS"
--	PASS1_CFLAGS="-prof_genx -prof_dir \$(PWD)/\$(top_builddir)/ $PASS1_CFLAGS"
--	PASS2_CFLAGS="-prof_use -prof_dir \$(PWD)/\$(top_builddir)/ $PASS2_CFLAGS"
--
--
--      fi
--
--
--cat >>confdefs.h <<_ACEOF
--#define ARCH_X86
--_ACEOF
--
--
--cat >>confdefs.h <<\_ACEOF
--#define FPM_INTEL 1
--_ACEOF
--
--	enable_ffmmx="yes"
--	enable_w32dll="yes"
--
--        case "$host_or_hostalias" in
--	*-*-cygwin)
--          enable_w32dll="no"
--	  LDFLAGS="-no-undefined @INTLLIBS@ $LDFLAGS"
--	  ;;
--	esac
--    else
--		CFLAGS="-O $CFLAGS"
--	DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
--
--cat >>confdefs.h <<_ACEOF
--#define FPM_64BIT
--_ACEOF
--
--    fi
--
--
- cat >>confdefs.h <<\_ACEOF
- #define __i386__ 1
- _ACEOF
diff --git a/media-video/xine-ui/files/preserve-CFLAGS.diff b/media-video/xine-ui/files/preserve-CFLAGS.diff
deleted file mode 100644
index 4374c309c6a8..000000000000
--- a/media-video/xine-ui/files/preserve-CFLAGS.diff
+++ /dev/null
@@ -1,206 +0,0 @@
---- xine-ui-0.9.22/configure	2003-08-07 11:40:09.000000000 -0600
-+++ xine-ui-0.9.22.new/configure	2003-10-11 20:21:41.000000000 -0600
-@@ -20370,203 +20370,6 @@
-     ;;
- 
-   i?86*-*-linux* | i386-*-solaris* | i?86-* | k?-* | athlon-*)
--    if test "$GCC" = yes; then
--
--		echo "$as_me:$LINENO: checking if $CC supports \"-mcpu=i386\" flags" >&5
--echo $ECHO_N "checking if $CC supports \"-mcpu=i386\" flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS=""-mcpu=i386""
--    cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--        sarchopt="-mcpu"
--    else
--        echo "$as_me:$LINENO: checking if $CC supports \"-march=i386\" flags" >&5
--echo $ECHO_N "checking if $CC supports \"-march=i386\" flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS=""-march=i386""
--    cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--        sarchopt="-march"
--    else
--         echo "$as_me:$LINENO: result: ** no cpu optimization supports **" >&5
--echo "${ECHO_T}** no cpu optimization supports **" >&6
--	          sarchopt=no
--    fi
--    fi
--
--	        echo "$as_me:$LINENO: checking if $CC supports \"$sarchopt=athlon\" flags" >&5
--echo $ECHO_N "checking if $CC supports \"$sarchopt=athlon\" flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS=""$sarchopt=athlon""
--    cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--        k7cpu="athlon"
--    else
--        k7cpu="i686"
--    fi
--
--		CFLAGS="$CFLAGS -O3 -pipe -fomit-frame-pointer $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions"
--	DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
--
--
--	if test x"$sarchopt" != "xno"; then
--
--	    archopt_val=
--
--	    case "$host_alias" in
--	    i386-*) # *BSD return this even on a P III #-))
--		archopt_val=i386 ;;
--	    i486-*) # oh dear!
--		archopt_val=i486 ;;
--	    i586-*)
--		archopt_val=pentium ;;
--	    i686-*)
--		archopt_val=pentiumpro
--		if test x"$check_athlon" = "xyes"; then
--		    if test -f /proc/cpuinfo; then
--			modelname=`cat /proc/cpuinfo | grep "model\ name\	:" | sed -e 's/ //g' | cut -d':' -f2`
--			case "$modelname" in
--			*Athlon* | *Duron* | *K7*)
--			    archopt_val="$k7cpu" ;;
--			esac
--		    fi
--		fi
--		;;
--	    k6-*)
--		archopt_val=k6 ;;
--	    k7-*)
--		archopt_val=k7 ;;
--	    athlon-*)
--		archopt_val=athlon ;;
--	    esac
--
--	    if test x"$archopt_val" != x; then
--		CFLAGS="$CFLAGS $sarchopt=$archopt_val"
--		DEBUG_CFLAGS="$DEBUG_CFLAGS $sarchopt=$archopt_val"
--	    fi
--
--	fi
--
--    else
--		CFLAGS="$CFLAGS -O"
--	DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
--    fi
--
--
- cat >>confdefs.h <<\_ACEOF
- #define __i386__ 1
- _ACEOF
diff --git a/media-video/xine-ui/files/symlink-bug.patch b/media-video/xine-ui/files/symlink-bug.patch
deleted file mode 100644
index 485a1ff9d907..000000000000
--- a/media-video/xine-ui/files/symlink-bug.patch
+++ /dev/null
@@ -1,192 +0,0 @@
---- misc/xine-check	2004-02-17 20:56:16.000000000 +0000
-+++ misc/xine-check	2004-02-17 20:56:16.000000000 +0000
-@@ -567,6 +567,7 @@
-     short=
-     description=
-     tmpfile=/tmp/xine-check-dsc.$$
-+    check_tmpfile;
-     true >$tmpfile
-     cat $messagefile | while read line; do
- 	if $found; then
-@@ -714,6 +715,45 @@
-   read answer
- }
- 
-+check_bugreport() {
-+  if test -f "$bugreport"; then
-+    echo "Hmmm, I already found a bug report in ${bugreport}."
-+    if yesno "Do you want me to overwrite that file?"; then
-+      rm "$bugreport" || clean_exit 1
-+    else
-+      echo "Okay, aborting on your request."
-+      clean_exit 0
-+    fi
-+  fi
-+
-+  if test -h "$bugreport"; then
-+    echo "Hmmm, I already found another file in ${bugreport}."
-+    if yesno "Do you want me to try to overwrite that file?"; then
-+      rm "$bugreport" || clean_exit 1
-+    else
-+      echo "Okay, aborting on your request."
-+      clean_exit 0
-+    fi
-+  fi
-+}
-+
-+check_logfile() {
-+  if test -h "$logfile"; then
-+    echo "Hmmm, I already found another file in ${logfile}."
-+    if yesno "Do you want me to try to overwrite that file?"; then
-+      rm "$logfile" || clean_exit 1
-+    else
-+      echo "Okay, aborting on your request."
-+      clean_exit 0
-+    fi
-+  fi
-+}
-+
-+check_tmpfile() {
-+  if test -h "$tmpfile"; then
-+    rm "$tmpfile" || clean_exit 1
-+  fi
-+}
- 
- # command line
- while [ "$#" -gt 0 ]; do
-@@ -763,12 +803,11 @@
- if [ "$runmode" = "bugreport" ]; then
-   do_log=true
-   logfile=/tmp/xine-check.log
-+  check_logfile;
-   echo logging to ${logfile}...
-   echo >$logfile
- fi
- 
--
--
- ## actual checks start here:
- 
- case `id` in
-@@ -1173,16 +1212,6 @@
-   clean_exit 0    
- fi
- 
--if test -f "$bugreport"; then
--  echo "Hmmm, I already found a bug report in ${bugreport}."
--  if yesno "Do you want me to overwrite that file?"; then
--    rm "$bugreport"
--  else
--    echo "Okay, aborting on your request."
--    clean_exit 0
--  fi
--fi
--  
- echo
- echo
- if yesno "Could you solve your xine problems using the previous hints?"; then
-@@ -1190,6 +1219,8 @@
-   clean_exit
- fi
- 
-+check_bugreport;
-+
- echo
- echo "What kind of trouble does xine cause for you?"
- echo
---- misc/xine-check.sh.in	2004-02-17 20:56:16.000000000 +0000
-+++ misc/xine-check.sh.in	2004-02-17 20:56:16.000000000 +0000
-@@ -567,6 +567,7 @@
-     short=
-     description=
-     tmpfile=/tmp/xine-check-dsc.$$
-+    check_tmpfile;
-     true >$tmpfile
-     cat $messagefile | while read line; do
- 	if $found; then
-@@ -714,6 +715,45 @@
-   read answer
- }
- 
-+check_bugreport() {
-+  if test -f "$bugreport"; then
-+    echo "Hmmm, I already found a bug report in ${bugreport}."
-+    if yesno "Do you want me to overwrite that file?"; then
-+      rm "$bugreport" || clean_exit 1
-+    else
-+      echo "Okay, aborting on your request."
-+      clean_exit 0
-+    fi
-+  fi
-+
-+  if test -h "$bugreport"; then
-+    echo "Hmmm, I already found another file in ${bugreport}."
-+    if yesno "Do you want me to try to overwrite that file?"; then
-+      rm "$bugreport" || clean_exit 1
-+    else
-+      echo "Okay, aborting on your request."
-+      clean_exit 0
-+    fi
-+  fi
-+}
-+
-+check_logfile() {
-+  if test -h "$logfile"; then
-+    echo "Hmmm, I already found another file in ${logfile}."
-+    if yesno "Do you want me to try to overwrite that file?"; then
-+      rm "$logfile" || clean_exit 1
-+    else
-+      echo "Okay, aborting on your request."
-+      clean_exit 0
-+    fi
-+  fi
-+}
-+
-+check_tmpfile() {
-+  if test -h "$tmpfile"; then
-+    rm "$tmpfile" || clean_exit 1
-+  fi
-+}
- 
- # command line
- while [ "$#" -gt 0 ]; do
-@@ -763,12 +803,11 @@
- if [ "$runmode" = "bugreport" ]; then
-   do_log=true
-   logfile=/tmp/xine-check.log
-+  check_logfile;
-   echo logging to ${logfile}...
-   echo >$logfile
- fi
- 
--
--
- ## actual checks start here:
- 
- case `id` in
-@@ -1173,16 +1212,6 @@
-   clean_exit 0    
- fi
- 
--if test -f "$bugreport"; then
--  echo "Hmmm, I already found a bug report in ${bugreport}."
--  if yesno "Do you want me to overwrite that file?"; then
--    rm "$bugreport"
--  else
--    echo "Okay, aborting on your request."
--    clean_exit 0
--  fi
--fi
--  
- echo
- echo
- if yesno "Could you solve your xine problems using the previous hints?"; then
-@@ -1190,6 +1219,8 @@
-   clean_exit
- fi
- 
-+check_bugreport;
-+
- echo
- echo "What kind of trouble does xine cause for you?"
- echo
diff --git a/media-video/xine-ui/files/true-false.patch b/media-video/xine-ui/files/true-false.patch
deleted file mode 100644
index a1252f0478c5..000000000000
--- a/media-video/xine-ui/files/true-false.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/xitk/download.c.orig	2004-02-08 13:00:00.194743343 +0000
-+++ src/xitk/download.c	2004-02-08 13:00:32.830012754 +0000
-@@ -36,6 +36,13 @@
- 
- #include "common.h"
- 
-+#ifndef FALSE
-+#define FALSE 0
-+#endif
-+#ifndef TRUE
-+#define TRUE !FALSE
-+#endif
-+
- extern gGui_t   *gGui;
- 
- #ifdef HAVE_CURL
diff --git a/media-video/xine-ui/files/xine-ui-configure-checks.patch b/media-video/xine-ui/files/xine-ui-configure-checks.patch
deleted file mode 100644
index d0360b1e7b48..000000000000
--- a/media-video/xine-ui/files/xine-ui-configure-checks.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -x '*~' -Npaur xine-ui-0.99.3-orig/configure.ac xine-ui-0.99.3-configure/configure.ac
---- xine-ui-0.99.3-orig/configure.ac	2005-03-20 15:31:48.902037336 +0100
-+++ xine-ui-0.99.3-configure/configure.ac	2005-03-20 17:08:21.006425264 +0100
-@@ -315,7 +315,10 @@ AM_CONDITIONAL(HAVE_XTESTEXTENSION, test
- dnl
- dnl readline
- dnl
--AC_CHECK_READLINE
-+if test x"$with_readline" != xno; then
-+  AC_CHECK_READLINE
-+fi
-+
- AM_CONDITIONAL(HAVE_READLINE, test x"$have_readline" = "xyes")
- if test x"$have_readline" != "xyes"; then
-   AC_MSG_RESULT([*** no readline found, xine network interface will be disabled ***])
-@@ -324,20 +327,35 @@ fi
- dnl
- dnl ncurses
- dnl
--AC_CHECK_HEADERS(curses.h)
--AC_CHECK_LIB(ncurses, cbreak,
--             AC_DEFINE(HAVE_NCURSES,,[Define this if you have ncurses installed])
--             ac_have_ncurses="yes"
--             NCURSES_LIB="-lncurses")
--AC_SUBST(NCURSES_LIB)
-+AC_ARG_WITH(ncurses,
-+   [  --without-ncurses       Turn off ncurses support.],
-+   [], with_ncurses=yes)
-+
-+if test x"$with_ncurses" = xyes; then
-+  AC_CHECK_HEADERS(curses.h)
-+  AC_CHECK_LIB(ncurses, cbreak,
-+               AC_DEFINE(HAVE_NCURSES,,[Define this if you have ncurses installed])
-+               ac_have_ncurses="yes"
-+               NCURSES_LIB="-lncurses")
-+  AC_SUBST(NCURSES_LIB)
-+fi
-+
- AM_CONDITIONAL(HAVE_NCURSES, test x$ac_have_ncurses = "xyes")
- 
- dnl
- dnl Libcurl
- dnl
--AM_PATH_CURL(7.10.2, [
--   AC_DEFINE(HAVE_CURL,,[Define this if you have libcurl installed])], [
--   AC_MSG_RESULT(*** All of curl dependent parts will be disabled ***)])
-+AC_ARG_WITH(curl,
-+   [  --without-curl          Turn off curl support.],
-+   [], with_curl=yes)
-+
-+if test x"$with_curl" = xyes; then
-+  AM_PATH_CURL(7.10.2, [
-+     AC_DEFINE(HAVE_CURL,,[Define this if you have libcurl installed])], [
-+     AC_MSG_RESULT(*** All of curl dependent parts will be disabled ***)])
-+else
-+  no_curl=yes
-+fi
- AM_CONDITIONAL(HAVE_CURL, test x$no_curl != "xyes")
- 
- 
-@@ -352,13 +370,29 @@ AC_SUBST(NET_LIBS)
- dnl
- dnl check for ascii-art library
- dnl
--AM_PATH_AALIB(1.2.0,,)
-+AC_ARG_WITH(aalib,
-+   [  --without-aalib         Turn off AALIB support.],
-+   [], with_aalib=yes)
-+
-+if test x"$with_aalib" = xyes; then
-+  AM_PATH_AALIB(1.2.0,,)
-+else
-+  no_aalib=yes
-+fi
- AM_CONDITIONAL(HAVE_AA, test x$no_aalib != "xyes")
- 
- dnl 
- dnl checks for Color AsCii Art library
- dnl 
--AM_PATH_CACA(0.3,, AC_MSG_RESULT([*** All CACA-dependent parts will be disabled ***]))
-+AC_ARG_WITH(libcaca,
-+   [  --without-libcaca       Turn off CACA support.],
-+   [], with_libcaca=yes)
-+
-+if test x"$with_libcaca" = xyes; then
-+  AM_PATH_CACA(0.3,, AC_MSG_RESULT([*** All CACA-dependent parts will be disabled ***]))
-+else
-+  no_caca=yes
-+fi
- AM_CONDITIONAL(HAVE_CACA, test x$no_caca != "xyes")
- 
- dnl option for font sets and multibyte string support
diff --git a/media-video/xine-ui/files/xine-ui-configure.patch b/media-video/xine-ui/files/xine-ui-configure.patch
deleted file mode 100644
index 418e9992ada9..000000000000
--- a/media-video/xine-ui/files/xine-ui-configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- xine-ui-0.9.12/configure.in	Sun Jun 23 04:00:40 2002
-+++ xine-ui-0.9.12/configure.in.new	Wed Jul 31 10:34:49 2002
-@@ -514,10 +514,6 @@
- 		archopt_val=athlon ;;
- 	    esac
- 
--	    if test x"$archopt_val" != x; then
--		CFLAGS="$CFLAGS $sarchopt=$archopt_val"
--		DEBUG_CFLAGS="$DEBUG_CFLAGS $sarchopt=$archopt_val"
--	    fi
- 	]
- 	fi
- 
diff --git a/media-video/xine-ui/files/xine-ui-gcc4.patch b/media-video/xine-ui/files/xine-ui-gcc4.patch
deleted file mode 100644
index 1adab007f5de..000000000000
--- a/media-video/xine-ui/files/xine-ui-gcc4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- xine-ui-0.99.3/src/xitk/mediamark.c.orig	2005-04-21 21:12:34.000000000 +0800
-+++ xine-ui-0.99.3/src/xitk/mediamark.c	2005-04-21 21:15:31.000000000 +0800
-@@ -3121,11 +3121,11 @@ static void mmkeditor_apply(xitk_widget_
-     
-     mrl = atoa(xitk_inputtext_get_text(mmkeditor->mrl));
-     if(mrl && (!strlen(mrl)))
--      xine_strdupa((char *) mrl, (*mmkeditor->mmk)->mrl);
-+      xine_strdupa(mrl, (*mmkeditor->mmk)->mrl);
-     
-     ident = atoa(xitk_inputtext_get_text(mmkeditor->ident));
-     if(ident && (!strlen(ident)))
--      xine_strdupa((char *) ident, mrl);
-+      xine_strdupa(ident, mrl);
- 
-     sub = xitk_inputtext_get_text(mmkeditor->sub);
-     if(sub && (!strlen(sub)))
diff --git a/media-video/xine-ui/files/xine-ui-gentoo.diff b/media-video/xine-ui/files/xine-ui-gentoo.diff
deleted file mode 100644
index 2cf70a7e6224..000000000000
--- a/media-video/xine-ui/files/xine-ui-gentoo.diff
+++ /dev/null
@@ -1,81 +0,0 @@
---- xine-ui.orig/misc/desktops/Makefile.in.orig	Wed Nov 14 06:04:37 2001
-+++ xine-ui/misc/desktops/Makefile.in	Wed Nov 14 06:06:49 2001
-@@ -239,31 +239,31 @@
- 	case "`id`" in \
- 	uid=0\(* ) \
- 	  echo "Installing destops icons/entries"; \
--	  $(mkinstalldirs) /usr/share/icons; \
--	  $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.xpm /usr/share/icons/xine.xpm; \
--	  $(mkinstalldirs) /usr/share/pixmaps; \
--	  $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.xpm /usr/share/pixmaps/xine.xpm; \
-+	  $(mkinstalldirs) $(DESTDIR)/usr/share/icons; \
-+	  $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.xpm $(DESTDIR)/usr/share/icons/xine.xpm; \
-+	  $(mkinstalldirs) $(DESTDIR)/usr/share/pixmaps; \
-+	  $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.xpm $(DESTDIR)/usr/share/pixmaps/xine.xpm; \
- 	  if test -d /etc/X11/wmconfig; then \
--	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.wmconfig /etc/X11/wmconfig/xine; \
-+	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.wmconfig $(DESTDIR)/etc/X11/wmconfig/xine; \
- 	  fi; \
- 	  if test -d /etc/X11/applnk/; then \
--	    $(mkinstalldirs) /etc/X11/applnk/Multimedia; \
--	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop /etc/X11/applnk/Multimedia/xine.desktop; \
-+	    $(mkinstalldirs) $(DESTDIR)/etc/X11/applnk/Multimedia; \
-+	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop $(DESTDIR)/etc/X11/applnk/Multimedia/xine.desktop; \
- 	  fi; \
- 	  if test -d /opt/gnome; then \
--	    $(mkinstalldirs) /opt/gnome/share/pixmaps; \
--	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.xpm /opt/gnome/share/pixmaps/xine.xpm; \
--	    $(mkinstalldirs) /opt/gnome/share/gnome/apps/Multimedia; \
--	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop /opt/gnome/share/gnome/apps/Multimedia/xine.desktop; \
-+	    $(mkinstalldirs) $(DESTDIR)/opt/gnome/share/pixmaps; \
-+	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.xpm $(DESTDIR)/opt/gnome/share/pixmaps/xine.xpm; \
-+	    $(mkinstalldirs) $(DESTDIR)/opt/gnome/share/gnome/apps/Multimedia; \
-+	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop $(DESTDIR)/opt/gnome/share/gnome/apps/Multimedia/xine.desktop; \
- 	  else \
- 	    if test -d /usr/share/gnome/apps; then \
--	      $(mkinstalldirs) /usr/share/gnome/apps/Multimedia; \
--	      $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop /usr/share/gnome/apps/Multimedia/xine.desktop; \
-+	      $(mkinstalldirs) $(DESTDIR)/usr/share/gnome/apps/Multimedia; \
-+	      $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop $(DESTDIR)/usr/share/gnome/apps/Multimedia/xine.desktop; \
- 	    fi; \
- 	  fi; \
- 	  if test -d /opt/kde2; then \
--	    DIR_HI=/opt/kde2/share/icons/hicolor; \
--	    DIR_LO=/opt/kde2/share/icons/locolor; \
-+	    DIR_HI=$(DESTDIR)/opt/kde2/share/icons/hicolor; \
-+	    DIR_LO=$(DESTDIR)/opt/kde2/share/icons/locolor; \
- 	    HIRES='48x48 32x32 22x22'; \
- 	    LORES='32x32 22x22 16x16'; \
- 	    for hires in $$HIRES; do \
-@@ -274,22 +274,22 @@
- 	      $(mkinstalldirs) $$DIR_LO/$$lores/apps; \
- 	      $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine_$$lores.png $$DIR_LO/$$lores/apps/xine.png; \
- 	    done; \
--	    $(mkinstalldirs) /opt/kde2/share/applnk/Multimedia; \
--	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop /opt/kde2/share/applnk/Multimedia/xine.desktop; \
-+	    $(mkinstalldirs) $(DESTDIR)/opt/kde2/share/applnk/Multimedia; \
-+	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop $(DESTDIR)/opt/kde2/share/applnk/Multimedia/xine.desktop; \
- 	  else \
- 	    if test -d /usr/share/applnk/Multimedia; then \
--	      $(mkinstalldirs) /usr/share/applnk/Multimedia; \
--	      $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop /usr/share/applnk/Multimedia/xine.desktop; \
-+	      $(mkinstalldirs) $(DESTDIR)/usr/share/applnk/Multimedia; \
-+	      $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop $(DESTDIR)/usr/share/applnk/Multimedia/xine.desktop; \
- 	    fi; \
- 	  fi; \
- 	  if test -d /opt/kde/; then \
--	    $(mkinstalldirs) /opt/kde/share/icons; \
--	    $(mkinstalldirs) /opt/kde/share/applnk/Multimedia/; \
--	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.xpm /opt/kde/share/icons/xine.xpm; \
--	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop /opt/kde/share/applnk/Multimedia/xine.desktop; \
-+	    $(mkinstalldirs) $(DESTDIR)/opt/kde/share/icons; \
-+	    $(mkinstalldirs) $(DESTDIR)/opt/kde/share/applnk/Multimedia/; \
-+	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.xpm $(DESTDIR)/opt/kde/share/icons/xine.xpm; \
-+	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop $(DESTDIR)/opt/kde/share/applnk/Multimedia/xine.desktop; \
- 	  else \
- 	    if test -d /usr/share/applnk/Multimedia/; then \
--	      $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop /usr/share/applnk/Multimedia/xine.desktop; \
-+	      $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop $(DESTDIR)/usr/share/applnk/Multimedia/xine.desktop; \
- 	    fi; \
- 	  fi; \
- 	  ;; \
diff --git a/media-video/xine-ui/files/xine.desktop b/media-video/xine-ui/files/xine.desktop
deleted file mode 100644
index c502f39cd4d0..000000000000
--- a/media-video/xine-ui/files/xine.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Xine
-Comment=Video Player
-Exec=xine %f
-MimeType=video/mpeg;video/quicktime;video/x-msvideo;video/x-anim;audio/x-mp3;audio/x-mp2;video/x-flic;
-Icon=xine.xpm
-Terminal=false
-Type=Application
-Categories=Application;Multimedia;AudioVideo;Player;
-StartupNotify=true
-Encoding=UTF-8
diff --git a/media-video/xine-ui/xine-ui-0.9.21-r1.ebuild b/media-video/xine-ui/xine-ui-0.9.21-r1.ebuild
deleted file mode 100644
index 59515d53da7b..000000000000
--- a/media-video/xine-ui/xine-ui-0.9.21-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.21-r1.ebuild,v 1.5 2005/01/04 10:51:50 hardave Exp $
-
-inherit eutils
-
-DESCRIPTION="Skinned front end for Xine movie player."
-HOMEPAGE="http://xine.sourceforge.net/"
-LICENSE="GPL-2"
-
-DEPEND="media-libs/libpng
-	>=media-libs/xine-lib-1_beta12
-	>=net-misc/curl-7.10.2
-	lirc? ( app-misc/lirc )
-	X? ( virtual/x11 )
-	media-libs/aalib
-	gnome? ( =gnome-base/orbit-0* )
-	directfb? ( media-libs/aalib
-		>=dev-libs/DirectFB-0.9.9 )"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-IUSE="X gnome nls directfb lirc"
-
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
-
-SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
-RESTRICT="nomirror"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	#patch -p1 < ${FILESDIR}/xine-ui-configure.patch || die "patch failed"
-	epatch ${FILESDIR}/symlink-bug.patch
-	epatch ${FILESDIR}/true-false.patch
-
-	use directfb || ( \
-		sed -e "s:dfb::" src/Makefile.in \
-		    > src/Makefile.in.hacked
-		mv src/Makefile.in.hacked src/Makefile.in
-	)
-
-	sed -e "s:LDFLAGS =:LDFLAGS = -L/lib:" src/xitk/Makefile.in \
-	    > src/xitk/Makefile.in.hacked
-	mv src/xitk/Makefile.in.hacked src/xitk/Makefile.in
-}
-
-src_compile() {
-
-	local myconf
-	use X	   || myconf="${myconf} --disable-x11 --disable-xv"
-	use nls	   || myconf="${myconf} --disable-nls"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} \
-		docdir=/usr/share/doc/${PF} \
-		docsdir=/usr/share/doc/${PF} \
-		install || die
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
-}
diff --git a/media-video/xine-ui/xine-ui-0.9.22-r1.ebuild b/media-video/xine-ui/xine-ui-0.9.22-r1.ebuild
deleted file mode 100644
index 3d2ea2058533..000000000000
--- a/media-video/xine-ui/xine-ui-0.9.22-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.22-r1.ebuild,v 1.5 2005/01/04 10:51:50 hardave Exp $
-
-inherit eutils
-
-DESCRIPTION="Skinned front end for Xine movie player."
-HOMEPAGE="http://xine.sourceforge.net/"
-LICENSE="GPL-2"
-
-DEPEND="media-libs/libpng
-	>=media-libs/xine-lib-1_rc0
-	>=net-misc/curl-7.10.2
-	lirc? ( app-misc/lirc )
-	X? ( virtual/x11 )
-	media-libs/aalib
-	gnome? ( =gnome-base/orbit-0* )
-	directfb? ( media-libs/aalib
-		>=dev-libs/DirectFB-0.9.9 )"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-IUSE="X gnome nls directfb lirc"
-
-SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
-
-SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
-RESTRICT="nomirror"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/symlink-bug.patch
-	epatch ${FILESDIR}/preserve-CFLAGS.diff
-	epatch ${FILESDIR}/true-false.patch
-
-	use directfb || ( \
-		sed -i "s:dfb::" src/Makefile.in
-	)
-
-	sed -i "s:LDFLAGS =:LDFLAGS = -L/lib:" src/xitk/Makefile.in
-}
-
-src_compile() {
-
-	local myconf
-	use X || myconf="${myconf} --disable-x11 --disable-xv"
-	use nls || myconf="${myconf} --disable-nls"
-	use lirc || myconf="${myconf} --disable-lirc"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} \
-		docdir=/usr/share/doc/${PF} \
-		docsdir=/usr/share/doc/${PF} \
-		install || die
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
-}
diff --git a/media-video/xine-ui/xine-ui-0.9.22-r2.ebuild b/media-video/xine-ui/xine-ui-0.9.22-r2.ebuild
deleted file mode 100644
index 969e72aaea4e..000000000000
--- a/media-video/xine-ui/xine-ui-0.9.22-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.22-r2.ebuild,v 1.4 2005/01/04 10:51:50 hardave Exp $
-
-inherit eutils
-
-DESCRIPTION="Skinned front end for Xine movie player."
-HOMEPAGE="http://xine.sourceforge.net/"
-LICENSE="GPL-2"
-
-DEPEND="media-libs/libpng
-	>=media-libs/xine-lib-1_rc0
-	>=net-misc/curl-7.10.2
-	lirc? ( app-misc/lirc )
-	X? ( virtual/x11 )
-	media-libs/aalib
-	gnome? ( =gnome-base/orbit-0* )
-	directfb? ( media-libs/aalib
-		>=dev-libs/DirectFB-0.9.9 )"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-IUSE="X gnome nls directfb lirc"
-
-SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
-
-SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
-RESTRICT="nomirror"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/symlink-bug.patch
-	epatch ${FILESDIR}/preserve-CFLAGS.diff
-	epatch ${FILESDIR}/true-false.patch
-
-	use directfb || sed -i "s:dfb::" src/Makefile.in
-
-	sed -i "s:LDFLAGS =:LDFLAGS = -L/lib:" src/xitk/Makefile.in
-}
-
-src_compile() {
-	rm misc/xine-bugreport
-	local myconf
-	use X || myconf="${myconf} --disable-x11 --disable-xv"
-	use nls || myconf="${myconf} --disable-nls"
-	use lirc || myconf="${myconf} --disable-lirc"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} \
-		docdir=/usr/share/doc/${PF} \
-		docsdir=/usr/share/doc/${PF} \
-		install || die
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
-}
diff --git a/media-video/xine-ui/xine-ui-0.9.23-r1.ebuild b/media-video/xine-ui/xine-ui-0.9.23-r1.ebuild
deleted file mode 100644
index 9d148d04e599..000000000000
--- a/media-video/xine-ui/xine-ui-0.9.23-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.23-r1.ebuild,v 1.6 2005/01/04 10:51:50 hardave Exp $
-
-inherit eutils
-
-DESCRIPTION="Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc amd64 ~alpha"
-IUSE="X gnome nls directfb lirc"
-
-DEPEND="media-libs/libpng
-	>=media-libs/xine-lib-1_rc3
-	>=net-misc/curl-7.10.2
-	lirc? ( app-misc/lirc )
-	X? ( virtual/x11 )
-	media-libs/aalib
-	gnome? ( =gnome-base/orbit-0* )
-	directfb? ( media-libs/aalib
-		>=dev-libs/DirectFB-0.9.9 )"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/symlink-bug.patch
-	epatch ${FILESDIR}/preserve-CFLAGS-${PV}.diff
-	epatch ${FILESDIR}/true-false.patch
-	use directfb || sed -i "s:dfb::" src/Makefile.in
-	sed -i "s:LDFLAGS =:LDFLAGS = -L/lib:" src/xitk/Makefile.in
-}
-
-src_compile() {
-	rm misc/xine-bugreport
-	local myconf=""
-	use X || myconf="${myconf} --disable-x11 --disable-xv"
-	use nls || myconf="${myconf} --disable-nls"
-	use lirc || myconf="${myconf} --disable-lirc"
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} \
-		docdir=/usr/share/doc/${PF} \
-		docsdir=/usr/share/doc/${PF} \
-		install || die
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-}
diff --git a/media-video/xine-ui/xine-ui-0.9.23-r2.ebuild b/media-video/xine-ui/xine-ui-0.9.23-r2.ebuild
index c0ce1814b164..ab53d3dee05d 100644
--- a/media-video/xine-ui/xine-ui-0.9.23-r2.ebuild
+++ b/media-video/xine-ui/xine-ui-0.9.23-r2.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.23-r2.ebuild,v 1.9 2005/03/29 05:18:32 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.23-r2.ebuild,v 1.10 2005/05/01 23:33:55 flameeyes Exp $
 
 inherit eutils
 
+PATCHLEVEL="0"
 DESCRIPTION="Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.gz
+	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,10 +28,8 @@ RDEPEND="nls? ( sys-devel/gettext )"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/implicit-config.patch
-	epatch ${FILESDIR}/symlink-bug.patch
-	epatch ${FILESDIR}/preserve-CFLAGS-${PV}.diff
-	epatch ${FILESDIR}/true-false.patch
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}
+
 	use directfb || sed -i "s:dfb::" src/Makefile.in
 	sed -i "s:LDFLAGS =:LDFLAGS = -L/lib:" src/xitk/Makefile.in
 }
diff --git a/media-video/xine-ui/xine-ui-0.99.1.ebuild b/media-video/xine-ui/xine-ui-0.99.1.ebuild
index 0ff3d11b8498..42cb9f8ccd03 100644
--- a/media-video/xine-ui/xine-ui-0.99.1.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.1.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.1.ebuild,v 1.5 2005/01/04 10:51:50 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.1.ebuild,v 1.6 2005/05/01 23:33:55 flameeyes Exp $
 
 inherit eutils
 
+PATCHLEVEL="0"
 DESCRIPTION="Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.gz
+	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,8 +29,8 @@ RDEPEND="nls? ( sys-devel/gettext )"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/preserve-CFLAGS-${PV}.diff
-	epatch ${FILESDIR}/true-false.patch
+	epatch ${WORKDIR}/other/preserve-CFLAGS-${PV}.patch
+	epatch ${WORKDIR}/other/true-false.patch
 	use directfb || sed -i "s:dfb::" src/Makefile.in
 	sed -i "s:LDFLAGS =:LDFLAGS = -L/lib:" src/xitk/Makefile.in
 }
diff --git a/media-video/xine-ui/xine-ui-0.99.2.ebuild b/media-video/xine-ui/xine-ui-0.99.2.ebuild
index 5c3ea918cbcf..235deca9ece3 100644
--- a/media-video/xine-ui/xine-ui-0.99.2.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.2.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.2.ebuild,v 1.5 2005/01/04 10:51:50 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.2.ebuild,v 1.6 2005/05/01 23:33:55 flameeyes Exp $
 
 inherit eutils
 
+PATCHLEVEL="0"
 DESCRIPTION="Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.gz
+	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,8 +29,8 @@ RDEPEND="nls? ( sys-devel/gettext )"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/preserve-CFLAGS-${PV}.diff
-	epatch ${FILESDIR}/true-false.patch
+	epatch ${WORKDIR}/other/preserve-CFLAGS-${PV}.patch
+	epatch ${WORKDIR}/other/true-false.patch
 	use directfb || sed -i "s:dfb::" src/Makefile.in
 	sed -i "s:LDFLAGS =:LDFLAGS = -L/lib:" src/xitk/Makefile.in
 }
diff --git a/media-video/xine-ui/xine-ui-0.99.3-r1.ebuild b/media-video/xine-ui/xine-ui-0.99.3-r1.ebuild
index 5f9998897000..1ca475cb243b 100644
--- a/media-video/xine-ui/xine-ui-0.99.3-r1.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.3-r1.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.3-r1.ebuild,v 1.3 2005/04/22 17:55:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.3-r1.ebuild,v 1.4 2005/05/01 23:33:55 flameeyes Exp $
 
 inherit eutils
 
+PATCHLEVEL="1"
 DESCRIPTION="Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.gz
+	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,13 +29,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	# Detects CFLAGS set in make.conf without this patch
-	#epatch ${FILESDIR}/preserve-CFLAGS-${PV}.diff
-
-	epatch ${FILESDIR}/true-false.patch
-	epatch ${FILESDIR}/${PN}-configure-checks.patch
-	epatch ${FILESDIR}/${PN}-desktop-fixes.patch
-	epatch ${FILESDIR}/${PN}-gcc4.patch
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}
 
 	export WANT_AUTOCONF=2.5
 	export WANT_AUTOMAKE=1.7
diff --git a/media-video/xine-ui/xine-ui-0.99.3.ebuild b/media-video/xine-ui/xine-ui-0.99.3.ebuild
index 7245ce85052b..1e29f0217c43 100644
--- a/media-video/xine-ui/xine-ui-0.99.3.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.3.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.3.ebuild,v 1.4 2005/03/27 02:33:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.3.ebuild,v 1.5 2005/05/01 23:33:55 flameeyes Exp $
 
 inherit eutils
 
+PATCHLEVEL="1"
 DESCRIPTION="Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.gz
+	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,10 +28,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	# Detects CFLAGS set in make.conf without this patch
-	#epatch ${FILESDIR}/preserve-CFLAGS-${PV}.diff
-
-	epatch ${FILESDIR}/true-false.patch
+	epatch ${WORKDIR}/${PV}/01_all_true-false.patch
 	use directfb || sed -i "s:dfb::" src/Makefile.in
 	sed -i "s:LDFLAGS =:LDFLAGS = -L/lib :" src/xitk/Makefile.in
 }
@@ -56,5 +55,5 @@ src_install() {
 	rm ${D}/usr/share/xine/desktop/xine.desktop
 
 	insinto /usr/share/applications
-	doins ${FILESDIR}/xine.desktop
+	doins ${WORKDIR}/${PV}/xine.desktop
 }
diff --git a/media-video/xine-ui/xine-ui-0.99.3_pre20041022-r1.ebuild b/media-video/xine-ui/xine-ui-0.99.3_pre20041022-r1.ebuild
index b4df1d2088c1..e8f17522bd56 100644
--- a/media-video/xine-ui/xine-ui-0.99.3_pre20041022-r1.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.3_pre20041022-r1.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.3_pre20041022-r1.ebuild,v 1.1 2005/03/29 06:06:09 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.3_pre20041022-r1.ebuild,v 1.2 2005/05/01 23:33:55 flameeyes Exp $
 
 inherit eutils
 
+PATCHLEVEL="0"
 DESCRIPTION="Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.gz
+	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,17 +30,20 @@ DEPEND="media-libs/libpng
 RDEPEND="nls? ( sys-devel/gettext )"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PN}-configure-checks.patch
-	epatch ${FILESDIR}/${PN}-desktop-fixes.patch
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}
+
+	export WANT_AUTOCONF=2.5
+	export WANT_AUTOMAKE=1.7
+	aclocal -I m4 || die "aclocal failed"
+	autoheader || die "autoheader failed"
+	automake -afc || die "automake failed"
+	autoconf || die "autoconf failed"
+	libtoolize --copy --force
 }
 
 src_compile() {
-
-	./autogen.sh
-
 	econf \
 		$(use_enable lirc) \
 		$(use_enable nls) \
@@ -63,5 +68,5 @@ src_install() {
 		newins ${S}/misc/desktops/xine_${res}x${res}.png xine.png
 	done
 
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/media-video/xine-ui/xine-ui-0.99.3_pre20041022.ebuild b/media-video/xine-ui/xine-ui-0.99.3_pre20041022.ebuild
index a2f0b7318776..f10079235426 100644
--- a/media-video/xine-ui/xine-ui-0.99.3_pre20041022.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.3_pre20041022.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.3_pre20041022.ebuild,v 1.3 2005/03/29 05:18:32 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.3_pre20041022.ebuild,v 1.4 2005/05/01 23:33:55 flameeyes Exp $
 
 inherit eutils
 
@@ -55,5 +55,5 @@ src_install() {
 		docsdir=/usr/share/doc/${PF} \
 		install || die
 
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 }