Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing

4 files changed, 135 insertions, 45 deletions

diff --git a/abs/extra/community/chromium/PKGBUILD b/abs/extra/community/chromium/PKGBUILD
index f844692..71e8250 100644
--- a/abs/extra/community/chromium/PKGBUILD
+++ b/abs/extra/community/chromium/PKGBUILD
@@ -5,12 +5,12 @@
 
 pkgname=chromium
 pkgver=9.0.597.94
-pkgrel=1
+pkgrel=2
 pkgdesc='The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser.'
 arch=('i686' 'x86_64')
 url='http://www.chromium.org/'
 license=('BSD')
-depends=('nss' 'gconf' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'bzip2' 'libevent' 'libxss' 'libxtst' 'ttf-dejavu')
+depends=('nss' 'gconf' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'bzip2' 'libevent' 'libxss' 'libxtst' 'ttf-dejavu' 'libcups')
 makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring' 'libcups')
 provides=('chromium-browser')
 conflicts=('chromium-browser')
diff --git a/abs/extra/web-on-tv/PKGBUILD b/abs/extra/web-on-linhes/PKGBUILD
index 7fd7a73..cfa481c 100644
--- a/abs/extra/web-on-tv/PKGBUILD
+++ b/abs/extra/web-on-linhes/PKGBUILD
@@ -1,9 +1,9 @@
 # $Id: PKGBUILD 5936 2008-07-21 20:24:16Z thomas $
 # Maintainer: Cecil Watson<knoppmyth@gmail.com>
 
-pkgname=web-on-tv
+pkgname=web-on-linhes
 pkgver=0.01.0
