4 files changed, 113 insertions, 88 deletions

diff --git a/multimedia/arista/Makefile b/multimedia/arista/Makefile
index 6ef3543eac0b..ba102d87436c 100644
--- a/multimedia/arista/Makefile
+++ b/multimedia/arista/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	arista
-PORTVERSION=	0.9.3
-PORTREVISION=	5
+PORTVERSION=	0.9.5
 CATEGORIES=	multimedia
 MASTER_SITES=	http://programmer-art.org/media/releases/arista-transcoder/ \
 		http://launchpadlibrarian.net/28489828/
diff --git a/multimedia/arista/distinfo b/multimedia/arista/distinfo
index 3ca5662a0ffe..4e1e92d01031 100644
--- a/multimedia/arista/distinfo
+++ b/multimedia/arista/distinfo
@@ -1,3 +1,3 @@
-MD5 (arista-0.9.3.tar.gz) = aacb98b3a020ed1dbdd6b201699d32f5
-SHA256 (arista-0.9.3.tar.gz) = 1749b3ea5b46d69f728ef79cb5ed81e91df514f12bb77c99584998ad4d1eca5c
-SIZE (arista-0.9.3.tar.gz) = 195937
+MD5 (arista-0.9.5.tar.gz) = 0b9948c9e4abd381b81af6c5c31d5db2
+SHA256 (arista-0.9.5.tar.gz) = 2d9b7d664225c9f4f9e2d7c365d40ed4673f87a673373cfb5612e4abe6285bd7
+SIZE (arista-0.9.5.tar.gz) = 307390
diff --git a/multimedia/arista/files/patch-arista-gtk b/multimedia/arista/files/patch-arista-gtk
deleted file mode 100644
index 89d906c3858b..000000000000
--- a/multimedia/arista/files/patch-arista-gtk
+++ /dev/null
@@ -1,15 +0,0 @@
---- arista-gtk.orig	2009-05-30 10:13:21.000000000 -0400
-+++ arista-gtk	2009-05-30 10:13:35.000000000 -0400
-@@ -1244,9 +1244,9 @@
-                            arista.utils.get_path("locale"))
-     gettext.textdomain("arista")
-     
--    locale.bindtextdomain("arista",
--                          arista.utils.get_path("locale"))
--    locale.textdomain("arista")
-+#    locale.bindtextdomain("arista",
-+#                          arista.utils.get_path("locale"))
-+#    locale.textdomain("arista")
-     
-     gtk.gdk.threads_init()
-     
diff --git a/multimedia/arista/pkg-plist b/multimedia/arista/pkg-plist
index 297faafd9c7a..517bb9b43f59 100644
--- a/multimedia/arista/pkg-plist
+++ b/multimedia/arista/pkg-plist
@@ -1,14 +1,89 @@
 bin/arista-gtk
 bin/arista-transcode
