25607121 clean up unused Python 2.6 vestiges
authorJohn Beck <John.Beck@Oracle.COM>
Thu, 23 Feb 2017 14:26:42 -0800
changeset 7688 3b2a3df0423e
parent 7687 1093e2a9adbd
child 7689 72c18d63696d
25607121 clean up unused Python 2.6 vestiges
components/hal-cups-utils/Makefile
components/python/lesscpy/lesscpy-PYVER.p5m
--- a/components/hal-cups-utils/Makefile	Thu Feb 23 13:46:52 2017 -0800
+++ b/components/hal-cups-utils/Makefile	Thu Feb 23 14:26:42 2017 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 BUILD_BITS= 32
 include ../../make-rules/shared-macros.mk
@@ -39,9 +39,6 @@
 include $(WS_MAKE_RULES)/common.mk
 
 PATCH_LEVEL = 0
-USED_PYTHON=$(PYTHON.2.6.32)
-
-CONFIGURE_ENV += PYTHON=$(USED_PYTHON)
 
 CONFIGURE_OPTIONS += --datarootdir=$(ETCDIR)
 CONFIGURE_OPTIONS += --libexecdir=$(USRLIBDIR)/hal
--- a/components/python/lesscpy/lesscpy-PYVER.p5m	Thu Feb 23 13:46:52 2017 -0800
+++ b/components/python/lesscpy/lesscpy-PYVER.p5m	Thu Feb 23 14:26:42 2017 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -83,9 +83,6 @@
 depend type=optional \
     fmri=library/python-2/lesscpy-$(PYV)@0.9.10,5.12-5.12.0.0.0.44.0
 
-# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/argparse-$(PYV)
-
 # force a dependency on the lesscpy package
 depend type=require \
     fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)