[138230] trunk/dports/gnome/gpodder/Portfile

[elelay at macports.org]

Revision: 138230
          https://trac.macports.org/changeset/138230
Author:   elelay at macports.org
Date:     2015-07-02 12:04:54 -0700 (Thu, 02 Jul 2015)
Log Message:
-----------
gpodder: drop python26, depend on py27-gtk-osx-application-gtk2

Modified Paths:
--------------
    trunk/dports/gnome/gpodder/Portfile

Modified: trunk/dports/gnome/gpodder/Portfile
===================================================================
--- trunk/dports/gnome/gpodder/Portfile	2015-07-02 18:59:53 UTC (rev 138229)
+++ trunk/dports/gnome/gpodder/Portfile	2015-07-02 19:04:54 UTC (rev 138230)
@@ -2,7 +2,6 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           active_variants 1.1
 
 name                gpodder
 version             3.8.4
@@ -28,76 +27,33 @@
                     port:intltool
 
 depends_lib         port:vorbis-tools\
-                    port:lame
+                    port:lame \
+                    port:py27-feedparser \
+                    port:dbus-python27 \
+                    port:py27-mygpoclient \
+                    port:py27-pygtk
 
-set my_python       "DUMMY_VALUE_WILL_BE_OVERWRITTEN"
-set python.version  "DUMMY_VALUE_WILL_BE_OVERWRITTEN"
-set python.branch   "DUMMY_VALUE_WILL_BE_OVERWRITTEN"
+set python.version  27
+set python.branch   "[string range ${python.version} 0 end-1].[string index ${python.version} end]"
+set my_python "${frameworks_dir}/Python.framework/Versions/${python.branch}"
 
-variant python26 conflicts python27 description {Use Python 2.6} {
-    set python.version  26
-    set python.branch "[string range ${python.version} 0 end-1].[string index ${python.version} end]"
-
-    set my_python "${frameworks_dir}/Python.framework/Versions/${python.branch}"
-
-    depends_lib-append  port:py${python.version}-feedparser \
-                        port:dbus-python${python.version} \
-                        port:py${python.version}-mygpoclient \
-                        port:py${python.version}-pygtk
-
-    post-patch {
-        reinplace s|python|${my_python}/bin/python|g ${worksrcpath}/Makefile
-    }
-    
-    # install in python 2.6 prefix, see bug #22522
-    destroot.args PREFIX=${my_python}
-    
-    # Install the 2.6 apps in the standard path :
-    # the 2 variants can't be active simultaneously.
-    post-destroot {
-    	foreach {app} {gpodder gpo gpodder-backup} {
-    		ln -s ${my_python}/bin/${app} ${destroot}${prefix}/bin/${app}
-        }
-    }
+post-patch {
+    reinplace s|python|${my_python}/bin/python|g ${worksrcpath}/Makefile
 }
 
-variant python27 conflicts python26 description {Use Python 2.7} {
-    set python.version  27
-    set python.branch   "[string range ${python.version} 0 end-1].[string index ${python.version} end]"
+# install in python 2.7 prefix
+destroot.args PREFIX=${my_python}
 
-    set my_python "${frameworks_dir}/Python.framework/Versions/${python.branch}"
-
-    depends_lib-append  port:py${python.version}-feedparser \
-                        port:dbus-python${python.version} \
-                        port:py${python.version}-mygpoclient \
-                        port:py${python.version}-pygtk
-
-    post-patch {
-        reinplace s|python|${my_python}/bin/python|g ${worksrcpath}/Makefile
+# Install the apps in the standard path :
+post-destroot {
+    foreach {app} {gpodder gpo gpodder-backup gpodder-migrate2tres} {
+        ln -s ${my_python}/bin/${app} ${destroot}${prefix}/bin/${app}
     }
-
-    # install in python 2.7 prefix, see bug #22522
-    destroot.args PREFIX=${my_python}
-
-    # Install the 2.7 apps in the standard path :
-    # the 2 variants can't be active simultaneously.
-    post-destroot {
-        foreach {app} {gpodder gpo gpodder-backup gpodder-migrate2tres} {
-            ln -s ${my_python}/bin/${app} ${destroot}${prefix}/bin/${app}
-        }
-    }
 }
 
-if {![variant_isset python26] && ![variant_isset python27]} {
-    default_variants +python27
-}
-
 variant quartz {
-    depends_lib-append  port:gtk-osx-application
+    depends_lib-append  port:py27-gtk-osx-application-gtk2
 
-    # gPodder is still using pygtk, not the gtk3 bindings
-    require_active_variants gtk-osx-application "" gtk3
-    
     post-destroot {
     	# Command-XX shortcuts in gPodder menus
     	system "/usr/bin/xsltproc -o ${destroot}${my_python}/share/gpodder/ui/gtk/gpodder.ui \
@@ -106,9 +62,7 @@
 }
 
 variant html_notes description {Use WebkitGtk+ to show episode notes in HTML format} {
-	if {[variant_isset python26] || [variant_isset python27]} {
 		depends_lib-append  port:py${python.version}-webkitgtk
-	}
 }
 
 use_configure       no
@@ -118,11 +72,7 @@
 post-destroot {
 
     # build a MacOS X application
-	if {[variant_isset python26] || [variant_isset python27]} {
-		set install_path "${my_python}"
-	} else {
-		set install_path "${prefix}"
-	}
+    set install_path "${my_python}"
 
 	system "cd ${worksrcpath}/tools/mac-osx && make \
 		GPODDERSCRIPT=\"${install_path}/bin/gpodder\"\
@@ -138,13 +88,9 @@
 }
 
 notes "
-
-****
-**** To subscribe to YouTube user feeds, you must setup a google developer
-**** project, enable the YouTube v3 api, generate a public api key (browser
-**** type, no origin url) and copy-paste this key to the gPodder preferences.
-**** Then you'll be able to subscribe to e.g. yt:gobelins
-****
+To subscribe to YouTube user feeds (e.g. yt:gobelins),
+you must enter a google API key.
+See http://wiki.gpodder.org/wiki/Youtube for detailed instructions.
 "
 
 livecheck.type      regex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150702/2d5bf588/attachment.html>