--- a/components/nmap/nmap.p5m	Thu Mar 05 15:29:46 2015 -0800
+++ b/components/nmap/nmap.p5m	Thu Mar 05 15:53:36 2015 -0800
@@ -49,119 +49,120 @@
 file path=usr/bin/uninstall_zenmap
 link path=usr/bin/xnmap target=zenmap
 file path=usr/bin/zenmap
-file path=usr/lib/python2.6/vendor-packages/radialnet/__init__.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/__init__.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/boxes.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/buttons.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/comboboxes.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/expanders.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/frames.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/labels.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/textview.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/windows.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/core/ArgvHandle.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/core/Coordinate.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/core/Graph.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/core/Info.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/core/Interpolation.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/core/XMLHandler.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/core/__init__.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Application.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/ControlWidget.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Dialogs.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/HostsViewer.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Image.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/NodeNotebook.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/NodeWindow.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/RadialNet.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/SaveDialog.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Toolbar.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/__init__.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/util/__init__.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/util/drawing.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/util/geometry.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/util/integration.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/util/misc.py
-file path=usr/lib/python2.6/vendor-packages/zenmap-$(COMPONENT_VERSION)-py2.6.egg-info
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/BasePaths.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/Diff.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/I18N.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/NSEDocParser.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/Name.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/NetworkInventory.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/NmapCommand.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/NmapOptions.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/NmapParser.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/Paths.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/RecentScans.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/ScriptArgsParser.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/ScriptMetadata.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/SearchResult.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/StringPool.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/TargetList.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitConf.py \
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/bestwidgets/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/bestwidgets/boxes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/bestwidgets/buttons.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/bestwidgets/comboboxes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/bestwidgets/expanders.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/bestwidgets/frames.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/bestwidgets/labels.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/bestwidgets/textview.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/bestwidgets/windows.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/core/ArgvHandle.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/core/Coordinate.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/core/Graph.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/core/Info.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/core/Interpolation.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/core/XMLHandler.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/core/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/Application.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/ControlWidget.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/Dialogs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/HostsViewer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/Image.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/NodeNotebook.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/NodeWindow.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/RadialNet.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/SaveDialog.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/Toolbar.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/util/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/util/drawing.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/util/geometry.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/util/integration.py
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/util/misc.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmap-$(COMPONENT_VERSION)-py$(PYVER).egg-info
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/BasePaths.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/Diff.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/I18N.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/NSEDocParser.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/Name.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/NetworkInventory.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/NmapCommand.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/NmapOptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/NmapParser.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/Paths.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/RecentScans.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/ScriptArgsParser.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/ScriptMetadata.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/SearchResult.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/StringPool.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/TargetList.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/UmitConf.py \
     pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitConfigParser.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitDB.py \
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/UmitConfigParser.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/UmitDB.py \
     pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitLogging.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitOptionParser.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/Version.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/__init__.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/About.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/App.py \
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/UmitLogging.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/UmitOptionParser.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/Version.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/About.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/App.py \
     pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/BugReport.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/CrashReport.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/DiffCompare.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/FileChoosers.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/FilterBar.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/Icons.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/MainWindow.py \
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/BugReport.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/CrashReport.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/DiffCompare.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/FileChoosers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/FilterBar.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/Icons.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/MainWindow.py \
     pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/NmapOutputProperties.py \
+file \
+    path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/NmapOutputProperties.py \
     pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/NmapOutputViewer.py \
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/NmapOutputViewer.py \
     pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/OptionBuilder.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/Print.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileCombo.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileEditor.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileHelp.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanHostDetailsPage.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanHostsView.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanInterface.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanNmapOutputPage.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanOpenPortsPage.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanRunDetailsPage.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanScanListPage.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanToolbar.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScansListStore.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScriptInterface.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/SearchGUI.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/SearchWindow.py \
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/OptionBuilder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/Print.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/ProfileCombo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/ProfileEditor.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/ProfileHelp.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/ScanHostDetailsPage.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/ScanHostsView.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/ScanInterface.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/ScanNmapOutputPage.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/ScanOpenPortsPage.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/ScanRunDetailsPage.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/ScanScanListPage.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/ScanToolbar.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/ScansListStore.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/ScriptInterface.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/SearchGUI.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/SearchWindow.py \
     pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/TargetCombo.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/TopologyPage.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/__init__.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/__init__.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/gtkutils.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higboxes.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higbuttons.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higdialogs.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higentries.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higexpanders.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higframe.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higlabels.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higlogindialogs.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/hignotebooks.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higprogressbars.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higscrollers.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higspinner.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higtables.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higtextviewers.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higwindows.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/TargetCombo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/TopologyPage.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/gtkutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/higboxes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/higbuttons.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/higdialogs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/higentries.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/higexpanders.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/higframe.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/higlabels.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/higlogindialogs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/hignotebooks.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/higprogressbars.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/higscrollers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/higspinner.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/higtables.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/higtextviewers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/higwindows.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets/utils.py
 file path=usr/share/applications/zenmap-root.desktop
 file path=usr/share/applications/zenmap.desktop
 file path=usr/share/man/man1/ncat.1