Update to 3.4.

Much faster, better looking.

4 files changed, 45 insertions, 35 deletions

diff --git a/net/penguintv-devel/Makefile b/net/penguintv-devel/Makefile
index 6400a1b95c67..8253d5b8e9e8 100644
--- a/net/penguintv-devel/Makefile
+++ b/net/penguintv-devel/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	PenguinTV
-PORTVERSION=	3.0
+PORTVERSION=	3.4
 CATEGORIES=	net audio multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	penguintv
@@ -22,8 +22,6 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/pysqlite2/_sqlite.so:${PORTSDIR}/databases/p
 		${PYTHON_SITELIBDIR}/Pyrex/__init__.py:${PORTSDIR}/devel/pyrex
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-BROKEN=		leaves egg file behind on deinstall
-
 WRKSRC=		${WRKDIR}/PenguinTV-${PORTVERSION}
 
 OPTIONS=	PYLUCENE "Use Lucene search engine" ON \
diff --git a/net/penguintv-devel/distinfo b/net/penguintv-devel/distinfo
index 88335dd02586..ac8eb542c7e4 100644
--- a/net/penguintv-devel/distinfo
+++ b/net/penguintv-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (PenguinTV-3.0.tar.gz) = 1dd07cdfea4a845b2d8919a6331c7e0f
-SHA256 (PenguinTV-3.0.tar.gz) = 13e8505be2e98f76b85640441c203d656c2a19472701f578beca36985c845a70
-SIZE (PenguinTV-3.0.tar.gz) = 285830
+MD5 (PenguinTV-3.4.tar.gz) = bbcbb9bd543f0277be7923d4f05e2e3f
+SHA256 (PenguinTV-3.4.tar.gz) = 707155ecd4a78b918f50c3792b545da3bbd93233f86f636eb9cf9686def0c614
+SIZE (PenguinTV-3.4.tar.gz) = 321421
diff --git a/net/penguintv-devel/files/patch-penguintv-utils.py b/net/penguintv-devel/files/patch-penguintv-utils.py
new file mode 100644
index 000000000000..33a7177a9af4
--- /dev/null
+++ b/net/penguintv-devel/files/patch-penguintv-utils.py
@@ -0,0 +1,10 @@
+--- penguintv/utils.py.orig	2008-03-13 21:59:27.000000000 +0000
++++ penguintv/utils.py	2008-03-13 22:00:06.000000000 +0000
+@@ -186,6 +186,7 @@
+ 		  os.path.join(os.path.split(os.path.abspath(sys.argv[0]))[0],"share"),
+ 		  os.path.join(GetPrefix(),"share","sugar","activities","ptv","share"),
+ 		  os.path.join(os.path.split(os.path.split(utils.__file__)[0])[0],'share'),
++		  "/usr/local/share/penguintv",
+ 		  "/usr/share/penguintv"):
+ 		try:
+ 			os.stat(os.path.join(p,"penguintv.glade"))
diff --git a/net/penguintv-devel/pkg-plist b/net/penguintv-devel/pkg-plist
index ed137d6237ce..fc8a0d6db1cb 100644
--- a/net/penguintv-devel/pkg-plist
+++ b/net/penguintv-devel/pkg-plist
@@ -1,5 +1,24 @@
+bin/PenguinTV
+share/applications/penguintv.desktop
+share/locale/pt/LC_MESSAGES/penguintv.mo
+share/locale/pt_BR/LC_MESSAGES/penguintv.mo
+share/locale/sv/LC_MESSAGES/penguintv.mo
+share/penguintv/defaultsubs.opml
+share/penguintv/mozilla-planet-hildon.css
+share/penguintv/mozilla-planet.css
+share/penguintv/mozilla.css
+share/penguintv/penguintv.glade
+share/penguintv/penguintvicon.png
+share/penguintv/pixmaps/ev_offline.png
+share/penguintv/pixmaps/ev_online.png
+share/penguintv/pixmaps/throbber.gif
+share/pixmaps/penguintvicon.png
+
+%%PYTHON_SITELIBDIR%%/PenguinTV-3.4-py2.5.egg-info
 %%PYTHON_SITELIBDIR%%/penguintv/AddFeedDialog.py
 %%PYTHON_SITELIBDIR%%/penguintv/AddFeedDialog.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/AddFeedUtils.py
