Alexander Pyhalov
2016-09-17 5d179a8b61ea7150e08b1c40d186798b6cb43d38
graphviz: remove python 2.6 support
1 files deleted
1 files added
3 files modified
57 ■■■■■ changed files
components/image/graphviz/Makefile 6 ●●●● patch | view | raw | blame | history
components/image/graphviz/graphviz-python-26.p5m 46 ●●●●● patch | view | raw | blame | history
components/image/graphviz/graphviz.p5m 2 ●●●●● patch | view | raw | blame | history
components/image/graphviz/history 1 ●●●● patch | view | raw | blame | history
components/image/graphviz/patches/python.patch 2 ●●● patch | view | raw | blame | history
components/image/graphviz/Makefile
@@ -27,7 +27,7 @@
COMPONENT_NAME=        graphviz
COMPONENT_VERSION=    2.38.0
COMPONENT_REVISION=    3
COMPONENT_REVISION=    4
COMPONENT_PROJECT_URL=    http://www.graphviz.org/
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
@@ -61,7 +61,7 @@
CONFIGURE_ENV +=    RUBY=$(RUBY.1.9)
CONFIGURE_OPTIONS +=    --without-included-ltdl
CONFIGURE_OPTIONS +=    --enable-python=no
CONFIGURE_OPTIONS +=    --enable-python26=yes
CONFIGURE_OPTIONS +=    --enable-python26=no
CONFIGURE_OPTIONS +=    --enable-python27=yes
CONFIGURE_OPTIONS +=    --x-libraries=$(CONFIGURE_LIBDIR.$(BITS))
CONFIGURE_OPTIONS +=    --with-qt=no
@@ -73,7 +73,6 @@
install:    $(INSTALL_32)
    env LD_LIBRARY_PATH=$(PROTO_DIR)/usr/lib GVBINDIR=$(PROTO_DIR)/usr/lib/graphviz $(PROTO_DIR)/usr/bin/dot -c
    $(PYTHON.2.6.32) -m compileall $(PROTO_DIR)/usr/lib/graphviz/python26
    $(PYTHON.2.7.32) -m compileall $(PROTO_DIR)/usr/lib/graphviz/python27
# The test infrastructure doesn't run in a VPATHed environment.
@@ -104,6 +103,7 @@
REQUIRED_PACKAGES += print/filter/ghostscript
REQUIRED_PACKAGES += runtime/lua
REQUIRED_PACKAGES += runtime/perl-522
REQUIRED_PACKAGES += runtime/python-27
REQUIRED_PACKAGES += runtime/ruby-19
REQUIRED_PACKAGES += runtime/tk-8
REQUIRED_PACKAGES += system/library
components/image/graphviz/graphviz-python-26.p5m
File was deleted
components/image/graphviz/graphviz.p5m
@@ -597,8 +597,6 @@
    type=conditional predicate=runtime/perl-522
depend fmri=image/graphviz/graphviz-php@$(IPS_COMPONENT_VERSION) \
    type=conditional predicate=web/php-54
depend fmri=image/graphviz/graphviz-python-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
    type=conditional predicate=runtime/python-26
depend fmri=image/graphviz/graphviz-python-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
    type=conditional predicate=runtime/python-27
depend fmri=image/graphviz/graphviz-ruby@$(IPS_COMPONENT_VERSION) \
components/image/graphviz/history
New file
@@ -0,0 +1 @@
image/graphviz/graphviz-python-26@2.38.0,5.11-2016.0.1.0
components/image/graphviz/patches/python.patch
@@ -2,7 +2,7 @@
+++ 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