now it should install correctly.

6 files changed, 26 insertions, 22 deletions

diff --git a/media-video/xine-ui/ChangeLog b/media-video/xine-ui/ChangeLog
index 9b7a2608b33f..58857aea8638 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.47 2004/04/13 15:48:00 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.48 2004/04/13 19:18:41 mholzer Exp $
+
+  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:
+  now it should install correctly.
 
   13 Apr 2004; <tester@gentoo.org> xine-ui-0.9.22-r1.ebuild:
   Fixed net-misc/curl dependency
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 0eb2dbf05007..c4814ed3bb2a 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,16 +1,16 @@
-MD5 4680a4434a951b6f6409fb49641c2ab7 xine-ui-0.9.13-r1.ebuild 1641
-MD5 31ccd11fed338847f415e572a3463aa7 xine-ui-0.9.22-r1.ebuild 1450
-MD5 1d90b3784514aaf9b9b664a8c8a8cd97 ChangeLog 7980
+MD5 01dfd409807b28e17e4af6489a9e4f35 ChangeLog 8172
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 ff538c09ce192f14ed62751156da2429 xine-ui-0.9.21-r1.ebuild 1615
-MD5 18500babfb20d944671efa824afe8646 xine-ui-0.9.23-r1.ebuild 1409
+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 507406ba270ef32d0ed30da3e932ef01 files/digest-xine-ui-0.9.13-r1 67
 MD5 32aa0f3c22f337999efc35a1eff3cd94 files/digest-xine-ui-0.9.21-r1 67
-MD5 eae093d61629b0d42b806e9e84814e79 files/xine-ui-gentoo.diff 5216
-MD5 daacb70d49e7ee5ca3c1593f10eea0bc files/true-false.patch 298
-MD5 72e97c4b1f21cf5aa998c87b95c7b383 files/digest-xine-ui-0.9.23-r1 67
-MD5 93797247103115aaa2ec56d8de5a6ec7 files/preserve-CFLAGS.diff 5500
 MD5 a40013de7a4c30965b9adb242f6d9203 files/digest-xine-ui-0.9.22-r1 67
-MD5 dae276f33adfb6323d319f2df7ee2d9b files/symlink-bug.patch 6491
+MD5 93797247103115aaa2ec56d8de5a6ec7 files/preserve-CFLAGS.diff 5500
 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 507406ba270ef32d0ed30da3e932ef01 files/digest-xine-ui-0.9.13-r1 67
+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 d4154e45fbef..fbb8f13a9525 100644
--- a/media-video/xine-ui/files/symlink-bug.patch
+++ b/media-video/xine-ui/files/symlink-bug.patch
@@ -1,5 +1,5 @@
 --- misc/xine-bugreport	2004-02-17 20:56:16.000000000 +0000
-+++ misc/xine-bugreport	2004-03-27 00:16:27.764287750 +0000
++++ misc/xine-bugreport	2004-02-17 20:56:16.000000000 +0000
 @@ -567,6 +567,7 @@
      short=
      description=
@@ -95,7 +95,7 @@
  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
++++ misc/xine-check	2004-02-17 20:56:16.000000000 +0000
 @@ -567,6 +567,7 @@
      short=
      description=
@@ -191,7 +191,7 @@
  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
++++ misc/xine-check.sh.in	2004-02-17 20:56:16.000000000 +0000
 @@ -567,6 +567,7 @@
      short=
      description=
diff --git a/media-video/xine-ui/xine-ui-0.9.13-r1.ebuild b/media-video/xine-ui/xine-ui-0.9.13-r1.ebuild
index 6284a4b64b91..5d334018d8e4 100644
--- a/media-video/xine-ui/xine-ui-0.9.13-r1.ebuild
+++ b/media-video/xine-ui/xine-ui-0.9.13-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.13-r1.ebuild,v 1.1 2004/04/13 13:33:20 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.13-r1.ebuild,v 1.2 2004/04/13 19:18:41 mholzer Exp $
 
 IUSE="X aalib gnome nls directfb"
 
@@ -30,8 +30,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch "${FILESDIR}/symlink-bug.patch"
-	epatch "${FILESDIR}/xine-ui-configure.patch"
+	epatch ${FILESDIR}/symlink-bug.patch
+	epatch ${FILESDIR}/${PN}-configure.patch
 
 	use directfb || ( \
 		sed -e "s:dfb::" src/Makefile.in \
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
index 137b01fe81cf..31906ef32e60 100644
--- a/media-video/xine-ui/xine-ui-0.9.21-r1.ebuild
+++ b/media-video/xine-ui/xine-ui-0.9.21-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.21-r1.ebuild,v 1.1 2004/04/13 13:33:20 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.21-r1.ebuild,v 1.2 2004/04/13 19:18:41 mholzer Exp $
 
 inherit eutils
 
@@ -33,7 +33,7 @@ src_unpack() {
 	cd ${S}
 
 	#patch -p1 < ${FILESDIR}/xine-ui-configure.patch || die "patch failed"
-	epatch "${FILESDIR}/symlink-bug.patch"
+	epatch ${FILESDIR}/symlink-bug.patch
 	epatch ${FILESDIR}/true-false.patch
 
 	use directfb || ( \
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
index f332fa348566..c4862be6d1f8 100644
--- a/media-video/xine-ui/xine-ui-0.9.23-r1.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-r1.ebuild,v 1.1 2004/04/13 13:33:20 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.23-r1.ebuild,v 1.2 2004/04/13 19:18:41 mholzer Exp $
 
 inherit eutils
 
@@ -27,7 +27,7 @@ RDEPEND="nls? ( sys-devel/gettext )"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch "${FILESDIR}/symlink-bug.patch"
+	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