-pkgrel=4
+pkgrel=14
 pkgdesc="Added multiple websites with 10' UIs to Online Streams."
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/abs/extra/web-on-linhes/web-on-tv.install b/abs/extra/web-on-linhes/web-on-tv.install
new file mode 100644
index 0000000..ca0f643
--- /dev/null
+++ b/abs/extra/web-on-linhes/web-on-tv.install
@@ -0,0 +1,131 @@
+# arg 1:  the new package version
+post_install() {
+  mv /usr/share/mythtv/themes/defaultmenu/is.xml /tmp
+  grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "   <button>" >> /tmp/is.xml.tmp
+  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
+  echo "     <text>Google Spotlight</text>" >> /tmp/is.xml.tmp
+  echo "     <action>EXEC /usr/bin/chromium --no-first-run --kiosk http://www.google.com/tv/spotlight-gallery.html</action>" >> /tmp/is.xml.tmp 
+  echo "   </button>" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "   <button>" >> /tmp/is.xml.tmp
+  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
+  echo "     <text>Blip tv</text>" >> /tmp/is.xml.tmp
+  echo "     <action>EXEC /usr/bin/chromium --no-first-run --kiosk http://blip.tv/?skin=googletv</action>" >> /tmp/is.xml.tmp 
+  echo "   </button>" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "   <button>" >> /tmp/is.xml.tmp
+  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
+  echo "     <text>Chow</text>" >> /tmp/is.xml.tmp
+  echo "     <action>EXEC /usr/bin/chromium --no-first-run --kiosk http://www.chow.com/tv</action>" >> /tmp/is.xml.tmp 
+  echo "   </button>" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "   <button>" >> /tmp/is.xml.tmp
+  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
+  echo "     <text>Clicker TV</text>" >> /tmp/is.xml.tmp
+  echo "     <action>EXEC /usr/bin/chromium --no-first-run --kiosk http://tv.clicker.com/</action>" >> /tmp/is.xml.tmp 
+  echo "   </button>" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "   <button>" >> /tmp/is.xml.tmp
+  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
+  echo "     <text>Crackle</text>" >> /tmp/is.xml.tmp
+  echo "     <action>EXEC /usr/bin/chromium --no-first-run --kiosk http://www.crackle.com/gtv/</action>" >> /tmp/is.xml.tmp 
+  echo "   </button>" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "   <button>" >> /tmp/is.xml.tmp
+  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
+  echo "     <text>Dailymotion</text>" >> /tmp/is.xml.tmp
+  echo "     <action>EXEC /usr/bin/chromium --no-first-run --kiosk http://iptv-app.dailymotion.com/dm-front-googletv/dojoroot/app/pages/webkit/index.jsp?&amp;qlang=us</action>" >> /tmp/is.xml.tmp 
+  echo "   </button>" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "   <button>" >> /tmp/is.xml.tmp
+  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
+  echo "     <text>Flixster</text>" >> /tmp/is.xml.tmp
+  echo "     <action>EXEC /usr/bin/chromium --no-first-run --kiosk http://www.flixster.com/tv/google</action>" >> /tmp/is.xml.tmp 
+  echo "   </button>" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "   <button>" >> /tmp/is.xml.tmp
+  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
+  echo "     <text>Fraboom</text>" >> /tmp/is.xml.tmp
+  echo "     <action>EXEC /usr/bin/chromium --no-first-run --kiosk http://fraboom.com/google/tv/ </action>" >> /tmp/is.xml.tmp 
+  echo "   </button>" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "   <button>" >> /tmp/is.xml.tmp
+  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
+  echo "     <text>KQED</text>" >> /tmp/is.xml.tmp
+  echo "     <action>EXEC /usr/bin/chromium --no-first-run --kiosk http://kqed.tv/</action>" >> /tmp/is.xml.tmp 
+  echo "   </button>" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "   <button>" >> /tmp/is.xml.tmp
+  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
+  echo "     <text>NowMov</text>" >> /tmp/is.xml.tmp
+  echo "     <action>EXEC /usr/bin/chromium --no-first-run --kiosk http://nowmov.com</action>" >> /tmp/is.xml.tmp 
+  echo "   </button>" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "   <button>" >> /tmp/is.xml.tmp
+  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
+  echo "     <text>The Onion</text>" >> /tmp/is.xml.tmp
+  echo "     <action>EXEC /usr/bin/chromium --no-first-run --kiosk http://www.theonion.com/video/googletv/</action>" >> /tmp/is.xml.tmp 
+  echo "   </button>" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "   <button>" >> /tmp/is.xml.tmp
+  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
+  echo "     <text>TuneIn </text>" >> /tmp/is.xml.tmp
+  echo "     <action>EXEC /usr/bin/chromium --no-first-run --kiosk http://tv.tunein.com/</action>" >> /tmp/is.xml.tmp 
+  echo "   </button>" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "   <button>" >> /tmp/is.xml.tmp
+  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
+  echo "     <text>Vimeo</text>" >> /tmp/is.xml.tmp
+  echo "     <action>EXEC /usr/bin/chromium --no-first-run --kiosk http://www.vimeo.com/couchmode</action>" >> /tmp/is.xml.tmp 
+  echo "   </button>" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "   <button>" >> /tmp/is.xml.tmp
+  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
+  echo "     <text>YouTube</text>" >> /tmp/is.xml.tmp
+  echo "     <action>EXEC /usr/bin/chromium --no-first-run --kiosk http://www.youtube.com/leanback</action>" >> /tmp/is.xml.tmp 
+  echo "   </button>" >> /tmp/is.xml.tmp
+  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
+  echo "" >> /tmp/is.xml.tmp
+  echo "</mythmenu>" >> /tmp/is.xml.tmp
+  mv /tmp/is.xml.tmp /usr/share/mythtv/themes/defaultmenu/is.xml
+}
+post_upgrade() {
+  post_remove $1
+  post_install $1	
+}
+post_remove() {
+	mv /usr/share/mythtv/themes/defaultmenu/is.xml /tmp/is.xml.tmp
+	sed -e '/\#WebOn/,/\#WebOn/d' < /tmp/is.xml.tmp > /usr/share/mythtv/themes/defaultmenu/is.xml
+}
+
+op=$1
+shift
+$op $*
diff --git a/abs/extra/web-on-tv/web-on-tv.install b/abs/extra/web-on-tv/web-on-tv.install
deleted file mode 100644
index 9764cff..0000000
--- a/abs/extra/web-on-tv/web-on-tv.install
+++ /dev/null
@@ -1,41 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp
-  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
-  echo "   <button>" >> /tmp/is.xml.tmp
-  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
-  echo "     <text>Google Spotlight</text>" >> /tmp/is.xml.tmp
-  echo "     <action>EXEC /usr/bin/chromium --kiosk http://www.google.com/tv/spotlight-gallery.html</action>" >> /tmp/is.xml.tmp 
-  echo "   </button>" >> /tmp/is.xml.tmp
-  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
-  echo "" >> /tmp/is.xml.tmp
-  echo "</mythmenu>" >> /tmp/is.xml.tmp
-  mv /tmp/is.xml.tmp /usr/share/mythtv/themes/defaultmenu/is.xml
-}
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  mv /usr/share/mythtv/themes/defaultmenu/is.xml /tmp/is.xml.tmp
-  sed -e '/\#WebOn/,/\#WebOn/d' < /tmp/is.xml.tmp > /usr/share/mythtv/themes/defaultmenu/is.xml
-  grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp
-  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
-  echo "   <button>" >> /tmp/is.xml.tmp
-  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
-  echo "     <text>Google Spotlight</text>" >> /tmp/is.xml.tmp
-  echo "     <action>EXEC /usr/bin/chromium --kiosk http://www.google.com/tv/spotlight-gallery.html</action>" >> /tmp/is.xml.tmp 
-  echo "   </button>" >> /tmp/is.xml.tmp
-  echo "<!--#WebOnTV-->" >> /tmp/is.xml.tmp
-  echo "" >> /tmp/is.xml.tmp
-  echo "</mythmenu>" >> /tmp/is.xml.tmp
-  mv /tmp/is.xml.tmp /usr/share/mythtv/themes/defaultmenu/is.xml	
-  }
-
-# arg 1:  the old package version
-post_remove() {
-	mv /usr/share/mythtv/themes/defaultmenu/is.xml /tmp/is.xml.tmp
-	sed -e '/\#WebOn/,/\#WebOn/d' < /tmp/is.xml.tmp > /usr/share/mythtv/themes/defaultmenu/is.xml
-	}
-
-op=$1
-shift
-$op $*