[121889] trunk/dports/net/deluge

[devans at macports.org]

Revision: 121889
          https://trac.macports.org/changeset/121889
Author:   devans at macports.org
Date:     2014-07-10 11:19:58 -0700 (Thu, 10 Jul 2014)
Log Message:
-----------
deluge: update to version 1.3.7, dependencies, use active-variants PortGroup to ensure that deluge and libtorrent-rasterbar python variants match (#34737).

Modified Paths:
--------------
    trunk/dports/net/deluge/Portfile
    trunk/dports/net/deluge/files/patch-remove-osx-native-menus.diff

Modified: trunk/dports/net/deluge/Portfile
===================================================================
--- trunk/dports/net/deluge/Portfile	2014-07-10 15:12:44 UTC (rev 121888)
+++ trunk/dports/net/deluge/Portfile	2014-07-10 18:19:58 UTC (rev 121889)
@@ -3,10 +3,10 @@
 
 PortSystem      1.0
 PortGroup       python 1.0
+PortGroup       active_variants 1.1
 
 name            deluge
-version         1.3.6
-revision        1
+version         1.3.7
 categories      net gnome python
 license         {GPL-3+ OpenSSLException}
 maintainers     devans openmaintainer
@@ -22,13 +22,15 @@
 
 use_bzip2       yes
 
-checksums       sha256  756a025d88752f39133aa34d8fc96d4ce216113919488d60098ee41f860a1f60 \
-                rmd160  04f3e92669e415d547648720bf96019aea0ce945
+checksums       sha256  b55ad9ed7a3281927508f2eb37560fc50e34012d4ecc05020290568fe7a3a51e \
+                rmd160  31773312e2a82a2145b6e54107419e21b8854245
 
 depends_lib-append \
+                port:gettext \
+                port:intltool \
                 path:lib/libtorrent-rasterbar.dylib:libtorrent-rasterbar \
-                port:boost \
-                port:librsvg
+                port:librsvg \
+                port:xdg-utils
 
 patchfiles      patch-remove-osx-native-menus.diff
 
@@ -38,6 +40,7 @@
                 CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp}
 
 variant python26 conflicts python27 description {Build for Python 2.6} {
+        require_active_variants libtorrent-rasterbar python26
         python.default_version 26
         depends_lib-append \
                 port:dbus-python26 \
@@ -53,6 +56,7 @@
 }
 
 variant python27 conflicts python26 description {Build for Python 2.7} {
+        require_active_variants libtorrent-rasterbar python27
         python.default_version 27
         depends_lib-append \
                 port:dbus-python27 \

Modified: trunk/dports/net/deluge/files/patch-remove-osx-native-menus.diff
===================================================================
--- trunk/dports/net/deluge/files/patch-remove-osx-native-menus.diff	2014-07-10 15:12:44 UTC (rev 121888)
+++ trunk/dports/net/deluge/files/patch-remove-osx-native-menus.diff	2014-07-10 18:19:58 UTC (rev 121889)
@@ -1,18 +1,18 @@
---- deluge/ui/gtkui/gtkui.py.orig	2013-06-16 13:05:13.000000000 -0700
-+++ deluge/ui/gtkui/gtkui.py	2013-06-16 13:11:49.000000000 -0700
+--- deluge/ui/gtkui/gtkui.py.orig	2014-07-09 12:08:22.000000000 -0700
++++ deluge/ui/gtkui/gtkui.py	2014-07-10 09:57:51.000000000 -0700
 @@ -197,12 +197,12 @@
                      return 1
              SetConsoleCtrlHandler(win_handler)
  
 -        if deluge.common.osx_check() and gtk.gdk.WINDOWING == "quartz":
--            import gtk_osxapplication
--            self.osxapp = gtk_osxapplication.OSXApplication()
+-            import gtkosx_application
+-            self.osxapp = gtkosx_application.gtkosx_application_get()
 -            def on_die(*args):
 -                reactor.stop()
 -            self.osxapp.connect("NSApplicationWillTerminate", on_die)
 +#        if deluge.common.osx_check() and gtk.gdk.WINDOWING == "quartz":
-+#            import gtk_osxapplication
-+#            self.osxapp = gtk_osxapplication.OSXApplication()
++#            import gtkosx_application
++#            self.osxapp = gtkosx_application.gtkosx_application_get()
 +#            def on_die(*args):
 +#                reactor.stop()
 +#            self.osxapp.connect("NSApplicationWillTerminate", on_die)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140710/1167195b/attachment.html>