[91164] trunk/dports/sysutils/yum/Portfile

[afb at macports.org]

Revision: 91164
          https://trac.macports.org/changeset/91164
Author:   afb at macports.org
Date:     2012-03-24 07:57:56 -0700 (Sat, 24 Mar 2012)
Log Message:
-----------
yum: python27 variant didn't work, revert r91163

Revision Links:
--------------
    https://trac.macports.org/changeset/91163

Modified Paths:
--------------
    trunk/dports/sysutils/yum/Portfile

Modified: trunk/dports/sysutils/yum/Portfile
===================================================================
--- trunk/dports/sysutils/yum/Portfile	2012-03-24 14:44:39 UTC (rev 91163)
+++ trunk/dports/sysutils/yum/Portfile	2012-03-24 14:57:56 UTC (rev 91164)
@@ -45,10 +45,10 @@
 build.args	PYTHON="${python.bin}"
 destroot.args	PYTHON="${python.bin}" PYSYSDIR="${prefix}"
 
-variant python24 conflicts python25 python26 python27 description "use python 2.4" {}
+variant python24 description "use python 2.4" {}
 default_variants +python24
 
-variant python25 conflicts python24 python26 python27 description "use python 2.5" {
+variant python25 description "use python 2.5" {
 	depends_lib-delete	port:python24 port:py-celementtree port:py-urlgrabber port:py-libxml2 port:py-yum-metadata-parser port:py-iniparse port:py-pygpgme
 	depends_lib-append	port:python25 port:py25-celementtree port:py25-urlgrabber port:py25-libxml2 port:py25-yum-metadata-parser port:py25-iniparse port:py25-pygpgme
 	depends_build-delete	port:py24-nose
@@ -60,7 +60,7 @@
 	destroot.args-append	PYTHON="${prefix}/bin/python2.5"
 }
 
-variant python26 conflicts python24 python25 python27 description "use python 2.6" {
+variant python26 description "use python 2.6" {
 	depends_lib-delete	port:python24 port:py-celementtree port:py-urlgrabber port:py-libxml2 port:py-yum-metadata-parser port:py-iniparse port:py-pygpgme
 	depends_lib-append	port:python26 port:py26-celementtree port:py26-urlgrabber port:py26-libxml2 port:py26-yum-metadata-parser port:py26-iniparse port:py26-pygpgme
 	depends_build-delete	port:py24-nose
@@ -72,18 +72,6 @@
 	destroot.args-append	PYTHON="${prefix}/bin/python2.6"
 }
 
-variant python27 conflicts python24 python25 python26 description "use python 2.7" {
-	depends_lib-delete	port:python24 port:py-celementtree port:py-urlgrabber port:py-libxml2 port:py-yum-metadata-parser port:py-iniparse port:py-pygpgme
-	depends_lib-append	port:python27 port:py27-celementtree port:py27-urlgrabber port:py27-libxml2 port:py27-yum-metadata-parser port:py27-iniparse port:py27-pygpgme
-	depends_build-delete	port:py24-nose
-	depends_build-append	port:py27-nose
-	set python.bin		${prefix}/bin/python2.7
-	build.args-delete	PYTHON="${prefix}/bin/python2.4"
-	build.args-append	PYTHON="${prefix}/bin/python2.7"
-	destroot.args-delete	PYTHON="${prefix}/bin/python2.4"
-	destroot.args-append	PYTHON="${prefix}/bin/python2.7"
-}
-
 post-destroot	{
 		xinstall -d -m 755 ${destroot}${prefix}/etc/yum/repos.d
 		xinstall -d -m 755 ${destroot}${prefix}/var/cache/yum/release/headers
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120324/0d6d8870/attachment-0001.html>