remove egg-optchar-new

dtool/Config.pp

@@ -505,9 +505,6 @@
   #define OBJ .o
 #endif
 
-// Temporary, while we migrate egg-optchar.
-#define USE_EGG_OPTCHAR_NEW 1
-
 
 ///////////////////////////////////////////////////////////////////////
 // The following variables are only meaningful when BUILD_TYPE is

dtool/pptempl/Template.models.pp

@@ -348,12 +348,7 @@ $[TAB]touch $[TARGET_DIR]/$[egg]
 
    // And this is the actual optchar pass.
 $[target] : $[sources] $[TARGET_DIR]/stamp
-// Temporary: while we're migrating egg-optchar, we might test this command.
-#if $[USE_EGG_OPTCHAR_NEW]
-$[TAB]egg-optchar-new $[OPTCHAR_NEW_OPTS] -d $[TARGET_DIR] $[sources]
-#else
 $[TAB]egg-optchar $[OPTCHAR_OPTS] -d $[TARGET_DIR] $[sources]
-#endif
 #end optchar_egg