--- /usr/portage/eclass/base.eclass	2004-06-25 03:12:59.000000000 +0200
+++ /usr/local/portage/eclass/base.eclass   2004-07-02 20:02:06.624532744 +0200
@@ -28,25 +28,23 @@
 			;;
 		patch)
 			debug-print-section patch
-			cd ${S}
-			patch -p0 < ${FILESDIR}/${P}-gentoo.diff
+			if [ -a ${FILESDIR}/${P}-gentoo.diff ]; then
+				cd ${S}
+				epatch  ${FILESDIR}/${P}-gentoo.diff
+			fi
 			;;
 		autopatch)
 			debug-print-section autopatch
-			debug-print "$FUNCNAME: autopatch: PATCHES=$PATCHES, PATCHES1=$PATCHES1"
+			debug-print "$FUNCNAME: autopatch: PATCHES=$PATCHES"
 			cd ${S}
-			for x in $PATCHES; do
-				debug-print "$FUNCNAME: autopatch: patching from ${x}"
-				patch -p0 < ${x}
-			done
-			for x in $PATCHES1; do
-				debug-print "$FUNCNAME: autopatch: patching -p1 from ${x}"
-				patch -p1 < ${x}
+			for patch in $PATCHES; do
+				debug-print "$FUNCNAME: autopatch: patching from ${patch}"
+				epatch ${patch}
 			done
 			;;
 	        all)
 			debug-print-section all
-			base_src_unpack unpack autopatch
+			base_src_unpack unpack patch autopatch
 			;;
 		esac