Added fix for bug #36420 so that the gentoo patch will succeed in all cases.

3 files changed, 20 insertions, 13 deletions

diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index 036cf45ed654..361b62cf5032 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-cdr/cdrdao
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.25 2003/12/16 22:03:01 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.26 2003/12/31 15:18:07 weeve Exp $
+
+  31 Dec 2003; Jason Wever <weeve@gentoo.org> cdrdao-1.1.7-r3.ebuild:
+  Added fix for bug #36420 so that the gentoo patch will succeed in all cases.
 
 *cdrdao-1.1.7-r3 (16 Dec 2003)
 
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index 6d44f861f915..be5ac1083331 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,16 +1,16 @@
-MD5 3f60abf919bc2d3996cee6389ec70b51 cdrdao-1.1.7-r1.ebuild 2498
-MD5 9945c13d43819d7f1f712389dba3ac0d cdrdao-1.1.7.ebuild 1941
-MD5 40876cfae3cd0a8985e8dccfecaffe84 ChangeLog 3604
+MD5 455667f73cbe52cad6cd3dfea2868cbb ChangeLog 3753
 MD5 df57ef8725ba1a35553f00ae1f40fdda cdrdao-1.1.5-r1.ebuild 2603
+MD5 3f60abf919bc2d3996cee6389ec70b51 cdrdao-1.1.7-r1.ebuild 2498
 MD5 6b2203c1b89fd2ac20dab8e814d265ee cdrdao-1.1.7-r2.ebuild 2748
-MD5 c63ccc40a56ec00a16103403c6ca5918 cdrdao-1.1.7-r3.ebuild 2919
-MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7-r2 69
-MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7-r3 69
-MD5 46fb619628173aa68a337e7d49dd25b6 files/cdrdao-1.1.7-gentoo-version.patch 753
-MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7-r1 69
-MD5 a7dc4823c3a7d7582f9b87afdddb51e0 files/cdrdao-1.1.7-r1-mp32dao-gentoo.diff 779
-MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7 69
-MD5 a7dc4823c3a7d7582f9b87afdddb51e0 files/cdrdao-1.1.7-r2-mp32dao-gentoo.diff 779
+MD5 9945c13d43819d7f1f712389dba3ac0d cdrdao-1.1.7.ebuild 1941
+MD5 b5124820c86a90358388f784b0183f74 cdrdao-1.1.7-r3.ebuild 3015
 MD5 3ea011fa1308fc478529300a80443aab files/cdrdao-1.1.5-c++.patch 1622
 MD5 3a9cce439930ba175e84bf2b82c61df5 files/cdrdao-1.1.5-gentoo.diff 19479
+MD5 a7dc4823c3a7d7582f9b87afdddb51e0 files/cdrdao-1.1.7-r1-mp32dao-gentoo.diff 779
+MD5 a7dc4823c3a7d7582f9b87afdddb51e0 files/cdrdao-1.1.7-r2-mp32dao-gentoo.diff 779
 MD5 229f6c96b696fe6251ce03abde9e3bbf files/digest-cdrdao-1.1.5-r1 68
+MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7 69
+MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7-r1 69
+MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7-r2 69
+MD5 46fb619628173aa68a337e7d49dd25b6 files/cdrdao-1.1.7-gentoo-version.patch 753
+MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7-r3 69
diff --git a/app-cdr/cdrdao/cdrdao-1.1.7-r3.ebuild b/app-cdr/cdrdao/cdrdao-1.1.7-r3.ebuild
index 1b3a62dbaab7..0a2e9dddf375 100644
--- a/app-cdr/cdrdao/cdrdao-1.1.7-r3.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.1.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.7-r3.ebuild,v 1.1 2003/12/16 22:03:01 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.7-r3.ebuild,v 1.2 2003/12/31 15:18:07 weeve Exp $
 
 inherit flag-o-matic eutils
 
@@ -47,6 +47,10 @@ src_unpack() {
 		done
 	fi
 
+	# Make sure we're in ${S} or the below patch for k3 bwill fail.
+	# Fixes bug #36420.
+	cd ${S}	
+
 	# Add '-gentoo' to version, so that k3b, etc can detect that we have
 	# a special version that includes scglib support.
 	epatch ${FILESDIR}/${P}-gentoo-version.patch