20663199 six Userland components need work for Python 2.6 -> 2.7 move s11-update
authorJohn Beck <John.Beck@Oracle.COM>
Wed, 18 Mar 2015 13:27:20 -0700
branchs11-update
changeset 3984 03ec35f09e5b
parent 3983 59c8a3f84172
child 3985 6cc44e5834f8
20663199 six Userland components need work for Python 2.6 -> 2.7 move
components/antlr/Makefile
components/antlr/resolve.deps
components/grails/patches/runant.py.patch
components/grails/resolve.deps
components/graphviz/patches/python.patch
components/meld/Makefile
components/meld/meld.p5m
components/mercurial/patches/magic.patch
components/nmap/Makefile
components/nmap/nmap.p5m
components/python/cherrypy/patches/setup.cfg.patch
--- a/components/antlr/Makefile	Mon Mar 16 13:40:16 2015 -0700
+++ b/components/antlr/Makefile	Wed Mar 18 13:27:20 2015 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -49,9 +49,9 @@
 CONFIGURE_OPTIONS +=	--without-examples
 
 # pkgdepend doesn't like the first line of a Python script to be:
-# '#!/usr/bin/env python' so turn it into '#!/usr/bin/python2.6'
+# '#!/usr/bin/env python' so turn it into '#!/usr/bin/python2.7'
 COMPONENT_POST_CONFIGURE_ACTION = \
-	$(GSED) -i -e 's/env python/python2.6/' \
+	$(GSED) -i -e 's/env python/python2.7/' \
 		$(BUILD_DIR_32)/scripts/pyantlr.sh
 
 COMPONENT_INSTALL_ARGS += prefix=$(PROTOUSRDIR)
--- a/components/antlr/resolve.deps	Mon Mar 16 13:40:16 2015 -0700
+++ b/components/antlr/resolve.deps	Wed Mar 18 13:27:20 2015 -0700
@@ -1,2 +1,2 @@
-runtime/python-26
+runtime/python-27
 shell/ksh93
--- a/components/grails/patches/runant.py.patch	Mon Mar 16 13:40:16 2015 -0700
+++ b/components/grails/patches/runant.py.patch	Wed Mar 18 13:27:20 2015 -0700
@@ -1,3 +1,5 @@
+The status of this patch is unknown.
+
 *** grails-1.0.3/ant/bin/runant.py.orig	Fri Jul  8 09:46:11 2011
 --- grails-1.0.3/ant/bin/runant.py	Fri Jul  8 09:46:26 2011
 ***************
@@ -7,7 +9,7 @@
   #
   #  Licensed under the Apache License, Version 2.0 (the "License");
 --- 1,4 ----
-! #!/usr/bin/python2.6
+! #!/usr/bin/python2.7
   # Copyright 2001,2003-2004 The Apache Software Foundation
   #
   #  Licensed under the Apache License, Version 2.0 (the "License");
--- a/components/grails/resolve.deps	Mon Mar 16 13:40:16 2015 -0700
+++ b/components/grails/resolve.deps	Wed Mar 18 13:27:20 2015 -0700
@@ -1,4 +1,4 @@
 runtime/perl-512
-runtime/python-26
+runtime/python-27
 shell/bash
 shell/ksh93
--- a/components/graphviz/patches/python.patch	Mon Mar 16 13:40:16 2015 -0700
+++ b/components/graphviz/patches/python.patch	Wed Mar 18 13:27:20 2015 -0700
@@ -1,8 +1,10 @@
+The status of this patch is unknown.
+
 --- graphviz-2.26.3/tclpkg/gv/demo/modgraph.py.orig	Wed Jan  2 18:58:18 2008
 +++ graphviz-2.26.3/tclpkg/gv/demo/modgraph.py	Tue Aug 24 23:48:48 2010
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
-+#!/usr/bin/python2.6
++#!/usr/bin/python2.7
  
  # display the kernel module dependencies
  
--- a/components/meld/Makefile	Mon Mar 16 13:40:16 2015 -0700
+++ b/components/meld/Makefile	Wed Mar 18 13:27:20 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -39,6 +39,10 @@
 include ../../make-rules/justmake.mk
 include ../../make-rules/ips.mk
 
+PYTHON_VERSION =	2.6
+
+PKG_MACROS +=		PYVER=$(PYTHON_VERSION)
+
 # Meld has no configure however it honors DESTDIR which is necessary so
 # we don't try to install into roots /usr but rather our proto areas usr
 COMPONENT_INSTALL_ARGS +=	DESTDIR=$(PROTO_DIR)
--- a/components/meld/meld.p5m	Mon Mar 16 13:40:16 2015 -0700
+++ b/components/meld/meld.p5m	Wed Mar 18 13:27:20 2015 -0700
@@ -41,7 +41,7 @@
 dir  path=usr
 dir  path=usr/bin
 file path=usr/bin/meld \
-    pkg.depend.runpath=/usr/lib/meld:/usr/lib/python2.6:/usr/lib/python2.6/vendor-packages/gtk-2.0 \
+    pkg.depend.runpath=/usr/lib/meld:/usr/lib/python$(PYVER):/usr/lib/python$(PYVER)/vendor-packages/gtk-2.0 \
     pkg.depend.bypass-generate=.*/checker.* \
     pkg.depend.bypass-generate=.*/pychecker/__init__.* \
     pkg.depend.bypass-generate=.*/pygtk.*
