various ports: correct usage of python portgroup

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@142807 d073be05-634f-4543-b044-5fe20cf6d1d6
mrkooll · Nov 24, 2015 · c2379d1 · c2379d1
1 parent 1a87e67
commit c2379d1
Show file tree

Hide file tree

Showing 21 changed files with 48 additions and 74 deletions.
diff --git a/databases/mycli/Portfile b/databases/mycli/Portfile
@@ -6,7 +6,7 @@ PortGroup           github 1.0
 
 github.setup        dbcli mycli 1.5.2 v
 
-python.versions     27
+python.default_version     27
 
 categories-prepend  databases
 maintainers         gmail.com:xeron.oskom openmaintainer

diff --git a/devel/hgview/Portfile b/devel/hgview/Portfile
@@ -21,21 +21,22 @@ long_description    hgview is a simple tool aiming at visually navigate \
                     in mind, trying to be fast enough to be usable for \
                     big repositories.
 
+python.default_version     27
+
 depends_build-append port:asciidoc \
                     port:xmlto
 
 depends_lib-append  path:bin/hg:mercurial \
-                    port:py27-qscintilla \
-                    port:py27-pygments \
-                    port:py27-docutils \
-                    port:py27-urwid
+                    port:py${python.version}-qscintilla \
+                    port:py${python.version}-pygments \
+                    port:py${python.version}-docutils \
+                    port:py${python.version}-urwid
 
 checksums           rmd160  31ada351796ecd636c7a454f4fc0492e9c00d6d7 \
                     sha256  8b2e5e10544deaa79ba9ef3f6339e103af357edbeb4b2594be079fddf7b8e6ed
 
 conflicts           ${name}-devel
 
-python.versions     27
 python.link_binaries_suffix
 
 livecheck.type      regex

diff --git a/devel/trac/Portfile b/devel/trac/Portfile
@@ -26,10 +26,8 @@ checksums	md5	429d9aa79e3d939add7963ca9a7deb57 \
 		sha1	a22c4f648c2f0adf7ca166aa5c01b0142bccbef0 \
 		rmd160	d6a2cfa1ed235cb36677d255f9e574dd230cbe53
 