+lib/nautilus/extensions-2.0/python/arista-nautilus.py
+share/applications/arista.desktop
+share/doc/arista/AUTHORS
+share/doc/arista/LICENSE
+share/doc/arista/README.md
+share/locale/ar/LC_MESSAGES/arista.mo
+share/locale/ast/LC_MESSAGES/arista.mo
+share/locale/bg/LC_MESSAGES/arista.mo
+share/locale/ca/LC_MESSAGES/arista.mo
+share/locale/cs/LC_MESSAGES/arista.mo
+share/locale/de/LC_MESSAGES/arista.mo
+share/locale/en_GB/LC_MESSAGES/arista.mo
+share/locale/es/LC_MESSAGES/arista.mo
+share/locale/eu/LC_MESSAGES/arista.mo
+share/locale/fi/LC_MESSAGES/arista.mo
+share/locale/fr/LC_MESSAGES/arista.mo
+share/locale/gl/LC_MESSAGES/arista.mo
+share/locale/hu/LC_MESSAGES/arista.mo
+share/locale/it/LC_MESSAGES/arista.mo
+share/locale/ja/LC_MESSAGES/arista.mo
+share/locale/kn/LC_MESSAGES/arista.mo
+share/locale/nl/LC_MESSAGES/arista.mo
+share/locale/pl/LC_MESSAGES/arista.mo
+share/locale/pt/LC_MESSAGES/arista.mo
+share/locale/pt_BR/LC_MESSAGES/arista.mo
+share/locale/ro/LC_MESSAGES/arista.mo
+share/locale/ru/LC_MESSAGES/arista.mo
+share/locale/sl/LC_MESSAGES/arista.mo
+share/locale/sv/LC_MESSAGES/arista.mo
+share/locale/tr/LC_MESSAGES/arista.mo
+share/locale/zh_TW/LC_MESSAGES/arista.mo
+share/locale/templates/arista.pot
+share/pixmaps/arista.svg
+%%DATADIR%%/presets/android-droid.png
+%%DATADIR%%/presets/android-g1.png
+%%DATADIR%%/presets/android-nexus-one.svg
+%%DATADIR%%/presets/android.json
+%%DATADIR%%/presets/android.svg
+%%DATADIR%%/presets/computer.json
+%%DATADIR%%/presets/computer-webm.svg
+%%DATADIR%%/presets/computer-live.svg
+%%DATADIR%%/presets/dvd.json
+%%DATADIR%%/presets/ipad.json
+%%DATADIR%%/presets/ipad.svg
+%%DATADIR%%/presets/ipod-iphone.svg
+%%DATADIR%%/presets/ipod-nano.svg
+%%DATADIR%%/presets/ipod-touch.svg
+%%DATADIR%%/presets/ipod-video.svg
+%%DATADIR%%/presets/ipod.json
+%%DATADIR%%/presets/nokia-nseries.json
+%%DATADIR%%/presets/ps3.json
+%%DATADIR%%/presets/psp.json
+%%DATADIR%%/presets/web-flv.png
+%%DATADIR%%/presets/web-webm.svg
+%%DATADIR%%/presets/web.json
+%%DATADIR%%/presets/web.svg
+%%DATADIR%%/presets/computer.svg
+%%DATADIR%%/presets/dvd.svg
+%%DATADIR%%/presets/nokia-nseries.svg
+%%DATADIR%%/presets/ps3.svg
+%%DATADIR%%/presets/psp.svg
+%%DATADIR%%/ui/about.ui
+%%DATADIR%%/ui/error.svg
+%%DATADIR%%/ui/icon-small.svg
+%%DATADIR%%/ui/icon.svg
+%%DATADIR%%/ui/logo.svg
+%%DATADIR%%/ui/main.ui
+%%DATADIR%%/ui/prefs.ui
+%%DATADIR%%/ui/props.ui
 %%PYTHON_SITELIBDIR%%/arista/__init__.py
 %%PYTHON_SITELIBDIR%%/arista/__init__.pyc
 %%PYTHON_SITELIBDIR%%/arista/__init__.pyo
 %%PYTHON_SITELIBDIR%%/arista/discoverer.py
 %%PYTHON_SITELIBDIR%%/arista/discoverer.pyc
 %%PYTHON_SITELIBDIR%%/arista/discoverer.pyo
-%%PYTHON_SITELIBDIR%%/arista/inputs.py
-%%PYTHON_SITELIBDIR%%/arista/inputs.pyc
-%%PYTHON_SITELIBDIR%%/arista/inputs.pyo
+%%PYTHON_SITELIBDIR%%/arista/inputs/__init__.py
+%%PYTHON_SITELIBDIR%%/arista/inputs/__init__.pyc
+%%PYTHON_SITELIBDIR%%/arista/inputs/__init__.pyo
+%%PYTHON_SITELIBDIR%%/arista/inputs/haldisco.py
+%%PYTHON_SITELIBDIR%%/arista/inputs/haldisco.pyc
+%%PYTHON_SITELIBDIR%%/arista/inputs/haldisco.pyo
+%%PYTHON_SITELIBDIR%%/arista/inputs/udevdisco.py
+%%PYTHON_SITELIBDIR%%/arista/inputs/udevdisco.pyc
+%%PYTHON_SITELIBDIR%%/arista/inputs/udevdisco.pyo
 %%PYTHON_SITELIBDIR%%/arista/presets.py
 %%PYTHON_SITELIBDIR%%/arista/presets.pyc
 %%PYTHON_SITELIBDIR%%/arista/presets.pyo
@@ -21,73 +96,39 @@ bin/arista-transcode
 %%PYTHON_SITELIBDIR%%/arista/utils.py
 %%PYTHON_SITELIBDIR%%/arista/utils.pyc
 %%PYTHON_SITELIBDIR%%/arista/utils.pyo
