Fixing bug #45448

11 files changed, 328 insertions, 26 deletions

diff --git a/media-video/xine-ui/ChangeLog b/media-video/xine-ui/ChangeLog
index bd4860db73f5..451c84158e98 100644
--- a/media-video/xine-ui/ChangeLog
+++ b/media-video/xine-ui/ChangeLog
@@ -1,6 +1,15 @@
 # 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.45 2004/04/07 22:03:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.46 2004/04/13 13:33:20 phosphan Exp $
+
+*xine-ui-0.9.23-r1 (13 Apr 2004)
+
+  13 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> xine-ui-0.9.13-r1.ebuild,
+  xine-ui-0.9.13.ebuild, xine-ui-0.9.21-r1.ebuild, xine-ui-0.9.21.ebuild,
+  xine-ui-0.9.22-r1.ebuild, xine-ui-0.9.22.ebuild, xine-ui-0.9.23-r1.ebuild,
+  xine-ui-0.9.23.ebuild, files/symlink-bug.patch:
+  Adding the patch for bug #45448 to every version in portage (symlink/tmpfile
+  bug). Bumped revisions, removed unpatched versions.
 
   07 Apr 2004; Aron Griffis <agriffis@gentoo.org> xine-ui-0.9.23.ebuild:
   Add ~alpha per bug 46903
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 2667a6ff401b..eecbf8ff3515 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,15 +1,16 @@
-MD5 4cfeeb07fb65cd00377b96ee2524a07b ChangeLog 7439
-MD5 42254497e684c72436958fe64a3af062 xine-ui-0.9.21.ebuild 1573
-MD5 82b03e3e1eaa1f1d261afadf03ede0f9 xine-ui-0.9.13.ebuild 1633
+MD5 ff538c09ce192f14ed62751156da2429 xine-ui-0.9.21-r1.ebuild 1615
+MD5 4680a4434a951b6f6409fb49641c2ab7 xine-ui-0.9.13-r1.ebuild 1641
+MD5 18500babfb20d944671efa824afe8646 xine-ui-0.9.23-r1.ebuild 1409
+MD5 b6b499e235dff86ba72e9b6c834f1e44 ChangeLog 7887
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 f3edea3b01b9f8272b748d457a4b6645 xine-ui-0.9.23.ebuild 1366
-MD5 8a2dc2c523f22a544541441d281896ba xine-ui-0.9.22.ebuild 1439
-MD5 32aa0f3c22f337999efc35a1eff3cd94 files/digest-xine-ui-0.9.21 67
-MD5 507406ba270ef32d0ed30da3e932ef01 files/digest-xine-ui-0.9.13 67
-MD5 93797247103115aaa2ec56d8de5a6ec7 files/preserve-CFLAGS.diff 5500
-MD5 f9ec30bd10b5c9d431b5d382310fe87d files/xine-ui-configure.patch 336
-MD5 eae093d61629b0d42b806e9e84814e79 files/xine-ui-gentoo.diff 5216
-MD5 72e97c4b1f21cf5aa998c87b95c7b383 files/digest-xine-ui-0.9.23 67
+MD5 f25e85672b391ee7b9ad3bb381db4dcc xine-ui-0.9.22-r1.ebuild 1451
 MD5 f474df8e81130d6b495663ed56763180 files/preserve-CFLAGS-0.9.23.diff 5470
 MD5 daacb70d49e7ee5ca3c1593f10eea0bc files/true-false.patch 298
-MD5 a40013de7a4c30965b9adb242f6d9203 files/digest-xine-ui-0.9.22 67
+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 dae276f33adfb6323d319f2df7ee2d9b files/symlink-bug.patch 6491
+MD5 f9ec30bd10b5c9d431b5d382310fe87d files/xine-ui-configure.patch 336
diff --git a/media-video/xine-ui/files/digest-xine-ui-0.9.13 b/media-video/xine-ui/files/digest-xine-ui-0.9.13-r1
index d2f85ebf16e8..d2f85ebf16e8 100644
--- a/media-video/xine-ui/files/digest-xine-ui-0.9.13
+++ b/media-video/xine-ui/files/digest-xine-ui-0.9.13-r1
diff --git a/media-video/xine-ui/files/digest-xine-ui-0.9.21 b/media-video/xine-ui/files/digest-xine-ui-0.9.21-r1
index 37622e3a35fa..37622e3a35fa 100644
--- a/media-video/xine-ui/files/digest-xine-ui-0.9.21
+++ b/media-video/xine-ui/files/digest-xine-ui-0.9.21-r1
diff --git a/media-video/xine-ui/files/digest-xine-ui-0.9.22 b/media-video/xine-ui/files/digest-xine-ui-0.9.22-r1
index 99854b1aa067..99854b1aa067 100644
--- a/media-video/xine-ui/files/digest-xine-ui-0.9.22
+++ b/media-video/xine-ui/files/digest-xine-ui-0.9.22-r1
diff --git a/media-video/xine-ui/files/digest-xine-ui-0.9.23 b/media-video/xine-ui/files/digest-xine-ui-0.9.23-r1
index 6f5eb90bbc14..6f5eb90bbc14 100644
--- a/media-video/xine-ui/files/digest-xine-ui-0.9.23
+++ b/media-video/xine-ui/files/digest-xine-ui-0.9.23-r1
diff --git a/media-video/xine-ui/files/symlink-bug.patch b/media-video/xine-ui/files/symlink-bug.patch
new file mode 100644
index 000000000000..d4154e45fbef
--- /dev/null
+++ b/media-video/xine-ui/files/symlink-bug.patch
@@ -0,0 +1,288 @@
+--- misc/xine-bugreport	2004-02-17 20:56:16.000000000 +0000
++++ misc/xine-bugreport	2004-03-27 00:16:27.764287750 +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-03-27 00:16:27.764287750 +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-03-27 00:16:27.764287750 +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/xine-ui-0.9.13.ebuild b/media-video/xine-ui/xine-ui-0.9.13-r1.ebuild
index 4c4c5d5a13a6..6284a4b64b91 100644
--- a/media-video/xine-ui/xine-ui-0.9.13.ebuild
+++ b/media-video/xine-ui/xine-ui-0.9.13-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.13.ebuild,v 1.12 2004/02/08 20:45:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.13-r1.ebuild,v 1.1 2004/04/13 13:33:20 phosphan Exp $
 
 IUSE="X aalib gnome nls directfb"
 