-python.versions 26 27
-
-variant python26 description {Use Python 2.6} {}
-variant python27 description {Use Python 2.7} {}
+variant python26 conflicts python27 description {Use Python 2.6} {}
+variant python27 conflicts python26 description {Use Python 2.7} {}
 if {[variant_isset python26]} {
     python.default_version 26
 } else {

diff --git a/gnome/nfoview/Portfile b/gnome/nfoview/Portfile
@@ -22,7 +22,7 @@ supported_archs     noarch
 checksums           rmd160  d664cf741f40a18d8e90ad5942d4ffe14b9da706 \
                     sha256  a40a7a654c83bee1c55602a05da9d8f3ba82c6f9b5aed408b7818cb4a652c734
 
-python.versions     34
+python.default_version     34
 
 depends_build-append \
                     port:intltool

diff --git a/net/coherence/Portfile b/net/coherence/Portfile
@@ -2,11 +2,10 @@
 # $Id$
 
 PortSystem      1.0
+PortGroup       python 1.0
 
 name            coherence
 
-PortGroup       python 1.0
-
 version         0.6.6.2
 revision        4
 license         permissive
@@ -29,16 +28,16 @@ distname        Coherence-${version}
 checksums       sha1    c8f3aedf6f393e400b012b9b79a45faf6bc3c809 \
                 rmd160  f3cea9a846059723c846cb2254aae73ff1a6a5e9
 
-python.version 27
+python.default_version 27
 
 depends_lib-append \
                 port:gstreamer010-gst-plugins-base \
-                port:py27-elementtree \
-                port:py27-twisted \
-                port:py27-gdata \
-                port:py27-feedparser \
-                port:py27-axiom \
-                port:py27-id3lib
+                port:py${python.version}-elementtree \
+                port:py${python.version}-twisted \
+                port:py${python.version}-gdata \
+                port:py${python.version}-feedparser \
+                port:py${python.version}-axiom \
+                port:py${python.version}-id3lib
 
 livecheck.type  regex
 livecheck.url   [lindex ${master_sites} 0]

diff --git a/net/exabgp/Portfile b/net/exabgp/Portfile
@@ -24,7 +24,4 @@ checksums           md5     1d09588425dc32221217fcf5ec8ed22c \
 
 extract.suffix  .tgz
 
-python.versions         27
 python.default_version  27
-python.move_binaries    no
-
diff --git a/net/upnp-inspector/Portfile b/net/upnp-inspector/Portfile
@@ -2,11 +2,10 @@
 # $Id$
 
 PortSystem      1.0
+PortGroup       python 1.0
 
 name            upnp-inspector
 
-PortGroup       python 1.0
-
 version         0.2.2
 revision        3
 license         permissive
@@ -27,13 +26,13 @@ distname        UPnP-Inspector-${version}
 checksums       sha1    4885b612b98d3272d3ccb6b7539384ea5895d41c \
                 rmd160  effc60387a78b62234665f91f638c602e6a823a6
 
-python.version  27
+python.default_version  27
 
 depends_build-append \
-                port:py27-setuptools
+                port:py${python.version}-setuptools
 
 depends_lib-append \
-                port:py27-pygtk \
+                port:py${python.version}-pygtk \
                 port:coherence
 
 livecheck.type  regex

diff --git a/office/DepreciateForLedger/Portfile b/office/DepreciateForLedger/Portfile
@@ -22,7 +22,7 @@ extract.mkdir       yes
 checksums           rmd160  9d7ed69f4db9e1fb16e10db54be66196374553e6 \
                     sha256  65d0ffdbe6bc59cedee1b948f3467e84e3f818ea0017a7d584a31c80f35fa063
 
-python.versions     27
+python.default_version     27
 
 depends_lib-append  port:py${python.version}-dateutil
 

diff --git a/office/GTDtoCSV/Portfile b/office/GTDtoCSV/Portfile
@@ -22,7 +22,7 @@ extract.mkdir       yes
 checksums           rmd160  edfc0b29f15bc831ff0a2a509e16f0ce9e8e21ac \
                     sha256  3dc1a53f936a25994da44ccdb7b8f63eeba1b17a11fd922fa676be9df7dee4e0
 
-python.versions     27
+python.default_version     27
 
 depends_lib-append  port:py${python.version}-dateutil
 

diff --git a/office/LedgerScheduler/Portfile b/office/LedgerScheduler/Portfile
@@ -22,7 +22,7 @@ extract.mkdir       yes
 checksums           rmd160  c4058e4585ca2be8155f968de130858c70836301 \
                     sha256  d463af658812d88d021f7b8330909518ad35d1d3cbb2dd3cdf0c1212aad2c388
 
-python.versions     27
+python.default_version     27
 
 depends_lib-append  port:py${python.version}-dateutil
 

diff --git a/office/csvToLedger/Portfile b/office/csvToLedger/Portfile
@@ -22,7 +22,7 @@ extract.mkdir       yes
 checksums           rmd160  1af663479284a7b0d2e5ee38f94614a358ac9137 \
                     sha256  9820bc99899075002f50bcd69f672a1e21c09234de714ec68414021358875412
 
-python.versions     27
+python.default_version     27
 
 depends_lib-append  port:py${python.version}-dateutil
 

diff --git a/office/expense.txt/Portfile b/office/expense.txt/Portfile
@@ -22,7 +22,7 @@ extract.mkdir       yes
 checksums           rmd160  c9dcaaf3760a4cfb81e66f88b85bea13b758e53d \
                     sha256  4c8264b55d411cfecbb0b5cbd1310bd15bd162e2d8d656b5f6925715fa4000a3
 
-python.versions     27
+python.default_version     27
 
 depends_lib-append  port:py${python.version}-dateutil
 

diff --git a/office/heapCL/Portfile b/office/heapCL/Portfile
@@ -24,7 +24,6 @@ checksums           rmd160  44c4acb31ca8491419a16a6ff94d13a64f66a460 \
                     sha256  cf04a961e5e7d6ce1bd68f9abafa9f6d6ed2aa0deee50f3664b73541c7b9ebd4
 
 python.default_version          27
-python.version                  27
 python.link_binaries_suffix
 
 livecheck.url       [lindex $master_sites 0]

diff --git a/office/time.txt/Portfile b/office/time.txt/Portfile
@@ -22,7 +22,7 @@ extract.mkdir       yes
 checksums           rmd160  92abec490bc439b427c55cf76792c4e6a012bd7a \
                     sha256  270f5e644fa20dfcbdccbcf58878e29904b4968d2aef276c034831c670db166e
 
-python.versions     27
+python.default_version     27
 
 depends_lib-append  port:py${python.version}-dateutil
 

diff --git a/office/torchCL/Portfile b/office/torchCL/Portfile
@@ -24,7 +24,6 @@ checksums           rmd160  25f34d30fdd1364546a9a3a4b038a4a95faf06a4 \
                     sha256  023712d65e0779447062d760c61cd1ece9297a32c6cb837a9ebdd098959cd35a
 
 python.default_version          27
-python.version                  27
 python.link_binaries_suffix
 
 livecheck.url       [lindex $master_sites 0]

diff --git a/python/docker-compose/Portfile b/python/docker-compose/Portfile
@@ -21,7 +21,7 @@ long_description    Compose is a tool for defining and running multi-container \
 checksums           rmd160  05b1a8124aa5da3f4b2fcef6b7c7b788aa847db4 \
                     sha256  65316b53ae6fed151055b5073366cbd82d4bf1ed138cf33cc9aa66c0c828824d
 
-python.versions     27
+python.default_version     27
 python.link_binaries_suffix
 
 depends_lib         port:py${python.version}-yaml \

diff --git a/python/impressive/Portfile b/python/impressive/Portfile
@@ -28,40 +28,16 @@ distname            Impressive-${version}
 checksums           rmd160  4a214c26624d932c8730f958e258c2cc4b258c0b \
                     sha256  a96735cbd5f0c36dd9e499c068b3a991a852fda71b73acd36da6b764ea198ad9
 
-python.versions     26 27
-
-# create python variants
-foreach ver ${python.versions} {
-     set variant_line {variant python${ver} description "Use python${ver} and packages from MacPorts"}
-
-    foreach over ${python.versions} {
-        if {${ver} == ${over}} {
-            continue
-        }
-        append variant_line " conflicts python${over}"
-    }
-    append variant_line { {}}
-    eval $variant_line
-}
-
-# set default python variant
-set variant_none true
-foreach ver ${python.versions} {
-    if {[variant_isset python${ver}]} {
-        set variant_none [expr $variant_none && ![variant_isset python${ver}]]
-    }
-}
-if {${variant_none}} {
-    default_variants-append "+python${python.default_version}"
-}
-
-# python variant settings
-foreach ver ${python.versions} {
-    if {[variant_isset python${ver}]} {python.version  ${ver}}
+variant python26 conflicts python27 description {Use Python 2.6} {}
+variant python27 conflicts python26 description {Use Python 2.7} {}
+if {[variant_isset python26]} {
+    python.default_version 26
+} else {
+    default_variants +python27
+    python.default_version 27
 }
 
-depends_lib-append  port:python${python.version} \
-                    port:py${python.version}-opengl \
+depends_lib-append  port:py${python.version}-opengl \
                     port:py${python.version}-game \
                     path:${python.pkgd}/PIL:py${python.version}-Pillow \
                     port:xpdf \

diff --git a/python/py27-elib.intl/Portfile → python/py-elib.intl/Portfile b/python/py27-elib.intl/Portfile → python/py-elib.intl/Portfile
@@ -10,7 +10,6 @@ name                py-elib.intl
 version             0.0.3-20110711
 revision            1
 python.versions     26 27
-python.default_version 27
 platforms           darwin
 supported_archs     noarch
 license             BSD

diff --git a/science/EGSimulation/Portfile b/science/EGSimulation/Portfile
@@ -30,7 +30,7 @@ distname            ${name}-${version}
 checksums           rmd160  d6b5d09981836ab80a8d1512df227b6685150b60 \
                     sha256  226181ccb0c42aa040541d051360c44778ccce226d5ccd7198222e008440bac7
 
-python.versions     27
+python.default_version     27
 
 depends_lib-append  port:py${python.version}-crypto \
                     port:py${python.version}-numpy \

diff --git a/science/cantera/Portfile b/science/cantera/Portfile
@@ -34,13 +34,13 @@ subport cantera-devel {
                         sha256  25e6c3f2140bf8cc04c6559928dd4aa1bad0dc1a9cc437d3ea3f82ac1a54b393
 }
 
+python.default_version         27
+
 depends_lib-append      port:py${python.version}-numpy \
                         port:py${python.version}-cython
 
 depends_build-append    port:scons
 
-python.versions         27
-
 use_configure           no
 
 build.cmd               ${prefix}/bin/scons install

diff --git a/sysutils/pypi2port/Portfile b/sysutils/pypi2port/Portfile
@@ -20,7 +20,14 @@ homepage            https://trac.macports.org/wiki/${name}
 fetch.type          svn
 svn.url             https://svn.macports.org/repository/macports/contrib/${name}
 
-python.versions     27 34
+variant python27 conflicts python34 description {Use Python 2.7} {}
+variant python34 conflicts python27 description {Use Python 3.4} {}
+if {[variant_isset python34]} {
+    python.default_version 34
+} else {
+    default_variants +python27
+    python.default_version 27
+}
 
 # list dependencies
 depends_run-append  port:py${python.version}-requests