104a105,108
> 	if ! use cvs || ! use perl ; then
> 		myopts="${myopts} NO_CVS=YesPlease"
> 	fi
> 
132,136c136,137
< 	# 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"