Update to 4.4.0

3 files changed, 46 insertions, 27 deletions

diff --git a/net-p2p/py-bittorrent-devel/Makefile b/net-p2p/py-bittorrent-devel/Makefile
index 35abfff37031..c039024e46c7 100644
--- a/net-p2p/py-bittorrent-devel/Makefile
+++ b/net-p2p/py-bittorrent-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	BitTorrent
-PORTVERSION=	4.3.5
+PORTVERSION=	4.4.0
 PORTEPOCH=	1
 CATEGORIES?=	net-p2p python
 MASTER_SITES=	http://www.bittorrent.com/dl/ \
@@ -57,29 +57,49 @@ PLIST_FILES+=	\
 		bin/bittorrent \
 		bin/maketorrent \
 		share/pixmaps/BitTorrent/bittorrent.ico \
-		share/pixmaps/BitTorrent/broken.png \
-		share/pixmaps/BitTorrent/finished.png \
-		share/pixmaps/BitTorrent/info.png \
+		share/pixmaps/BitTorrent/icons/default/abort.png \
+		share/pixmaps/BitTorrent/icons/default/broken.png \
+		share/pixmaps/BitTorrent/icons/default/finished.png \
+		share/pixmaps/BitTorrent/icons/default/info.png \
+		share/pixmaps/BitTorrent/icons/default/pause.png \
+		share/pixmaps/BitTorrent/icons/default/paused.png \
+		share/pixmaps/BitTorrent/icons/default/play.png \
+		share/pixmaps/BitTorrent/icons/default/queued.png \
+		share/pixmaps/BitTorrent/icons/default/remove.png \
+		share/pixmaps/BitTorrent/icons/default/running.png \
+		share/pixmaps/BitTorrent/icons/default/status-broken.png \
+		share/pixmaps/BitTorrent/icons/default/status-natted.png \
+		share/pixmaps/BitTorrent/icons/default/status-pre-natted.png \
+		share/pixmaps/BitTorrent/icons/default/status-running.png \
+		share/pixmaps/BitTorrent/icons/default/status-starting.png \
+		share/pixmaps/BitTorrent/icons/default/status-stopped.png \
+		share/pixmaps/BitTorrent/icons/default/trashcan.png \
+		share/pixmaps/BitTorrent/icons/old/broken.png \
+		share/pixmaps/BitTorrent/icons/old/finished.png \
+		share/pixmaps/BitTorrent/icons/old/info.png \
+		share/pixmaps/BitTorrent/icons/old/pause.png \
+		share/pixmaps/BitTorrent/icons/old/paused.png \
+		share/pixmaps/BitTorrent/icons/old/play.png \
+		share/pixmaps/BitTorrent/icons/old/queued.png \
+		share/pixmaps/BitTorrent/icons/old/remove.png \
+		share/pixmaps/BitTorrent/icons/old/running.png \
+		share/pixmaps/BitTorrent/icons/old/status-broken.png \
+		share/pixmaps/BitTorrent/icons/old/status-natted.png \
+		share/pixmaps/BitTorrent/icons/old/status-pre-natted.png \
+		share/pixmaps/BitTorrent/icons/old/status-running.png \
+		share/pixmaps/BitTorrent/icons/old/status-starting.png \
+		share/pixmaps/BitTorrent/icons/old/status-stopped.png \
 		share/pixmaps/BitTorrent/logo/bittorrent_32.png \
-		share/pixmaps/BitTorrent/logo/bittorrent_96.png \
-		share/pixmaps/BitTorrent/pause.png \
-		share/pixmaps/BitTorrent/paused.png \
-		share/pixmaps/BitTorrent/play.png \
-		share/pixmaps/BitTorrent/queued.png \
-		share/pixmaps/BitTorrent/remove.png \
-		share/pixmaps/BitTorrent/running.png \
-		share/pixmaps/BitTorrent/status-broken.png \
-		share/pixmaps/BitTorrent/status-natted.png \
-		share/pixmaps/BitTorrent/status-pre-natted.png \
-		share/pixmaps/BitTorrent/status-running.png \
-		share/pixmaps/BitTorrent/status-starting.png \
-		share/pixmaps/BitTorrent/status-stopped.png
-
-PLIST_SUB+=	GUI=""
+		share/pixmaps/BitTorrent/logo/bittorrent_96.png
+
+PLIST_DIRS+=	\
+		share/pixmaps/BitTorrent/logo \
+		share/pixmaps/BitTorrent/icons/old \
+		share/pixmaps/BitTorrent/icons/default \
+		share/pixmaps/BitTorrent/icons \
+		share/pixmaps/BitTorrent
 .else
 EXTRA_PATCHES+=	${FILESDIR}/extra-nogui-patch-setup.py
-
-PLIST_SUB+=	GUI="@comment "
 .endif
 # required for PSYCO
 .ifndef(WITHOUT_PSYCO)
diff --git a/net-p2p/py-bittorrent-devel/distinfo b/net-p2p/py-bittorrent-devel/distinfo
index 1fd1bf39521e..f6c54251b260 100644
--- a/net-p2p/py-bittorrent-devel/distinfo
+++ b/net-p2p/py-bittorrent-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (BitTorrent-4.3.5.tar.gz) = 4a00027831aa9ce2505cebd55a2a5376
-SHA256 (BitTorrent-4.3.5.tar.gz) = bd15cd0ac7568b100e88dfa170ddc1e559dd56227aa784932117d828948fb1b6
-SIZE (BitTorrent-4.3.5.tar.gz) = 1196112
+MD5 (BitTorrent-4.4.0.tar.gz) = 74d4b48202c28f0b27e989b6d5f5b214
+SHA256 (BitTorrent-4.4.0.tar.gz) = 1c9338ed384240258b5733a814670e2dee8ca2fb65babf3f0ca07978707301e0
+SIZE (BitTorrent-4.4.0.tar.gz) = 1255281
diff --git a/net-p2p/py-bittorrent-devel/pkg-plist b/net-p2p/py-bittorrent-devel/pkg-plist
index f6e9ca29d9cb..5e9aa4a708e0 100644
--- a/net-p2p/py-bittorrent-devel/pkg-plist
+++ b/net-p2p/py-bittorrent-devel/pkg-plist
@@ -239,7 +239,9 @@ share/locale/el/LC_MESSAGES/bittorrent.mo
 share/locale/es/LC_MESSAGES/bittorrent.mo
 share/locale/es_MX/LC_MESSAGES/bittorrent.mo
 share/locale/fr/LC_MESSAGES/bittorrent.mo
+share/locale/he/LC_MESSAGES/bittorrent.mo
 share/locale/hu/LC_MESSAGES/bittorrent.mo
+share/locale/is/LC_MESSAGES/bittorrent.mo
 share/locale/it/LC_MESSAGES/bittorrent.mo
 share/locale/ja/LC_MESSAGES/bittorrent.mo
 share/locale/ko/LC_MESSAGES/bittorrent.mo
@@ -257,9 +259,6 @@ share/locale/tr/LC_MESSAGES/bittorrent.mo
 share/locale/vi/LC_MESSAGES/bittorrent.mo
 share/locale/zh_CN/LC_MESSAGES/bittorrent.mo
 share/locale/zh_TW/LC_MESSAGES/bittorrent.mo
-%%GUI%%@dirrm share/pixmaps/BitTorrent/logo
-%%GUI%%@dirrm share/pixmaps/BitTorrent
-%%GUI%%@dirrmtry share/pixmaps
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_CN/LC_MESSAGES