symlink patch cleanup for bug 45448

3 files changed, 14 insertions, 106 deletions

diff --git a/media-video/xine-ui/ChangeLog b/media-video/xine-ui/ChangeLog
index 58857aea8638..749483305a51 100644
--- a/media-video/xine-ui/ChangeLog
+++ b/media-video/xine-ui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/xine-ui
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.48 2004/04/13 19:18:41 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.49 2004/04/14 11:08:15 swtaylor Exp $
+
+  14 Apr 2004; Scott W Taylor <swtaylor@gentoo.org> files/symlink-bug.patch:
+  Bug 45448 - symlink-bug.patch tried to patch a file as well as the symlink to
+  itself
 
   13 Apr 2004; Martin Holzer <mholzer@gentoo.org> xine-ui-0.9.13-r1.ebuild,
   xine-ui-0.9.21-r1.ebuild, xine-ui-0.9.23-r1.ebuild, files/symlink-bug.patch:
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index c4814ed3bb2a..29733add244c 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,16 +1,16 @@
-MD5 01dfd409807b28e17e4af6489a9e4f35 ChangeLog 8172
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 MD5 d8cb167064fc4556b071967d3079ef52 xine-ui-0.9.21-r1.ebuild 1612
-MD5 31ccd11fed338847f415e572a3463aa7 xine-ui-0.9.22-r1.ebuild 1450
-MD5 b120995e12610a29b7155a7476366d9a xine-ui-0.9.23-r1.ebuild 1406
 MD5 151e217a87e10ebbb3322f5b56acb758 xine-ui-0.9.13-r1.ebuild 1634
+MD5 b120995e12610a29b7155a7476366d9a xine-ui-0.9.23-r1.ebuild 1406
+MD5 b717eef862fe6ab9fdba17de24db73ec ChangeLog 8339
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 31ccd11fed338847f415e572a3463aa7 xine-ui-0.9.22-r1.ebuild 1450
+MD5 f474df8e81130d6b495663ed56763180 files/preserve-CFLAGS-0.9.23.diff 5470
+MD5 daacb70d49e7ee5ca3c1593f10eea0bc files/true-false.patch 298
+MD5 eae093d61629b0d42b806e9e84814e79 files/xine-ui-gentoo.diff 5216
 MD5 507406ba270ef32d0ed30da3e932ef01 files/digest-xine-ui-0.9.13-r1 67
 MD5 32aa0f3c22f337999efc35a1eff3cd94 files/digest-xine-ui-0.9.21-r1 67
 MD5 a40013de7a4c30965b9adb242f6d9203 files/digest-xine-ui-0.9.22-r1 67
+MD5 72e97c4b1f21cf5aa998c87b95c7b383 files/digest-xine-ui-0.9.23-r1 67
 MD5 93797247103115aaa2ec56d8de5a6ec7 files/preserve-CFLAGS.diff 5500
+MD5 24814788406be1e1ce09035b2c867399 files/symlink-bug.patch 4326
 MD5 f9ec30bd10b5c9d431b5d382310fe87d files/xine-ui-configure.patch 336
-MD5 eae093d61629b0d42b806e9e84814e79 files/xine-ui-gentoo.diff 5216
-MD5 f474df8e81130d6b495663ed56763180 files/preserve-CFLAGS-0.9.23.diff 5470
-MD5 72e97c4b1f21cf5aa998c87b95c7b383 files/digest-xine-ui-0.9.23-r1 67
-MD5 daacb70d49e7ee5ca3c1593f10eea0bc files/true-false.patch 298
-MD5 5d4ef5503b6915d70d2abbc96a24126c files/symlink-bug.patch 6491
diff --git a/media-video/xine-ui/files/symlink-bug.patch b/media-video/xine-ui/files/symlink-bug.patch
index fbb8f13a9525..485a1ff9d907 100644
--- a/media-video/xine-ui/files/symlink-bug.patch
+++ b/media-video/xine-ui/files/symlink-bug.patch
@@ -1,99 +1,3 @@
---- misc/xine-bugreport	2004-02-17 20:56:16.000000000 +0000
-+++ misc/xine-bugreport	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	2004-02-17 20:56:16.000000000 +0000
 +++ misc/xine-check	2004-02-17 20:56:16.000000000 +0000
 @@ -567,6 +567,7 @@