-share/applications/arista.desktop
-share/pixmaps/arista.svg
-%%DATADIR%%/locale/de/LC_MESSAGES/arista.mo
-%%DATADIR%%/locale/es/LC_MESSAGES/arista.mo
-%%DATADIR%%/locale/fr/LC_MESSAGES/arista.mo
-%%DATADIR%%/locale/it/LC_MESSAGES/arista.mo
-%%DATADIR%%/locale/pt_BR/LC_MESSAGES/arista.mo
-%%DATADIR%%/locale/ca/LC_MESSAGES/arista.mo
-%%DATADIR%%/locale/ar/LC_MESSAGES/arista.mo
-%%DATADIR%%/locale/pl/LC_MESSAGES/arista.mo
-%%DATADIR%%/locale/fi/LC_MESSAGES/arista.mo
-%%DATADIR%%/locale/ja/LC_MESSAGES/arista.mo
-%%DATADIR%%/locale/ast/LC_MESSAGES/arista.mo
-%%DATADIR%%/locale/templates/arista.pot
-%%DATADIR%%/presets/computer.svg
-%%DATADIR%%/presets/computer.xml
-%%DATADIR%%/presets/d2.svg
-%%DATADIR%%/presets/d2.xml
-%%DATADIR%%/presets/dvd.svg
-%%DATADIR%%/presets/dvd.xml
-%%DATADIR%%/presets/ipod.svg
-%%DATADIR%%/presets/ipod.xml
-%%DATADIR%%/presets/ps3.svg
-%%DATADIR%%/presets/ps3.xml
-%%DATADIR%%/presets/psp.svg
-%%DATADIR%%/presets/psp.xml
-%%DATADIR%%/presets/pda.png
-%%DATADIR%%/presets/pda.xml
-%%DATADIR%%/presets/nwz-818.svg
-%%DATADIR%%/presets/nokia-nseries.svg
-%%DATADIR%%/presets/nokia-nseries.xml
-%%DATADIR%%/presets/nwz-818.xml
-%%DATADIR%%/ui/props.ui
-%%DATADIR%%/ui/about.ui
-%%DATADIR%%/ui/icon-small.svg
-%%DATADIR%%/ui/icon.svg
-%%DATADIR%%/ui/logo.svg
-%%DATADIR%%/ui/main.ui
-%%DATADIR%%/ui/prefs.ui
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry %%PYTHON_SITELIBDIR%%/arista
-@dirrmtry share/applications
-@dirrmtry %%DATADIR%%/locale/fr/LC_MESSAGES
-@dirrmtry %%DATADIR%%/locale/it/LC_MESSAGES
-@dirrmtry %%DATADIR%%/locale/de/LC_MESSAGES
-@dirrmtry %%DATADIR%%/locale/es/LC_MESSAGES
-@dirrmtry %%DATADIR%%/locale/ca/LC_MESSAGES
-@dirrmtry %%DATADIR%%/locale/pt_BR/LC_MESSAGES
-@dirrmtry %%DATADIR%%/locale/ar/LC_MESSAGES
-@dirrmtry %%DATADIR%%/locale/pl/LC_MESSAGES
-@dirrmtry %%DATADIR%%/locale/fi/LC_MESSAGES
-@dirrmtry %%DATADIR%%/locale/ja/LC_MESSAGES
-@dirrmtry %%DATADIR%%/locale/ast/LC_MESSAGES
-@dirrmtry %%DATADIR%%/locale/fr
-@dirrmtry %%DATADIR%%/locale/it
-@dirrmtry %%DATADIR%%/locale/de
-@dirrmtry %%DATADIR%%/locale/es
-@dirrmtry %%DATADIR%%/locale/ca
-@dirrmtry %%DATADIR%%/locale/pt_BR
-@dirrmtry %%DATADIR%%/locale/ar
-@dirrmtry %%DATADIR%%/locale/pl
-@dirrmtry %%DATADIR%%/locale/fi
-@dirrmtry %%DATADIR%%/locale/ja
-@dirrmtry %%DATADIR%%/locale/ast
-@dirrmtry %%DATADIR%%/locale/templates
-@dirrmtry %%DATADIR%%/locale
+@dirrmtry lib/nautilus/extensions-2.0/python
+@dirrmtry %%DATADIR%%/arista/presets
+@dirrmtry %%DATADIR%%/arista
+@dirrmtry share/locale/ar/LC_MESSAGES
+@dirrmtry share/locale/ar
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/de/LC_MESSAGES
+@dirrmtry share/locale/de
+@dirrmtry share/locale/es/LC_MESSAGES
+@dirrmtry share/locale/es
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/fr
+@dirrmtry share/locale/it/LC_MESSAGES
+@dirrmtry share/locale/it
+@dirrmtry share/locale/ja/LC_MESSAGES
+@dirrmtry share/locale/ja
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/pt_BR/LC_MESSAGES
+@dirrmtry share/locale/pt_BR
+@dirrmtry share/locale/templates
+@dirrmtry share/locale
 @dirrmtry %%DATADIR%%/presets
 @dirrmtry %%DATADIR%%/ui
 @dirrmtry %%DATADIR%%
+@dirrmtry %%PYTHON_SITELIBDIR%%/arista/inputs
+@dirrmtry %%PYTHON_SITELIBDIR%%/arista
+@dirrmtry share/applications
+@dirrmtry share/doc/arista