--- a/components/mercurial/patches/magic.patch	Mon Mar 16 13:40:16 2015 -0700
+++ b/components/mercurial/patches/magic.patch	Wed Mar 18 13:27:20 2015 -0700
@@ -1,8 +1,10 @@
+The status of this patch is unknown.
+
 --- mercurial-1.8.2/contrib/check-code.py.orig	Fri Apr  1 10:41:52 2011
 +++ mercurial-1.8.2/contrib/check-code.py	Fri Apr  1 11:10:58 2011
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/python2.6
++#!/usr/bin/python2.7
  #
  # check-code - a style and portability checker for Mercurial
  #
@@ -10,7 +12,7 @@
 +++ mercurial-1.8.2/contrib/dumprevlog	Fri Apr  1 11:11:03 2011
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/python2.6
++#!/usr/bin/python2.7
  # Dump revlogs as raw data stream
  # $ find .hg/store/ -name "*.i" | xargs dumprevlog > repo.dump
  
@@ -18,7 +20,7 @@
 +++ mercurial-1.8.2/contrib/hg-ssh	Fri Apr  1 11:11:05 2011
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/python2.6
++#!/usr/bin/python2.7
  #
  # Copyright 2005-2007 by Intevation GmbH <[email protected]>
  #
@@ -26,7 +28,7 @@
 +++ mercurial-1.8.2/contrib/hgweb.fcgi	Fri Apr  1 11:11:07 2011
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/python2.6
++#!/usr/bin/python2.7
  #
  # An example FastCGI script for use with flup, edit as necessary
  
@@ -34,7 +36,7 @@
 +++ mercurial-1.8.2/contrib/simplemerge	Fri Apr  1 11:11:08 2011
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/python2.6
++#!/usr/bin/python2.7
  
  from mercurial import demandimport
  demandimport.enable()
@@ -42,7 +44,7 @@
 +++ mercurial-1.8.2/contrib/undumprevlog	Fri Apr  1 11:11:10 2011
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/python2.6
++#!/usr/bin/python2.7
  # Undump a dump from dumprevlog
  # $ hg init
  # $ undumprevlog < repo.dump
--- a/components/nmap/Makefile	Mon Mar 16 13:40:16 2015 -0700
+++ b/components/nmap/Makefile	Wed Mar 18 13:27:20 2015 -0700
@@ -48,6 +48,10 @@
 COMPONENT_PRE_CONFIGURE_ACTION = \
 	($(CLONEY) $(SOURCE_DIR) $(@D))
 
+PYTHON_VERSION =	2.6
+
+PKG_MACROS +=		PYVER=$(PYTHON_VERSION)
+
 CONFIGURE_OPTIONS  +=   CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS  +=   CXX="$(CXX)"
 CONFIGURE_OPTIONS  +=   CXXFLAGS="$(CXXFLAGS)"
--- a/components/nmap/nmap.p5m	Mon Mar 16 13:40:16 2015 -0700
+++ b/components/nmap/nmap.p5m	Wed Mar 18 13:27:20 2015 -0700
@@ -52,129 +52,130 @@
 link path=usr/bin/xnmap target=zenmap
 file path=usr/bin/zenmap
 dir  path=usr/lib
-dir  path=usr/lib/python2.6
-dir  path=usr/lib/python2.6/vendor-packages
-dir  path=usr/lib/python2.6/vendor-packages/radialnet
-file path=usr/lib/python2.6/vendor-packages/radialnet/__init__.py
-dir  path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets
-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
-dir  path=usr/lib/python2.6/vendor-packages/radialnet/core
-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
-dir  path=usr/lib/python2.6/vendor-packages/radialnet/gui
-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
-dir  path=usr/lib/python2.6/vendor-packages/radialnet/util
-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
-dir  path=usr/lib/python2.6/vendor-packages/zenmapCore
-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 \
+dir  path=usr/lib/python$(PYVER)
+dir  path=usr/lib/python$(PYVER)/vendor-packages
+dir  path=usr/lib/python$(PYVER)/vendor-packages/radialnet
+file path=usr/lib/python$(PYVER)/vendor-packages/radialnet/__init__.py
+dir  path=usr/lib/python$(PYVER)/vendor-packages/radialnet/bestwidgets
+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
+dir  path=usr/lib/python$(PYVER)/vendor-packages/radialnet/core
+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
+dir  path=usr/lib/python$(PYVER)/vendor-packages/radialnet/gui
+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
+dir  path=usr/lib/python$(PYVER)/vendor-packages/radialnet/util
+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
+dir  path=usr/lib/python$(PYVER)/vendor-packages/zenmapCore
+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
-dir  path=usr/lib/python2.6/vendor-packages/zenmapGUI
-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
+dir  path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI
+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
-dir  path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets
-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
+dir  path=usr/lib/python$(PYVER)/vendor-packages/zenmapGUI/higwidgets
+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
 dir  path=usr/share
 dir  path=usr/share/applications
 file path=usr/share/applications/zenmap-root.desktop
--- a/components/python/cherrypy/patches/setup.cfg.patch	Mon Mar 16 13:40:16 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-diff -Nur setup.cfg 
---- setup.cfg	1969-12-31 16:00:00.000000000 -0800
-+++ setup.cfg	2011-06-07 04:19:50.112162699 -0700
[email protected]@ -0,0 +1,3 @@
-+[install]
-+install-data=/usr/lib/python2.6/vendor-packages
-+