-inherit libtool
+inherit eutils libtool
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Xine is a free gpl-licensed video player for unix-like systems"
 HOMEPAGE="http://xine.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
@@ -31,7 +30,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	patch -p1 < ${FILESDIR}/xine-ui-configure.patch || die "patch failed"
+	epatch "${FILESDIR}/symlink-bug.patch"
+	epatch "${FILESDIR}/xine-ui-configure.patch"
 
 	use directfb || ( \
 		sed -e "s:dfb::" src/Makefile.in \
diff --git a/media-video/xine-ui/xine-ui-0.9.21.ebuild b/media-video/xine-ui/xine-ui-0.9.21-r1.ebuild
index c4722d77ce0d..137b01fe81cf 100644
--- a/media-video/xine-ui/xine-ui-0.9.21.ebuild
+++ b/media-video/xine-ui/xine-ui-0.9.21-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.ebuild,v 1.12 2004/03/29 01:05:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.21-r1.ebuild,v 1.1 2004/04/13 13:33:20 phosphan Exp $
+
+inherit eutils
 
 DESCRIPTION="Skinned front end for Xine movie player."
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -22,7 +24,6 @@ IUSE="X gnome nls directfb lirc"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc"
 
-S=${WORKDIR}/${P}
 SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
 RESTRICT="nomirror"
 
@@ -32,6 +33,7 @@ src_unpack() {
 	cd ${S}
 
 	#patch -p1 < ${FILESDIR}/xine-ui-configure.patch || die "patch failed"
+	epatch "${FILESDIR}/symlink-bug.patch"
 	epatch ${FILESDIR}/true-false.patch
 
 	use directfb || ( \
diff --git a/media-video/xine-ui/xine-ui-0.9.22.ebuild b/media-video/xine-ui/xine-ui-0.9.22-r1.ebuild
index 2825ecd282a4..7f6cba51b178 100644
--- a/media-video/xine-ui/xine-ui-0.9.22.ebuild
+++ b/media-video/xine-ui/xine-ui-0.9.22-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.ebuild,v 1.13 2004/03/29 01:05:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.22-r1.ebuild,v 1.1 2004/04/13 13:33:20 phosphan Exp $
+
+inherit eutils
 
 DESCRIPTION="Skinned front end for Xine movie player."
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -8,7 +10,7 @@ LICENSE="GPL-2"
 
 DEPEND="media-libs/libpng
 	>=media-libs/xine-lib-1_rc0
-	>=net-misc/curl-7.10.2
+	>=net-ftp/curl-7.10.2
 	lirc? ( app-misc/lirc )
 	X? ( virtual/x11 )
 	media-libs/aalib
@@ -20,9 +22,8 @@ RDEPEND="nls? ( sys-devel/gettext )"
 IUSE="X gnome nls directfb lirc"
 
 SLOT="0"
-KEYWORDS="x86 ~ppc amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 
-S=${WORKDIR}/${P}
 SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
 RESTRICT="nomirror"
 
@@ -30,8 +31,8 @@ src_unpack() {
 
 	unpack ${A}
 	cd ${S}
-
-	patch -p1 < ${FILESDIR}/preserve-CFLAGS.diff || die "patch failed"
+	epatch ${FILESDIR}/symlink-bug.patch
+	epatch ${FILESDIR}/preserve-CFLAGS.diff
 	epatch ${FILESDIR}/true-false.patch
 
 	use directfb || ( \
diff --git a/media-video/xine-ui/xine-ui-0.9.23.ebuild b/media-video/xine-ui/xine-ui-0.9.23-r1.ebuild
index d04e4c29cdf4..f332fa348566 100644
--- a/media-video/xine-ui/xine-ui-0.9.23.ebuild
+++ b/media-video/xine-ui/xine-ui-0.9.23-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.ebuild,v 1.8 2004/04/07 22:03:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.23-r1.ebuild,v 1.1 2004/04/13 13:33:20 phosphan Exp $
 
 inherit eutils
 
@@ -27,6 +27,7 @@ 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