--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -105,0 +105,1 @@ 
+	use cvs || myopts="${myopts} NO_CVS=YesPlease"
@@ -132,5 +133,2 @@ 
-	# Noperl is being merged to upstream as of 2009/04/05
-	#epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-	# GetOpt-Long v2.38 is strict
-	epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
---
+	# Apply NO_CVS patch
+	epatch "${FILESDIR}/${PN}-1.6.3-nocvs.patch"