Merge pull request #24 from V3n3RiX/master

fix minor issue with tv-maxe schedule tool, drop old releases

6 files changed, 2 insertions, 180 deletions

diff --git a/media-video/tv-maxe/Manifest b/media-video/tv-maxe/Manifest
index 5ba991cc..db60eb73 100644
--- a/media-video/tv-maxe/Manifest
+++ b/media-video/tv-maxe/Manifest
@@ -1,4 +1,2 @@
-DIST tv-maxe-0.08.tar.gz 1175803 SHA256 ba2dbef7e69a63e55367c42f7479d8ec19a31703b34f403823036395c8a348c7 SHA512 d20ed7f8740d09c45f9bdaa34c77a07ebdd20f4332ab3bb584db9b70384ad2a59834a8ea0b3ebbd3ca850c05cb0c485db513e401b06901852d57206088cbafb9 WHIRLPOOL 616a6de75e4642bf10b5c2f6f33e35dd2bc333e626bfe28461bffac16ab6ddfff1ccc5e03d621e4650fad57dc762d7d3415a26ff1c270f534d33963bf9fbf250
-DIST tv-maxe-0.09.tar.gz 2157775 SHA256 3f580f0801cc2326ed1c367917bea9d1d9d68d86384d85380fda4d3adf391210 SHA512 516feaf829758626d643791c7ab84093ce717c42e9af5d46c5ab0adf032c5c56ccb164bcf5c93d9e89a8fc4de8b4c2f32ea07283c38865c3d71adb291b339d19 WHIRLPOOL e92413d3d0f976683f97c7392f5eda548207eac90868c029a2b07f027c5139a9244cead8891f0f50688bc79314b965a3b9637a7f37b90d2cafade0d0daa0b249
 DIST tv-maxe_0.10-0ubuntu1~trusty.tar.gz 2157761 SHA256 87bf8f4650a91f455f4bd34d7677fbd555a1a8116d117f4e0e6a6d7ff09b3764 SHA512 2aabc8bf87bf3290f577cabcc194c387d4048ea9e682b3a87103db18a0682beda75b37d72ff36d24e8d2ac26d3fd9856837e4fa164f0a7421f296df3e2d6d24d WHIRLPOOL 65e03534f60422977acec72dd792360b5926a7698c4f348403a1361dbc13d3fdbaa305b4d026cd8283947ace5892dc654cb38698cc475917d02467663ae8d877
