terminator can't coexist with python 2.7

components/python/terminator/Makefile

@@ -16,16 +16,14 @@ include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		terminator
 COMPONENT_VERSION=	0.97
+COMPONENT_REVISION=	1
 COMPONENT_PROJECT_URL=	http://www.tenshu.net/terminator/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:9131847023fa22f11cf812f6ceff51b5d66d140b6518ad41d7fa8b0742bfd3f7
 COMPONENT_ARCHIVE_URL=	http://launchpad.net/terminator/trunk/$(COMPONENT_VERSION)/+download/$(COMPONENT_ARCHIVE)
 
-# pygtk is required and we provide it only for Python 2.6
-PYTHON_VERSIONS=2.6
-
 include $(WS_TOP)/make-rules/prep.mk
 include $(WS_TOP)/make-rules/setup.py.mk
 include $(WS_TOP)/make-rules/ips.mk

components/python/terminator/terminator-26.p5m

@@ -0,0 +1,113 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL)". You may
+# only use this file in accordance with the terms of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source. A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2014 Alexander Pyhalov.  All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/terminal/terminator-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Multiple GNOME terminals in one window"
+set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license COPYING license=GPLv2
+
+# force a dependency on the Python runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python2.6 \
+    pkg.debug.depend.path=usr/bin
+
+depend type=require \
+    fmri=terminal/terminator@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+link path=usr/bin/remotinator target=remotinator-2.6 mediator=python \
+    mediator-version=2.6
+link path=usr/bin/terminator target=terminator-2.6 mediator=python \
+    mediator-version=2.6
+
+file path=usr/bin/remotinator-2.6
+file path=usr/bin/terminator-2.6
+file path=usr/lib/python2.6/vendor-packages/Terminator-$(COMPONENT_VERSION)-py2.6.egg-info
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/__init__.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/__init__.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/borg.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/borg.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/config.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/config.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/configobj/__init__.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/configobj/__init__.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/configobj/configobj.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/configobj/configobj.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/configobj/validate.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/configobj/validate.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/container.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/container.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/cwd.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/cwd.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/debugserver.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/debugserver.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/editablelabel.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/editablelabel.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/encoding.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/encoding.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/factory.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/factory.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/freebsd.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/freebsd.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/ipc.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/ipc.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/keybindings.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/keybindings.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/notebook.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/notebook.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/optionparse.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/optionparse.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/paned.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/paned.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/plugin.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/plugin.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/plugins/activitywatch.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/plugins/activitywatch.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/plugins/custom_commands.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/plugins/custom_commands.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/plugins/logger.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/plugins/logger.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/plugins/maven.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/plugins/maven.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/plugins/terminalshot.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/plugins/terminalshot.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/plugins/testplugin.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/plugins/testplugin.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/plugins/url_handlers.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/plugins/url_handlers.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/preferences.glade
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/prefseditor.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/prefseditor.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/searchbar.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/searchbar.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/signalman.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/signalman.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/terminal.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/terminal.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/terminal_popup_menu.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/terminal_popup_menu.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/terminator.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/terminator.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/titlebar.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/titlebar.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/translation.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/translation.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/util.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/util.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/version.py
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/version.pyc
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/window.py pkg.depend.bypass-generate=.*/keybinder.*
+file path=usr/lib/python2.6/vendor-packages/terminatorlib/window.pyc

components/python/terminator/terminator-GENFRAG.p5m → components/python/terminator/terminator.p5m

@@ -12,8 +12,19 @@
 # Copyright (c) 2014 Alexander Pyhalov.  All rights reserved.
 #
 
+set name=pkg.fmri value=pkg:/terminal/terminator@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Multiple GNOME terminals in one window"
+set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
 license COPYING license=GPLv2
 
+depend fmri=terminal/terminator-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26 \
+    type=conditional
+
 file path=usr/share/applications/terminator.desktop
 file path=usr/share/icons/hicolor/16x16/actions/terminator_active_broadcast_all.png
 file path=usr/share/icons/hicolor/16x16/actions/terminator_active_broadcast_group.png