+%%PYTHON_SITELIBDIR%%/penguintv/AddFeedUtils.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/AddSearchTagDialog.py
 %%PYTHON_SITELIBDIR%%/penguintv/AddSearchTagDialog.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/BTDownloader.py
@@ -10,6 +29,8 @@
 %%PYTHON_SITELIBDIR%%/penguintv/Downloader.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/EditSearchesDialog.py
 %%PYTHON_SITELIBDIR%%/penguintv/EditSearchesDialog.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/EntryFormatter.py
+%%PYTHON_SITELIBDIR%%/penguintv/EntryFormatter.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/EntryList.py
 %%PYTHON_SITELIBDIR%%/penguintv/EntryList.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/EntryView.py
@@ -28,6 +49,8 @@
 %%PYTHON_SITELIBDIR%%/penguintv/GStreamerPlayer.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/HTTPDownloader.py
 %%PYTHON_SITELIBDIR%%/penguintv/HTTPDownloader.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/HildonListener.py
+%%PYTHON_SITELIBDIR%%/penguintv/HildonListener.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/IconManager.py
 %%PYTHON_SITELIBDIR%%/penguintv/IconManager.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/LoginDialog.py
@@ -40,8 +63,8 @@
 %%PYTHON_SITELIBDIR%%/penguintv/MediaManager.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/OPML.py
 %%PYTHON_SITELIBDIR%%/penguintv/OPML.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/PTVAppSocket.py
-%%PYTHON_SITELIBDIR%%/penguintv/PTVAppSocket.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/PTVXapian.py
+%%PYTHON_SITELIBDIR%%/penguintv/PTVXapian.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/PlanetView.py
 %%PYTHON_SITELIBDIR%%/penguintv/PlanetView.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/Player.py
@@ -76,6 +99,8 @@
 %%PYTHON_SITELIBDIR%%/penguintv/penguintv.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/ptvDB.py
 %%PYTHON_SITELIBDIR%%/penguintv/ptvDB.pyc
+%%PYTHON_SITELIBDIR%%/penguintv/ptvDbus.py
+%%PYTHON_SITELIBDIR%%/penguintv/ptvDbus.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/ptv_sync.py
 %%PYTHON_SITELIBDIR%%/penguintv/ptv_sync.pyc
 %%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Choker.py
@@ -147,32 +172,9 @@
 %%PYTHON_SITELIBDIR%%/penguintv/utils.py
 %%PYTHON_SITELIBDIR%%/penguintv/utils.pyc
 
-@comment This one shouldn't be here, but the py-lucene port doesn't generate it
-%%PYTHON_SITELIBDIR%%/PyLucene.pyc
-
-bin/PenguinTV
-
-share/applications/penguintv.desktop
-share/pixmaps/penguintvicon.png
-
-share/penguintv/defaultsubs.opml
-share/penguintv/penguintv.glade
-share/penguintv/penguintvicon.png
-share/penguintv/gtkhtml.css
-share/penguintv/mozilla.css
-share/penguintv/mozilla-planet.css
-
-share/locale/pt/LC_MESSAGES/penguintv.mo
-share/locale/pt_BR/LC_MESSAGES/penguintv.mo
-share/locale/sv/LC_MESSAGES/penguintv.mo
-
-@dirrmtry share/applications
-@dirrm share/penguintv
-@dirrm %%PYTHON_SITELIBDIR%%/penguintv/trayicon
-@dirrm %%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent
 @dirrm %%PYTHON_SITELIBDIR%%/penguintv/ajax
+@dirrm %%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent
+@dirrm %%PYTHON_SITELIBDIR%%/penguintv/trayicon
 @dirrm %%PYTHON_SITELIBDIR%%/penguintv
-
-@comment @cwd %%X11BASE%%
-@comment etc/gconf/gconf.xml.defaults/schemas/apps/penguintv/%gconf.xml
-@comment etc/gconf/gconf.xml.defaults/apps/penguintv/%gconf.xml
+@dirrm share/penguintv/pixmaps
+@dirrm share/penguintv