-DIST tv-maxe_0.11-0ubuntu1~trusty.tar.gz 2159143 SHA256 670918f8709ea285e58564c5c2ff058233272d31fdb643146fde3ba969f5c266 SHA512 ab65d205f6c857ff0088d5ecb40307dd0780d972b83a934a9d6e0c1dee1a4dc89ae5cdcc611633918c0c6bbd831243dbea4b0bac14a458b3d0aaec15f323bfb2 WHIRLPOOL 4b53aa10922b3bf412d0be6c32c55f181a8ae016ef946fbe8ea64816c81104dc3c1c20f29e8f18b1f05aeb06d40430a1273eda0ced47cc758a76fde53d5b1c0c
+DIST tv-maxe_0.11-0ubuntu2~trusty.tar.gz 2159664 SHA256 78c67564ed548a3d901178131f62d50108d32929bb71ca8c2f0ebcf472b1ddb1 SHA512 7579bb55e42def70c7246f5a14b779914f0dfa6d3a730b7cbe71e0d0dc527a72484ff31e5be6abab894fabc185bc2d403a731356527c561d344fcc7486882237 WHIRLPOOL 1300931bcb321c68ee0e03d89103972188f7557d4110436883b79cb6b3a00cb8460dc2739388337de36af7444a2823f0ac932b9f99209d2674b004fe707fa3a2
diff --git a/media-video/tv-maxe/files/tv-maxe-0.09-pillow-support.patch b/media-video/tv-maxe/files/tv-maxe-0.09-pillow-support.patch
deleted file mode 100644
index b1a4acc2..00000000
--- a/media-video/tv-maxe/files/tv-maxe-0.09-pillow-support.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nur tv-maxe-0.09-orig/statusimage.py tv-maxe-0.09/statusimage.py
---- tv-maxe-0.09-orig/statusimage.py	2012-07-03 22:26:03.000000000 +0300
-+++ tv-maxe-0.09/statusimage.py	2013-10-19 14:57:28.089423913 +0300
-@@ -1,4 +1,7 @@
--import gtk, gobject, StringIO, Image, ImageDraw, ImageFont, os, tempfile
-+import gtk, gobject, StringIO, os, tempfile
-+from PIL import Image
-+from PIL import ImageDraw
-+from PIL import ImageFont
- 
- class StatusImage:
- 	def __init__(self):
-diff -Nur tv-maxe-0.09-orig/tvmaxe.py tv-maxe-0.09/tvmaxe.py
---- tv-maxe-0.09-orig/tvmaxe.py	2013-03-24 00:08:17.000000000 +0200
-+++ tv-maxe-0.09/tvmaxe.py	2013-10-19 14:56:46.927938502 +0300
-@@ -31,8 +31,9 @@
- pygtk.require('2.0')
- import gtk
- import subprocess, threading, urllib2, workerpool, random, time, datetime, webbrowser, string, copy
--import irwatch, which, sqlite3, re, json, base64, Image, StringIO
-+import irwatch, which, sqlite3, re, json, base64, StringIO
- import tools, keysim, scheduler, socketserver
-+from PIL import Image
- from settingsManager import settingsManager
- from channel import Channel
- from scheduler import Scheduler
diff --git a/media-video/tv-maxe/tv-maxe-0.08.ebuild b/media-video/tv-maxe/tv-maxe-0.08.ebuild
deleted file mode 100644
index 07b764d9..00000000
--- a/media-video/tv-maxe/tv-maxe-0.08.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="Program to view free channels"
-HOMEPAGE="http://code.google.com/p/tv-maxe"
-SRC_URI="http://tv-maxe.googlecode.com/files/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/imaging
-	media-video/mplayer
-	media-video/vlc
-	virtual/ffmpeg
-	dev-python/python-virtkey
-	dev-python/pygtk
-	dev-lang/python
-	media-tv/sopcast-player
-	media-video/rtmpdump
-	dev-python/sqlite3dbm
-	dev-python/gst-python 
-	media-libs/gst-plugins-good 
-	media-plugins/gst-plugins-meta"
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_prepare() {
-	sed -i "s|python|python2|g" ${S}/${PN}-${PV}/${PN} || die "Cannot sed file"
-}
-
-src_install() {
-	cd "${S}"
-	dodir /usr/share/${PN} || die
-	insinto /usr/share/${PN} || die
-	doins -r "${S}"/${PN}-${PV}/* || die
-	fperms 755 /usr/share/${PN}/${PN} || die "Errors on permission giving"
-	fperms 755 /usr/share/${PN} || die "Errors on permission folder giving"
-	dosym /usr/share/${PN}/${PN} /usr/bin/${PN} || die "Not too many symbolic links"
-	make_desktop_entry tv-maxe TV-maxe \
-		"/usr/share/tv-maxe/tvmaxe_mini.png" \
-		Video
-}
diff --git a/media-video/tv-maxe/tv-maxe-0.09-r1.ebuild b/media-video/tv-maxe/tv-maxe-0.09-r1.ebuild
deleted file mode 100644
index a5ea248e..00000000
--- a/media-video/tv-maxe/tv-maxe-0.09-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="Program to view free channels"
-HOMEPAGE="http://code.google.com/p/tv-maxe"
-SRC_URI="http://tv-maxe.googlecode.com/files/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+sqlite"
-
-DEPEND="dev-lang/python[sqlite]"
-RDEPEND="dev-python/pillow
-	media-video/mplayer2
-	media-video/vlc
-	virtual/ffmpeg
-	dev-python/python-virtkey
-	dev-python/pygtk
-	dev-lang/python[sqlite]
-	media-tv/sp-auth
-	media-video/rtmpdump
-	dev-python/gst-python 
-	media-libs/gst-plugins-good 
-	media-plugins/gst-plugins-meta"
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_prepare() {
-	sed -i "s|python|python2|g" ${S}/${PN}-${PV}/${PN} || die "Cannot sed file"
-	epatch -p0 "${FILESDIR}/tv-maxe-0.09-pillow-support.patch"
-}
-
-src_install() {
-	cd "${S}"
-	dodir /usr/share/${PN} || die
-	insinto /usr/share/${PN} || die
-	doins -r "${S}"/${PN}-${PV}/* || die
-	fperms 755 /usr/share/${PN}/${PN} || die "Errors on permission giving"
-	fperms 755 /usr/share/${PN} || die "Errors on permission folder giving"
-	dosym /usr/share/${PN}/${PN} /usr/bin/${PN} || die "Not too many symbolic links"
-	make_desktop_entry tv-maxe TV-maxe \
-		"/usr/share/tv-maxe/tvmaxe_mini.png" \
-		Video
-}
diff --git a/media-video/tv-maxe/tv-maxe-0.09.ebuild b/media-video/tv-maxe/tv-maxe-0.09.ebuild
deleted file mode 100644
index e05037bf..00000000
--- a/media-video/tv-maxe/tv-maxe-0.09.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="Program to view free channels"
-HOMEPAGE="http://code.google.com/p/tv-maxe"
-SRC_URI="http://tv-maxe.googlecode.com/files/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+sqlite"
-
-DEPEND="dev-lang/python[sqlite]"
-RDEPEND="dev-python/imaging
-	media-video/mplayer2
-	media-video/vlc
-	virtual/ffmpeg
-	dev-python/python-virtkey
-	dev-python/pygtk
-	dev-lang/python[sqlite]
-	media-tv/sp-auth
-	media-video/rtmpdump
-	dev-python/gst-python 
-	media-libs/gst-plugins-good 
-	media-plugins/gst-plugins-meta"
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_prepare() {
-	sed -i "s|python|python2|g" ${S}/${PN}-${PV}/${PN} || die "Cannot sed file"
-}
-
-src_install() {
-	cd "${S}"
-	dodir /usr/share/${PN} || die
-	insinto /usr/share/${PN} || die
-	doins -r "${S}"/${PN}-${PV}/* || die
-	fperms 755 /usr/share/${PN}/${PN} || die "Errors on permission giving"
-	fperms 755 /usr/share/${PN} || die "Errors on permission folder giving"
-	dosym /usr/share/${PN}/${PN} /usr/bin/${PN} || die "Not too many symbolic links"
-	make_desktop_entry tv-maxe TV-maxe \
-		"/usr/share/tv-maxe/tvmaxe_mini.png" \
-		Video
-}
diff --git a/media-video/tv-maxe/tv-maxe-0.11.ebuild b/media-video/tv-maxe/tv-maxe-0.11-r1.ebuild
index 528ff019..1ea7aa5e 100644
--- a/media-video/tv-maxe/tv-maxe-0.11.ebuild
+++ b/media-video/tv-maxe/tv-maxe-0.11-r1.ebuild
@@ -8,7 +8,7 @@ inherit eutils
 
 DESCRIPTION="Program to view free channels"
 HOMEPAGE="http://code.google.com/p/tv-maxe"
-SRC_URI="https://launchpad.net/~venerix/+archive/ubuntu/pkg/+files/${PN}_${PV}-0ubuntu1~trusty.tar.gz"
+SRC_URI="https://launchpad.net/~venerix/+archive/ubuntu/pkg/+files/${PN}_${PV}-0ubuntu2~trusty.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"