From c76221ba1d158462f18e48be788bb5758754b58a Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Thu, 2 Dec 2010 23:57:08 +0000
Subject: agg: initial include as dep for gnash

---
 abs/extra/community/agg/PKGBUILD                | 34 ++++++++++++++++++
 abs/extra/community/agg/agg-2.4-depends.patch   | 48 +++++++++++++++++++++++++
 abs/extra/community/agg/agg-2.5-pkgconfig.patch | 10 ++++++
 3 files changed, 92 insertions(+)
 create mode 100644 abs/extra/community/agg/PKGBUILD
 create mode 100644 abs/extra/community/agg/agg-2.4-depends.patch
 create mode 100644 abs/extra/community/agg/agg-2.5-pkgconfig.patch

diff --git a/abs/extra/community/agg/PKGBUILD b/abs/extra/community/agg/PKGBUILD
new file mode 100644
index 0000000..b0d6d40
--- /dev/null
+++ b/abs/extra/community/agg/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 49798 2009-08-16 14:04:06Z jgc $
+# Maintainer:
+
+pkgname=agg
+pkgver=2.5
+pkgrel=3
+pkgdesc="A High Quality Rendering Engine for C++"
+arch=('i686' 'x86_64')
+url="http://www.antigrain.com/"
+license=('GPL')
+depends=('gcc-libs>=4.4.1' 'sdl>=1.2.13' 'freetype2>=2.3.9')
+makedepends=('automake')
+provides=('antigrain')
+replaces=('antigrain')
+options=('!libtool' '!makeflags')
+source=(http://www.antigrain.com/${pkgname}-${pkgver}.tar.gz
+        agg-2.4-depends.patch
+        agg-2.5-pkgconfig.patch)
+md5sums=('0229a488bc47be10a2fee6cf0b2febd6'
+         '22f8e48c137d25038181c86d5e40b110'
+         '43a19a7b1564c591e56c8d09a0fd8da5')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/agg-2.4-depends.patch" || return 1
+  patch -Np1 -i "${srcdir}/agg-2.5-pkgconfig.patch" || return 1
+  sh ./autogen.sh || return 1
+  ./configure --prefix=/usr --disable-static || return 1
+  make || return 1
+}
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install || return 1
+}
diff --git a/abs/extra/community/agg/agg-2.4-depends.patch b/abs/extra/community/agg/agg-2.4-depends.patch
new file mode 100644
index 0000000..9d4f6e3
--- /dev/null
+++ b/abs/extra/community/agg/agg-2.4-depends.patch
@@ -0,0 +1,48 @@
+--- agg-2.4.orig/font_freetype/Makefile.am	2005-10-18 11:45:40.000000000 +0100
++++ agg-2.4/font_freetype/Makefile.am	2006-07-10 15:11:55.000000000 +0100
+@@ -4,8 +4,9 @@
+ agginclude_HEADERS = agg_font_freetype.h
+ lib_LTLIBRARIES = libaggfontfreetype.la
+ 
+-libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @FREETYPE_LIBS@ 
++libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@
+ libaggfontfreetype_la_SOURCES = agg_font_freetype.cpp
+ libaggfontfreetype_la_CXXFLAGS = -I$(top_srcdir)/include @FREETYPE_CFLAGS@ 
++libaggfontfreetype_la_LIBADD = ../src/libagg.la @FREETYPE_LIBS@
+ endif
+ 
+--- agg-2.4.orig/src/platform/sdl/Makefile.am	2005-10-17 23:49:35.000000000 +0100
++++ agg-2.4/src/platform/sdl/Makefile.am	2006-07-10 15:11:55.000000000 +0100
+@@ -5,6 +5,6 @@
+ libaggplatformsdl_la_LDFLAGS = -version-info @AGG_LIB_VERSION@
+ libaggplatformsdl_la_SOURCES = agg_platform_support.cpp
+ libaggplatformsdl_la_CXXFLAGS = -I$(top_srcdir)/include @SDL_CFLAGS@
+-libaggplatformsdl_la_LIBADD = @SDL_LIBS@
++libaggplatformsdl_la_LIBADD = ../../libagg.la @SDL_LIBS@
+ endif
+ 
+--- agg-2.5.orig/configure.in	2006-10-09 05:06:36.000000000 +0100
++++ agg-2.5/configure.in	2007-01-07 14:07:39.000000000 +0000
+@@ -122,7 +122,8 @@
+ fi
+ AM_CONDITIONAL(ENABLE_X11,[test x$no_x = x -a xno != x$enable_platform -a x$win32_host != xyes])
+ AC_SUBST(x_includes)
+-AC_SUBST(x_libraries)
++test -n "$x_libraries" && X_LDFLAGS="-L$x_libraries"
++AC_SUBST(X_LDFLAGS)
+ dnl ###############################################
+ 
+ dnl Settung up library version
+--- agg-2.5.orig/src/platform/X11/Makefile.am	2006-12-11 00:59:45.000000000 +0000
++++ agg-2.5/src/platform/X11/Makefile.am	2007-01-07 14:07:39.000000000 +0000
+@@ -1,8 +1,8 @@
+ if ENABLE_X11
+ lib_LTLIBRARIES = libaggplatformX11.la
+ 
+-libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@  -L@x_libraries@
++libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @X_LDFLAGS@
+ libaggplatformX11_la_SOURCES = agg_platform_support.cpp
+ libaggplatformX11_la_CXXFLAGS =  -I$(top_srcdir)/include -I@x_includes@
+-libaggplatformX11_la_LIBADD = -lX11
++libaggplatformX11_la_LIBADD = ../../libagg.la -lX11
+ endif
diff --git a/abs/extra/community/agg/agg-2.5-pkgconfig.patch b/abs/extra/community/agg/agg-2.5-pkgconfig.patch
new file mode 100644
index 0000000..a303bfb
--- /dev/null
+++ b/abs/extra/community/agg/agg-2.5-pkgconfig.patch
@@ -0,0 +1,10 @@
+--- agg-2.5/libagg.pc.in.orig	2007-01-07 13:58:28.000000000 +0000
++++ agg-2.5/libagg.pc.in	2007-01-07 14:02:40.000000000 +0000
+@@ -6,5 +6,6 @@
+ Name: libagg
+ Description: Anti Grain Geometry - A High Quality Rendering Engine for C++
+ Version: @VERSION@
+-Libs: -L${libdir} -Wl,-rpath,${exec_prefix}/lib -lagg
++Requires.private: freetype2
++Libs: -L${libdir} -lagg
+ Cflags: -I${includedir}
-- 
cgit v0.12


From 62806a62a4ca74e49948c3b8c070a4a8e61d72f2 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Thu, 2 Dec 2010 23:57:28 +0000
Subject: gnash: upgrade

---
 abs/extra/community/gnash/PKGBUILD | 59 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 abs/extra/community/gnash/PKGBUILD

diff --git a/abs/extra/community/gnash/PKGBUILD b/abs/extra/community/gnash/PKGBUILD
new file mode 100644
index 0000000..daed440
--- /dev/null
+++ b/abs/extra/community/gnash/PKGBUILD
@@ -0,0 +1,59 @@
+# $Id: PKGBUILD 82896 2010-06-18 18:30:20Z ibiru $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+
+pkgbase=gnash
+pkgname=(gnash-common gnash-gtk)
+pkgver=0.8.8
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/gnash/"
+license=(GPL3)
+makedepends=(curl giflib boost-libs libldap sdl agg libjpeg libpng libtool
+             speex fontconfig libva ffmpeg libxinerama
+             gstreamer0.10-base gstreamer0.10-ffmpeg
+             gtk2 libldap
+             pkgconfig boost)
+options=(!libtool !emptydirs)
+source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2)
+md5sums=('ce57f66e222f7eb1adf7f7b4a1274612')
+
+build() {
+  cd "$srcdir/gnash-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-plugins-install=system \
+    --with-npapi-plugindir=/usr/lib/mozilla/plugins \
+    --enable-gui=sdl,gtk \
+    --enable-renderer=agg \
+    --enable-media=gst,ffmpeg \
+    --enable-hwaccel=vaapi
+
+  make
+}
+
+package_gnash-common() {
+  pkgdesc="A GNU Flash movie player"
+  depends=(curl giflib boost-libs libldap ffmpeg sdl agg libjpeg libpng
+           speex fontconfig libva libxinerama
+           gstreamer0.10-base gstreamer0.10-ffmpeg)
+  backup=(etc/gnashrc etc/gnashpluginrc)
+
+  cd "$srcdir/gnash-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  mv "$pkgdir/usr/bin/gtk-gnash" "$srcdir"
+}
+
+package_gnash-gtk() {
+  pkgdesc="A GNU Flash movie player"
+  depends=("gnash-common=$pkgver" gtk2 libldap)
+
+  cd "$srcdir/gnash-$pkgver"
+
+  make DESTDIR="$pkgdir" install-plugin
+
+  install -D "$srcdir/gtk-gnash" "$pkgdir/usr/bin/gtk-gnash"
+}
-- 
cgit v0.12


From 4266b3d27baad265d0c4821b4bc614b7973aaa8f Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Thu, 2 Dec 2010 23:57:48 +0000
Subject: gstreamer0.10: upgrade

---
 abs/extra/community/gstreamer0.10/PKGBUILD | 32 +++++++++++++++---------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/abs/extra/community/gstreamer0.10/PKGBUILD b/abs/extra/community/gstreamer0.10/PKGBUILD
index 52934e2..0a52614 100644
--- a/abs/extra/community/gstreamer0.10/PKGBUILD
+++ b/abs/extra/community/gstreamer0.10/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 18833 2008-11-09 14:51:01Z jgc $
+# $Id: PKGBUILD 87764 2010-08-18 09:05:27Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gstreamer0.10
-pkgver=0.10.21
-pkgrel=2
+pkgver=0.10.30
+pkgrel=1
 pkgdesc="GStreamer Multimedia Framework"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://gstreamer.freedesktop.org/"
-depends=('libxml2>=2.6.32' 'glib2>=2.18.1')
-makedepends=('perlxml' 'pkgconfig' 'gtk-doc')
+depends=('libxml2>=2.7.7' 'glib2>=2.24.1')
+makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
 options=('!libtool')
-source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.bz2
-	bgo555631.patch)
-md5sums=('7bad90af3fd81a1535363cf85359125c'
-         '71eb301845184638e6556dacd1ca7d55')
+source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.bz2)
+sha256sums=('e8ef301be423797ff36a0bb3615930b112b4175634051d19fd655e0ed974532a')
 
 build() {
   cd "${srcdir}/gstreamer-${pkgver}"
-  patch -Np0 -i "${srcdir}/bgo555631.patch" || return 1
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc --localstatedir=/var \
-	--disable-docs-build || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
+    --with-package-name="GStreamer (Archlinux)" \
+    --with-package-origin="http://www.archlinux.org/"
+  make
+}
+package() {
+  cd "${srcdir}/gstreamer-${pkgver}"
+  make DESTDIR="${pkgdir}" install
   cd "${pkgdir}/usr/bin"
 
   #Remove unversioned gst-* binaries to get rid of conflicts
-- 
cgit v0.12


From 5d36e96f625459fc16fbb24d525547e4dcdd429d Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Thu, 2 Dec 2010 23:58:04 +0000
Subject: gstreamer0.10-base: upgrade

---
 abs/extra/community/gstreamer0.10-base/PKGBUILD | 50 +++++++++++++++++--------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/abs/extra/community/gstreamer0.10-base/PKGBUILD b/abs/extra/community/gstreamer0.10-base/PKGBUILD
index b1b065d..8b115a1 100644
--- a/abs/extra/community/gstreamer0.10-base/PKGBUILD
+++ b/abs/extra/community/gstreamer0.10-base/PKGBUILD
@@ -1,28 +1,46 @@
-# $Id: PKGBUILD 14433 2008-10-06 17:33:22Z jgc $
+# $Id: PKGBUILD 87769 2010-08-18 09:20:05Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-pkgname=gstreamer0.10-base
-pkgver=0.10.21
+pkgbase=('gstreamer0.10-base')
+pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins')
+pkgver=0.10.30
 pkgrel=1
-pkgdesc="GStreamer Multimedia Framework Base plugin libraries"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('gstreamer0.10>=0.10.21' 'liboil>=0.3.15' 'libsm' 'libxv')
-makedepends=('pkgconfig')
-options=(!libtool)
+arch=('i686' 'x86_64')
+license=('LGPL')
+makedepends=('pkgconfig' 'gstreamer0.10>=0.10.30' 'orc>=0.4.6' 'libsm>=1.1.1' 'libxv>=1.0.5' 'alsa-lib>=1.0.23' 'cdparanoia>=10.2' 'libvisual>=0.4.0' 'libvorbis>=1.3.1' 'libtheora>=1.1.1' 'pango>=1.28.1' 'udev>=151' 'gobject-introspection')
+options=(!libtool !emptydirs)
 url="http://gstreamer.freedesktop.org/"
-_relname=gst-plugins-base
-source=(${url}/src/${_relname}/${_relname}-${pkgver}.tar.bz2)
-md5sums=('0e0cd485311502ad1c0c028148e3186a')
+source=(${url}/src/gst-plugins-base/gst-plugins-base-${pkgver}.tar.bz2)
+sha256sums=('63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7')
 
 build() {
-  cd ${startdir}/src/${_relname}-${pkgver}
+  cd "${srcdir}/gst-plugins-base-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental --disable-external \
-    --disable-docs-build --disable-plugin-docs \
+    --disable-static --enable-experimental --disable-gnome_vfs \
     --with-package-name="GStreamer Base Plugins (Archlinux)" \
     --with-package-origin="http://www.archlinux.org/" || return 1
 
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile || return 1
+}
+
+package_gstreamer0.10-base() {
+  pkgdesc="GStreamer Multimedia Framework Base plugin libraries"
+  depends=('gstreamer0.10>=0.10.30' 'orc>=0.4.6' 'libsm>=1.1.1' 'libxv>=1.0.5' 'udev>=151')
+
+  cd "${srcdir}/gst-plugins-base-${pkgver}"
+  make DESTDIR="${pkgdir}" install || return 1
+}
+
+package_gstreamer0.10-base-plugins() {
+  pkgdesc="GStreamer Multimedia Framework Base Plugins (gst-plugins-base)"
+  depends=("gstreamer0.10-base=${pkgver}" 'alsa-lib>=1.0.23' 'cdparanoia>=10.2' 'libvisual>=0.4.0' 'libvorbis>=1.3.1' 'libtheora>=1.1.1' 'pango>=1.28.1')
+  replaces=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-ogg')
+  conflicts=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-ogg')
+  groups=('gstreamer0.10-plugins')
+
+  cd "${srcdir}/gst-plugins-base-${pkgver}"
+  make -C gst-libs DESTDIR="${pkgdir}" install || return 1
+  make -C ext DESTDIR="${pkgdir}" install || return 1
+  make -C gst-libs DESTDIR="${pkgdir}" uninstall || return 1
 }
-- 
cgit v0.12


From e509c70e498901466c0bfba06e114b77838a5ca3 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Thu, 2 Dec 2010 23:58:20 +0000
Subject: gstreamer0.10-ffmpeg: upgrade

---
 abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD | 28 +++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD

diff --git a/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD b/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD
new file mode 100644
index 0000000..7922430
--- /dev/null
+++ b/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 72240 2010-03-13 20:27:01Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gstreamer0.10-ffmpeg
+pkgver=0.10.10
+pkgrel=1
+pkgdesc="Gstreamer FFMpeg Plugin"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gstreamer0.10-base>=0.10.30' 'bzip2')
+makedepends=('pkgconfig')
+url="http://www.gstreamer.net"
+groups=('gstreamer0.10-plugins')
+source=(http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-${pkgver}.tar.bz2)
+sha256sums=('697114483444a0a469028857a1d58145c99e6f5d2cd7edd8cb04cdc3fc72ad94')
+
+build() {
+  cd "${srcdir}/gst-ffmpeg-${pkgver}"
+  unset CFLAGS
+  unset CXXFLAGS
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
+  make || return 1
+}
+package() {
+  cd "${srcdir}/gst-ffmpeg-${pkgver}"
+  make DESTDIR="${pkgdir}" install || return 1
+  rm -f ${pkgdir}/usr/lib/gstreamer-0.10/*.{l,}a
+}
-- 
cgit v0.12


From 116d03af8c83524c31ad0213113cfa4091dbadfc Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Thu, 2 Dec 2010 23:59:48 +0000
Subject: Housekeeping

---
 abs/core/freetype2-static/bytecode.patch           |  29 ---------------
 .../freetype-2.2.1-memcpy-fix.patch                |  14 --------
 abs/extra/community/gnash-common/PKGBUILD          |  40 ---------------------
 abs/extra/community/gnash-gtk/PKGBUILD             |  40 ---------------------
 abs/extra/qscintilla/ChangeLog                     |  13 -------
 abs/extra/wireshark/wireshark.desktop              |  10 ------
 abs/extra/wireshark/wireshark.png                  | Bin 18535 -> 0 bytes
 7 files changed, 146 deletions(-)
 delete mode 100644 abs/core/freetype2-static/bytecode.patch
 delete mode 100644 abs/core/freetype2-static/freetype-2.2.1-memcpy-fix.patch
 delete mode 100644 abs/extra/community/gnash-common/PKGBUILD
 delete mode 100644 abs/extra/community/gnash-gtk/PKGBUILD
 delete mode 100644 abs/extra/qscintilla/ChangeLog
 delete mode 100644 abs/extra/wireshark/wireshark.desktop
 delete mode 100644 abs/extra/wireshark/wireshark.png

diff --git a/abs/core/freetype2-static/bytecode.patch b/abs/core/freetype2-static/bytecode.patch
deleted file mode 100644
index dd901ad..0000000
--- a/abs/core/freetype2-static/bytecode.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- include/freetype/config/ftoption.h.old	2006-05-12 02:05:49.000000000 +0800
-+++ include/freetype/config/ftoption.h	2006-10-02 01:22:50.000000000 +0800
-@@ -436,7 +436,7 @@
-   /*   Do not #undef this macro here, since the build system might         */
-   /*   define it for certain configurations only.                          */
-   /*                                                                       */
--/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
-+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
- 
- 
-   /*************************************************************************/
-@@ -448,7 +448,7 @@
-   /* FT_PARAM_TAG_UNPATENTED_HINTING; or when the debug hook               */
-   /* FT_DEBUG_HOOK_UNPATENTED_HINTING is globally activated.               */
-   /*                                                                       */
--#define TT_CONFIG_OPTION_UNPATENTED_HINTING
-+#undef TT_CONFIG_OPTION_UNPATENTED_HINTING
- 
- 
-   /*************************************************************************/
-@@ -480,7 +480,7 @@
-   /*   http://partners.adobe.com/asn/developer/opentype/glyf.html          */
-   /*   http://fonts.apple.com/TTRefMan/RM06/Chap6glyf.html                 */
-   /*                                                                       */
--#undef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED
-+#define TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED
- 
- 
-   /*************************************************************************/
diff --git a/abs/core/freetype2-static/freetype-2.2.1-memcpy-fix.patch b/abs/core/freetype2-static/freetype-2.2.1-memcpy-fix.patch
deleted file mode 100644
index 67a1c07..0000000
--- a/abs/core/freetype2-static/freetype-2.2.1-memcpy-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- freetype-2.2.1/src/psaux/psobjs.c~	2006-04-26 16:38:17.000000000 +0200
-+++ freetype-2.2.1/src/psaux/psobjs.c	2006-09-10 15:01:13.000000000 +0200
-@@ -165,6 +165,11 @@
-       return PSaux_Err_Invalid_Argument;
-     }
- 
-+    if ( length < 0 ) {
-+      FT_ERROR(( "ps_table_add: invalid length\n" ));
-+      return PSaux_Err_Invalid_Argument;
-+    }
-+
-     /* grow the base block if needed */
-     if ( table->cursor + length > table->capacity )
-     {
diff --git a/abs/extra/community/gnash-common/PKGBUILD b/abs/extra/community/gnash-common/PKGBUILD
deleted file mode 100644
index 107afb8..0000000
--- a/abs/extra/community/gnash-common/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 17544 2008-10-30 22:40:52Z pierre $
-
-pkgname=gnash-common
-pkgver=0.8.4
-pkgrel=1
-pkgdesc='A GNU Flash movie player'
-arch=('i686' 'x86_64')
-url='http://www.gnu.org/software/gnash/'
-license=('GPL3')
-depends=('curl' 'giflib' 'boost' 'libldap' 'gstreamer0.10-base' 'sdl' 'libgl'
-         'libjpeg' 'libpng' 'mesa')
-makedepends=('pkgconfig')
-source=("http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2")
-options=('!libtool' '!emptydirs' '!docs')
-provides=('gnash')
-replaces=('gnash')
-md5sums=('b47a7ed4b7c66b8c2ebacc2286ef0d4b')
-
-build() {
-	cd $srcdir/gnash-$pkgver
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-plugins \
-		--disable-menus \
-		--enable-gui=sdl \
-		--enable-renderer=ogl \
-		--enable-z \
-		--enable-jpeg \
-		--enable-libpng \
-		--enable-gif \
-		--enable-fontconfig \
-		--enable-Xft \
-		--enable-expat \
-		--enable-gstreamer \
-		--enable-media=gst || return 1
-
-	make || return 1
-	make DESTDIR=$pkgdir install || return 1
-}
diff --git a/abs/extra/community/gnash-gtk/PKGBUILD b/abs/extra/community/gnash-gtk/PKGBUILD
deleted file mode 100644
index 45ba804..0000000
--- a/abs/extra/community/gnash-gtk/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 17609 2008-10-31 06:16:21Z pierre $
-
-pkgname=gnash-gtk
-pkgver=0.8.4
-pkgrel=1
-pkgdesc='A GNU Flash movie player (gtk)'
-arch=('i686' 'x86_64')
-url='http://www.gnu.org/software/gnash/'
-license=("GPL3")
-depends=("gnash-common=$pkgver" 'gtk2' 'gtkglext')
-makedepends=('pkgconfig')
-source=("http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2")
-options=('!libtool' '!emptydirs' '!docs')
-md5sums=('b47a7ed4b7c66b8c2ebacc2286ef0d4b')
-
-build() {
-	cd $srcdir/gnash-$pkgver
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--enable-gui=gtk \
-		--with-plugins-install=system \
-		--with-npapi-plugindir=/usr/lib/mozilla/plugins \
-		--enable-renderer=ogl \
-		--enable-z \
-		--enable-jpeg \
-		--enable-libpng \
-		--enable-gif \
-		--enable-fontconfig \
-		--enable-Xft \
-		--enable-expat \
-		--enable-gstreamer \
-		--enable-media=gst || return 1
-
-	make || return 1
-	make DESTDIR=$pkgdir install install-plugin || return 1
-	rm -rf $pkgdir/usr/{lib/gnash,share}
-	rm -f $pkgdir/usr/bin/{gnash,gprocessor,dumpshm,soldumper,flvdumper}
-	rm -rf $pkgdir/etc
-}
diff --git a/abs/extra/qscintilla/ChangeLog b/abs/extra/qscintilla/ChangeLog
deleted file mode 100644
index 8e78889..0000000
--- a/abs/extra/qscintilla/ChangeLog
+++ /dev/null
@@ -1,13 +0,0 @@
-
-2008-11-22  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 2.3.2
-
-2008-10-15  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 2.3
-
-2008-07-06  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 2.2
-
diff --git a/abs/extra/wireshark/wireshark.desktop b/abs/extra/wireshark/wireshark.desktop
deleted file mode 100644
index f4317f6..0000000
--- a/abs/extra/wireshark/wireshark.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-GenericName=Wireshark
-Comment=Network protocol analyzer
-Name=wireshark
-Exec=wireshark
-Icon=/usr/share/icons/wireshark.png
-Type=Application
-Terminal=false
-Categories=Application;Network;
diff --git a/abs/extra/wireshark/wireshark.png b/abs/extra/wireshark/wireshark.png
deleted file mode 100644
index 4e40263..0000000
Binary files a/abs/extra/wireshark/wireshark.png and /dev/null differ
-- 
cgit v0.12


From 8bcd3604981cb7f65cd1732bbee9160df7fa65db Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 00:00:32 +0000
Subject: Housekeeping: Missed a file

---
 abs/extra/community/gstreamer0.10/bgo555631.patch | 88 -----------------------
 1 file changed, 88 deletions(-)
 delete mode 100644 abs/extra/community/gstreamer0.10/bgo555631.patch

diff --git a/abs/extra/community/gstreamer0.10/bgo555631.patch b/abs/extra/community/gstreamer0.10/bgo555631.patch
deleted file mode 100644
index b9a18f4..0000000
--- a/abs/extra/community/gstreamer0.10/bgo555631.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- libs/gst/base/gstbasetransform.c	2008/10/20 13:29:06	1.126
-+++ libs/gst/base/gstbasetransform.c	2008/10/21 16:30:41	1.127
-@@ -251,7 +251,7 @@
-   /* upstream caps and size suggestions */
-   GstCaps *sink_suggest;
-   guint size_suggest;
--  gint suggest_pending;
-+  gboolean suggest_pending;
- 
-   gboolean reconfigure;
- };
-@@ -1224,7 +1224,7 @@
-             gst_caps_unref (priv->sink_suggest);
-           priv->sink_suggest = gst_caps_ref (othercaps);
-           priv->size_suggest = size_suggest;
--          g_atomic_int_set (&trans->priv->suggest_pending, 1);
-+          trans->priv->suggest_pending = TRUE;
-           GST_OBJECT_UNLOCK (trans->sinkpad);
-         }
-         gst_caps_unref (othercaps);
-@@ -1366,7 +1366,7 @@
-   GstBaseTransform *trans;
-   GstBaseTransformPrivate *priv;
-   GstFlowReturn res;
--  gboolean proxy, suggest;
-+  gboolean proxy, suggest, same_caps;
-   GstCaps *sink_suggest;
-   guint size_suggest;
- 
-@@ -1384,8 +1384,12 @@
- 
-   /* we remember our previous alloc request to quickly see if we can proxy or
-    * not. We skip this check if we have a pending suggestion. */
--  if (g_atomic_int_get (&priv->suggest_pending) == 0 && caps &&
--      gst_caps_is_equal (priv->sink_alloc, caps)) {
-+  GST_OBJECT_LOCK (pad);
-+  same_caps = !priv->suggest_pending && caps &&
-+      gst_caps_is_equal (priv->sink_alloc, caps);
-+  GST_OBJECT_UNLOCK (pad);
-+
-+  if (same_caps) {
-     /* we have seen this before, see below if we need to proxy */
-     GST_DEBUG_OBJECT (trans, "have old caps");
-     sink_suggest = caps;
-@@ -1414,7 +1418,7 @@
-       size_suggest = size;
-       suggest = FALSE;
-     }
--    g_atomic_int_set (&priv->suggest_pending, 0);
-+    priv->suggest_pending = FALSE;
-     GST_OBJECT_UNLOCK (pad);
- 
-     /* check if we actually handle this format on the sinkpad */
-@@ -1462,7 +1466,10 @@
-     }
-   }
-   /* remember the new caps */
-+  GST_OBJECT_LOCK (pad);
-   gst_caps_replace (&priv->sink_alloc, sink_suggest);
-+  GST_OBJECT_UNLOCK (pad);
-+
-   proxy = priv->proxy_alloc;
-   GST_DEBUG_OBJECT (trans, "doing default alloc, proxy %d", proxy);
- 
-@@ -1487,11 +1494,13 @@
-     if (!gst_caps_is_equal (newcaps, caps)) {
-       GST_DEBUG_OBJECT (trans, "caps are new");
-       /* we have new caps, see if we can proxy downstream */
--      if (gst_pad_peer_accept_caps (trans->sinkpad, newcaps)) {
-+      if (gst_pad_peer_accept_caps (pad, newcaps)) {
-         /* peer accepts the caps, return a buffer in this format */
-         GST_DEBUG_OBJECT (trans, "peer accepted new caps");
-         /* remember the format */
-+        GST_OBJECT_LOCK (pad);
-         gst_caps_replace (&priv->sink_alloc, newcaps);
-+        GST_OBJECT_UNLOCK (pad);
-       } else {
-         GST_DEBUG_OBJECT (trans, "peer did not accept new caps");
-         /* peer does not accept the caps, free the buffer we received and
-@@ -2306,7 +2315,7 @@
-     caps = gst_caps_copy (caps);
-   trans->priv->sink_suggest = caps;
-   trans->priv->size_suggest = size;
--  g_atomic_int_set (&trans->priv->suggest_pending, 1);
-+  trans->priv->suggest_pending = TRUE;
-   GST_DEBUG_OBJECT (trans, "new suggest %" GST_PTR_FORMAT, caps);
-   GST_OBJECT_UNLOCK (trans->sinkpad);
- }
-- 
cgit v0.12


From a553921fb7ca90057f6930276ba509656f5c9ff8 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 00:52:44 +0000
Subject: lcdproc: recompile

---
 abs/extra/lcdproc/PKGBUILD | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/abs/extra/lcdproc/PKGBUILD b/abs/extra/lcdproc/PKGBUILD
index e5cc719..03b4333 100644
--- a/abs/extra/lcdproc/PKGBUILD
+++ b/abs/extra/lcdproc/PKGBUILD
@@ -1,25 +1,27 @@
 # Contributor: Bernhard Walle <bernhard.walle@gmx.de>
 pkgname=lcdproc
 pkgver=0.5.3
-pkgrel=3
+pkgrel=4
 pkgdesc="LCDproc is a utility to drive one or more LCD (and LCD-like) devices attached to a host."
 url="http://lcdproc.omnipotent.net/"
 license="GPL"
 depends=(libusb serdisplib libftdi autoconf automake lirc libnxml libmrss pkgconfig xosd)
 backup=(etc/LCDd.conf)
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 install=lcdproc.install
 source=(http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
-        lcdproc-add-serdisplib
-        )
+        lcdproc-add-serdisplib)
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
 #  patch -p1 < ../lcdproc-add-serdisplib
   autoreconf
   ./configure --prefix=/usr --sysconfdir=/etc --enable-libusb --enable-lcdproc-menus --enable-stat-smbfs --enable-drivers=all
   make
-  make DESTDIR=$startdir/pkg install
+}
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
   sed -e "s/server\/drivers\//\/usr\/lib\/lcdproc\//g" LCDd.conf > $pkgdir/etc/LCDd.conf
 }
 md5sums=('fe9a7c9d8f2c5e76250ce2ea8f644921'
-- 
cgit v0.12


From baaddb9bc1f31f42d8ee74118a9ff3607c464ca1 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 00:53:27 +0000
Subject: pearlog: upgrade

---
 abs/extra/community/pearlog/PKGBUILD | 40 +++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/abs/extra/community/pearlog/PKGBUILD b/abs/extra/community/pearlog/PKGBUILD
index 5bc4ccc..31ad2b3 100755
--- a/abs/extra/community/pearlog/PKGBUILD
+++ b/abs/extra/community/pearlog/PKGBUILD
@@ -1,25 +1,27 @@
-arch=('i686')
-pkgname=PearLog
-pkgver=1.12.0
+pkgname=pearlog
+pkgver=1.12.3
 pkgrel=1
-_kernver=2.6.28-LinHES
 pkgdesc="Pear Logging Framework"
+arch=('i686')
 url="http://pear.php.net/"
-license=('GPL-2')
-source=('http://download.pear.php.net/package/Log-1.12.0.tgz')
-#install=('')
+license=('GPL2')
+replaces=('PearLog')
+source=(http://download.pear.php.net/package/Log-${pkgver}.tgz)
 
 build() {
-	mkdir -p $startdir/pkg/usr/share/pear/
-	cp -r $startdir/src/Log-$pkgver/Log* $startdir/pkg/usr/share/pear/
-	mkdir -p $startdir/pkg/usr/share/pear/docs/Log
-	cp -r $startdir/src/Log-$pkgver/docs/* $startdir/pkg/usr/share/pear/docs/Log/
-	mkdir -p $startdir/pkg/usr/share/pear/examples/Log
-	cp -r $startdir/src/Log-$pkgver/examples/* $startdir/pkg/usr/share/pear/examples/Log/
-	mkdir -p $startdir/pkg/usr/share/pear/misc/Log
-	cp -r $startdir/src/Log-$pkgver/misc/* $startdir/pkg/usr/share/pear/misc/Log/
-	mkdir -p $startdir/pkg/usr/share/pear/tests/Log
-	cp -r $startdir/src/Log-$pkgver/tests/* $startdir/pkg/usr/share/pear/tests/Log/
-	}
+        /bin/true
+}
 
-md5sums=('7fe68920afc4b122cb15aba40d735cb6')
+package() {
+        mkdir -p ${pkgdir}/usr/share/pear/
+        cp -r ${srcdir}/Log-${pkgver}/Log* ${pkgdir}/usr/share/pear/
+        mkdir -p ${pkgdir}/usr/share/pear/docs/Log
+        cp -r ${srcdir}/Log-${pkgver}/docs/* ${pkgdir}/usr/share/pear/docs/Log/
+        mkdir -p ${pkgdir}/usr/share/pear/examples/Log
+        cp -r ${srcdir}/Log-${pkgver}/examples/* ${pkgdir}/usr/share/pear/examples/Log/
+        mkdir -p ${pkgdir}/usr/share/pear/misc/Log
+        cp -r ${srcdir}/Log-${pkgver}/misc/* ${pkgdir}/usr/share/pear/misc/Log/
+        mkdir -p ${pkgdir}/usr/share/pear/tests/Log
+        cp -r ${srcdir}/Log-${pkgver}/tests/* ${pkgdir}/usr/share/pear/tests/Log/
+}
+md5sums=('9930cb6d52b3af2ca6a24db267e237f0')
-- 
cgit v0.12


From 0db9c25b5655ffce6c45f11e9b299e0783c7d706 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 00:54:06 +0000
Subject: peardb: recompile

---
 abs/extra/community/peardb/PKGBUILD | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/abs/extra/community/peardb/PKGBUILD b/abs/extra/community/peardb/PKGBUILD
index dafe00f..01164eb 100755
--- a/abs/extra/community/peardb/PKGBUILD
+++ b/abs/extra/community/peardb/PKGBUILD
@@ -1,22 +1,24 @@
-arch=('i686')
-pkgname=PearDB
+pkgname=peardb
 pkgver=1.7.13
-pkgrel=1
-_kernver=2.6.28-LinHES
+pkgrel=2
+arch=('i686')
 pkgdesc="Pear Database Abstraction Layer"
 url="http://pear.php.net/"
-license=('GPL-2')
-source=('http://download.pear.php.net/package/DB-1.7.13.tgz')
-#install=('')
+license=('GPL2')
+replaces=('PearDB')
+source=(http://download.pear.php.net/package/DB-${pkgver}.tgz)
 
 build() {
-	mkdir -p $startdir/pkg/usr/share/pear/
-	cp -r $startdir/src/DB-$pkgver/DB* $startdir/pkg/usr/share/pear/
-	mkdir -p $startdir/pkg/usr/share/pear/docs/DB/
-	cp -r $startdir/src/DB-$pkgver/doc/* $startdir/pkg/usr/share/pear/docs/DB/
-	mkdir -p $startdir/pkg/usr/share/pear/tests/DB/
-	cp -r $startdir/src/DB-$pkgver/tests/* $startdir/pkg/usr/share/pear/tests/DB/
+        /bin/true
+}
 
-	}
+package() {
+        mkdir -p ${pkgdir}/usr/share/pear/
+        cp -r ${srcdir}/DB-$pkgver/DB* ${pkgdir}/usr/share/pear/
+        mkdir -p ${pkgdir}/usr/share/pear/docs/DB/
+        cp -r ${srcdir}/DB-$pkgver/doc/* ${pkgdir}/usr/share/pear/docs/DB/
+        mkdir -p ${pkgdir}/usr/share/pear/tests/DB/
+        cp -r ${srcdir}/DB-$pkgver/tests/* ${pkgdir}/usr/share/pear/tests/DB/
+}
 
 md5sums=('39b451245941a7059511a852f18b4946')
-- 
cgit v0.12


From eda157f81c5147ed610263fecece005d92ea3f1a Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 01:00:10 +0000
Subject: php: repackage becasue I'm an idiot

---
 abs/core/php/PKGBUILD    | 2 +-
 abs/core/php/__changelog | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/abs/core/php/PKGBUILD b/abs/core/php/PKGBUILD
index fc3b8b3..3fe0a55 100644
--- a/abs/core/php/PKGBUILD
+++ b/abs/core/php/PKGBUILD
@@ -1,7 +1,7 @@
 pkgbase=php
 pkgname=('php' 'php-cgi' 'php-pear')
 pkgver=5.3.3
-pkgrel=1
+pkgrel=3
 _suhosinver=${pkgver}-0.9.10
 pkgdesc='A high-level scripting language'
 arch=('i686' 'x86_64')
diff --git a/abs/core/php/__changelog b/abs/core/php/__changelog
index c8f04da..5c87426 100644
--- a/abs/core/php/__changelog
+++ b/abs/core/php/__changelog
@@ -8,3 +8,4 @@ php.ini -jm
 	remove open_basedir
 
 split package into "php" "php-cgi" and "php-pear" -mh
+php-pear replaces PearLog -mh
-- 
cgit v0.12


From 23e92a9bcefb4b5f7a0b84920986830dafeaf0c2 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:22:02 +0000
Subject: monitorix: upgrade

---
 abs/extra/monitorix/PKGBUILD       | 45 ++++++++++++-------------------
 abs/extra/monitorix/monitorix.rc.d | 10 ++++---
 abs/extra/monitorix/readme.install | 54 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 77 insertions(+), 32 deletions(-)
 create mode 100644 abs/extra/monitorix/readme.install

diff --git a/abs/extra/monitorix/PKGBUILD b/abs/extra/monitorix/PKGBUILD
index e73fcd1..d2dceec 100644
--- a/abs/extra/monitorix/PKGBUILD
+++ b/abs/extra/monitorix/PKGBUILD
@@ -1,22 +1,22 @@
-# Maintainer: graysky <da_audiophile yahoo>
+# Contributor: graysky <graysky AT archlinux dot us>
+# Contributor: res <andres87p gmail>
 
 pkgname=monitorix
-pkgver=1.4.2
-pkgrel=8
+pkgver=1.5.2
+pkgrel=1
 pkgdesc='A lightweight system monitoring tool that uses rrd databases.'
-arch=(i686)
+arch=(any)
 url=http://www.$pkgname.org/
 license=(GPL)
-depends=(dcron rrdtool lighttpd )
+depends=('rrdtool' 'perl-libwww')
 optdepends=('lm_sensors: enable support for system temp monitoring'
-'hddtemp: enable support for hdd temp monitoring')
+'hddtemp: enable support for hdd temp monitoring'
+'metamail: enable support for reports via system mail')
 
 backup=(etc/$pkgname.conf)
 source=($url$pkgname-$pkgver.tar.gz
         monitorix.rc.d)
-md5sums=('6db1bdbeeb0d128622590dfecb9694e4'
-'34e7cb2d78bb4e3ece4aeb4ed26a0d43')
-install=('monitorix.install')
+install=('readme.install')
 
 build() {
   cd $pkgname-$pkgver
@@ -24,22 +24,10 @@ build() {
   install -D $pkgname.pl $pkgdir/usr/sbin/$pkgname.pl
   install -D ../$pkgname.rc.d $pkgdir/etc/rc.d/$pkgname
 
-# use LinHES defaults
+# use Arch defaults
   sed -e '/^our $OSTYPE/ s,RHFC,Arch,' \
-      -e '/^our $TITLE/ s,FIBRANET NSP\, SL,LinHES,' \
-      -e '/^our @HDDTEMP_LIST/ s,hda,sda,' \
-      -e '/^our $ENABLE_CROND_MAIL/ s,Y,N,' \
-      -e '/^our $ENABLE_SERVU/ s,Y,N,' \
-      -e '/^our $ENABLE_PORT/ s,Y,N,' \
-      -e '/^our $ENABLE_USER/ s,Y,N,' \
-      -e '/^our $ENABLE_INT/ s,Y,N,' \
-      -e '/^our @HDDTEMP_LIST/ s,hda,sda,' \
-      -e '/^our @MNT_LIST/ s,boot,myth,' \
-      -e '/^\s*"Linux-Arch"/ s,/var/log/httpd/access.log,/var/log/httpd/access_log,' \
-      -e '/^\s*"Linux-Arch"/ s,/var/log/secure,/var/log/auth.log,' \
-      -e '/^\s*"Linux-Arch"/ s,/srv/http,/data/srv/httpd/htdocs,' < $pkgname.conf \
-                                                                        > $pkgdir/etc/$pkgname.conf
-
+      -e '/^our @HDDTEMP_LIST/ s,hda,sda,' < $pkgname.conf \
+                                           > $pkgdir/etc/$pkgname.conf
   mkdir -p $pkgdir/var/lib/$pkgname/usage
   cp -r reports $pkgdir/var/lib/$pkgname
 
@@ -47,12 +35,13 @@ build() {
   cp Changes $pkgname-apache.conf $pkgname-alert.sh README README.nginx TODO \
      $pkgdir/usr/share/doc/$pkgname
 
-  install -dm777 $pkgdir/data/srv/httpd/htdocs/$pkgname/imgs
-  cp {logo_bot,logo_top,${pkgname}ico}.png $pkgdir/data/srv/httpd/htdocs/$pkgname
+  install -dm777 $pkgdir/srv/http/$pkgname/imgs
+  cp {logo_bot,logo_top,${pkgname}ico}.png $pkgdir/srv/http/$pkgname
 
-  install -D $pkgname.cgi $pkgdir/data/srv/httpd/htdocs/cgi-bin/$pkgname.cgi
+  install -D $pkgname.cgi $pkgdir/srv/http/cgi-bin/$pkgname.cgi
 
   gzip -9 man/man5/$pkgname.conf.5
   install -Dm644 man/man5/$pkgname.conf.5.gz $pkgdir/usr/share/man/man5/$pkgname.conf.5.gz
 }
-
+sha256sums=('3d025d097fe8dd458501b8cf3345b80b1b66625ae257e21452b95d1596ec5b6d'
+            'f9ba4e09f8e583808bc9fa5476ddac067182799512e103ea40565b7da47dbab6')
diff --git a/abs/extra/monitorix/monitorix.rc.d b/abs/extra/monitorix/monitorix.rc.d
index 9649519..24eb433 100644
--- a/abs/extra/monitorix/monitorix.rc.d
+++ b/abs/extra/monitorix/monitorix.rc.d
@@ -10,15 +10,16 @@ case $1 in
     start)
         stat_busy "Starting Monitorix"
         if ck_daemon monitorix; then
-	if [ -x /etc/cron.hourly/sync-monitorix.sh ]; then
+        # check for monitorix-tmps and if present execute it
+        if [ -x /etc/cron.hourly/sync-monitorix.sh ]; then
                 /etc/cron.hourly/sync-monitorix.sh >/dev/null 2>&1
         fi
             # Creates RRDs files if needed
             /usr/sbin/monitorix.pl create >/dev/null 2>&1 || stat_die $?
             /usr/sbin/monitorix.pl init >/dev/null 2>&1 || stat_die $?
             add_daemon monitorix
-        # restart crond so data gets collected
-        /sbin/sv restart cron
+	# restart crond so data gets collected
+	/etc/rc.d/crond restart
             stat_done
         else
             stat_fail
@@ -28,13 +29,14 @@ case $1 in
     stop)
         stat_busy "Stopping Monitorix"
         if ! ck_daemon monitorix; then
+        # check for monitorix-tmps and if present execute it
         if [ -x /etc/cron.hourly/sync-monitorix.sh ]; then
                 /etc/cron.hourly/sync-monitorix.sh >/dev/null 2>&1
         fi
             /usr/sbin/monitorix.pl stop 2>&1 || stat_die $?
             rm_daemon monitorix
         # restart crond data stops getting collected
-        /sbin/sv restart cron
+        /etc/rc.d/crond restart
             stat_done
         else
             stat_fail
diff --git a/abs/extra/monitorix/readme.install b/abs/extra/monitorix/readme.install
new file mode 100644
index 0000000..2630018
--- /dev/null
+++ b/abs/extra/monitorix/readme.install
@@ -0,0 +1,54 @@
+post_install() {
+ echo '----------------------------------------------------------------------'
+ echo 'NOTE that you will need a mono-font for this package to work.'
+ echo 'There are many options here so I did not add one as a formal dep.'
+ echo 'You may use for example terminus-font.  If your graphs have no numbers'
+ echo 'go ahead and install it.  If they work as is you do not need it.'
+ echo ' '
+ echo 'Consider having your rrd databases for monitorix reside in RAM.'
+ echo 'D/L and build the monitorix-tmpfs package from the AUR:'
+ echo
+ echo '            http://aur.archlinux.org/packages.php?ID=34134'
+ echo '----------------------------------------------------------------------'
+}
+
+post_remove() {
+ echo '----------------------------------------------------------------------'
+ echo 'To remove all traces of monitorix from your system, you must manually'
+ echo 'remove the following dir trees (doing so will delete your databases):'
+ echo
+ echo '/var/lib/monitorix'
+ echo '/srv/http/monitorix'
+ echo '----------------------------------------------------------------------'
+}
+
+# $1: The new package version
+# $2: The old package version
+
+post_upgrade() {
+NEW=`echo $1 | cut -f-1 -d '-'`
+OLD=`echo $2 | cut -f-1 -d '-'`
+
+# if running the 1.4.2 series then display warning message
+
+if [ "$OLD" = "1.4.2" ]; then
+ echo '----------------------------------------------------------------------'
+ echo ' WARNING:'
+ echo
+ echo 'With this upgrade you MUST replace your current version of'
+ echo '/etc/monitorix.conf with /etc/monitorix.conf.pacnew which contains new'
+ echo 'configs needed by the 1.5.0 release of monitorix.'
+ echo
+ echo 'Simply do the following:'
+ echo '# cp /etc/monitorix.conf /etc/monitorix.conf.old'
+ echo '# mv /etc/monitorix.conf.pacnew /etc/monitorix.conf'
+ echo
+ echo 'Now you can compare your old config saved as /etc/monitorix.conf.old'
+ echo 'to your new config to ensure that you get all your config options into'
+ echo 'the new version.'
+ echo
+ echo 'Restart monitorix when you have completed the edit as well:'
+ echo '# /etc/rc.d/monitorix restart'
+ echo '----------------------------------------------------------------------'
+fi
+}
-- 
cgit v0.12


From 9b7b1315e4d4fbce1211ff06795465d24e2898d8 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:22:24 +0000
Subject: printproto: upgrade

---
 abs/core/printproto/PKGBUILD | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/abs/core/printproto/PKGBUILD b/abs/core/printproto/PKGBUILD
index 11595db..4606f59 100644
--- a/abs/core/printproto/PKGBUILD
+++ b/abs/core/printproto/PKGBUILD
@@ -1,22 +1,25 @@
-# $Id: PKGBUILD 567 2008-04-21 09:43:18Z alexander $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 71582 2010-03-07 20:09:38Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=printproto
 pkgver=1.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 print extension wire protocol"
-arch=(i686 x86_64)
+arch=(any)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('7321847a60748b4d2f1fa16db4b6ede8')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+}
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install || return 1
 
-  install -D -m644 ${startdir}/src/${pkgname}-${pkgver}/COPYING \
-                   ${startdir}/pkg/usr/share/licenses/${pkgname}/COPYING
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }
-md5sums=('7321847a60748b4d2f1fa16db4b6ede8')
-- 
cgit v0.12


From e98ca1911e435e6cf24283a579f4736f49ac0b8a Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:22:40 +0000
Subject: fontcacheproto: upgrade

---
 abs/core/fontcacheproto/PKGBUILD | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/abs/core/fontcacheproto/PKGBUILD b/abs/core/fontcacheproto/PKGBUILD
index 5bc123b..527dd57 100644
--- a/abs/core/fontcacheproto/PKGBUILD
+++ b/abs/core/fontcacheproto/PKGBUILD
@@ -2,18 +2,20 @@
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=fontcacheproto
-pkgver=0.1.2
+pkgver=0.1.3
 pkgrel=1
 pkgdesc="X11 font cache extension wire protocol"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('60df6b625074a9790e28543dcea71651')
-sha1sums=('6a531ef505ba2f7c1aa884bb4efdac3e32dfd99b')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make || return 1
+}
+package() {
+  cd ${startdir}/src/${pkgname}-${pkgver}
   make DESTDIR=${startdir}/pkg install || return 1
 }
+md5sums=('a8a50e5e995bfacb0359575faf7f6906')
-- 
cgit v0.12


From f05d32ec3995dd5f7296295329903d1f459c5605 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:23:12 +0000
Subject: athcool: recompile

---
 abs/extra/community/athcool/PKGBUILD | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/abs/extra/community/athcool/PKGBUILD b/abs/extra/community/athcool/PKGBUILD
index c5a3290..fb24df1 100644
--- a/abs/extra/community/athcool/PKGBUILD
+++ b/abs/extra/community/athcool/PKGBUILD
@@ -1,24 +1,28 @@
 pkgname=athcool
 pkgver=0.3.12
-pkgrel=3
+pkgrel=4
 pkgdesc="Small utility allowing to enable powersaving mode on AMD Duron/Athlon/Athlon XP processors."
 url="http://members.jcom.home.ne.jp/jacobi/linux/softwares.html"
-depends=(pciutils)
-license="GPL"
+depends=('pciutils')
+license=('GPL')
 install=athcool.install
-arch=(i686)
+arch=('i686')
 source=(http://members.jcom.home.ne.jp/jacobi/linux/files/$pkgname-$pkgver.tar.gz
-athcool run finish)
-md5sums=('f2e0f4fbd04f5e1f09aa60a3ecb24645'
-	 'bbf32484cec6431568ccf51c2516f9e7'
-	 'b9cf31ac580c1665d50d70e405d276bc')
+        athcool run finish)
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  /bin/install -D -m0755 ../athcool $startdir/pkg/etc/rc.d/athcool
-  mkdir -p $pkgdir/etc/sv/athcool/supervise
-  install -D -m0755 ../run $pkgdir/etc/sv/athcool
-  install -D -m0755 ../finish $pkgdir/etc/sv/athcool
 }
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  /bin/install -D -m0755 ../athcool ${pkgdir}/etc/rc.d/athcool
+  mkdir -p ${pkgdir}/etc/sv/athcool/supervise
+  install -D -m0755 ../run ${pkgdir}/etc/sv/athcool
+  install -D -m0755 ../finish ${pkgdir}/etc/sv/athcool
+}
+md5sums=('f2e0f4fbd04f5e1f09aa60a3ecb24645'
+         'bbf32484cec6431568ccf51c2516f9e7'
+         'b9cf31ac580c1665d50d70e405d276bc'
+         'f854a49b2430852fddab2b7baa0591ad')
-- 
cgit v0.12


From bf891223ed04826a46fa1fa7f85ddb5c18923ecb Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:23:32 +0000
Subject: xcursor-themes: recompile

---
 abs/core/xcursor-themes/PKGBUILD | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abs/core/xcursor-themes/PKGBUILD b/abs/core/xcursor-themes/PKGBUILD
index 7d3f1a8..03895f9 100644
--- a/abs/core/xcursor-themes/PKGBUILD
+++ b/abs/core/xcursor-themes/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=xcursor-themes
 pkgver=1.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org Cursor themes"
 arch=(any)
 url="http://xorg.freedesktop.org/"
@@ -17,6 +17,9 @@ build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make || return 1
+}
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install || return 1
   install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
-- 
cgit v0.12


From f306f81a337f4305a5be4ce9bbf4f1613e066cdc Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:24:01 +0000
Subject: moblock: recompile

---
 abs/extra/community/moblock/MoBlock-nfq.sh.patch |  2 +-
 abs/extra/community/moblock/PKGBUILD             | 39 ++++++++++++------------
 abs/extra/community/moblock/moblock.install      | 12 +++-----
 3 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/abs/extra/community/moblock/MoBlock-nfq.sh.patch b/abs/extra/community/moblock/MoBlock-nfq.sh.patch
index 15e742f..f9136c3 100644
--- a/abs/extra/community/moblock/MoBlock-nfq.sh.patch
+++ b/abs/extra/community/moblock/MoBlock-nfq.sh.patch
@@ -28,7 +28,7 @@
 +    iptables -I MOBLOCK_OUT -p all -m iprange --dst-range $IP -j ACCEPT
 +done
 +for IP in $WHITE_IP_IN; do
-+    iptables -I MOBLOCK_IN -p all -m iprange --dst-range $IP -j ACCEPT
++    iptables -I MOBLOCK_IN -p all -m iprange --src-range $IP -j ACCEPT
 +done
 +for IP in $WHITE_IP_FW; do
 +    iptables -I MOBLOCK_FW -p all -m iprange --dst-range $IP -j ACCEPT
diff --git a/abs/extra/community/moblock/PKGBUILD b/abs/extra/community/moblock/PKGBUILD
index f6c7e51..0f3ff26 100755
--- a/abs/extra/community/moblock/PKGBUILD
+++ b/abs/extra/community/moblock/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=moblock
 pkgver=0.9rc2
-pkgrel=8
+pkgrel=9
 pkgdesc="Console application that blocks connections from/to hosts listed in a file in peerguardian format"
 arch=('i686' 'x86_64')
 url="http://moblock.berlios.de/"
@@ -19,17 +19,9 @@ source=(http://download.berlios.de/moblock/MoBlock-0.8-i586.tar.bz2 \
         moblock-update \
         moblock \
         moblock.logrotate)
-md5sums=('199967adb48b153be90db10fe21325c5'
-         'e4e33c515677fa53eaca4616591d4e44'
-         '1193adccce219d31a7c0540807a4a8e8'
-         'b23b5214965df59632de5cec317ddbde'
-         '840bb52a99529305e49212a69c9ced8a'
-         '49a16feb221d4d912cc7200313517f7b'
-         '1bdc949fcff0ce751a5096e489061513'
-         'a8285fd3e68043cd8d21993d3dbbf9d4')
 
 build() {
-    cd $startdir/src/MoBlock-0.8
+    cd ${srcdir}/MoBlock-0.8
     
     # patch to update moblock to the latest cvs version
     patch -Np1 -i ../moblock_0.9_rc2.patch || return 1
@@ -43,14 +35,23 @@ build() {
     
     # build
     make || return 1
-    
-    #move the files
-    install -D -m 755 ./MoBlock-nfq.sh $startdir/pkg/usr/bin/moblock-nfq || return 1
-    install -D -m 744 ./moblock $startdir/pkg/usr/bin/moblock || return 1
-    install -D -m 755 ../moblock-update $startdir/pkg/usr/bin/moblock-update || return 1
-    install -D -m 744 ../moblock $startdir/pkg/etc/rc.d/moblock || return 1
-    install -D -m 644 ../config $startdir/pkg/etc/moblock/config || return 1
-    install -D -m 644 ../moblock.logrotate $startdir/pkg/etc/logrotate.d/moblock || return 1
 }
 
-
+package() {
+    cd ${srcdir}/MoBlock-0.8
+    #move the files
+    install -D -m 755 ./MoBlock-nfq.sh ${pkgdir}/usr/bin/moblock-nfq || return 1
+    install -D -m 744 ./moblock ${pkgdir}/usr/bin/moblock || return 1
+    install -D -m 755 ../moblock-update ${pkgdir}/usr/bin/moblock-update || return 1
+    install -D -m 744 ../moblock ${pkgdir}/etc/rc.d/moblock || return 1
+    install -D -m 644 ../config ${pkgdir}/etc/moblock/config || return 1
+    install -D -m 644 ../moblock.logrotate ${pkgdir}/etc/logrotate.d/moblock || return 1
+}
+md5sums=('199967adb48b153be90db10fe21325c5'
+         'e4e33c515677fa53eaca4616591d4e44'
+         'e9f3c6b09f5e07dee948450780340ea3'
+         'b23b5214965df59632de5cec317ddbde'
+         '840bb52a99529305e49212a69c9ced8a'
+         '49a16feb221d4d912cc7200313517f7b'
+         '1bdc949fcff0ce751a5096e489061513'
+         'a8285fd3e68043cd8d21993d3dbbf9d4')
diff --git a/abs/extra/community/moblock/moblock.install b/abs/extra/community/moblock/moblock.install
index c7715e7..6afe1d5 100644
--- a/abs/extra/community/moblock/moblock.install
+++ b/abs/extra/community/moblock/moblock.install
@@ -7,10 +7,6 @@ post_install() {
     echo ">>> moblock-update script no longer uses /var/spool/moblock"
     echo ">>> as a temporary directory.  You can safely delete it."
     echo ""
-    if [ ! -d /var/spool/moblock/used ]
-    then
-        mkdir -p /var/spool/moblock/used
-    fi
 }
 
 post_upgrade() {
@@ -18,10 +14,10 @@ post_upgrade() {
     if [ -h /usr/lib/libnfnetlink.so.1 ]; then
         rm /usr/lib/libnfnetlink.so.1
     fi
-    if [ ! -d /var/spool/moblock/used ]
-    then
-        mkdir -p /var/spool/moblock/used
-   fi
+    echo ""
+    echo ">>> moblock-update script no longer uses /var/spool/moblock"
+    echo ">>> as a temporary directory.  You can safely delete it."
+    echo ""
 }
 
 op=$1
-- 
cgit v0.12


From 94fa9f25882bd71a79914a188be1cb702358eea3 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:24:41 +0000
Subject: xorg-fonts-encoding: upgrade

---
 abs/core/xorg-fonts-encodings/PKGBUILD | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/abs/core/xorg-fonts-encodings/PKGBUILD b/abs/core/xorg-fonts-encodings/PKGBUILD
index e0e3633..a69df06 100644
--- a/abs/core/xorg-fonts-encodings/PKGBUILD
+++ b/abs/core/xorg-fonts-encodings/PKGBUILD
@@ -1,21 +1,27 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id: PKGBUILD 57486 2009-10-31 18:28:17Z jgc $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-fonts-encodings
-pkgver=1.0.2
-pkgrel=2
+pkgver=1.0.3
+pkgrel=1
 pkgdesc="X.org font encoding files"
-arch=(i686 x86_64)
+arch=(any)
 url="http://xorg.freedesktop.org/"
+license=('custom')
 depends=('xorg-font-utils')
-install="xorg-fonts-encodings.install"
+install=xorg-fonts-encodings.install
 source=(${url}/releases/individual/font/encodings-${pkgver}.tar.bz2)
-md5sums=('11adda157b03d63fd61d95ad7ef00466')
+md5sums=('29637480e7ce12546668631067c19ced')
 
 build() {
-  cd ${startdir}/src/encodings-${pkgver}
+  cd "${srcdir}/encodings-${pkgver}"
   ./configure --prefix=/usr \
-              --with-encodingsdir=/usr/share/fonts/encodings
+      --with-encodingsdir=/usr/share/fonts/encodings || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+}
+package() {
+  cd "${srcdir}/encodings-${pkgver}"
+  make DESTDIR="${pkgdir}" install || return 1
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }
-- 
cgit v0.12


From 1c526448111bc7a04b0df663a2f4539e106faca0 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:25:15 +0000
Subject: ipw2200-fw: upgrade

---
 abs/core/ipw2200-fw/PKGBUILD | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/abs/core/ipw2200-fw/PKGBUILD b/abs/core/ipw2200-fw/PKGBUILD
index 75b4be9..8016831 100644
--- a/abs/core/ipw2200-fw/PKGBUILD
+++ b/abs/core/ipw2200-fw/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 59427 2009-11-23 20:20:15Z giovanni $
+# $Id: PKGBUILD 100060 2010-11-20 03:37:56Z pierre $
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=ipw2200-fw
 pkgver=3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Firmware for the Intel PRO/Wireless 2200BG"
 arch=('any')
 url='http://ipw2200.sourceforge.net/'
 license=('custom')
-depends=()
-source=(http://bughost.org/firmware/${pkgname}-${pkgver}.tgz)
+source=("http://bughost.org/firmware/${pkgname}-${pkgver}.tgz")
 replaces=('ipw2200')
 md5sums=('eaba788643c7cc7483dd67ace70f6e99')
 
-build() {
+package() {
   cd "${srcdir}/ipw2200-fw-${pkgver}"
   # Install firmware
   for i in ipw*.fw; do
     install -D -m 644 $i "${pkgdir}/lib/firmware/$i"
   done
   # Install license
-  install -D -m 644 LICENSE.ipw2200-fw "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+  install -D -m 644 LICENSE.ipw2200-fw "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
+
-- 
cgit v0.12


From 4004c7c21e83a7f90db802b5f603fd510304e81e Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:25:38 +0000
Subject: bash-completion: upgrade

---
 abs/extra/bash-completion/PKGBUILD | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/abs/extra/bash-completion/PKGBUILD b/abs/extra/bash-completion/PKGBUILD
index 5aa6b22..a20fa08 100644
--- a/abs/extra/bash-completion/PKGBUILD
+++ b/abs/extra/bash-completion/PKGBUILD
@@ -1,34 +1,33 @@
-# $Id: PKGBUILD 67318 2010-02-06 09:38:55Z eric $
+# $Id: PKGBUILD 95183 2010-10-16 21:57:23Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Aurelien Foret <orelien@chez.com>
-# Contributor: Evangelos Foutras <foutrelis@gmail.com>
 
 pkgname=bash-completion
 pkgver=1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Programmable completion for the bash shell"
-arch=(any)
+arch=('any')
 url="http://bash-completion.alioth.debian.org/"
 license=('GPL')
 depends=('bash')
-source=(http://bash-completion.alioth.debian.org/files/$pkgname-$pkgver.tar.gz cowsay.bashcomp)
+source=(http://bash-completion.alioth.debian.org/files/$pkgname-$pkgver.tar.bz2)
+md5sums=('88c022a98a02a02293716f840eadd884')
+sha1sums=('47e6fb919ae227e74172870379b0fe999a2ae70d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # fixes for archlinux
-  sed -i 's#/sbin/lsmod#/bin/lsmod#' bash_completion || return 1
+  sed -i 's#/sbin" lsmod#/bin" lsmod#' bash_completion
 
   ./configure --prefix=/usr --sysconfdir=/etc
-  make || return 1
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
-  install -D -m644 "$srcdir/cowsay.bashcomp" "$pkgdir/etc/bash_completion.d/cowsay"
 
-  # apache2ctl doesn't work, even when renamed to apachectl (and sed'd)
-  rm "$pkgdir/etc/bash_completion.d/apache2ctl"
-  # munin-node doesn't work, even i've updated munin to 1.4.0
-  rm "$pkgdir/etc/bash_completion.d/munin-node"
+# Doesn't work on Arch Linux and cause problems (FS#20112)
+  rm "$pkgdir/etc/bash_completion.d/service"
 }
-# vim:set ts=2 sw=2 et:
-md5sums=('457c8808ed54f2b2cdd737b1f37ffa24'
-         'e9766bdc391caf825cb24e704422987e')
+
-- 
cgit v0.12


From 9e1bbb32ae25fef6111d95205614a612ed9f70ec Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:26:25 +0000
Subject: man-db: upgrade

---
 abs/core/man-db/PKGBUILD          | 52 +++++++++++++++++++++++++++++++++++++++
 abs/core/man-db/convert-mans      | 11 +++++++++
 abs/core/man-db/man-db.cron.daily | 39 +++++++++++++++++++++++++++++
 abs/core/man-db/man-db.install    | 18 ++++++++++++++
 abs/core/man/PKGBUILD             | 31 -----------------------
 abs/core/man/man-troff.patch      | 16 ------------
 abs/core/man/whatis.cron.daily    |  9 -------
 7 files changed, 120 insertions(+), 56 deletions(-)
 create mode 100644 abs/core/man-db/PKGBUILD
 create mode 100644 abs/core/man-db/convert-mans
 create mode 100755 abs/core/man-db/man-db.cron.daily
 create mode 100644 abs/core/man-db/man-db.install
 delete mode 100644 abs/core/man/PKGBUILD
 delete mode 100644 abs/core/man/man-troff.patch
 delete mode 100755 abs/core/man/whatis.cron.daily

diff --git a/abs/core/man-db/PKGBUILD b/abs/core/man-db/PKGBUILD
new file mode 100644
index 0000000..05265fd
--- /dev/null
+++ b/abs/core/man-db/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id: PKGBUILD 99794 2010-11-17 19:07:22Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
+
+pkgname=man-db
+pkgver=2.5.9
+pkgrel=1
+pkgdesc="A utility for reading man pages"
+arch=('i686' 'x86_64')
+url="http://www.nongnu.org/man-db/"
+license=('GPL' 'LGPL')
+groups=('base')
+depends=( 'bash' 'gdbm' 'zlib' 'groff')
+optdepends=('less' 'gzip')
+backup=('etc/man_db.conf'
+	'etc/cron.daily/man-db')
+conflicts=('man')
+provides=('man')
+replaces=('man')
+install=${pkgname}.install
+source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.gz
+	#http://launchpad.net/man-db/main/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz
+        convert-mans man-db.cron.daily)
+md5sums=('9841394f5c5fe7e2dd2e0c5fb4766d0f'
+         '2b7662a7d5b33fe91f9f3e034361a2f6'
+         'd30c39ae47560304471b5461719e0f03')
+options=('!libtool')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+	--with-db=gdbm --disable-setuid --enable-mandirs=GNU \
+	--with-sections="1 n l 8 3 0 2 5 4 9 6 7"
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install || return 1
+
+  # part of groff pkg
+  rm -f ${pkgdir}/usr/bin/zsoelim
+
+  # script from LFS to convert manpages, see
+  # http://www.linuxfromscratch.org/lfs/view/6.4/chapter06/man-db.html
+  install -D -m755 ${srcdir}/convert-mans  ${pkgdir}/usr/bin/convert-mans 
+
+  #install whatis cron script
+  install -D -m744 ${srcdir}/man-db.cron.daily ${pkgdir}/etc/cron.daily/man-db
+}
+
diff --git a/abs/core/man-db/convert-mans b/abs/core/man-db/convert-mans
new file mode 100644
index 0000000..58a0224
--- /dev/null
+++ b/abs/core/man-db/convert-mans
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+FROM="$1"
+TO="$2"
+shift ; shift
+while [ $# -gt 0 ]
+do
+        FILE="$1"
+        shift
+        iconv -f "$FROM" -t "$TO" "$FILE" >.tmp.iconv
+        mv .tmp.iconv "$FILE"
+done
diff --git a/abs/core/man-db/man-db.cron.daily b/abs/core/man-db/man-db.cron.daily
new file mode 100755
index 0000000..53e66e1
--- /dev/null
+++ b/abs/core/man-db/man-db.cron.daily
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
+NICE=19
+
+# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
+IONICE_CLASS=2
+
+# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
+IONICE_PRIORITY=7
+
+UPDATEMANDB="/usr/bin/mandb --quiet"
+
+# Update the "whatis" database
+#/usr/sbin/makewhatis -u -w
+
+# taken from Debian
+# man-db cron daily
+set -e
+
+if ! [ -d /var/cache/man ]; then
+    # Recover from deletion, per FHS.
+    mkdir -p /var/cache/man
+    chmod 755 /var/cache/man
+fi
+
+# regenerate man database
+
+if [ -x /usr/bin/nice ]; then
+  UPDATEMANDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEMANDB}"
+fi
+
+if [ -x /usr/bin/ionice ]; then
+  UPDATEMANDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${UPDATEMANDB}"
+fi
+
+${UPDATEMANDB}
+
+exit 0
diff --git a/abs/core/man-db/man-db.install b/abs/core/man-db/man-db.install
new file mode 100644
index 0000000..6a0f36b
--- /dev/null
+++ b/abs/core/man-db/man-db.install
@@ -0,0 +1,18 @@
+post_install() {
+  echo "it's recommended to create an initial"
+  echo "database running as root:"
+  echo "\"/usr/bin/mandb --quiet\""
+}
+
+post_upgrade() {
+  if [ "`vercmp $2 2.5.3-2`" -lt 0 ]; then
+     echo "systemuser \"man\" is no more required"
+     echo "run \"userdel man\". please also"
+     echo "chown root:root /var/cache/man"
+  fi
+}
+
+post_remove() {
+  rm -rf /var/cache/man
+}
+
diff --git a/abs/core/man/PKGBUILD b/abs/core/man/PKGBUILD
deleted file mode 100644
index 6cb2bf0..0000000
--- a/abs/core/man/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: judd <jvinet@zeroflux.org>
-pkgname=man
-pkgver=1.6f
-pkgrel=11
-pkgdesc="A utility for reading man pages"
-arch=('i686' 'x86_64')
-url="http://primates.ximian.com/~flucifredi/man/"
-license=('GPL')
-groups=('base')
-depends=('groff' 'less' 'gzip' 'awk' 'coreutils' 'sh' 'diffutils')
-backup=(etc/man.conf)
-source=(http://primates.ximian.com/~flucifredi/man/man-$pkgver.tar.gz \
-        whatis.cron.daily man-troff.patch)
-md5sums=('67aaaa6df35215e812fd7d89472c44b6'
-         'b86a5f2dd87c6be30421a8813547229d'
-         '21541cb3073259f7fb9335675ca41b0e')
-options=(!emptydirs)
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -Np1 -i ../man-troff.patch || return 1
-  ./configure -confdir='/etc' -d +lang all -mandir=/usr/share/man
-  make || return 1
-  make PREFIX=$startdir/pkg install || return 1
-
-  sed -i "s|-Tlatin1||g" $startdir/pkg/etc/man.conf
-
-  #install whatis cron script
-  install -D -m744 ../whatis.cron.daily $startdir/pkg/etc/cron.daily/whatis
-}
diff --git a/abs/core/man/man-troff.patch b/abs/core/man/man-troff.patch
deleted file mode 100644
index e08e931..0000000
--- a/abs/core/man/man-troff.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur man-1.5p-orig/src/man.conf.in man-1.5p/src/man.conf.in
---- man-1.5p-orig/src/man.conf.in	2005-01-08 10:50:45.000000000 -0800
-+++ man-1.5p/src/man.conf.in	2005-03-18 13:22:17.000000000 -0800
-@@ -88,9 +88,9 @@
- # If you have a new troff (version 1.18.1?) and its colored output
- # causes problems, add the -c option to TROFF, NROFF, JNROFF.
- #
--TROFF		@troff@
--NROFF		@nroff@
--JNROFF		@jnroff@
-+TROFF		@troff@ -c
-+NROFF		@nroff@ -c
-+JNROFF		@jnroff@ -c
- EQN		@eqn@
- NEQN		@neqn@
- JNEQN		@jneqn@
diff --git a/abs/core/man/whatis.cron.daily b/abs/core/man/whatis.cron.daily
deleted file mode 100755
index 6332d80..0000000
--- a/abs/core/man/whatis.cron.daily
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Make sure MANPATH is complete
-source /etc/profile
-source /etc/profile.d/* 2>/dev/null
-
-# Update the "whatis" database
-/usr/sbin/makewhatis -u -w
-
-- 
cgit v0.12


From 94be58b530423249b0fd8d47755db401cdddd19e Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:26:50 +0000
Subject: deluge: upgrade

---
 abs/extra/community/deluge/PKGBUILD       | 43 +++++++++++++++++++++----------
 abs/extra/community/deluge/__changelog    |  1 +
 abs/extra/community/deluge/deluge-web     | 42 ++++++++++++++++++++++++++++++
 abs/extra/community/deluge/deluge.install | 29 +++++++++++++++++++++
 abs/extra/community/deluge/deluged        | 43 +++++++++++++++++++++++++++++++
 abs/extra/community/deluge/deluged.conf.d |  1 +
 6 files changed, 145 insertions(+), 14 deletions(-)
 create mode 100644 abs/extra/community/deluge/__changelog
 create mode 100644 abs/extra/community/deluge/deluge-web
 create mode 100644 abs/extra/community/deluge/deluge.install
 create mode 100644 abs/extra/community/deluge/deluged
 create mode 100644 abs/extra/community/deluge/deluged.conf.d

diff --git a/abs/extra/community/deluge/PKGBUILD b/abs/extra/community/deluge/PKGBUILD
index 8238baa..3d36405 100644
--- a/abs/extra/community/deluge/PKGBUILD
+++ b/abs/extra/community/deluge/PKGBUILD
@@ -1,25 +1,40 @@
-# $Id: PKGBUILD 26558 2009-02-09 16:10:09Z hugo $
-# Maintainer: Hugo Doria <hugo@archlinux.org>
+# $Id: PKGBUILD 97661 2010-10-31 22:31:52Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=deluge
-pkgver=1.2.2
+pkgver=1.3.1
 pkgrel=1
 pkgdesc="A bittorrent client written with python and pygtk"
-arch=('i686' 'x86_64')
+arch=('any')
 url="http://deluge-torrent.org/"
 license=('GPL3')
-depends=('pygtk' 'boost>=1.37.0' 'pyxdg' 'dbus-python' 'librsvg' 'setuptools')
-makedepends=('subversion' 'intltool')
-options=('!emptydirs')
-source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.gz)
+depends=('pyxdg' 'python2-distribute' 'libtorrent-rasterbar>=0.15.0' 'twisted' 'pyopenssl' 'xdg-utils' 'python-chardet')
+makedepends=( 'intltool' 'pygtk' 'librsvg' 'python-mako')
+optdepends=('python-notify: libnotify notifications'
+	    'pygtk: needed for gtk ui'
+	    'librsvg: needed for gtk ui'
+	    'python-mako: needed for web ui')
+source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 deluged deluged.conf.d deluge-web)
+backup=(etc/conf.d/deluged)
+install=deluge.install
+md5sums=('496a9cfaf01e6cf7ab141498acf2d1f1'
+         '7d5790eeb14cd0b47d1bb3e0a19c9935'
+         '332d23fe0d21ce92b494efd73322856c'
+         '6c913ec7322eaa60494ac9d53103005f')
 
 build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  python2 setup.py build
+}
 
-  cd ${srcdir}/${pkgname}-${pkgver}/
-  python setup.py build
-  python setup.py install --prefix=/usr --root=${pkgdir}
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
 
-  install -D -m644 deluge/data/pixmaps/deluge.svg ${pkgdir}/usr/share/pixmaps/deluge.svg 
+  install -d -m755 "${pkgdir}"/srv/deluge
+  install -D -m644 deluge/data/pixmaps/deluge.svg "${pkgdir}"/usr/share/pixmaps/deluge.svg
+  install -D -m755 "${srcdir}"/deluged "${pkgdir}"/etc/rc.d/deluged
+  install -D -m755 "${srcdir}"/deluge-web "${pkgdir}"/etc/rc.d/deluge-web
+  install -D -m644 "${srcdir}"/deluged.conf.d "${pkgdir}"/etc/conf.d/deluged
 }
-
-md5sums=('5165c6113efa75e2be0310976ce55e43')
diff --git a/abs/extra/community/deluge/__changelog b/abs/extra/community/deluge/__changelog
new file mode 100644
index 0000000..c5602d9
--- /dev/null
+++ b/abs/extra/community/deluge/__changelog
@@ -0,0 +1 @@
+change 'setuptools' dep to 'python2-distribute'
diff --git a/abs/extra/community/deluge/deluge-web b/abs/extra/community/deluge/deluge-web
new file mode 100644
index 0000000..587496f
--- /dev/null
+++ b/abs/extra/community/deluge/deluge-web
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/deluged
+
+[[ -f /var/run/deluge-web.pid ]] && PID=$(cat /var/run/deluge-web.pid)
+[[ -d /proc/$PID ]] || PID=
+
+case "$1" in
+  start)
+    stat_busy "Starting Deluge WebUI"
+    [[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluge-web -f >/dev/null" $DELUGE_USER
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      sleep 1
+      echo $(pgrep -u $DELUGE_USER deluge-web) > /var/run/deluge-web.pid
+      add_daemon deluge-web
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Deluge WebUI"
+    [[ ! -z $PID ]] && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm /var/run/deluge-web.pid
+      rm_daemon deluge-web
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/abs/extra/community/deluge/deluge.install b/abs/extra/community/deluge/deluge.install
new file mode 100644
index 0000000..9377a63
--- /dev/null
+++ b/abs/extra/community/deluge/deluge.install
@@ -0,0 +1,29 @@
+post_install() {
+  getent group deluge >/dev/null 2>&1 || usr/sbin/groupadd -g 125 deluge
+  if getent passwd deluge > /dev/null 2>&1; then
+      usr/sbin/usermod -c 'Deluge user' -d /srv/deluge -s /bin/false deluge > /dev/null 2>&1
+  else
+      usr/sbin/useradd -c 'Deluge user' -u 125 -g deluge -d /srv/deluge -s /bin/false deluge
+  fi
+  usr/bin/passwd -l deluge &>/dev/null
+
+  chown deluge.deluge srv/deluge
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+
+cat << _EOF
+>>> Deluge's daemon is running default with the "deluge" user. The default download directory is /srv/deluge/.
+    You can change the user by editing /etc/conf.d/deluged
+_EOF
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  getent passwd deluge >/dev/null 2>&1 && userdel deluge
+  getent group deluge >/dev/null 2>&1 && groupdel deluge
+
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
diff --git a/abs/extra/community/deluge/deluged b/abs/extra/community/deluge/deluged
new file mode 100644
index 0000000..096d36a
--- /dev/null
+++ b/abs/extra/community/deluge/deluged
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/deluged
+
+[[ -f /var/run/deluged.pid ]] && PID=$(cat /var/run/deluged.pid)
+[[ -d /proc/$PID ]] || PID=
+
+case "$1" in
+  start)
+    stat_busy "Starting Deluge Daemon"
+    [[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluged >/dev/null" $DELUGE_USER
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      sleep 1
+      echo $(pgrep -u $DELUGE_USER deluged) > /var/run/deluged.pid
+      add_daemon deluged
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Deluge Daemon"
+    [[ ! -z $PID ]] && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm /var/run/deluged.pid
+      rm_daemon deluged
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
+
diff --git a/abs/extra/community/deluge/deluged.conf.d b/abs/extra/community/deluge/deluged.conf.d
new file mode 100644
index 0000000..7f4e873
--- /dev/null
+++ b/abs/extra/community/deluge/deluged.conf.d
@@ -0,0 +1 @@
+DELUGE_USER="deluge"
-- 
cgit v0.12


From 9a9de8a9747fb3aeaeebb39327cf00b5f3bd49a3 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:27:08 +0000
Subject: libtorrent-rasterbar: inital include for deluge

---
 abs/extra/community/libtorrent-rasterbar/PKGBUILD  | 30 ++++++++++++++++++++++
 .../community/libtorrent-rasterbar/__changelog     |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 abs/extra/community/libtorrent-rasterbar/PKGBUILD
 create mode 100644 abs/extra/community/libtorrent-rasterbar/__changelog

diff --git a/abs/extra/community/libtorrent-rasterbar/PKGBUILD b/abs/extra/community/libtorrent-rasterbar/PKGBUILD
new file mode 100644
index 0000000..dc719f9
--- /dev/null
+++ b/abs/extra/community/libtorrent-rasterbar/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 100316 2010-11-22 16:29:19Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Hugo Doria <hugo@archlinux.org>
+# Contributor: Andrea Scarpino <bash.lnx@gmail.com>
+
+pkgname=libtorrent-rasterbar
+pkgver=0.15.4
+pkgrel=3
+pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
+url="http://www.rasterbar.com/products/libtorrent/"
+arch=('i686' 'x86_64')
+license=('custom')
+depends=('boost-libs>=1.44.0' 'python2')
+makedepends=('boost')
+source=(http://libtorrent.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
+md5sums=('58750b3a246d056335745f9e805bb949')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --enable-python-binding \
+              --with-boost-filesystem=mt \
+              --with-boost-thread=mt
+  make
+}
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
+}
+
diff --git a/abs/extra/community/libtorrent-rasterbar/__changelog b/abs/extra/community/libtorrent-rasterbar/__changelog
new file mode 100644
index 0000000..6528095
--- /dev/null
+++ b/abs/extra/community/libtorrent-rasterbar/__changelog
@@ -0,0 +1 @@
+change boost-lib dep to >=1.44
-- 
cgit v0.12


From 50a596f7dec079904365c4685771e26f55e9f645 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:27:30 +0000
Subject: twisted: initial include for deluge

---
 abs/extra/community/twisted/PKGBUILD        | 29 +++++++++++++++++++++++++++++
 abs/extra/community/twisted/twisted.install | 11 +++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 abs/extra/community/twisted/PKGBUILD
 create mode 100644 abs/extra/community/twisted/twisted.install

diff --git a/abs/extra/community/twisted/PKGBUILD b/abs/extra/community/twisted/PKGBUILD
new file mode 100644
index 0000000..e008e92
--- /dev/null
+++ b/abs/extra/community/twisted/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 94591 2010-10-08 12:55:33Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor:  Douglas Soares de Andrade <douglas@archlinux.org>
+
+pkgname=twisted
+pkgver=10.1.0
+pkgrel=1
+pkgdesc="Asynchronous networking framework written in Python."
+arch=('i686' 'x86_64')
+url="http://twistedmatrix.com/"
+license=('MIT')
+depends=('python2' 'pycrypto' 'zope-interface')
+optdepends=('pyopenssl'
+            'python-soappy:for twisted.web.soap')
+install=twisted.install
+source=(http://tmrc.mit.edu/mirror/twisted/Twisted/${pkgver%.*}/Twisted-${pkgver}.tar.bz2)
+md5sums=('04cca97506e830074cffc1965297da3f')
+build() {
+  cd "${srcdir}/Twisted-${pkgver}"
+
+  python2 setup.py install --prefix=/usr --root=$pkgdir --optimize=1
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
+
+  sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+      -i ${pkgdir}/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py
+  sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+      -i ${pkgdir}/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py
+}
diff --git a/abs/extra/community/twisted/twisted.install b/abs/extra/community/twisted/twisted.install
new file mode 100644
index 0000000..8e93ffd
--- /dev/null
+++ b/abs/extra/community/twisted/twisted.install
@@ -0,0 +1,11 @@
+post_install() {
+  python2 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1 || return 1
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  find /usr/lib/python2.7/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f
+}
-- 
cgit v0.12


From b9a0dbfc6dc59c8b54435d4d23c44069f81a6427 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:27:51 +0000
Subject: zope-interface: inital include for twisted

---
 abs/extra/community/zope-interface/PKGBUILD | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 abs/extra/community/zope-interface/PKGBUILD

diff --git a/abs/extra/community/zope-interface/PKGBUILD b/abs/extra/community/zope-interface/PKGBUILD
new file mode 100644
index 0000000..a2918bf
--- /dev/null
+++ b/abs/extra/community/zope-interface/PKGBUILD
@@ -0,0 +1,21 @@
+# $Id: PKGBUILD 87850 2010-08-18 13:23:55Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+
+pkgname=zope-interface
+pkgver=3.5.3
+pkgrel=2
+pkgdesc="Separate distribution of the zope.interface package used in Zope 3."
+license=('ZPL')
+arch=('i686' 'x86_64')
+url="http://www.zope.org/Products/ZopeInterface/"
+depends=('python2')
+source=(http://pypi.python.org/packages/source/z/zope.interface/zope.interface-${pkgver}.tar.gz)
+md5sums=('1fdb9a77f92d3ada3e795a8c9b58d0c6')
+
+build() {
+  cd ${srcdir}/zope.interface-${pkgver}
+  python2 setup.py install --prefix=/usr --root=${pkgdir} --optimize=1
+  # Blabla.
+  rm $pkgdir/usr/lib/python2.7/site-packages/zope/interface/README*.txt
+}
-- 
cgit v0.12


From b1b6af43c00e8d29e0ac8e0925ea3f2815538733 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:28:18 +0000
Subject: python-chardet: inital include for deluge

---
 abs/extra/community/python-chardet/PKGBUILD | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 abs/extra/community/python-chardet/PKGBUILD

diff --git a/abs/extra/community/python-chardet/PKGBUILD b/abs/extra/community/python-chardet/PKGBUILD
new file mode 100644
index 0000000..6ed1086
--- /dev/null
+++ b/abs/extra/community/python-chardet/PKGBUILD
@@ -0,0 +1,20 @@
+# $Id: PKGBUILD 87872 2010-08-18 15:26:20Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: William Rea <sillywilly@gmail.com>
+pkgname=python-chardet
+_pkgnamebase=python2-chardet
+pkgver=2.0.1
+pkgrel=2
+pkgdesc="Python module for character encoding auto-detection"
+arch=('any')
+url="http://chardet.feedparser.org"
+license=('LGPL')
+depends=('python2')
+source=(http://chardet.feedparser.org/download/${_pkgnamebase}-${pkgver}.tgz)
+sha256sums=('56fa0c37189b0a5f082d064dec59d69a044aaa3eeb7acb9b3081e2ba306deaa4')
+
+build() {
+  cd "${srcdir}/${_pkgnamebase}-${pkgver}"
+  python2 setup.py install --root="${pkgdir}" --optimize=1
+}
+
-- 
cgit v0.12


From 4821279479feed48038cdf08750b07613a059f5e Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:28:43 +0000
Subject: pyxdg: upgrade

---
 abs/extra/community/pyxdg/PKGBUILD | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/abs/extra/community/pyxdg/PKGBUILD b/abs/extra/community/pyxdg/PKGBUILD
index c56fd55..8c3d7bc 100644
--- a/abs/extra/community/pyxdg/PKGBUILD
+++ b/abs/extra/community/pyxdg/PKGBUILD
@@ -1,18 +1,20 @@
-# $Id: PKGBUILD 16878 2008-10-23 00:28:55Z douglas $
-# Maintainer: Aaron Griffin <aarongriffin@gmail.com>
+# $Id: PKGBUILD 89531 2010-09-01 15:23:06Z remy $
+# Maintainer: Hugo Doria <hugo@archlinux.org>
 # Contributor: Mario A. Vazquez <mario_vazq@hotmail.com>
+
 pkgname=pyxdg
-pkgver=0.15
-pkgrel=3
+pkgver=0.19
+pkgrel=2
 pkgdesc="Python library to access freedesktop.org standards."
-arch=(i686 x86_64)
+arch=('any')
 url="http://freedesktop.org/Software/pyxdg"
 license=("LGPL")
-depends=('python')
-source=(http://gentoolabs.com.ar/distfiles/${pkgname}-${pkgver}.tar.gz)
+depends=('python2')
+source=(http://www.freedesktop.org/~lanius/${pkgname}-${pkgver}.tar.gz)
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  python setup.py install --prefix=/usr --root=${startdir}/pkg || return 1
+  cd ${srcdir}/${pkgname}-${pkgver}
+  python2 setup.py install --prefix=/usr --root=${pkgdir} || return 1
 }
-md5sums=('86a5441285fc908145414b63348d11a3')
+md5sums=('9f33542e846d0fc1e0bfa992a8555b0a')
+
-- 
cgit v0.12


From 24db0e62438bcb8076231aed841974e61f64f38f Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:29:04 +0000
Subject: python-mako: inital include for deluge

---
 abs/extra/community/python-mako/PKGBUILD | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 abs/extra/community/python-mako/PKGBUILD

diff --git a/abs/extra/community/python-mako/PKGBUILD b/abs/extra/community/python-mako/PKGBUILD
new file mode 100644
index 0000000..8d68c9b
--- /dev/null
+++ b/abs/extra/community/python-mako/PKGBUILD
@@ -0,0 +1,21 @@
+# $Id: PKGBUILD 87883 2010-08-18 15:32:33Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Roberto Alsina <ralsina@kde.org>
+pkgname=python-mako
+pkgver=0.3.4
+pkgrel=4
+pkgdesc="Hyperfast and lightweight templating for the Python platform."
+arch=('any')
+url="http://www.makotemplates.org/"
+license=('custom')
+depends=('python2' 'python-markupsafe>=0.9.2' 'python-beaker>=1.5.4')
+makedepends=('setuptools')
+source=(http://www.makotemplates.org/downloads/Mako-$pkgver.tar.gz)
+md5sums=('2ae56ccc6c9b5c4e2e67f42b69475009')
+
+build() {
+  cd "$srcdir/Mako-$pkgver"
+  python2 setup.py install --root="$pkgdir" --optimize=1 || return 1
+  install -D LICENSE "$pkgdir/usr/share/licenses/python-mako/COPYING" || return 1
+}
+
-- 
cgit v0.12


From c0c5a4cd49ad9981eaf9c8f7eef4e48cf265052b Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:29:30 +0000
Subject: python-markupsafe: inital include for python-mako

---
 abs/extra/community/python-markupsafe/PKGBUILD | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 abs/extra/community/python-markupsafe/PKGBUILD

diff --git a/abs/extra/community/python-markupsafe/PKGBUILD b/abs/extra/community/python-markupsafe/PKGBUILD
new file mode 100644
index 0000000..92c9282
--- /dev/null
+++ b/abs/extra/community/python-markupsafe/PKGBUILD
@@ -0,0 +1,23 @@
+# $Id: PKGBUILD 87877 2010-08-18 15:28:18Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Alex Anthony <alex.anthony28991@gmail.com>
+
+pkgname=python-markupsafe
+pkgver=0.9.2
+pkgrel=2
+pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
+arch=('i686' 'x86_64')
+url="http://pypi.python.org/pypi/MarkupSafe"
+license=('custom')
+depends=('python2')
+makedepends=('setuptools')
+source=(http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz)
+md5sums=('69b72d1afdd9e808f9c1ef65f819c7a6')
+
+build() {
+  cd ${srcdir}/MarkupSafe-${pkgver}
+  python2 setup.py install --root=${pkgdir} --optimize=1
+
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
+
-- 
cgit v0.12


From 18403346bbdca01ed3b5aa9d9de200cae752eaa6 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:30:02 +0000
Subject: python-beaker: inital include for deluge

---
 abs/extra/community/python-beaker/PKGBUILD    | 21 +++++++++++++++++++++
 abs/extra/community/python-beaker/__changelog |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 abs/extra/community/python-beaker/PKGBUILD
 create mode 100644 abs/extra/community/python-beaker/__changelog

diff --git a/abs/extra/community/python-beaker/PKGBUILD b/abs/extra/community/python-beaker/PKGBUILD
new file mode 100644
index 0000000..6cf06b4
--- /dev/null
+++ b/abs/extra/community/python-beaker/PKGBUILD
@@ -0,0 +1,21 @@
+# $Id: PKGBUILD 87715 2010-08-18 03:37:40Z allan $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Massimiliano Torromeo < massimiliano DOT torromeo AT gmail DOT com >
+pkgname=python-beaker
+pkgver=1.5.4
+pkgrel=2
+arch=('any')
+license=('custom')
+pkgdesc="Caching and sessions WSGI middleware for use with web applications and stand-alone Python scripts and applications"
+url="http://beaker.groovie.org/"
+depends=('python2')
+makedepends=('python2-distribute')
+source=("http://cheeseshop.python.org/packages/source/B/Beaker/Beaker-$pkgver.tar.gz")
+md5sums=('de84e7511119dc0b8eb4ac177d3e2512')
+
+build() {
+    cd ${srcdir}/Beaker-${pkgver}
+    sed -i "s#/usr/bin/python#/usr/bin/python2#" beaker/crypto/pbkdf2.py
+    python2 setup.py install --root=${pkgdir} --optimize=1
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/abs/extra/community/python-beaker/__changelog b/abs/extra/community/python-beaker/__changelog
new file mode 100644
index 0000000..9e2b603
--- /dev/null
+++ b/abs/extra/community/python-beaker/__changelog
@@ -0,0 +1 @@
+makedepends=('setuptools') -> makedepends=('python2-distribute')
-- 
cgit v0.12


From 5dd9363e01cf9fbe13534522fb4e4cbcbdceb93f Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:30:29 +0000
Subject: ttf-dejavu: upgrade

---
 abs/core/ttf-dejavu/ChangeLog          |  5 ++++
 abs/core/ttf-dejavu/PKGBUILD           | 24 +++++++++--------
 abs/core/ttf-dejavu/ttf-dejavu.install | 47 ++++++++++++++++++++++++++++++++--
 3 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/abs/core/ttf-dejavu/ChangeLog b/abs/core/ttf-dejavu/ChangeLog
index b3cf284..c5c8c4a 100644
--- a/abs/core/ttf-dejavu/ChangeLog
+++ b/abs/core/ttf-dejavu/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-12  Alexander Fehr  <pizzapunk gmail com>
+
+  * ttf-dejavu-2.29-1:
+  New upstream release.
+
 2008-12-22  Alexander Fehr  <pizzapunk gmail com>
 
   * ttf-dejavu-2.28-1:
diff --git a/abs/core/ttf-dejavu/PKGBUILD b/abs/core/ttf-dejavu/PKGBUILD
index 93356a5..a5fd988 100644
--- a/abs/core/ttf-dejavu/PKGBUILD
+++ b/abs/core/ttf-dejavu/PKGBUILD
@@ -1,25 +1,29 @@
-# $Id: PKGBUILD 22203 2008-12-22 23:29:26Z alexanderf $
+# $Id: PKGBUILD 71355 2010-03-06 19:39:30Z jgc $
 # Maintainer: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Michal Krenek <mikos@sg1.cz>
 
 pkgname=ttf-dejavu
-pkgver=2.28
-pkgrel=1
+pkgver=2.30
+pkgrel=2
 pkgdesc="Font family based on the Bitstream Vera Fonts with a wider range of characters"
-arch=('i686' 'x86_64')
+arch=('any')
 url="http://dejavu.sourceforge.net/"
 license=('custom')
 depends=('fontconfig' 'xorg-fonts-encodings')
 install=ttf-dejavu.install
-source=(http://downloads.sourceforge.net/dejavu/dejavu-fonts-ttf-$pkgver.tar.bz2)
-md5sums=('10002ae52fbad207641d1fd2bf9bf4b8')
+source=(http://downloads.sourceforge.net/project/dejavu/dejavu/${pkgver}/dejavu-fonts-ttf-${pkgver}.tar.bz2)
+md5sums=('545b3bfc69893075a90a7c6e6f4a7e67')
 
 build() {
-  cd "$srcdir/dejavu-fonts-ttf-$pkgver"
+  cd "${srcdir}/dejavu-fonts-ttf-${pkgver}"
 
-  mkdir -p "$pkgdir/usr/share/fonts/TTF" || return 1
-  install -m644 ttf/*.ttf "$pkgdir/usr/share/fonts/TTF" || return 1
+  install -m755 -d "${pkgdir}/usr/share/fonts/TTF"
+  install -m644 ttf/*.ttf "${pkgdir}/usr/share/fonts/TTF/" || return 1
 
-  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/ttf-dejavu/LICENSE" || return 1
+  install -m755 -d "${pkgdir}/etc/fonts/conf.avail"
+  install -m644 fontconfig/*.conf "${pkgdir}/etc/fonts/conf.avail/" || return 1
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/${pkgname}/" || return 1
 }
diff --git a/abs/core/ttf-dejavu/ttf-dejavu.install b/abs/core/ttf-dejavu/ttf-dejavu.install
index 18666d2..f831cb1 100644
--- a/abs/core/ttf-dejavu/ttf-dejavu.install
+++ b/abs/core/ttf-dejavu/ttf-dejavu.install
@@ -1,13 +1,56 @@
+configs=(20-unhint-small-dejavu-sans-mono.conf
+         20-unhint-small-dejavu-sans.conf
+         20-unhint-small-dejavu-serif.conf
+         57-dejavu-sans-mono.conf
+         57-dejavu-sans.conf
+         57-dejavu-serif.conf)
 post_install() {
+  pushd /etc/fonts/conf.d > /dev/null
+  for config in "${configs[@]}"; do
+    ln -sf ../conf.avail/${config} .
+  done
+  popd > /dev/null
   fc-cache -fs
   mkfontscale usr/share/fonts/TTF
   mkfontdir usr/share/fonts/TTF
 }
 
 post_upgrade() {
-  post_install
+  if [ `vercmp 2.30-2 $2` -gt 0 ]; then 
+    pushd /etc/fonts/conf.d > /dev/null
+    for config in "${configs[@]}"; do
+      ln -sf ../conf.avail/${config} .
+    done
+    popd > /dev/null
+  fi
+  for config in /etc/fonts/conf.d/*; do
+    if [ ! -f ${config} ]; then
+      rm -f ${config}
+    fi
+  done
+  fc-cache -fs
+  mkfontscale usr/share/fonts/TTF
+  mkfontdir usr/share/fonts/TTF
+}
+
+pre_upgrade() {
+  # Link new config files not present on system yet
+  pushd /etc/fonts/conf.d > /dev/null
+  for config in "${configs[@]}"; do
+    if [ ! -f ../conf.avail/${config} ]; then
+      ln -sf ../conf.avail/${config} .
+    fi
+  done
+  popd > /dev/null
 }
 
 post_remove() {
-  post_install
+  pushd /etc/fonts/conf.d > /dev/null
+  for config in "${configs[@]}"; do
+    rm -f ${config}
+  done
+  popd > /dev/null
+  fc-cache -fs
+  mkfontscale usr/share/fonts/TTF
+  mkfontdir usr/share/fonts/TTF
 }
-- 
cgit v0.12


From 4e5226bf198610e867e822ad4ef7381ce620525e Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:30:50 +0000
Subject: mpeg_stat: recompile

---
 abs/extra/mpeg_stat/PKGBUILD | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/abs/extra/mpeg_stat/PKGBUILD b/abs/extra/mpeg_stat/PKGBUILD
index 37be249..b0f7315 100644
--- a/abs/extra/mpeg_stat/PKGBUILD
+++ b/abs/extra/mpeg_stat/PKGBUILD
@@ -10,10 +10,13 @@ depends=('ffmpeg')
 source=(http://www.sfr-fresh.com/unix/misc/old/${pkgname}-${pkgver}-src.tar.gz)
 
 build() {
+   cd ${srcdir}/${pkgname}
 
-cd $startdir/src/mpeg_stat
-make || return 1
-install -m755 -D $startdir/src/mpeg_stat/mpeg_stat $startdir/pkg/usr/bin/mpeg_stat
-install -m644 -D $startdir/src/mpeg_stat/COPYRIGHT $startdir/pkg/usr/share/licenses/mpeg_stat/COPYRIGHT
+   make || return 1
 }
-
+package() {
+   cd ${srcdir}/${pkgname}
+   install -m755 -D ${srcdir}/mpeg_stat/mpeg_stat ${pkgdir}/usr/bin/mpeg_stat
+   install -m644 -D ${srcdir}/mpeg_stat/COPYRIGHT ${pkgdir}/usr/share/licenses/mpeg_stat/COPYRIGHT
+}
+md5sums=('d0eca3833b76855c4e348b39deaf667d')
-- 
cgit v0.12


From d31e6d5a5c58f3673869ac14f1e508dc88ad9a26 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:31:24 +0000
Subject: xcmiscproto: upgrade

---
 abs/core/xcmiscproto/PKGBUILD | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/abs/core/xcmiscproto/PKGBUILD b/abs/core/xcmiscproto/PKGBUILD
index ccdbff8..f7803b4 100644
--- a/abs/core/xcmiscproto/PKGBUILD
+++ b/abs/core/xcmiscproto/PKGBUILD
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id: PKGBUILD 97539 2010-10-31 15:37:25Z jgc $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xcmiscproto
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 pkgdesc="X11 XC-Miscellaneous extension wire protocol"
-arch=(i686 x86_64)
+arch=(any)
 url="http://xorg.freedesktop.org/"
+license=('custom')
+makedepends=('xorg-util-macros')
 source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('ff7ddb6e5698bf4461a524ca30f3b32e2a9dce8a')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
-  make || return 1
+  make
 }
-package () {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  make DESTDIR=${startdir}/pkg install || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
-md5sums=('7b83e4a7e9f4edc9c6cfb0500f4a7196')
+
-- 
cgit v0.12


From 96e386c436555285f0101fe5af35387023f54d34 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:31:41 +0000
Subject: mpgtx: upgrade

---
 abs/extra/mpgtx/PKGBUILD | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/abs/extra/mpgtx/PKGBUILD b/abs/extra/mpgtx/PKGBUILD
index 1181564..8474da3 100644
--- a/abs/extra/mpgtx/PKGBUILD
+++ b/abs/extra/mpgtx/PKGBUILD
@@ -1,16 +1,23 @@
-pkgname="mpgtx"
-pkgver="1.3.1"
-pkgrel=1
-arch=('i686')
-pkgdesc="mpgtx is a commandline MPEG audio/video/system file toolbox."
-url="http://mpgtx.sourceforge.net/"
-source=(http://downloads.sourceforge.net/project/mpgtx/mpgtx/$pkgver/mpgtx-$pkgver.tar.gz)
+# $Id: PKGBUILD 5185 2009-11-07 02:20:01Z dgriffiths $
+# Contributor: Peter Baldwin <bald_pete@hotmail.com>
+pkgname=mpgtx
+pkgver=1.3.1
+pkgrel=2
+pkgdesc="A command line MPEG audio/video/system toolkit"
+arch=('i686' 'x86_64')
+url="http://mpgtx.sourceforge.net"
+license=("GPL")
+depends=()
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('d628060aa04ad3b40a175bf35f5167cf')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make || return 1
-  make INSTALLDIR=$startdir/pkg/usr/bin MANDIR=$startdir/pkg/usr/man/man1 MANDIRDE=$startdir/usr/man/de/man1 install
 }
-
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make PREFIX=${pkgdir}/usr install
+  mv ${pkgdir}/usr/man ${pkgdir}/usr/share/
+}
-- 
cgit v0.12


From 531c6d5528d441bf8bd0e366cd3d5951aab70374 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 3 Dec 2010 03:31:58 +0000
Subject: damageproto: upgrade

---
 abs/core/damageproto/PKGBUILD | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/abs/core/damageproto/PKGBUILD b/abs/core/damageproto/PKGBUILD
index 14f6122..870efcd 100644
--- a/abs/core/damageproto/PKGBUILD
+++ b/abs/core/damageproto/PKGBUILD
@@ -1,23 +1,28 @@
-# $Id: PKGBUILD 51004 2009-09-04 13:03:02Z jgc $
+# $Id: PKGBUILD 97557 2010-10-31 15:48:11Z jgc $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=damageproto
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 pkgdesc="X11 Damage extension wire protocol"
 arch=(any)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('xproto' 'fixesproto')
+makedepends=('xorg-util-macros')
 source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('ffe177a6ae2cf023d41e015aa6ece2b191cb8a8a')
+sha1sums=('bd0f0f4dc8f37eaabd9279d10fe2889710507358')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr
+  make
+}
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
+
-- 
cgit v0.12


From 076d04e53b2abd395dc11399af2875c4fe546dcf Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Sat, 4 Dec 2010 00:11:41 +0000
Subject: fuzemux-svn: recompile and rename dir from "fuzemux" to "fuzemux-svn"

---
 abs/extra/community/fuzemux-svn/PKGBUILD           | 41 +++++++++++++++++++++
 .../community/fuzemux-svn/fuzemux-svn.install      |  5 +++
 abs/extra/community/fuzemux/PKGBUILD               | 42 ----------------------
 abs/extra/community/fuzemux/fuzemux-svn.install    |  5 ---
 4 files changed, 46 insertions(+), 47 deletions(-)
 create mode 100644 abs/extra/community/fuzemux-svn/PKGBUILD
 create mode 100644 abs/extra/community/fuzemux-svn/fuzemux-svn.install
 delete mode 100644 abs/extra/community/fuzemux/PKGBUILD
 delete mode 100644 abs/extra/community/fuzemux/fuzemux-svn.install

diff --git a/abs/extra/community/fuzemux-svn/PKGBUILD b/abs/extra/community/fuzemux-svn/PKGBUILD
new file mode 100644
index 0000000..1acc914
--- /dev/null
+++ b/abs/extra/community/fuzemux-svn/PKGBUILD
@@ -0,0 +1,41 @@
+# Contributor: Michael Hanson <hansonorders@verizon.net>
+# Maintainer: Michael Hanson <hansonorders@verizon.net>
+pkgname=fuzemux-svn
+pkgver=11
+pkgrel=2
+pkgdesc="A tool to remux AVI video files for the San Disk Sansa Fuze portable media player"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/fuzemux"
+license=('GPL3')
+#depends=()
+makedepends=('subversion' 'autoconf')
+provides=('fuzemux')
+install=('fuzemux-svn.install')
+
+_svntrunk=http://fuzemux.googlecode.com/svn/trunk/
+_svnmod=fuzemux
+
+build() {
+  cd "$srcdir"
+
+  if [ -d $_svnmod/.svn ]; then
+    (cd $_svnmod && svn up -r $pkgver)
+  else
+    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
+  fi
+
+  msg "SVN checkout done or server timeout"
+  msg "Starting make..."
+
+  rm -rf "$srcdir/$_svnmod-build"
+  cp -r "$srcdir/$_svnmod" "$srcdir/$_svnmod-build"
+  cd "$srcdir/$_svnmod-build"
+
+  #
+  # BUILD
+  #
+  /usr/bin/autoreconf --install
+  ./configure --prefix=/usr
+  make || return 1
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/abs/extra/community/fuzemux-svn/fuzemux-svn.install b/abs/extra/community/fuzemux-svn/fuzemux-svn.install
new file mode 100644
index 0000000..877ec1b
--- /dev/null
+++ b/abs/extra/community/fuzemux-svn/fuzemux-svn.install
@@ -0,0 +1,5 @@
+post_install() {
+	echo ">>>"
+	echo ">>> A user job script is supplied at /usr/LH/bin/myth2fuze"
+	echo ">>>"
+}
diff --git a/abs/extra/community/fuzemux/PKGBUILD b/abs/extra/community/fuzemux/PKGBUILD
deleted file mode 100644
index 5cce2d0..0000000
--- a/abs/extra/community/fuzemux/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: Michael Hanson <hansonorders@verizon.net>
-# Maintainer: Michael Hanson <hansonorders@verizon.net>
-pkgname=fuzemux-svn
-pkgver=11
-pkgrel=1
-pkgdesc="A tool to remux AVI video files for the San Disk Sansa Fuze portable media player"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/fuzemux"
-license=('GPL3')
-#depends=()
-makedepends=('subversion' 'autoconf')
-provides=('fuzemux')
-install=('fuzemux-svn.install')
-
-_svntrunk=http://fuzemux.googlecode.com/svn/trunk/
-_svnmod=fuzemux
-
-build() {
-  cd "$srcdir"
-
-  if [ -d $_svnmod/.svn ]; then
-    (cd $_svnmod && svn up -r $pkgver)
-  else
-    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-  fi
-
-  msg "SVN checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "$srcdir/$_svnmod-build"
-  cp -r "$srcdir/$_svnmod" "$srcdir/$_svnmod-build"
-  cd "$srcdir/$_svnmod-build"
-
-  #
-  # BUILD
-  #
-  /usr/bin/autoreconf --install
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install
-}
-md5sums=()
diff --git a/abs/extra/community/fuzemux/fuzemux-svn.install b/abs/extra/community/fuzemux/fuzemux-svn.install
deleted file mode 100644
index 877ec1b..0000000
--- a/abs/extra/community/fuzemux/fuzemux-svn.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_install() {
-	echo ">>>"
-	echo ">>> A user job script is supplied at /usr/LH/bin/myth2fuze"
-	echo ">>>"
-}
-- 
cgit v0.12


From 5e6b91969940f5a5887ac6301904e5ce297592df Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Sat, 4 Dec 2010 01:59:26 +0000
Subject: serdisplib: upgrade

---
 abs/extra/serdisplib/PKGBUILD | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/abs/extra/serdisplib/PKGBUILD b/abs/extra/serdisplib/PKGBUILD
index 454769b..e888a7d 100644
--- a/abs/extra/serdisplib/PKGBUILD
+++ b/abs/extra/serdisplib/PKGBUILD
@@ -1,22 +1,26 @@
-# Contributor: Bernhard Walle <bernhard.walle@gmx.de>
+# Contributor: Bernhard Walle <bernhard@bwalle.de>
+# AUR Category: system
 pkgname=serdisplib
-pkgver=1.97.8
+pkgver=1.97.9
 pkgrel=1
 pkgdesc="Library for Certain Serial and Parallel LC Displays"
 url="http://serdisplib.sourceforge.net/"
 license="GPL"
 depends=(libusb gd)
-backup=(etc/LCDd.conf)
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 source=(http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('2aa91c43d01d2dfc9fbc1116e3063ae1')
+md5sums=('130552ec60d01e974712a60274f34de7')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc --enable-libusb
-  make
-  make DESTDIR=$startdir/pkg includedir=$startdir/pkg/usr/include \
-        libdir=$startdir/pkg/usr/lib bindir=$startdir/pkg/usr/bin \
+  make || return 1
+}
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} includedir=${pkgdir}/usr/include \
+        libdir=${pkgdir}/usr/lib bindir=${pkgdir}/usr/bin \
         install
 }
 # :mode=shellscript:
+
-- 
cgit v0.12


From b474ad34a73eca34de57e798e28d99010e74acfb Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Sat, 4 Dec 2010 01:59:55 +0000
Subject: ttf-bitstream-vera: recompile

---
 abs/core/ttf-bitstream-vera/PKGBUILD | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/abs/core/ttf-bitstream-vera/PKGBUILD b/abs/core/ttf-bitstream-vera/PKGBUILD
index d802ca4..4fa76b8 100644
--- a/abs/core/ttf-bitstream-vera/PKGBUILD
+++ b/abs/core/ttf-bitstream-vera/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id
-# Maintainer: dorphell <dorphell@archlinux.org>
+# $Id: PKGBUILD 77738 2010-04-17 15:45:51Z thayer $
+# Maintainer: Thayer Williams <thayer@archlinux.org>
+# Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=ttf-bitstream-vera
 pkgver=1.10
-pkgrel=5
+pkgrel=7
 pkgdesc="Bitstream vera fonts"
-arch=(i686 x86_64)
-license=(custom)
+arch=('any')
+license=('custom')
 url="http://www.gnome.org/fonts"
-depends=(fontconfig xorg-fonts-encodings xorg-font-utils)
+depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
 install=vera.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/1.10/${pkgname}-${pkgver}.tar.bz2)
 md5sums=(bb22bd5b4675f5dbe17c6963d8c00ed6)
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  mkdir -p  ${startdir}/pkg/usr/share/fonts/TTF
-  install -m644 *.ttf ${startdir}/pkg/usr/share/fonts/TTF/
-  mkdir -p ${startdir}/pkg/usr/share/licenses/custom/ttf-bitstream-vera
-  install -m644 COPYRIGHT.TXT ${startdir}/pkg/usr/share/licenses/custom/ttf-bitstream-vera/license.txt
+  cd ${srcdir}/${pkgname}-${pkgver}
+  mkdir -p  ${pkgdir}/usr/share/fonts/TTF
+  install -m644 *.ttf ${pkgdir}/usr/share/fonts/TTF/
+  mkdir -p ${pkgdir}/usr/share/licenses/ttf-bitstream-vera
+  install -m644 COPYRIGHT.TXT ${pkgdir}/usr/share/licenses/ttf-bitstream-vera/LICENSE
 }
+
-- 
cgit v0.12


From 6476c831da58722d0c4c1996b1e7428c2841dfcc Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Sat, 4 Dec 2010 02:00:25 +0000
Subject: mime-types: recompile

---
 abs/extra/mime-types/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abs/extra/mime-types/PKGBUILD b/abs/extra/mime-types/PKGBUILD
index 563857d..0457da6 100644
--- a/abs/extra/mime-types/PKGBUILD
+++ b/abs/extra/mime-types/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=mime-types
 pkgver=1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Provides /etc/mime.types"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/"
-- 
cgit v0.12


From b5846affabc25b34b226880674f2edbfae707b65 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Sat, 4 Dec 2010 02:00:51 +0000
Subject: libelf: upgrade

---
 abs/extra/community/libelf/PKGBUILD | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/abs/extra/community/libelf/PKGBUILD b/abs/extra/community/libelf/PKGBUILD
index 0cf517b..18bd118 100644
--- a/abs/extra/community/libelf/PKGBUILD
+++ b/abs/extra/community/libelf/PKGBUILD
@@ -3,20 +3,23 @@
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=libelf
-pkgver=0.8.10
-pkgrel=3
+pkgver=0.8.13
+pkgrel=1
 pkgdesc="libelf is a free ELF object file access library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 source=(http://www.mr511.de/software/${pkgname}-${pkgver}.tar.gz)
 url="http://directory.fsf.org/libs/misc/libelf.html"
 depends=('glibc')
-md5sums=('9db4d36c283d9790d8fa7df1f4d7b4d9')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure --prefix=/usr --enable-shared \
       --enable-gnu-names --enable-compat || return 1
     make || return 1
+}
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
     make prefix="${pkgdir}/usr" install || return 1
 }
+md5sums=('4136d7b4c04df68b686570afa26988ac')
-- 
cgit v0.12


From 3fe25cca904a12b402fe678a85c2e44a7219f8ca Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Sat, 4 Dec 2010 02:01:12 +0000
Subject: xorg-fonts-alias: upgrade

---
 abs/core/xorg-fonts-alias/LICENSE  | 49 ++++++++++++++++++++++++++++++++++++++
 abs/core/xorg-fonts-alias/PKGBUILD | 26 +++++++++++---------
 2 files changed, 64 insertions(+), 11 deletions(-)
 create mode 100644 abs/core/xorg-fonts-alias/LICENSE

diff --git a/abs/core/xorg-fonts-alias/LICENSE b/abs/core/xorg-fonts-alias/LICENSE
new file mode 100644
index 0000000..76947d1
--- /dev/null
+++ b/abs/core/xorg-fonts-alias/LICENSE
@@ -0,0 +1,49 @@
+Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES
+OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+from the XFree86 Project.
+
+
+
+  Copyright 2005 Red Hat, Inc.
+
+  Permission to use, copy, modify, distribute, and sell this software
+  and its documentation for any purpose is hereby granted without
+  fee, provided that the above copyright notice appear in all copies
+  and that both that copyright notice and this permission notice
+  appear in supporting documentation, and that the name of Red Hat
+  not be used in advertising or publicity pertaining to distribution
+  of the software without specific, written prior permission.  Red
+  Hat makes no representations about the suitability of this software
+  for any purpose.  It is provided "as is" without express or implied
+  warranty.
+
+  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+  NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
diff --git a/abs/core/xorg-fonts-alias/PKGBUILD b/abs/core/xorg-fonts-alias/PKGBUILD
index 41b431d..bf5a60f 100644
--- a/abs/core/xorg-fonts-alias/PKGBUILD
+++ b/abs/core/xorg-fonts-alias/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id: PKGBUILD 57479 2009-10-31 18:08:56Z jgc $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-fonts-alias
-pkgver=1.0.1
+pkgver=1.0.2
 pkgrel=1
 pkgdesc="X.org font alias files"
+arch=('any')
 url="http://xorg.freedesktop.org/"
-_xorg=X11R7.0
-_relname=font-alias
-arch=('i686' 'x86_64')
-source=(${url}/releases/${_xorg}/src/everything/${_relname}-${_xorg}-${pkgver}.tar.bz2)
-md5sums=('de7035b15ba7edc36f8685ab3c17a9cf')
+license=('custom')
+source=(${url}/releases/individual/font/font-alias-${pkgver}.tar.bz2 LICENSE)
 
 build() {
-  cd ${startdir}/src/${_relname}-${_xorg}-${pkgver}
-  ./configure --prefix=/usr \
-              --with-top-fontdir=/usr/share/fonts
+  cd "${srcdir}/font-alias-${pkgver}"
+  ./configure --prefix=/usr --with-fontrootdir=/usr/share/fonts || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+}
+package() {
+  cd "${srcdir}/font-alias-${pkgver}"
+  make DESTDIR="${pkgdir}" install || return 1
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }
 
+md5sums=('9d40dba6fb8cb58dacb433fc7bcaafca'
+         '8a4f7b210c3cf793f7b6de272f7b70d9')
-- 
cgit v0.12


From 8e3741f0c4809be53dd3eb06ad47bd9ee85d74ef Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Sat, 4 Dec 2010 02:01:36 +0000
Subject: cwiid-git: upgrade (needs testing)

---
 abs/extra/community/cwiid-git/PKGBUILD | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/abs/extra/community/cwiid-git/PKGBUILD b/abs/extra/community/cwiid-git/PKGBUILD
index 909f224..b87571a 100644
--- a/abs/extra/community/cwiid-git/PKGBUILD
+++ b/abs/extra/community/cwiid-git/PKGBUILD
@@ -1,14 +1,14 @@
 #Contributor:Andrea Tarocchi <valdar@email.it> 
 pkgname=cwiid-git
 #pkgver=`date +%Y%m%d`
-pkgver=20100716
+pkgver=20101204
 pkgrel=1
 pkgdesc="Cwiid-git is the bleeding edge version of a wiimote's driver and utility tools"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://github.com/abstrakraft/cwiid"
 license=('GPL')
 
-depends=('bluez>=4' 'gtk2' 'python')
+depends=('bluez>=4' 'gtk2' 'python2')
 makedepends=('git' 'make' 'automake' 'autoconf')
 replaces=('cwiid' 'cwiid-svn')
 provides=('cwiid' 'cwiid-git')
@@ -21,7 +21,7 @@ _builddir=$srcdir/$_gitname-build
 
 build() {
   
-  export LDFLAGS=
+  export LDFLAGS=""
 
   cd $srcdir/
   msg "Connecting to github.com GIT server...."
@@ -40,9 +40,13 @@ build() {
   
   aclocal
   autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-ldconfig
+  ./configure --prefix=/usr --sysconfdir=/etc --with-python=python`python2 --version 2>&1 | cut -d ' ' -f2` --disable-ldconfig
 
   make || return 1
+}
+
+package() {
+  cd ${_builddir}
   make DESTDIR="${pkgdir}" install || return 1
 
 #  aclocal
-- 
cgit v0.12


From beb70179c1c38f1088eaf8e38ab4079d85c465a3 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Sat, 4 Dec 2010 02:02:04 +0000
Subject: xmltv: upgrade

---
 abs/core/xmltv/PKGBUILD | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/abs/core/xmltv/PKGBUILD b/abs/core/xmltv/PKGBUILD
index 98ddf75..3f2ed58 100755
--- a/abs/core/xmltv/PKGBUILD
+++ b/abs/core/xmltv/PKGBUILD
@@ -3,31 +3,36 @@
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
 pkgname=xmltv
-pkgver=0.5.57
-pkgrel=1
+pkgver=0.5.59
+pkgrel=2
 pkgdesc="Set of utilities to download tv listings and format them in xml"
 arch=('any')
 url="http://xmltv.org/wiki/"
 license=('GPL')
-depends=('perl-archive-zip' 'perl-date-manip' 'perl-file-slurp'
-         'perl-http-cache-transparent' 'perl-http-response-encoding' 
-         'perl-html-tree' 'perl-io-stringy' 'perl-lingua-en-numbers-ordinate' 
-         'perl-lingua-preferred' 'perl-soap-lite' 'perl-term-progressbar'
-         'perl-term-readkey' 'perl-timedate' 'perl-tk-tablematrix' 
-         'perl-unicode-string' 'perl-unicode-utf8simple' 'perl-www-mechanize'
-         'perl-xml-dom' 'perl-xml-libxml' 'perl-xml-libxslt' 'perl-xml-simple'
-         'perl-xml-twig' 'perl-xml-writer')
+depends=('perl-archive-zip' 'perl-datetime' 'perl-date-manip' 
+  'perl-file-slurp' 'perl-datetime-format-strptime' 'perl-datetime-locale' 
+  'perl-http-cache-transparent' 'perl-http-response-encoding' 
+  'perl-html-tree' 'perl-io-stringy' 'perl-lingua-en-numbers-ordinate' 
+  'perl-lingua-preferred' 'perl-soap-lite' 'perl-term-progressbar'
+  'perl-term-readkey' 'perl-timedate' 'perl-tk-tablematrix' 
+  'perl-unicode-string' 'perl-unicode-utf8simple' 'perl-www-mechanize'
+  'perl-xml-dom' 'perl-xml-libxml' 'perl-xml-libxslt' 'perl-xml-simple'
+  'perl-xml-twig' 'perl-xml-writer' 'perl-parse-recdescent')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('c8396db9f823ba43d42ca3f4662b816b')
+md5sums=('29497a1d165ef0cdedfe376e04c06903')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   yes | perl Makefile.PL PREFIX=/usr INSTALLDIRS=vendor 
 
-  make || return 1
+  make
+}
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} PREFIX=/usr install
-	 
+         
   # remove perllocal.pod and .packlist
   find ${pkgdir} -name perllocal.pod -delete
   find ${pkgdir} -name .packlist -delete
 }
+
-- 
cgit v0.12


From 0c58d38a0c7d4df8d84b047dbbed979866d35266 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Sat, 4 Dec 2010 02:02:39 +0000
Subject: perl-http-response-encoding: initial include for xmltv

---
 .../perl-http-response-encoding/PKGBUILD           | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 abs/core/perl_modules/perl-http-response-encoding/PKGBUILD

diff --git a/abs/core/perl_modules/perl-http-response-encoding/PKGBUILD b/abs/core/perl_modules/perl-http-response-encoding/PKGBUILD
new file mode 100644
index 0000000..be9c20e
--- /dev/null
+++ b/abs/core/perl_modules/perl-http-response-encoding/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 3654 2009-10-07 08:13:13Z spupykin $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: Mladen Pejakovic <pejakm@gmail.com>
+
+pkgname=perl-http-response-encoding
+pkgver=0.06
+pkgrel=1
+pkgdesc="Adds encoding to HTTP::Response"
+arch=(any)
+url="http://search.cpan.org/dist/HTTP-Response-Encoding"
+license=('GPL' 'PerlArtistic')
+depends=('perl-libwww')
+options=('!emptydirs')
+source=(http://www.cpan.org/authors/id/D/DA/DANKOGAI/HTTP-Response-Encoding-$pkgver.tar.gz) 
+md5sums=('7e1d46f2d88022580e1a18bb7ac4ab71')
+
+build() {
+  cd  $srcdir/HTTP-Response-Encoding-$pkgver
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 
+  make || return 1
+}
+package() {
+  cd  $srcdir/HTTP-Response-Encoding-$pkgver
+  make install DESTDIR=$pkgdir || return 1
+  find $startdir/pkg -name '.packlist' -delete
+  find $startdir/pkg -name '*.pod' -delete
+}
+
-- 
cgit v0.12


From 5608cdbcece860b46b4cd0f8a563b89c11366226 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Sat, 4 Dec 2010 02:03:17 +0000
Subject: perl-parse-recdescent: initial include for xmltv

---
 .../perl_modules/perl-parse-recdescent/PKGBUILD    | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 abs/core/perl_modules/perl-parse-recdescent/PKGBUILD

diff --git a/abs/core/perl_modules/perl-parse-recdescent/PKGBUILD b/abs/core/perl_modules/perl-parse-recdescent/PKGBUILD
new file mode 100644
index 0000000..ab2ae40
--- /dev/null
+++ b/abs/core/perl_modules/perl-parse-recdescent/PKGBUILD
@@ -0,0 +1,29 @@
+# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman
+# Contributor: François Charette <firmicus ατ gmx δοτ net>
+
+pkgname=perl-parse-recdescent
+pkgver=1.965001
+pkgrel=1
+pkgdesc="Recursive descent parser generator"
+arch=(any)
+url="http://search.cpan.org/dist/Parse-RecDescent"
+license=('GPL' 'PerlArtistic')
+depends=('perl>=5.10.0')
+options=('!emptydirs')
+LC_NUMERIC=C
+provides=("perl-parse-recdescent=`printf %.6f ${pkgver}`")
+source=(http://www.cpan.org/authors/id/D/DC/DCONWAY/Parse-RecDescent-$pkgver.tar.gz)
+md5sums=('e91351ad179a3843fbe8e521b135acaf')
+
+build() {
+  cd  $srcdir/Parse-RecDescent-$pkgver
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
+  make || return 1
+}
+package() {
+  cd  $srcdir/Parse-RecDescent-$pkgver
+  make install DESTDIR=$pkgdir || return 1
+  find $pkgdir -name '.packlist' -delete
+  find $pkgdir -name '*.pod' -delete
+}
+
-- 
cgit v0.12


From 8eb43d3703f505eaf355c4ba79211c30094a2721 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Sat, 4 Dec 2010 02:46:00 +0000
Subject: mythtv: upgrade the suite cuz it's been a few weeks (mythtv,
 mythplugins, myththemes, morethemes, mythsmolt)

---
 abs/core/morethemes/PKGBUILD                       |  66 ---
 .../retro-wide_video-ui.xml-filetypes.patch        |  22 -
 abs/core/mythplugins/PKGBUILD                      | 145 ------
 abs/core/mythplugins/mtd                           |  36 --
 .../mythplugins/mythplugins-mythzoneminder.install |   3 -
 abs/core/mythplugins/qt-4.7-buildfixes.diff        |  26 -
 abs/core/mythsmolt/PKGBUILD                        |  27 -
 abs/core/mythsmolt/mythsmolt.patch                 |   8 -
 abs/core/mythsmolt/smolt_init_login.sh             |  39 --
 abs/core/myththemes/PKGBUILD                       |  51 --
 abs/core/mythtv/stable-0.24/PKGBUILD               | 113 ----
 abs/core/mythtv/stable-0.24/__changelog            |   1 -
 .../mythtv/stable-0.24/menu-xml/HOST_SETTINGS.xml  |  94 ----
 abs/core/mythtv/stable-0.24/menu-xml/is.xml        |   3 -
 .../mythtv/stable-0.24/menu-xml/library.xml.patch  |  12 -
 abs/core/mythtv/stable-0.24/menu-xml/linhes.xml    |  59 ---
 .../mythtv/stable-0.24/menu-xml/mainmenu.xml.patch |  37 --
 .../mythtv/stable-0.24/menu-xml/mythbackup.xml     |  20 -
 .../mythtv/stable-0.24/menu-xml/mythrestore.xml    |  20 -
 .../stable-0.24/menu-xml/optical_menu.xml.patch    |  16 -
 .../stable-0.24/menu-xml/original/create_patch.sh  |   5 -
 abs/core/mythtv/stable-0.24/menu-xml/setup.xml     | 111 ----
 .../mythtv/stable-0.24/menu-xml/siriusmenu.xml     | 419 ---------------
 abs/core/mythtv/stable-0.24/menu-xml/update.xml    |  20 -
 abs/core/mythtv/stable-0.24/menu-xml/update2.xml   |  26 -
 .../stable-0.24/menu-xml/util_menu.xml.patch       |  16 -
 abs/core/mythtv/stable-0.24/menu-xml/xmmenu.xml    | 574 ---------------------
 abs/core/mythtv/stable-0.24/morethemes/PKGBUILD    |  66 +++
 .../retro-wide_video-ui.xml-filetypes.patch        |  22 +
 abs/core/mythtv/stable-0.24/myth.sh                |   4 -
 abs/core/mythtv/stable-0.24/mythbackend            |  38 --
 abs/core/mythtv/stable-0.24/mythbackend.lr         |   9 -
 abs/core/mythtv/stable-0.24/mythbackend.sh         | 117 -----
 abs/core/mythtv/stable-0.24/mythfrontend.lr        |   9 -
 abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD   | 145 ++++++
 abs/core/mythtv/stable-0.24/mythplugins/mtd        |  36 ++
 .../mythplugins/mythplugins-mythzoneminder.install |   3 +
 .../stable-0.24/mythplugins/qt-4.7-buildfixes.diff |  26 +
 abs/core/mythtv/stable-0.24/mythsmolt/PKGBUILD     |  23 +
 .../mythtv/stable-0.24/mythsmolt/mythsmolt.patch   |   8 +
 .../stable-0.24/mythsmolt/smolt_init_login.sh      |  39 ++
 abs/core/mythtv/stable-0.24/myththemes/PKGBUILD    |  51 ++
 abs/core/mythtv/stable-0.24/mythtv.install         |  47 --
 abs/core/mythtv/stable-0.24/mythtv/PKGBUILD        | 113 ++++
 abs/core/mythtv/stable-0.24/mythtv/__changelog     |   1 +
 .../stable-0.24/mythtv/menu-xml/HOST_SETTINGS.xml  |  94 ++++
 abs/core/mythtv/stable-0.24/mythtv/menu-xml/is.xml |   3 +
 .../stable-0.24/mythtv/menu-xml/library.xml.patch  |  12 +
 .../mythtv/stable-0.24/mythtv/menu-xml/linhes.xml  |  59 +++
 .../stable-0.24/mythtv/menu-xml/mainmenu.xml.patch |  37 ++
 .../stable-0.24/mythtv/menu-xml/mythbackup.xml     |  20 +
 .../stable-0.24/mythtv/menu-xml/mythrestore.xml    |  20 +
 .../mythtv/menu-xml/optical_menu.xml.patch         |  16 +
 .../mythtv/menu-xml/original/create_patch.sh       |   5 +
 .../mythtv/stable-0.24/mythtv/menu-xml/setup.xml   | 111 ++++
 .../stable-0.24/mythtv/menu-xml/siriusmenu.xml     | 419 +++++++++++++++
 .../mythtv/stable-0.24/mythtv/menu-xml/update.xml  |  20 +
 .../mythtv/stable-0.24/mythtv/menu-xml/update2.xml |  26 +
 .../mythtv/menu-xml/util_menu.xml.patch            |  16 +
 .../mythtv/stable-0.24/mythtv/menu-xml/xmmenu.xml  | 574 +++++++++++++++++++++
 abs/core/mythtv/stable-0.24/mythtv/myth.sh         |   4 +
 abs/core/mythtv/stable-0.24/mythtv/mythbackend     |  38 ++
 abs/core/mythtv/stable-0.24/mythtv/mythbackend.lr  |   9 +
 abs/core/mythtv/stable-0.24/mythtv/mythbackend.sh  | 117 +++++
 abs/core/mythtv/stable-0.24/mythtv/mythfrontend.lr |   9 +
 abs/core/mythtv/stable-0.24/mythtv/mythtv.install  |  47 ++
 abs/core/mythtv/stable-0.24/mythtv/pretty          |   9 +
 .../mythtv/stable-0.24/mythtv/smolt_jump.patch     |  10 +
 abs/core/mythtv/stable-0.24/pretty                 |   9 -
 abs/core/mythtv/stable-0.24/smolt_jump.patch       |  10 -
 70 files changed, 2208 insertions(+), 2212 deletions(-)
 delete mode 100644 abs/core/morethemes/PKGBUILD
 delete mode 100644 abs/core/morethemes/retro-wide_video-ui.xml-filetypes.patch
 delete mode 100644 abs/core/mythplugins/PKGBUILD
 delete mode 100644 abs/core/mythplugins/mtd
 delete mode 100644 abs/core/mythplugins/mythplugins-mythzoneminder.install
 delete mode 100644 abs/core/mythplugins/qt-4.7-buildfixes.diff
 delete mode 100644 abs/core/mythsmolt/PKGBUILD
 delete mode 100644 abs/core/mythsmolt/mythsmolt.patch
 delete mode 100644 abs/core/mythsmolt/smolt_init_login.sh
 delete mode 100644 abs/core/myththemes/PKGBUILD
 delete mode 100755 abs/core/mythtv/stable-0.24/PKGBUILD
 delete mode 100644 abs/core/mythtv/stable-0.24/__changelog
 delete mode 100644 abs/core/mythtv/stable-0.24/menu-xml/HOST_SETTINGS.xml
 delete mode 100644 abs/core/mythtv/stable-0.24/menu-xml/is.xml
 delete mode 100644 abs/core/mythtv/stable-0.24/menu-xml/library.xml.patch
 delete mode 100644 abs/core/mythtv/stable-0.24/menu-xml/linhes.xml
 delete mode 100644 abs/core/mythtv/stable-0.24/menu-xml/mainmenu.xml.patch
 delete mode 100644 abs/core/mythtv/stable-0.24/menu-xml/mythbackup.xml
 delete mode 100644 abs/core/mythtv/stable-0.24/menu-xml/mythrestore.xml
 delete mode 100644 abs/core/mythtv/stable-0.24/menu-xml/optical_menu.xml.patch
 delete mode 100755 abs/core/mythtv/stable-0.24/menu-xml/original/create_patch.sh
 delete mode 100644 abs/core/mythtv/stable-0.24/menu-xml/setup.xml
 delete mode 100644 abs/core/mythtv/stable-0.24/menu-xml/siriusmenu.xml
 delete mode 100644 abs/core/mythtv/stable-0.24/menu-xml/update.xml
 delete mode 100644 abs/core/mythtv/stable-0.24/menu-xml/update2.xml
 delete mode 100644 abs/core/mythtv/stable-0.24/menu-xml/util_menu.xml.patch
 delete mode 100644 abs/core/mythtv/stable-0.24/menu-xml/xmmenu.xml
 create mode 100644 abs/core/mythtv/stable-0.24/morethemes/PKGBUILD
 create mode 100644 abs/core/mythtv/stable-0.24/morethemes/retro-wide_video-ui.xml-filetypes.patch
 delete mode 100755 abs/core/mythtv/stable-0.24/myth.sh
 delete mode 100755 abs/core/mythtv/stable-0.24/mythbackend
 delete mode 100644 abs/core/mythtv/stable-0.24/mythbackend.lr
 delete mode 100755 abs/core/mythtv/stable-0.24/mythbackend.sh
 delete mode 100644 abs/core/mythtv/stable-0.24/mythfrontend.lr
 create mode 100644 abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD
 create mode 100644 abs/core/mythtv/stable-0.24/mythplugins/mtd
 create mode 100644 abs/core/mythtv/stable-0.24/mythplugins/mythplugins-mythzoneminder.install
 create mode 100644 abs/core/mythtv/stable-0.24/mythplugins/qt-4.7-buildfixes.diff
 create mode 100644 abs/core/mythtv/stable-0.24/mythsmolt/PKGBUILD
 create mode 100644 abs/core/mythtv/stable-0.24/mythsmolt/mythsmolt.patch
 create mode 100644 abs/core/mythtv/stable-0.24/mythsmolt/smolt_init_login.sh
 create mode 100644 abs/core/mythtv/stable-0.24/myththemes/PKGBUILD
 delete mode 100755 abs/core/mythtv/stable-0.24/mythtv.install
 create mode 100755 abs/core/mythtv/stable-0.24/mythtv/PKGBUILD
 create mode 100644 abs/core/mythtv/stable-0.24/mythtv/__changelog
 create mode 100644 abs/core/mythtv/stable-0.24/mythtv/menu-xml/HOST_SETTINGS.xml
 create mode 100644 abs/core/mythtv/stable-0.24/mythtv/menu-xml/is.xml
 create mode 100644 abs/core/mythtv/stable-0.24/mythtv/menu-xml/library.xml.patch
 create mode 100644 abs/core/mythtv/stable-0.24/mythtv/menu-xml/linhes.xml
 create mode 100644 abs/core/mythtv/stable-0.24/mythtv/menu-xml/mainmenu.xml.patch
 create mode 100644 abs/core/mythtv/stable-0.24/mythtv/menu-xml/mythbackup.xml
 create mode 100644 abs/core/mythtv/stable-0.24/mythtv/menu-xml/mythrestore.xml
 create mode 100644 abs/core/mythtv/stable-0.24/mythtv/menu-xml/optical_menu.xml.patch
 create mode 100755 abs/core/mythtv/stable-0.24/mythtv/menu-xml/original/create_patch.sh
 create mode 100644 abs/core/mythtv/stable-0.24/mythtv/menu-xml/setup.xml
 create mode 100644 abs/core/mythtv/stable-0.24/mythtv/menu-xml/siriusmenu.xml
 create mode 100644 abs/core/mythtv/stable-0.24/mythtv/menu-xml/update.xml
 create mode 100644 abs/core/mythtv/stable-0.24/mythtv/menu-xml/update2.xml
 create mode 100644 abs/core/mythtv/stable-0.24/mythtv/menu-xml/util_menu.xml.patch
 create mode 100644 abs/core/mythtv/stable-0.24/mythtv/menu-xml/xmmenu.xml
 create mode 100755 abs/core/mythtv/stable-0.24/mythtv/myth.sh
 create mode 100755 abs/core/mythtv/stable-0.24/mythtv/mythbackend
 create mode 100644 abs/core/mythtv/stable-0.24/mythtv/mythbackend.lr
 create mode 100755 abs/core/mythtv/stable-0.24/mythtv/mythbackend.sh
 create mode 100644 abs/core/mythtv/stable-0.24/mythtv/mythfrontend.lr
 create mode 100755 abs/core/mythtv/stable-0.24/mythtv/mythtv.install
 create mode 100755 abs/core/mythtv/stable-0.24/mythtv/pretty
 create mode 100644 abs/core/mythtv/stable-0.24/mythtv/smolt_jump.patch
 delete mode 100755 abs/core/mythtv/stable-0.24/pretty
 delete mode 100644 abs/core/mythtv/stable-0.24/smolt_jump.patch

diff --git a/abs/core/morethemes/PKGBUILD b/abs/core/morethemes/PKGBUILD
deleted file mode 100644
index 196d1da..0000000
--- a/abs/core/morethemes/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-pkgname=morethemes
-pkgver=0.24
-pkgrel=3
-pkgdesc="Additional themes for MythTV"
-url="http://www.mythtv.org"
-license="GPL"
-arch=('any')
-depends=('mythtv')
-groups=('mythtv-extras')
-source=(#'ftp://ftp.knoppmyth.net/R6/sources/morethemes-0.23.tar.bz2'
-        'ftp://miroku.no-ip.com/blue-abstract-wide.2010.09.16.tar.bz2'
-        'http://elkin.de/mythtv/2010.09.08-blootube-ng.tar.bz2'
-        'http://elkin.de/mythtv/2010.11.04-Willi.tar.lzma'
-        'http://elkin.de/mythtv/2010.03.13-bando-blue.tar.bz2'
-        'http://www.thepetersclan.com/files/TintedGlass-1.18.tbz2'
-        'http://www.thepetersclan.com/files/Mod-Gray-OSD.tar.bz2'
-        'http://www.thepetersclan.com/files/Bluebar-Hires-OSD.tar.bz2'
-        'http://www.thepetersclan.com/files/BlueCurves-OSD.tar.bz2'
-        'http://www.thepetersclan.com/files/SimplyBlue-OSD.tbz2'
-        'http://www.thepetersclan.com/files/BlueCurves2-OSD.tbz2'
-        'http://www.thepetersclan.com/files/BlueCurves-2.1-OSD.tbz2'
-        'http://www.mythtv.org/themes/LCARS.tar.gz'
-        'http://www.mythtv.org/themes/TransBlue.tar.gz'
-        'http://www.westnet.com/~chris/Mythtv/Retro-wide.tar.gz'
-        'retro-wide_video-ui.xml-filetypes.patch'
-        'http://capnbry.net/~bmayland/fi/pvr150/SimpleGray-OSD-0.4.tar.bz2'
-        'http://www.jobs-khakis-chicks.com/MythTV/IsthmusBlue-OSD.tar.gz'
-        'http://static.castlesblog.com/public/Glass-OSD-V1.3.zip'
-        'http://static.castlesblog.com/public/Minimal-OSD-V1.1.zip')
-
-build() {
-    cd ${srcdir}
-    mkdir -p ${pkgdir}/usr/share/mythtv/themes
-    
-    msg "Copying files..."
-    for d in `ls -d */`
-     do
-      cp -a "${d}" ${pkgdir}/usr/share/mythtv/themes
-    done
-
-   # Housekeeping
-    rm -fr "${pkgdir}/usr/share/mythtv/themes/__MACOSX" || return 1
-   # Little fix
-    cd ${pkgdir}/usr/share/mythtv/themes/Retro-wide || return 1
-    patch -p0 <${srcdir}/retro-wide_video-ui.xml-filetypes.patch || return 1
-}
-
-md5sums=('878605505599a0f49c44f3df9affe10f'
-         '7c2a2b238b7d44e52b7a8a0361d395aa'
-         '2890f3b991db805a88a48eb6c7048f91'
-         'c6d90fb469bc30a94e32f76c82122dd3'
-         '80d250bf87c8f72ee238a91c854c0a11'
-         'c973d0779967034f7a5bc0043574d6f9'
-         'fb32ddd900e54cff62a62a21025b2585'
-         '79247cf87bbee10363bb214325b7f671'
-         '67c501b80afdefeca623261634dafd9c'
-         '7b2f2eca37f2d9598b00bce85a193bae'
-         '9793dc85a486e1ad9d0c0b6684efd245'
-         'a36bb7b2597a44128401b1aba9106122'
-         '21d6f967631e45b7039b965a63755282'
-         'bfc56ffe1c872989f7a1cb7ae20aea49'
-         'e05bb3d77a11f97a1d547b2f5bc1ddf7'
-         '09dd8679b56794f9850a2382b4e1ea62'
-         'b6c187b233778abacce102fe609d4e09'
-         'f8d4fd90f1e45512ea5237de59d5090d'
-         '5646e1df6f593f7116cbdec656146266')
diff --git a/abs/core/morethemes/retro-wide_video-ui.xml-filetypes.patch b/abs/core/morethemes/retro-wide_video-ui.xml-filetypes.patch
deleted file mode 100644
index c98487f..0000000
--- a/abs/core/morethemes/retro-wide_video-ui.xml-filetypes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- video-ui.xml.orig	2010-07-04 06:21:18.000000000 +0000
-+++ video-ui.xml	2010-07-04 06:22:22.000000000 +0000
-@@ -967,14 +967,17 @@
- 
-         <button name="done_button" from="basebutton">
-             <position>700,550</position>
-+            <value>Done</value>
-         </button>
- 
-         <button name="new_button" from="basebutton">
--            <position>600,550</position>
-+            <position>400,550</position>
-+            <value>New</value>
-         </button>
- 
-         <button name="delete_button" from="basebutton">
--            <position>0,550</position>
-+            <position>100,550</position>
-+            <value>Delete</value>
-         </button>
-     </window>
-
diff --git a/abs/core/mythplugins/PKGBUILD b/abs/core/mythplugins/PKGBUILD
deleted file mode 100644
index f32e8dc..0000000
--- a/abs/core/mythplugins/PKGBUILD
+++ /dev/null
@@ -1,145 +0,0 @@
-# $Id: PKGBUILD 91281 2010-09-26 06:04:21Z remy $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgbase=mythplugins
-pkgname=('mythplugins-mytharchive'
-         'mythplugins-mythbrowser'
-         'mythplugins-mythgallery'
-         'mythplugins-mythgame'
-         'mythplugins-mythmusic'
-         'mythplugins-mythnetvision'
-         'mythplugins-mythnews'
-         'mythplugins-mythvideo'
-         'mythplugins-mythweather'
-         'mythplugins-mythweb'
-         'mythplugins-mythzoneminder')
-pkgver=0.24
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://www.mythtv.org"
-license=('GPL')
-conflicts=('mythmovies')
-makedepends=("mythtv>=${pkgver}" 'mplayer' 'fftw' 'dvdauthor' 'libexif'
-             'python-imaging' 'libcdaudio' 'taglib' 'perl-xml-simple' 'dcraw'
-             'libvisual' 'perl-xml-xpath' 'perl-image-size'
-             'perl-class-inspector' 'perl-datetime-format-iso8601'
-             'flac' 'libvorbis' 'python2' 'python-pycurl' 'python-oauth')
-
-build() {
-   _svntrunk="http://svn.mythtv.org/svn/branches/release-0-24-fixes"
-   _svnmod="${pkgbase}"
-
-        # get clean copy from SVN repo
-        if [ -d "${srcdir}/${pkgbase}" ]
-         then
-           cd "${srcdir}/${pkgbase}"
-           echo "Updating from SVN..."
-           svn up
-         else
-           cd "${srcdir}"
-           echo "Checking Out from SVN..."
-           svn co "${_svntrunk}/${_svnmod}"
-         fi
-
-  cd "${srcdir}/${pkgbase}"
-  find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' 
-
-  ./configure --prefix=/usr \
-              --enable-all
-
-  qmake mythplugins.pro || return 1
-  make || return 1
-}
-
-package_mythplugins-mytharchive() {
-  pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows"
-  depends=("mythtv>=${pkgver}" 'libxmu' 'pil' 'dvdauthor')
-  replaces=('mytharchive')
-  cd "${srcdir}/${pkgbase}/mytharchive"
-  make INSTALL_ROOT="${pkgdir}" install || return 1
-}
-
-package_mythplugins-mythbrowser() {
-  pkgdesc="Mini web browser for MythTV"
-  depends=("mythtv>=${pkgver}")
-  replaces=('mythbrowser')
-  cd "${srcdir}/${pkgbase}/mythbrowser"
-  make INSTALL_ROOT="${pkgdir}" install || return 1
-}
-
-package_mythplugins-mythgallery() {
-  pkgdesc="Image gallery plugin for MythTV"
-  depends=("mythtv>=${pkgver}" 'libexif')
-  replaces=('mythgallery')
-  cd "${srcdir}/${pkgbase}/mythgallery"
-  make INSTALL_ROOT="${pkgdir}" install || return 1
-}
-
-package_mythplugins-mythgame() {
-  pkgdesc="Game emulator module for MythTV"
-  depends=("mythtv>=${pkgver}" 'zlib')
-  replaces=('mythgame')
-  cd "${srcdir}/${pkgbase}/mythgame"
-  make INSTALL_ROOT="${pkgdir}" install || return 1
-}
-
-package_mythplugins-mythmusic() {
-  pkgdesc="Music playing plugin for MythTV"
-  depends=("mythtv>=${pkgver}" 'flac' 'libvorbis' 'libcdaudio' 'cdparanoia' 'taglib' 'libvisual')
-  replaces=('mythmusic')
-  cd "${srcdir}/${pkgbase}/mythmusic"
-  make INSTALL_ROOT="${pkgdir}" install || return 1
-}
-
-package_mythplugins-mythnetvision() {
-  pkgdesc="MythNetvision plugin for MythTV"
-  depends=("mythtv>=${pkgver}" 'python-pycurl' 'python-oauth')
-  replaces=('mythnetvision')
-  cd "${srcdir}/${pkgbase}/mythnetvision"
-  make INSTALL_ROOT="${pkgdir}" install || return 1
-}
-
-package_mythplugins-mythnews() {
-  pkgdesc="News checking plugin for MythTV"
-  depends=("mythtv>=${pkgver}")
-  replaces=('mythnews')
-  cd "${srcdir}/${pkgbase}/mythnews"
-  make INSTALL_ROOT="${pkgdir}" install || return 1
-}
-
-package_mythplugins-mythvideo() {
-  pkgdesc="Video playback and browsing plugin for MythTV"
-  depends=("mythtv>=${pkgver}" 'mplayer' 'perl-xml-simple')
-  replaces=('mythvideo')
-  cd "${srcdir}/${pkgbase}/mythvideo"
-  make INSTALL_ROOT="${pkgdir}" install || return 1
-}
-
-package_mythplugins-mythweather() {
-  pkgdesc="Weather checking plugin for MythTV"
-  depends=("mythtv>=${pkgver}" 'perl-xml-xpath' 'perl-image-size' 'perl-class-inspector' 'perl-datetime-format-iso8601')
-  replaces=('mythweather')
-  cd "${srcdir}/${pkgbase}/mythweather"
-  make INSTALL_ROOT="${pkgdir}" install || return 1
-}
-
-package_mythplugins-mythweb() {
-  pkgdesc="Web interface for MythTV's backend"
-  depends=("mythtv>=${pkgver}")
-  optdepends=('php-apache'
-              'lighttpd')
-  replaces=('mythweb')
-  mkdir -p ${pkgdir}/data/srv/httpd/htdocs/mythweb/{image_cache,php_sessions}
-  cp -r ${srcdir}/mythplugins/mythweb/* ${pkgdir}/data/srv/httpd/htdocs/mythweb || return 1
-  chown -R http:http ${pkgdir}/data/srv/httpd/htdocs/mythweb
-  chmod g+rw ${pkgdir}/data/srv/httpd/htdocs/mythweb/{image_cache,php_sessions,data}
-}
-
-package_mythplugins-mythzoneminder() {
-  pkgdesc="Allows for viewing of CCTV cameras through zoneminder"
-  depends=("mythtv>=${pkgver}" zoneminder)
-  replaces=('mythzoneminder')
-#  install=mythplugins-mythzoneminder.install
-  cd "${srcdir}/${pkgbase}/mythzoneminder"
-  make INSTALL_ROOT="${pkgdir}" install || return 1
-}
diff --git a/abs/core/mythplugins/mtd b/abs/core/mythplugins/mtd
deleted file mode 100644
index 1f46dfe..0000000
--- a/abs/core/mythplugins/mtd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/mtd`
-case "$1" in
-  start)
-    stat_busy "Starting Myth Transcoding Daemon"
-    [ -z "$PID" ] && /usr/bin/mtd -d
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/mtd.pid
-      add_daemon mythtranscode
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Myth Transcoding Daemon"
-    [ ! -z "$PID" ]  && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mtd 
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/core/mythplugins/mythplugins-mythzoneminder.install b/abs/core/mythplugins/mythplugins-mythzoneminder.install
deleted file mode 100644
index 142212b..0000000
--- a/abs/core/mythplugins/mythplugins-mythzoneminder.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_install() {
-  echo "If you want to use this plugin, install zoneminder from AUR."
-}
diff --git a/abs/core/mythplugins/qt-4.7-buildfixes.diff b/abs/core/mythplugins/qt-4.7-buildfixes.diff
deleted file mode 100644
index dcffebe..0000000
--- a/abs/core/mythplugins/qt-4.7-buildfixes.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: /branches/release-0-23-fixes/mythplugins/mythnetvision/mythnetvision/netsearch.cpp
-===================================================================
---- /branches/release-0-23-fixes/mythplugins/mythnetvision/mythnetvision/netsearch.cpp	(revision 24265)
-+++ /branches/release-0-23-fixes/mythplugins/mythnetvision/mythnetvision/netsearch.cpp	(revision 26391)
-@@ -45,7 +45,7 @@
-       m_progress(NULL),              m_busyPopup(NULL),
-       m_okPopup(NULL),               m_popupStack(),
--      m_netSearch(),                 m_currentSearch(NULL),
--      m_currentGrabber(0),           m_currentCmd(NULL),
--      m_currentDownload(NULL),       m_pagenum(0),
-+      m_netSearch(),                 m_currentSearch(QString()),
-+      m_currentGrabber(0),           m_currentCmd(QString()),
-+      m_currentDownload(QString()),  m_pagenum(0),
-       m_lock(QMutex::Recursive)
- {
-Index: /branches/release-0-23-fixes/mythplugins/mythvideo/mythvideo/videodlg.h
-===================================================================
---- /branches/release-0-23-fixes/mythplugins/mythvideo/mythvideo/videodlg.h	(revision 22916)
-+++ /branches/release-0-23-fixes/mythplugins/mythvideo/mythvideo/videodlg.h	(revision 26391)
-@@ -151,5 +151,5 @@
-     QString GetCoverImage(MythGenericTree *node);
-     QString GetFirstImage(MythGenericTree *node, QString type,
--                          QString gpnode = NULL, int levels = 0);
-+                          QString gpnode = QString(), int levels = 0);
-     QString GetImageFromFolder(Metadata *metadata);
-     QString GetScreenshot(MythGenericTree *node);
diff --git a/abs/core/mythsmolt/PKGBUILD b/abs/core/mythsmolt/PKGBUILD
deleted file mode 100644
index f7ba9f8..0000000
--- a/abs/core/mythsmolt/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-pkgname=mythsmolt
-pkgver=0.24
-pkgrel=3
-pkgdesc="mythsmolt, a hardware profileing tool"
-arch=('i686' 'x86_64')
-url="http://www.mythvantage.com"
-license=('GPL')
-depends=("mythtv>=${pkgver}" urlgrabber python-simplejson python-pycurl)
-#source=("http://jmeyer.us/download/mythsmolt.tar.gz" 'smolt_init_login.sh' 'mythsmolt.patch')
-source=("http://jmeyer.us/download/mythsmolt.tar.gz" 'smolt_init_login.sh' )
-
-groups=('mythtv-extras')
-
-build() {
-   cd $startdir/src/mythsmolt
-#   patch -p1 < ../mythsmolt.patch || return 1
-   ./configure.sh
-   make || return 1
-   make INSTALL_ROOT=$startdir/pkg install
-   install -D -m 755 $srcdir/smolt_init_login.sh $pkgdir/etc/profile.d/smolt_init_login.sh
-}
-md5sums=('ffe0728d314dc03550691e2fe1c153b9'
-         '57a3416d90e59abbd5062436583c17e1')
-md5sums=('ffe0728d314dc03550691e2fe1c153b9'
-         '57a3416d90e59abbd5062436583c17e1')
-md5sums=('17d740c348301ab47ac557ad7402115b'
-         '57a3416d90e59abbd5062436583c17e1')
diff --git a/abs/core/mythsmolt/mythsmolt.patch b/abs/core/mythsmolt/mythsmolt.patch
deleted file mode 100644
index 4767865..0000000
--- a/abs/core/mythsmolt/mythsmolt.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -ruaN mythsmolt.orig/settings.pro mythsmolt/settings.pro
---- mythsmolt.orig/settings.pro	2010-01-06 15:49:59.000000000 +0000
-+++ mythsmolt/settings.pro	2010-05-28 03:30:59.000000000 +0000
-@@ -1,3 +1,3 @@
- 
--LIBVERSION = 0.24
-+LIBVERSION = 0.24
- 
diff --git a/abs/core/mythsmolt/smolt_init_login.sh b/abs/core/mythsmolt/smolt_init_login.sh
deleted file mode 100644
index 0b76305..0000000
--- a/abs/core/mythsmolt/smolt_init_login.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-if [ $UID = 0  -o  $UID = 1000 ]
-then
-    INIT=`ps -p 1 -o comm=`
-    if [ x$INIT = xrunit ]
-    then
-        if [[ -f /home/mythtv/.configure  &&  $- = *i* ]]
-        then
-            if  [ ! -z "$PS1" ]
-            then
-                if  [ $0 = "-bash" ]
-                then
-                    if [ ! -e /home/mythtv/.mythtv/MythSmolt/hw-uuid ]
-                    then
-                        echo ""
-                        echo "####################################################"
-                        echo "It appears you have not yet run smolt"
-                        echo "Please take the time to submit your hardware profile"
-                        echo ""
-                        echo "press any key to continue:"
-                        echo "####################################################"
-                        read a
-                        mkdir -p /home/mythtv/.mythtv/MythSmolt
-                        chown -R mythtv:users /home/mythtv/.mythtv/MythSmolt
-
-                        if [ $UID = 0 ]
-                        then
-                            su   mythtv -c "/usr/share/mythtv/mythsmolt/scripts/sendProfile.py" &&   su mythtv -c "touch  /home/mythtv/.mythtv/MythSmolt/hw-uuid"
-                        else
-                            /usr/share/mythtv/mythsmolt/scripts/sendProfile.py &&  touch  /home/mythtv/.mythtv/MythSmolt/hw-uuid
-                        fi
-                    fi
-                fi
-            fi
-        fi
-    fi
-fi
-
-
-
diff --git a/abs/core/myththemes/PKGBUILD b/abs/core/myththemes/PKGBUILD
deleted file mode 100644
index ae142b7..0000000
--- a/abs/core/myththemes/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 86938 2010-08-06 21:53:33Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org> 
-# Contributor: kleptophobiac@gmail.com
-
-pkgname=myththemes
-pkgver=0.24
-pkgrel=3
-pkgdesc="Themes for MythTV"
-arch=('any')
-url="http://www.mythtv.org/"
-license=('GPL')
-depends=("mythtv>=${pkgver}")
-source=(`echo ${patches[@]:0}`)
-
-build() {
-   _svntrunk="http://svn.mythtv.org/svn/branches/release-0-24-fixes"
-   _svnmod="${pkgname}"
-
-     # get clean copy from SVN repo
-     if [ -d "${srcdir}/${pkgname}" ]
-       then
-         cd "${srcdir}/${pkgname}"
-         msg "Clean up from previous build..."
-         make distclean
-         msg "Updating from SVN..."
-         svn up
-       else
-         cd "${srcdir}"
-         msg "Checking Out from SVN..."
-         svn co "${_svntrunk}/${_svnmod}"
-         cd "${srcdir}/${pkgname}"
-     fi
-
-        # apply patches
-        echo "--------------------------applying patches----------------------------------------------------"
-        for i in `echo ${patchs[@]:0} `
-        do
-                echo applying $i
-                echo "-----------------------------"
-                patch -Np0  -i ${startdir}/src/$i  || return 1
-        done
-        echo "--------------------------done applying patches-----------------------------------------------"
-
-  cd "${srcdir}/${pkgname}"
-  ./configure --prefix=/usr || return 1
-}
-package() {
-  cd "${srcdir}/${pkgname}"
-  make INSTALL_ROOT="${pkgdir}" install || return 1
-}
diff --git a/abs/core/mythtv/stable-0.24/PKGBUILD b/abs/core/mythtv/stable-0.24/PKGBUILD
deleted file mode 100755
index 71b9ef0..0000000
--- a/abs/core/mythtv/stable-0.24/PKGBUILD
+++ /dev/null
@@ -1,113 +0,0 @@
-# $Id: PKGBUILD 91139 2010-09-23 10:45:09Z remy $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: <kleptophobiac@gmail.com>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=mythtv
-pkgver=0.24
-pkgrel=5
-pkgdesc="A Homebrew PVR project"
-arch=('i686' 'x86_64')
-url="http://www.mythtv.org/"
-license=('GPL')
-depends=('mysql-clients' 'qt' 'lame' 'lirc-utils' 'ffmpeg-svn' 'libxvmc'
-         'fribidi' 'perl-soap-lite' 'perl-date-manip' 'perl-xml-sax'
-         'perl-math-round' 'perl-net-upnp' 'perl-dbd-mysql' 'perl-time-hires'
-         'libavc1394' 'wget' 'libiec61883' 'mysql-python' 'python-lxml' 
-         'mesa' 'libxinerama' 'libxrandr' 'faad2' 'libvdpau' 'libcrystalhd-git')
-makedepends=('yasm' 'libgl' 'subversion' 'rsync')
-replaces=()
-groups=('pvr')
-#backup=(/usr/share/mythtv/is.xml)
-#options=(!strip)
-#MAKEFLAGS="-j6"
-install='mythtv.install'
-patchs=('smolt_jump.patch')
-optdepends=('xmltv: to download tv listings')
-#replaces=('mythtv-contrib')
-#conflicts=('mythtv-contrib')
-source=('mythbackend' 'myth.sh' `echo ${patchs[@]:0}` 'mythbackend.lr' 'mythfrontend.lr' 'pretty')
-
-build() {
-   _svntrunk="http://svn.mythtv.org/svn/branches/release-0-24-fixes"
-   _svnmod="${pkgname}"
-
-        # get clean copy from SVN repo
-        if [ -d "${srcdir}/${pkgname}" ]
-         then
-           cd "${srcdir}/${pkgname}"
-           msg "Clean up previous build..."
-           make distclean 
-           msg "Updating from SVN..."
-           svn up
-        else
-           cd "${srcdir}"
-           msg "Checking Out from SVN..."
-           svn co "${_svntrunk}/${_svnmod}"
-           cd "${srcdir}/${pkgname}"
-         fi
-
-        # apply patches
-        echo "--------------------------applying patches----------------------------------------------------"
-        for i in `echo ${patchs[@]:0} `
-        do
-                echo applying $i
-                echo "-----------------------------"
-                patch -Np0  -i ${startdir}/src/$i  || return 1
-        done
-        echo "--------------------------done applying patches-----------------------------------------------"
-
-        sed -i -e "s/\`(svnversion \$\${SVNTREEDIR} 2>\/dev\/null) || echo Unknown\`/$pkgver/" version.pro
-        find bindings/python contrib -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
-  ARCH=${CARCH/_/-}
-  ./configure --prefix=/usr --cpu=${ARCH} \
-              --disable-audio-jack \
-              --disable-audio-pulse \
-              --disable-altivec \
-              --disable-distcc \
-              --disable-ccache \
-              --enable-vdpau \
-              --enable-crystalhd \
-              --dvb-path=/usr/include \
-              --enable-opengl-vsync \
-              --with-bindings=perl,python --python=python2 || return 1
-
-  make all || return 1
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  # basic install
-  make INSTALL_ROOT="${pkgdir}" install
-  # install contrib files
-  rsync -arp --exclude .svn --delete-excluded contrib ${pkgdir}/usr/share/mythtv/ || return 1
-  # install database structure
-  rsync -arp --exclude .svn --delete-excluded database ${pkgdir}/usr/share/mythtv/ || return 1
-  # install docs
-  rsync -arp --exclude .svn --delete-excluded docs ${pkgdir}/usr/share/mythtv/ || return 1
-
-  # patch the xml LinHES style
-  cp -r ${startdir}/menu-xml/*.xml ${pkgdir}/usr/share/mythtv/themes/defaultmenu/
-#  mv ${pkgdir}/usr/share/mythtv/themes/defaultmenu/is.xml ${pkgdir}/usr/share/mythtv/
-  cd ${pkgdir}/usr/share/mythtv
-  patch -p0 < ${startdir}/menu-xml/mainmenu.xml.patch || return 1
-  patch -p0 < ${startdir}/menu-xml/optical_menu.xml.patch || return 1
-  patch -p0 < ${startdir}/menu-xml/library.xml.patch || return 1
-  patch -p0 < ${startdir}/menu-xml/util_menu.xml.patch || return 1
-
-  # make log dir
-  mkdir -p ${pkgdir}/var/log/mythtv
-  chown 1000.1000 ${pkgdir}/var/log/mythtv
-  mkdir -p ${pkgdir}/etc/logrotate.d
-  cp ${srcdir}/*.lr ${pkgdir}/etc/logrotate.d
-  mkdir -p ${pkgdir}/etc/cron.hourly/
-  install -m0755 ${srcdir}/pretty ${pkgdir}/etc/cron.hourly/
-}
-md5sums=('7ef6de58240e7aad389a0b13d91b1cf6'
-         '2babd4b8e146a7538d18dcd55695b0be'
-         'a837de9ccc201994320071e48952b17d'
-         'f735805a80b0d1180dee01f9df1b7004'
-         'f407d6af23e74a49540755420f84fa58'
-         '5469d9921b726db750b991c87d226158')
diff --git a/abs/core/mythtv/stable-0.24/__changelog b/abs/core/mythtv/stable-0.24/__changelog
deleted file mode 100644
index 940f84b..0000000
--- a/abs/core/mythtv/stable-0.24/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-update to 0.24-fixes
diff --git a/abs/core/mythtv/stable-0.24/menu-xml/HOST_SETTINGS.xml b/abs/core/mythtv/stable-0.24/menu-xml/HOST_SETTINGS.xml
deleted file mode 100644
index ac52497..0000000
--- a/abs/core/mythtv/stable-0.24/menu-xml/HOST_SETTINGS.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<mythmenu name="HOST_SETTINGS">
-
-   <button>
-      <type>MV_NETWORK_SETUP_MENU</type>
-      <text>Network Settings</text>
-      <action>EXEC  mythinstall -s network </action>
-   </button>
-
-   <button>
-      <type>MV_NETWORK_SETUP_MENU</type>
-      <text>DDNS Settings</text>
-      <action>EXEC  mythinstall -s ddns </action>
-   </button>
-   <button>
-      <type>MV_SYSTEM_SETUP_MENU</type>
-      <text>System Type</text>
-      <action>EXEC  mythinstall -s hostype </action>
-   </button>
-
-   <button>
-      <type>MV_SCREENSAVER_SETUP_MENU</type>
-      <text>Screensaver Settings</text>
-      <action>EXEC  mythinstall -s screensaver </action>
-   </button>
-
-   <button>
-      <type>MV_IR_SETUP_MENU</type>
-      <text>Remotes</text>
-       <action>EXEC  mythinstall -s ir </action>
-   </button>
-
-   <button>
-      <type>MV_MISC_SETUP_MENU</type>
-      <text>Miscellanous Settings</text>
-      <action>EXEC  mythinstall -s misc </action>
-   </button>
-
-   <button>
-      <type>MV_SOFTWARE_MENU</type>
-      <text>Software</text>
-      <action>EXEC  mythinstall -s  plugins </action>
-   </button>
-
-   <button>
-      <type>MV_SHUTDOWN_SETUP_MENU</type>
-      <text>Shutdown Settings</text>
-      <action>EXEC  mythinstall -s sleep </action>
-   </button>
-
-   <button>
-      <type>MV_ADVANCED_X_SETUP_MENU</type>
-      <text>Display Settings</text>
-      <action>EXEC  mythinstall -s advancedX</action>
-   </button>
-
-   <button>
-      <type>MV_ADVANCED_SETUP_MENU</type>
-      <text>Advanced Settings</text>
-      <action>EXEC  mythinstall -s advanced</action>
-   </button>
-
-   <button>
-      <type>MV_AUDIO_SETUP_MENU</type>
-      <text>Audio Settings</text>
-       <action>EXEC  mythinstall -s sound </action>
-   </button>
-
-   <button>
-      <type>MV_ACCESS_SETUP_MENU</type>
-      <text>Access Control</text>
-      <action>EXEC  mythinstall -s accesscontrol </action>
-   </button>
-
-   <button>
-      <type>MV_USER_SETUP_MENU</type>
-      <text>User Accounts</text>
-      <action>EXEC  mythinstall -s user </action>
-   </button>
-
-   <button>
-      <type>MV_WEBACCESS_SETUP_MENU</type>
-      <text>Web Security</text>
-      <action>EXEC  mythinstall -s webuser </action>
-   </button>
-
-   <!--
-   <button>
-      <type>SETUP_MENU</type>
-      <text>Settings Profile Manager</text>
-      <action>EXEC  mythinstall -t </action>
-   </button>
-   -->
-
-</mythmenu>
diff --git a/abs/core/mythtv/stable-0.24/menu-xml/is.xml b/abs/core/mythtv/stable-0.24/menu-xml/is.xml
deleted file mode 100644
index 88b7e6b..0000000
--- a/abs/core/mythtv/stable-0.24/menu-xml/is.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<mythmenu name="Internet Steams">
-
-</mythmenu>
diff --git a/abs/core/mythtv/stable-0.24/menu-xml/library.xml.patch b/abs/core/mythtv/stable-0.24/menu-xml/library.xml.patch
deleted file mode 100644
index be06e34..0000000
--- a/abs/core/mythtv/stable-0.24/menu-xml/library.xml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- themes/defaultmenu/library.xml.orig	2010-11-06 00:39:51.000000000 +0000
-+++ themes/defaultmenu/library.xml	2010-11-06 00:44:54.000000000 +0000
-@@ -44,8 +44,7 @@
-         <type>STREAM</type>
-         <text>Play Online Streams</text>
-         <description></description>
--        <action>PLUGIN mythstream</action>
--        <depends>mythstream</depends>
-+        <action>MENU is.xml</action>
-     </button>
- 
-     <button>
diff --git a/abs/core/mythtv/stable-0.24/menu-xml/linhes.xml b/abs/core/mythtv/stable-0.24/menu-xml/linhes.xml
deleted file mode 100644
index ebc848b..0000000
--- a/abs/core/mythtv/stable-0.24/menu-xml/linhes.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<mythmenu name="LinHES">
-
-    <button>
-        <type>SETUP_GENERAL</type>
-        <text>MythTV Configuration</text>
-        <text lang="IT">Impostazioni</text>
-        <text lang="ES">Configuración</text>
-        <text lang="DE">Zubehör / Konfiguration</text>
-        <text lang="DA">Tilbehør/Indstillinger</text>
-        <text lang="IS">Uppsetning</text>
-        <text lang="NL">Configuratie</text>
-        <text lang="PT">Utensílios</text>
-        <text lang="SV">Verktyg / Inställningar</text>
-        <text lang="JA">設�~Z</text>
-        <text lang="FI">Oheis/Asetukset</text>
-        <text lang="ZH_TW">工�~E�/設�~Z</text>
-        <text lang="SL">Nastavitve</text>
-        <text lang="ET">Utiliidid / sätted</text>
-        <text lang="RU">У�~Bили�~B�~K / �~]а�~A�~B�~@ойки</text>
-        <text lang="AR">تضب�~Jطات</text>
-        <text lang="PL">Narz�~Ydzia / ustawienia</text>
-        <text lang="HE">ע�~Vר�~Y�~] / �~T�~R�~Sר�~Uת</text>
-        <text lang="HU">Eszközök / Beállítások</text>
-        <alttext lang="DE">Verschiedenes</alttext>
-        <alttext lang="SV">Inställningar</alttext>
-        <alttext lang="ET">Sätted</alttext>
-        <alttext lang="RU">�~]а�~A�~B�~@ойки</alttext>
-        <alttext lang="AR">تضب�~Jطات</alttext>
-        <description>Configure MythTV and plugins</description>
-        <description lang="DE">MythTV und Plugins konfigurieren</description>
-        <action>MENU util_menu.xml</action>
-    </button>
-
-   <button>
-     <type>LINHES_SETUP</type>
-     <text>LinHES Configuration</text>
-     <action>MENU HOST_SETTINGS.xml</action>
-   </button>
-
-   <button>
-     <type>BACKUP</type>
-     <text>Backup LinHES</text>
-     <action>MENU mythbackup.xml</action>
-   </button>
-
-   <button>
-     <type>RESTORE</type>
-     <text>Restore LinHES</text>
-     <action>MENU mythrestore.xml</action>
-   </button>
-
-<!--#Check for updates-->
-   <button>
-     <type>UPGRADE</type>
-     <text>Upgrade LinHES</text>
-     <action>MENU update.xml</action>
-   </button>
-<!--#Check for updates-->
-</mythmenu>
diff --git a/abs/core/mythtv/stable-0.24/menu-xml/mainmenu.xml.patch b/abs/core/mythtv/stable-0.24/menu-xml/mainmenu.xml.patch
deleted file mode 100644
index 0491803..0000000
--- a/abs/core/mythtv/stable-0.24/menu-xml/mainmenu.xml.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- themes/defaultmenu/mainmenu.xml.orig	2010-11-08 22:30:08.000000000 +0000
-+++ themes/defaultmenu/mainmenu.xml	2010-11-08 22:35:51.000000000 +0000
-@@ -2,6 +2,13 @@
- <mythmenu name="MAIN">
- 
-     <button>
-+        <type>TV_WATCH_TV</type>
-+        <text>Watch TV</text>
-+        <description>Watch live television</description>
-+        <action>TV_WATCH_LIVE</action>
-+    </button>
-+
-+    <button>
-         <type>MENU_MEDIA_LIBRARY</type>
-         <text>Media Library</text>
-         <action>MENU library.xml</action>
-@@ -31,17 +38,10 @@
-     </button>
- 
-     <button>
--        <type>TV_WATCH_TV</type>
--        <text>Watch TV</text>
--        <description>Watch live television</description>
--        <action>TV_WATCH_LIVE</action>
--    </button>
--
--    <button>
-         <type>MENU_UTILITIES_SETUP</type>
--        <text>Utilities / Setup</text>
--        <description>Configure MythTV and plugins</description>
--        <action>MENU util_menu.xml</action>
-+        <text>Service Menu</text>
-+        <description>Configure your system</description>
-+        <action>MENU linhes.xml</action>
-     </button>
- 
- </mythmenu>
diff --git a/abs/core/mythtv/stable-0.24/menu-xml/mythbackup.xml b/abs/core/mythtv/stable-0.24/menu-xml/mythbackup.xml
deleted file mode 100644
index 5914b33..0000000
--- a/abs/core/mythtv/stable-0.24/menu-xml/mythbackup.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<mythmenu name="LinHES">
-
-   <button>
-     <type>BACKUP</type>
-     <text>Do you wish to backup?</text>
-     <action>NONE</action>
-   </button>
-
-   <button>
-     <type>BACKUP</type>
-     <text>Yes</text>
-     <action>EXEC sudo /usr/LH/bin/mythbackup</action>
-   </button>
-   
-   <button>
-     <type>BACKUP</type>
-     <text>No</text>
-     <action>UPMENU</action>
-   </button>
-</mythmenu>
diff --git a/abs/core/mythtv/stable-0.24/menu-xml/mythrestore.xml b/abs/core/mythtv/stable-0.24/menu-xml/mythrestore.xml
deleted file mode 100644
index 8f5c285..0000000
--- a/abs/core/mythtv/stable-0.24/menu-xml/mythrestore.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<mythmenu name="LinHES">
-
-   <button>
-     <type>RESTORE</type>
-     <text>Do you wish to restore?</text>
-     <action>NONE</action>
-   </button>
-
-   <button>
-     <type>RESTORE</type>
-     <text>Yes</text>
-     <action>EXEC sudo /usr/LH/bin/mythrestore</action>
-   </button>
-   
-   <button>
-     <type>BACKUP</type>
-     <text>No</text>
-     <action>UPMENU</action>
-   </button>
-</mythmenu>
diff --git a/abs/core/mythtv/stable-0.24/menu-xml/optical_menu.xml.patch b/abs/core/mythtv/stable-0.24/menu-xml/optical_menu.xml.patch
deleted file mode 100644
index 143424f..0000000
--- a/abs/core/mythtv/stable-0.24/menu-xml/optical_menu.xml.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- themes/defaultmenu/optical_menu.xml.orig	2010-11-06 00:39:43.000000000 +0000
-+++ themes/defaultmenu/optical_menu.xml	2010-11-06 00:42:59.000000000 +0000
-@@ -26,6 +26,13 @@
-     </button>
- 
-     <button>
-+        <type>DVD_RIP</type>
-+        <text>Import video files from DVD</text>
-+       <description>Import video files from a data DVD</description>
-+        <action>EXEC /usr/LH/bin/importfiles.sh</action>
-+    </button>
-+
-+    <button>
-         <type>MUSIC_RIP</type>
-         <text>Import CD</text>
-         <description>Import music from an audio CD</description>
diff --git a/abs/core/mythtv/stable-0.24/menu-xml/original/create_patch.sh b/abs/core/mythtv/stable-0.24/menu-xml/original/create_patch.sh
deleted file mode 100755
index 34d8b8c..0000000
--- a/abs/core/mythtv/stable-0.24/menu-xml/original/create_patch.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-for i in *.xml
-do
-	diff -u $i.orig $i > ../$i.patch
-done
diff --git a/abs/core/mythtv/stable-0.24/menu-xml/setup.xml b/abs/core/mythtv/stable-0.24/menu-xml/setup.xml
deleted file mode 100644
index f56bb6f..0000000
--- a/abs/core/mythtv/stable-0.24/menu-xml/setup.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<mythmenu name="MAIN">
-
-   <button>
-     <type>SETUP_GENERAL</type>
-     <text>1. General</text>
-     <text lang="IT">1. Generale</text>
-     <text lang="PT">1. Geral</text>
-     <text lang="SV">1. Generellt</text>
-     <text lang="JA">1. 一般</text>
-     <text lang="DE">1. Allgemeines</text>
-     <text lang="FI">1. Yleiset</text>
-     <text lang="FR">1. Général</text>
-     <text lang="SI">1. Splošno</text>
-     <text lang="ET">1. Üldine</text>
-     <text lang="NB">1 Generelt</text>
-     <text lang="DK">1. Generelt</text>
-     <text lang="ES">1. General</text>
-     <text lang="CZ">1. Obecný</text>
-     <text lang="RU">1. Общие</text>
-     <action>GENERAL</action>
-   </button>
-
-   <button>
-     <type>SETUP_CAPTURE_CARDS</type>
-     <text>2. Capture cards</text>
-     <text lang="IT">2. Schede di Acquisizione</text>
-     <text lang="PT">2. Placas de Captura</text>
-     <text lang="SV">2. TV-kort</text>
-     <text lang="JA">2. キャプチャカード</text>
-     <text lang="DE">2. TV-Karten</text>
-     <text lang="FI">2. TV-kortit</text>
-     <text lang="FR">2. Cartes d'acquisition</text>
-     <text lang="SI">2. Kartice za zajem</text>
-     <text lang="ET">2. TV-kaardid</text>
-     <text lang="NB">2 TV-kort</text>
-     <text lang="DK">2. TV-kort</text>
-     <text lang="ES">2. Capturadoras</text>
-     <text lang="CZ">2. Zachytávací karty</text>
-     <text lang="RU">2. Карты захвата</text>
-     <action>CAPTURE CARDS</action>
-   </button>
-
-   <button>
-     <type>SETUP_VIDEO_SOURCES</type>
-     <text>3. Video sources</text>
-     <text lang="IT">3. Fonte Video</text>
-     <text lang="PT">3. Fontes de Vídeo</text>
-     <text lang="SV">3. Videokällor</text>
-     <text lang="JA">3. ビデオソース</text>
-     <text lang="DE">3. Videoquellen</text>
-     <text lang="FI">3. Kuvanlähteet</text>
-     <text lang="FR">3. Sources vidéo</text>
-     <text lang="SI">3. Video viri</text>
-     <text lang="ET">3. Videosisendid</text>
-     <text lang="NB">3 Videokilder</text>
-     <text lang="DK">3. Videokilder</text>
-     <text lang="ES">3. Fuentes de Vídeo</text>
-     <text lang="CZ">3. Zdroje obrazu</text>
-     <text lang="RU">3. Видео источники</text>
-     <action>VIDEO SOURCES</action>
-   </button>
-
-   <button>
-     <type>SETUP_INPUT_CONNECTIONS</type>
-     <text>4. Input connections</text>
-     <text lang="IT">4. Connessioni di Ingresso</text>
-     <text lang="PT">4. Ligações de Entrada</text>
-     <text lang="SV">4. Anslutningar</text>
-     <text lang="JA">4. 入力とソースの接続</text>
-     <text lang="DE">4. Verknüpfungen</text>
-     <text lang="FI">4. Sisääntuloasetukset</text>
-     <text lang="FR">4. Entrées Vidéos</text>
-     <text lang="SI">4. Vhodne povezave</text>
-     <text lang="ET">4. Sisendite ühendused</text>
-     <text lang="NB">4 Inndata</text>
-     <text lang="DK">4. Indgange</text>
-     <text lang="ES">4. Conexiones</text>
-     <text lang="CZ">4. Připojení vstupů</text>
-     <text lang="RU">4. Соединение входов</text>
-     <action>CARD INPUTS</action>
-   </button>
-
-   <button>
-     <type>SETUP_CHANNEL_EDITOR</type>
-     <text>5. Channel Editor</text>
-     <text lang="IT">5. Modifica Canali</text>
-     <text lang="SV">5. Kanaleditor</text>
-     <text lang="JA">5. チャンネル設定</text>
-     <text lang="DE">5. Sender bearbeiten</text>
-     <text lang="FI">5. Kanavanviritys</text>
-     <text lang="FR">5. Editeur de chaînes</text>
-     <text lang="SI">5. Urejanje kanalov</text>
-     <text lang="ET">5. Kanaliredaktor</text>
-     <text lang="NB">5 Kanalredigerer</text>
-     <text lang="DK">5. Kanal opsætning</text>
-     <text lang="ES">5. Editor Canales</text>
-     <text lang="CZ">5. Editor kanálů</text>
-     <text lang="RU">5. Редактор каналов</text>
-     <action>CHANNEL EDITOR</action>
-   </button>
-
-   <button>
-     <type>SETUP_STORAGE_GROUPS</type>
-     <text>6. Storage Directories</text>
-     <text lang="IT">6. Cartelle</text>
-     <text lang="FI">Tallennusryhmät</text>
-     <text lang="SV">Lagringsgrupper</text>
-     <action>STORAGE GROUPS</action>
-   </button>
-
-</mythmenu>
diff --git a/abs/core/mythtv/stable-0.24/menu-xml/siriusmenu.xml b/abs/core/mythtv/stable-0.24/menu-xml/siriusmenu.xml
deleted file mode 100644
index e317b36..0000000
--- a/abs/core/mythtv/stable-0.24/menu-xml/siriusmenu.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<mythmenu name="SIRIUS">
-   <button>
-      <type>MUSIC</type>
-      <text>Sirius Hits 1</text>
-      <action>EXEC /usr/bin/cliSipie siriushits1</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>StarLite</text>
-      <action>EXEC /usr/bin/cliSipie starlite</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Sirius Love</text>
-      <action>EXEC /usr/bin/cliSipie siriuslove</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Movin EZ</text>
-      <action>EXEC /usr/bin/cliSipie movineasy</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Sirius Gold</text>
-      <action>EXEC /usr/bin/cliSipie siriusgold</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>'60s Vibrations</text>
-      <action>EXEC /usr/bin/cliSipie 60svibrations</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Totally '70s</text>
-      <action>EXEC /usr/bin/cliSipie totally70s</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Big '80s</text>
-      <action>EXEC /usr/bin/cliSipie big80s</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>ThePulse</text>
-      <action>EXEC /usr/bin/cliSipie thepulse</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Bridge</text>
-      <action>EXEC /usr/bin/cliSipie thebridge</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>BBC Radio 1</text>
-      <action>EXEC /usr/bin/cliSipie bbcradio1</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Super Shuffle</text>
-      <action>EXEC /usr/bin/cliSipie supershuffle</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Elvis Radio</text>
-      <action>EXEC /usr/bin/cliSipie elvisradio</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Classic Vinyl</text>
-      <action>EXEC /usr/bin/cliSipie classicvinyl</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Classic Rewind</text>
-      <action>EXEC /usr/bin/cliSipie classicrewind</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>TheVault</text>
-      <action>EXEC /usr/bin/cliSipie thevault</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Jam_ON</text>
-      <action>EXEC /usr/bin/cliSipie jamon</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Spectrum</text>
-      <action>EXEC /usr/bin/cliSipie thespectrum</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>BuzzSaw</text>
-      <action>EXEC /usr/bin/cliSipie buzzsaw</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Octane</text>
-      <action>EXEC /usr/bin/cliSipie octane</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Alt Nation</text>
-      <action>EXEC /usr/bin/cliSipie altnation</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>1st Wave</text>
-      <action>EXEC /usr/bin/cliSipie firstwave</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Hair Nation</text>
-      <action>EXEC /usr/bin/cliSipie hairnation</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>'90s Alternative</text>
-      <action>EXEC /usr/bin/cliSipie 90salternative</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Garage</text>
-      <action>EXEC /usr/bin/cliSipie undergroundgarage</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Left of Center</text>
-      <action>EXEC /usr/bin/cliSipie leftofcenter</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Hard Attack</text>
-      <action>EXEC /usr/bin/cliSipie hardattack</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Faction</text>
-      <action>EXEC /usr/bin/cliSipie faction</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Punk</text>
-      <action>EXEC /usr/bin/cliSipie punk</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>The Coffee House</text>
-      <action>EXEC /usr/bin/cliSipie coffeehouse</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Margaritaville</text>
-      <action>EXEC /usr/bin/cliSipie radiomargaritaville</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Sirius Disorder</text>
-      <action>EXEC /usr/bin/cliSipie siriusdisorder</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Reggae</text>
-      <action>EXEC /usr/bin/cliSipie reggaerhythms</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Area 33</text>
-      <action>EXEC /usr/bin/cliSipie area33</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Boombox</text>
-      <action>EXEC /usr/bin/cliSipie boombox</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Chill</text>
-      <action>EXEC /usr/bin/cliSipie chill</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>The Beat</text>
-      <action>EXEC /usr/bin/cliSipie thebeat</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Strobe</text>
-      <action>EXEC /usr/bin/cliSipie thestrobe</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Hip-Hop Nation</text>
-      <action>EXEC /usr/bin/cliSipie hiphopnation</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>BackSpin</text>
-      <action>EXEC /usr/bin/cliSipie backspin</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Shade 45</text>
-      <action>EXEC /usr/bin/cliSipie shade45</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Hot Jamz</text>
-      <action>EXEC /usr/bin/cliSipie hotjamz</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Heart  &amp; Soul</text>
-      <action>EXEC /usr/bin/cliSipie heartandsoul</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>SoulTown</text>
-      <action>EXEC /usr/bin/cliSipie soultown</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>New Country</text>
-      <action>EXEC /usr/bin/cliSipie newcountry</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Prime Country</text>
-      <action>EXEC /usr/bin/cliSipie primecountry</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Roadhouse</text>
-      <action>EXEC /usr/bin/cliSipie theroadhouse</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Outlaw Country</text>
-      <action>EXEC /usr/bin/cliSipie outlawcountry</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Bluegrass</text>
-      <action>EXEC /usr/bin/cliSipie bluegrass</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Spirit</text>
-      <action>EXEC /usr/bin/cliSipie spirit</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Praise</text>
-      <action>EXEC /usr/bin/cliSipie praise</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Planet Jazz</text>
-      <action>EXEC /usr/bin/cliSipie planetjazz</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>JazzCafe</text>
-      <action>EXEC /usr/bin/cliSipie jazzcafe</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>PureJazz</text>
-      <action>EXEC /usr/bin/cliSipie purejazz</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Spa 73</text>
-      <action>EXEC /usr/bin/cliSipie spa73</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Blues</text>
-      <action>EXEC /usr/bin/cliSipie siriusblues</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Siriusly Sinatra</text>
-      <action>EXEC /usr/bin/cliSipie siriuslysinatra</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Broadway's Best</text>
-      <action>EXEC /usr/bin/cliSipie broadwaysbest</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Symphony Hall</text>
-      <action>EXEC /usr/bin/cliSipie symphonyhall</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Met Opera Radio</text>
-      <action>EXEC /usr/bin/cliSipie metropolitanopera</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Sirius Pops</text>
-      <action>EXEC /usr/bin/cliSipie siriuspops</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Universo Latino</text>
-      <action>EXEC /usr/bin/cliSipie universolatino</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Rumbon</text>
-      <action>EXEC /usr/bin/cliSipie rumbon</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Martha Stewart</text>
-      <action>EXEC /usr/bin/cliSipie marthastewartlivingradio</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Sirius Stars</text>
-      <action>EXEC /usr/bin/cliSipie siriusstars</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>OutQ Gay Radio</text>
-      <action>EXEC /usr/bin/cliSipie siriusoutq</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Patriot</text>
-      <action>EXEC /usr/bin/cliSipie siriuspatriot</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Left</text>
-      <action>EXEC /usr/bin/cliSipie siriusleft</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>CNN</text>
-      <action>EXEC /usr/bin/cliSipie cnn</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>wrn</text>
-      <action>EXEC /usr/bin/cliSipie wrn</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Blue Collar Comedy</text>
-      <action>EXEC /usr/bin/cliSipie bluecollarcomedy</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Raw Dog Comedy</text>
-      <action>EXEC /usr/bin/cliSipie rawdog</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Laugh Break Comedy</text>
-      <action>EXEC /usr/bin/cliSipie laughbreak</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>thefoxxhole</text>
-      <action>EXEC /usr/bin/cliSipie thefoxxhole</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>lime</text>
-      <action>EXEC /usr/bin/cliSipie lime</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Kids Stuff</text>
-      <action>EXEC /usr/bin/cliSipie kidsstuff</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Catholic Channel</text>
-      <action>EXEC /usr/bin/cliSipie thecatholicchannel</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>EWTN</text>
-      <action>EXEC /usr/bin/cliSipie ewtnglobal</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>christiantalk</text>
-      <action>EXEC /usr/bin/cliSipie christiantalk</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Sirius NFL Radio</text>
-      <action>EXEC /usr/bin/cliSipie siriusnflradio</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Maxim Radio</text>
-      <action>EXEC /usr/bin/cliSipie maximradio</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Cosmo Radio</text>
-      <action>EXEC /usr/bin/cliSipie cosmopolitanradio</action>
-   </button>
-   <button>
-     <type>TV_DELETE</type>
-     <text>Stop Listening</text>
-     <action>EXEC /usr/bin/sipie_kill</action>
-  </button>
-
-</mythmenu>
-
diff --git a/abs/core/mythtv/stable-0.24/menu-xml/update.xml b/abs/core/mythtv/stable-0.24/menu-xml/update.xml
deleted file mode 100644
index 5b28833..0000000
--- a/abs/core/mythtv/stable-0.24/menu-xml/update.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<mythmenu name="LinHES">
-
-   <button>
-     <type>UPGRADE</type>
-     <text>Check for updates?</text>
-     <action>NONE</action>
-   </button>
-
-   <button>
-     <type>UPGRADE</type>
-     <text>Yes</text>
-     <action>EXEC sudo /usr/LH/bin/linhes_update.sh</action>
-   </button>
-   
-   <button>
-     <type>UPGRADE</type>
-     <text>No</text>
-     <action>UPMENU</action>
-   </button>
-</mythmenu>
diff --git a/abs/core/mythtv/stable-0.24/menu-xml/update2.xml b/abs/core/mythtv/stable-0.24/menu-xml/update2.xml
deleted file mode 100644
index 2ab82ea..0000000
--- a/abs/core/mythtv/stable-0.24/menu-xml/update2.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<mythmenu name="LinHES">
-
-   <button>
-     <type>UPGRADE</type>
-     <text>Perform updates?</text>
-     <action>NONE</action>
-   </button>
-
-   <button>
-     <type>UPGRADE</type>
-     <text>Yes</text>
-     <action>EXEC sudo /usr/LH/bin/linhes_update2.sh</action>
-   </button>
-   
-   <button>
-     <type>UPGRADE</type>
-     <text>No</text>
-     <action>UPMENU</action>
-   </button>
-
-   <button>
-     <type>UPGRADE</type>
-     <text>View files to be upgraded.</text>
-     <action>EXEC sudo /usr/LH/bin/linhes_update3.sh</action>
-   </button>
-</mythmenu>
diff --git a/abs/core/mythtv/stable-0.24/menu-xml/util_menu.xml.patch b/abs/core/mythtv/stable-0.24/menu-xml/util_menu.xml.patch
deleted file mode 100644
index 82d303e..0000000
--- a/abs/core/mythtv/stable-0.24/menu-xml/util_menu.xml.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- themes/defaultmenu/util_menu.xml.orig	2010-11-06 00:40:01.000000000 +0000
-+++ themes/defaultmenu/util_menu.xml	2010-11-06 00:45:42.000000000 +0000
-@@ -17,6 +17,13 @@
-     </button>
- 
-     <button>
-+        <type>VIDEO_SCREENSHOOTER</type>
-+        <text>Thumbnail Generator</text>
-+        <description>Generate thumbnail images for videos</description>
-+        <action>EXEC /usr/LH/bin/shootscreens-mythtv.sh</action>
-+    </button>
-+
-+    <button>
-         <type>SETUP_MENU</type>
-         <text>Setup</text>
-         <description>Configure MythTV and plugins</description>
diff --git a/abs/core/mythtv/stable-0.24/menu-xml/xmmenu.xml b/abs/core/mythtv/stable-0.24/menu-xml/xmmenu.xml
deleted file mode 100644
index 6b26d11..0000000
--- a/abs/core/mythtv/stable-0.24/menu-xml/xmmenu.xml
+++ /dev/null
@@ -1,574 +0,0 @@
-<!-- Current as of April 25, 2007 -->
-<mythmenu name="XM">
-
-	<button>
-		<type>MUSIC</type>
-		<text>The '40s</text>
-		<action>EXEC /usr/bin/xamp kill 4</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The '50s</text>
-		<action>EXEC /usr/bin/xamp kill 5</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The '60s</text>
-		<action>EXEC /usr/bin/xamp kill 6</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The '70s</text>
-		<action>EXEC /usr/bin/xamp kill 7</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The '80s</text>
-		<action>EXEC /usr/bin/xamp kill 8</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The '90s</text>
-		<action>EXEC /usr/bin/xamp kill 9</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>America</text>
-		<action>EXEC /usr/bin/xamp kill 10</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>X Country</text>
-		<action>EXEC /usr/bin/xamp kill 12</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Willie's Place</text>
-		<action>EXEC /usr/bin/xamp kill 13</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Bluegrass Junction</text>
-		<action>EXEC /usr/bin/xamp kill 14</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Village</text>
-		<action>EXEC /usr/bin/xamp kill 15</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Highway 16</text>
-		<action>EXEC /usr/bin/xamp kill 16</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>US Country</text>
-		<action>EXEC /usr/bin/xamp kill 17</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>20 on 20</text>
-		<action>EXEC /usr/bin/xamp kill 20</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Heart</text>
-		<action>EXEC /usr/bin/xamp kill 23</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Blend</text>
-		<action>EXEC /usr/bin/xamp kill 25</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Flight 26</text>
-		<action>EXEC /usr/bin/xamp kill 26</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Cinemagic</text>
-		<action>EXEC /usr/bin/xamp kill 27</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>On Broadway</text>
-		<action>EXEC /usr/bin/xamp kill 28</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>U-Pop</text>
-		<action>EXEC /usr/bin/xamp kill 29</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>XM Hitlist</text>
-		<action>EXEC /usr/bin/xamp kill 30</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Torch</text>
-		<action>EXEC /usr/bin/xamp kill 31</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Message</text>
-		<action>EXEC /usr/bin/xamp kill 32</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Spirit</text>
-		<action>EXEC /usr/bin/xamp kill 33</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>enLighten</text>
-		<action>EXEC /usr/bin/xamp kill 34</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Deep Tracks</text>
-		<action>EXEC /usr/bin/xamp kill 40</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Boneyard</text>
-		<action>EXEC /usr/bin/xamp kill 41</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>XM Liquid Metal</text>
-		<action>EXEC /usr/bin/xamp kill 42</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>XMU</text>
-		<action>EXEC /usr/bin/xamp kill 43</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Fred</text>
-		<action>EXEC /usr/bin/xamp kill 44</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>XM Cafe</text>
-		<action>EXEC /usr/bin/xamp kill 45</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Top Tracks</text>
-		<action>EXEC /usr/bin/xamp kill 46</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Ethel</text>
-		<action>EXEC /usr/bin/xamp kill 47</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Squizz</text>
-		<action>EXEC /usr/bin/xamp kill 48</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Big Tracks</text>
-		<action>EXEC /usr/bin/xamp kill 49</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Loft</text>
-		<action>EXEC /usr/bin/xamp kill 50</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>XM Music Lab</text>
-		<action>EXEC /usr/bin/xamp kill 51</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Verge</text>
-		<action>EXEC /usr/bin/xamp kill 52</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Fungus</text>
-		<action>EXEC /usr/bin/xamp kill 53</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Lucy</text>
-		<action>EXEC /usr/bin/xamp kill 54</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Soul Street</text>
-		<action>EXEC /usr/bin/xamp kill 60</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Flow</text>
-		<action>EXEC /usr/bin/xamp kill 61</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Suite 62</text>
-		<action>EXEC /usr/bin/xamp kill 62</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Groove</text>
-		<action>EXEC /usr/bin/xamp kill 64</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Rhyme</text>
-		<action>EXEC /usr/bin/xamp kill 65</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>RAW</text>
-		<action>EXEC /usr/bin/xamp kill 66</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The City</text>
-		<action>EXEC /usr/bin/xamp kill 67</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Heat</text>
-		<action>EXEC /usr/bin/xamp kill 68</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Real Jazz</text>
-		<action>EXEC /usr/bin/xamp kill 70</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Watercolors</text>
-		<action>EXEC /usr/bin/xamp kill 71</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Beyond Jazz</text>
-		<action>EXEC /usr/bin/xamp kill 72</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>High Standards</text>
-		<action>EXEC /usr/bin/xamp kill 73</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Bluesville</text>
-		<action>EXEC /usr/bin/xamp kill 74</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Hear Music</text>
-		<action>EXEC /usr/bin/xamp kill 75</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Fine Tuning</text>
-		<action>EXEC /usr/bin/xamp kill 76</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Audio Visions</text>
-		<action>EXEC /usr/bin/xamp kill 77</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Escape</text>
-		<action>EXEC /usr/bin/xamp kill 78</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>On The Rocks</text>
-		<action>EXEC /usr/bin/xamp kill 79</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Move</text>
-		<action>EXEC /usr/bin/xamp kill 80</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>BPM</text>
-		<action>EXEC /usr/bin/xamp kill 81</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The System</text>
-		<action>EXEC /usr/bin/xamp kill 82</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Chrome</text>
-		<action>EXEC /usr/bin/xamp kill 83</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>XM-Chill</text>
-		<action>EXEC /usr/bin/xamp kill 84</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Fuego</text>
-		<action>EXEC /usr/bin/xamp kill 90</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Viva</text>
-		<action>EXEC /usr/bin/xamp kill 91</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Aguila</text>
-		<action>EXEC /usr/bin/xamp kill 92</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Caliente</text>
-		<action>EXEC /usr/bin/xamp kill 94</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Luna</text>
-		<action>EXEC /usr/bin/xamp kill 95</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Air Musique</text>
-		<action>EXEC /usr/bin/xamp kill 100</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Joint</text>
-		<action>EXEC /usr/bin/xamp kill 101</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Sur La Route</text>
-		<action>EXEC /usr/bin/xamp kill 102</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>World Zone</text>
-		<action>EXEC /usr/bin/xamp kill 103</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Ngoma</text>
-		<action>EXEC /usr/bin/xamp kill 104</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>XM Classics</text>
-		<action>EXEC /usr/bin/xamp kill 110</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Vox</text>
-		<action>EXEC /usr/bin/xamp kill 112</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>XM Pops</text>
-		<action>EXEC /usr/bin/xamp kill 113</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>XM Kids</text>
-		<action>EXEC /usr/bin/xamp kill 116</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Bob Edwards Show</text>
-		<action>EXEC /usr/bin/xamp kill 133</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>XM Comedy</text>
-		<action>EXEC /usr/bin/xamp kill 150</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Laugh USA</text>
-		<action>EXEC /usr/bin/xamp kill 151</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Special X</text>
-		<action>EXEC /usr/bin/xamp kill 154</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Agenda</text>
-		<action>EXEC /usr/bin/xamp kill 134</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Oprah and Friends</text>
-		<action>EXEC /usr/bin/xamp kill 156</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Virus</text>
-		<action>EXEC /usr/bin/xamp kill 202</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>1 Hit Wonders</text>
-		<action>EXEC /usr/bin/xamp kill 300</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Metalcore</text>
-		<action>EXEC /usr/bin/xamp kill 301</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>New Indie First</text>
-		<action>EXEC /usr/bin/xamp kill 302</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Late Night Mix</text>
-		<action>EXEC /usr/bin/xamp kill 303</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Sessions@AOL</text>
-		<action>EXEC /usr/bin/xamp kill 304</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Shuffle</text>
-		<action>EXEC /usr/bin/xamp kill 305</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>New Rock First</text>
-		<action>EXEC /usr/bin/xamp kill 306</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>New Country First</text>
-		<action>EXEC /usr/bin/xamp kill 307</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>New Hip Hop First</text>
-		<action>EXEC /usr/bin/xamp kill 308</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>New Pop First</text>
-		<action>EXEC /usr/bin/xamp kill 309</action>
-	</button>
-
-	<button>
-		<type>TV_DELETE</type>
-		<text>Stop Listening</text>
-		<action>EXEC /usr/bin/xamp kill</action>
-	</button>
-
-</mythmenu>
diff --git a/abs/core/mythtv/stable-0.24/morethemes/PKGBUILD b/abs/core/mythtv/stable-0.24/morethemes/PKGBUILD
new file mode 100644
index 0000000..c6368bc
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/morethemes/PKGBUILD
@@ -0,0 +1,66 @@
+pkgname=morethemes
+pkgver=0.24
+pkgrel=6
+pkgdesc="Additional themes for MythTV"
+url="http://www.mythtv.org"
+license="GPL"
+arch=('any')
+depends=('mythtv')
+groups=('mythtv-extras')
+source=(#'ftp://ftp.knoppmyth.net/R6/sources/morethemes-0.23.tar.bz2'
+        'ftp://miroku.no-ip.com/blue-abstract-wide.2010.09.16.tar.bz2'
+        'http://elkin.de/mythtv/2010.09.08-blootube-ng.tar.bz2'
+        'http://elkin.de/mythtv/2010.11.04-Willi.tar.lzma'
+        'http://elkin.de/mythtv/2010.03.13-bando-blue.tar.bz2'
+        'http://www.thepetersclan.com/files/TintedGlass-1.18.tbz2'
+        'http://www.thepetersclan.com/files/Mod-Gray-OSD.tar.bz2'
+        'http://www.thepetersclan.com/files/Bluebar-Hires-OSD.tar.bz2'
+        'http://www.thepetersclan.com/files/BlueCurves-OSD.tar.bz2'
+        'http://www.thepetersclan.com/files/SimplyBlue-OSD.tbz2'
+        'http://www.thepetersclan.com/files/BlueCurves2-OSD.tbz2'
+        'http://www.thepetersclan.com/files/BlueCurves-2.1-OSD.tbz2'
+        'http://www.mythtv.org/themes/LCARS.tar.gz'
+        'http://www.mythtv.org/themes/TransBlue.tar.gz'
+        'http://www.westnet.com/~chris/Mythtv/Retro-wide.tar.gz'
+        'retro-wide_video-ui.xml-filetypes.patch'
+        'http://capnbry.net/~bmayland/fi/pvr150/SimpleGray-OSD-0.4.tar.bz2'
+        'http://www.jobs-khakis-chicks.com/MythTV/IsthmusBlue-OSD.tar.gz'
+        'http://static.castlesblog.com/public/Glass-OSD-V1.3.zip'
+        'http://static.castlesblog.com/public/Minimal-OSD-V1.1.zip')
+
+build() {
+    cd ${srcdir}
+    mkdir -p ${pkgdir}/usr/share/mythtv/themes
+    
+    msg "Copying files..."
+    for d in `ls -d */`
+     do
+      cp -a "${d}" ${pkgdir}/usr/share/mythtv/themes
+    done
+
+   # Housekeeping
+    rm -fr "${pkgdir}/usr/share/mythtv/themes/__MACOSX" || return 1
+   # Little fix
+    cd ${pkgdir}/usr/share/mythtv/themes/Retro-wide || return 1
+    patch -p0 <${srcdir}/retro-wide_video-ui.xml-filetypes.patch || return 1
+}
+
+md5sums=('878605505599a0f49c44f3df9affe10f'
+         '7c2a2b238b7d44e52b7a8a0361d395aa'
+         '2890f3b991db805a88a48eb6c7048f91'
+         'c6d90fb469bc30a94e32f76c82122dd3'
+         '80d250bf87c8f72ee238a91c854c0a11'
+         'c973d0779967034f7a5bc0043574d6f9'
+         'fb32ddd900e54cff62a62a21025b2585'
+         '79247cf87bbee10363bb214325b7f671'
+         '67c501b80afdefeca623261634dafd9c'
+         '7b2f2eca37f2d9598b00bce85a193bae'
+         '9793dc85a486e1ad9d0c0b6684efd245'
+         'a36bb7b2597a44128401b1aba9106122'
+         '21d6f967631e45b7039b965a63755282'
+         'bfc56ffe1c872989f7a1cb7ae20aea49'
+         'e05bb3d77a11f97a1d547b2f5bc1ddf7'
+         '09dd8679b56794f9850a2382b4e1ea62'
+         'b6c187b233778abacce102fe609d4e09'
+         'f8d4fd90f1e45512ea5237de59d5090d'
+         '5646e1df6f593f7116cbdec656146266')
diff --git a/abs/core/mythtv/stable-0.24/morethemes/retro-wide_video-ui.xml-filetypes.patch b/abs/core/mythtv/stable-0.24/morethemes/retro-wide_video-ui.xml-filetypes.patch
new file mode 100644
index 0000000..c98487f
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/morethemes/retro-wide_video-ui.xml-filetypes.patch
@@ -0,0 +1,22 @@
+--- video-ui.xml.orig	2010-07-04 06:21:18.000000000 +0000
++++ video-ui.xml	2010-07-04 06:22:22.000000000 +0000
+@@ -967,14 +967,17 @@
+ 
+         <button name="done_button" from="basebutton">
+             <position>700,550</position>
++            <value>Done</value>
+         </button>
+ 
+         <button name="new_button" from="basebutton">
+-            <position>600,550</position>
++            <position>400,550</position>
++            <value>New</value>
+         </button>
+ 
+         <button name="delete_button" from="basebutton">
+-            <position>0,550</position>
++            <position>100,550</position>
++            <value>Delete</value>
+         </button>
+     </window>
+
diff --git a/abs/core/mythtv/stable-0.24/myth.sh b/abs/core/mythtv/stable-0.24/myth.sh
deleted file mode 100755
index fb7122c..0000000
--- a/abs/core/mythtv/stable-0.24/myth.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export PATH=$PATH:/usr/local/bin
-# set core file size to 0
-ulimit -c 0
-export MALLOC_CHECK_=0
\ No newline at end of file
diff --git a/abs/core/mythtv/stable-0.24/mythbackend b/abs/core/mythtv/stable-0.24/mythbackend
deleted file mode 100755
index 93773a2..0000000
--- a/abs/core/mythtv/stable-0.24/mythbackend
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/mythbackend`
-case "$1" in
-  start)
-    stat_busy "Starting MythTV Backend"
-    [ ! -e /var/run/mysqld.pid ] && echo -n "mysqld not started" && stat_fail && exit
-    [ -z "$PID" ] && /usr/bin/mythbackend -d -l /var/log/mythbackend.log -v important 
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/mythbackend.pid
-      add_daemon mythbackend
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping MythTV Backend"
-    [ ! -z "$PID" ]  && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mythbackend
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1s 
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/core/mythtv/stable-0.24/mythbackend.lr b/abs/core/mythtv/stable-0.24/mythbackend.lr
deleted file mode 100644
index 4f218bc..0000000
--- a/abs/core/mythtv/stable-0.24/mythbackend.lr
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/mythtv/mythbackend.log {
-	copytruncate
-	daily
-	size 10M
-	missingok
-	rotate 7
-	compress
-	notifempty
-}
diff --git a/abs/core/mythtv/stable-0.24/mythbackend.sh b/abs/core/mythtv/stable-0.24/mythbackend.sh
deleted file mode 100755
index e7a7b70..0000000
--- a/abs/core/mythtv/stable-0.24/mythbackend.sh
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/bash
-#
-#	/etc/rc.d/init.d/mythbackend
-#
-# Starts the mythbackend as a daemon
-#
-# chkconfig: 345 90 10
-# description: Starts the mythbackend process as a daemon after the XWindows \
-#              system is started, in runlevel 5. This allows scheduled \
-#              recordings to occur without manual intervention.
-# processname: mythbackend
-
-# Copyright (c) by Michael Thomson <linux at m-thomson dot net>
-# With thanks to Stu Tomlinson <stu at nosnilmot dot com>
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-
-# Default values to use if none are supplied in the config file.
-# User who should start the mythbackend processes
-MBE_USER="root"
-# Directory holding the mythbackend binary
-MBE_LOCATION="/usr/local/bin/"
-# Name of mythbackend binary
-MBE_PROG="mythbackend"
-# Full path to mythbackend log file
-MBE_LOGFILE="/var/log/mythtv/mythbackend.log"
-
-# Source function library.
-. /etc/init.d/functions
-
-# Source config file if available
-if [ -f "/etc/sysconfig/mythbackend" ]; then
-  . /etc/sysconfig/mythbackend
-fi
-
-test -x ${MBE_LOCATION}${MBE_PROG} || exit 0
-
-RETVAL=0
-
-#
-#	See how we were called.
-#
-
-start() {
-	# Check if mythbackend is already running
-	if [ ! -f /var/lock/subsys/${MBE_PROG} ]; then
-	    echo -n "Starting ${MBE_PROG}: "
-	    # /usr/local/bin/mythbackend -d -l /some/log/file
-	    #daemon --user ${MBE_USER} ${MBE_LOCATION}${MBE_PROG} -d -l ${MBE_LOGFILE}
-	    ${MBE_LOCATION}${MBE_PROG} -d -l ${MBE_LOGFILE}
-	    RETVAL=$?
-	    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/${MBE_PROG}
-	    echo
-	fi
-	return $RETVAL
-}
-
-stop() {
-	echo -n "Stopping ${MBE_PROG}: "
-	killproc ${MBE_LOCATION}${MBE_PROG}
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/${MBE_PROG}
-	echo
-        return $RETVAL
-}
-
-
-restart() {
-	stop
-	start
-}	
-
-reload() {
-	restart
-}	
-
-status_at() {
- 	status ${MBE_LOCATION}${MBE_PROG}
-}
-
-case "$1" in
-start)
-	start
-	;;
-stop)
-	stop
-	;;
-reload|restart)
-	restart
-	;;
-condrestart)
-	if [ -f /var/lock/subsys/${MBE_PROG} ]; then
-	    restart
-	fi
-	;;
-status)
-	status_at
-	;;
-*)
-	echo "Usage: $0 {start|stop|restart|condrestart|status}"
-	exit 1
-esac
-
-exit $?
-exit $RETVAL
diff --git a/abs/core/mythtv/stable-0.24/mythfrontend.lr b/abs/core/mythtv/stable-0.24/mythfrontend.lr
deleted file mode 100644
index 1580533..0000000
--- a/abs/core/mythtv/stable-0.24/mythfrontend.lr
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/mythtv/mythfrontend.log {
-	copytruncate
-	daily
-	size 10M
-	missingok
-	rotate 7
-	compress
-	notifempty
-}
diff --git a/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD
new file mode 100644
index 0000000..85a7521
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD
@@ -0,0 +1,145 @@
+# $Id: PKGBUILD 91281 2010-09-26 06:04:21Z remy $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+
+pkgbase=mythplugins
+pkgname=('mythplugins-mytharchive'
+         'mythplugins-mythbrowser'
+         'mythplugins-mythgallery'
+         'mythplugins-mythgame'
+         'mythplugins-mythmusic'
+         'mythplugins-mythnetvision'
+         'mythplugins-mythnews'
+         'mythplugins-mythvideo'
+         'mythplugins-mythweather'
+         'mythplugins-mythweb'
+         'mythplugins-mythzoneminder')
+pkgver=0.24
+pkgrel=6
+arch=('i686' 'x86_64')
+url="http://www.mythtv.org"
+license=('GPL')
+conflicts=('mythmovies')
+makedepends=("mythtv>=${pkgver}" 'mplayer' 'fftw' 'dvdauthor' 'libexif'
+             'python-imaging' 'libcdaudio' 'taglib' 'perl-xml-simple' 'dcraw'
+             'libvisual' 'perl-xml-xpath' 'perl-image-size'
+             'perl-class-inspector' 'perl-datetime-format-iso8601'
+             'flac' 'libvorbis' 'python2' 'python-pycurl' 'python-oauth')
+
+build() {
+   _svntrunk="http://svn.mythtv.org/svn/branches/release-0-24-fixes"
+   _svnmod="${pkgbase}"
+
+        # get clean copy from SVN repo
+        if [ -d "${srcdir}/${pkgbase}" ]
+         then
+           cd "${srcdir}/${pkgbase}"
+           echo "Updating from SVN..."
+           svn up
+         else
+           cd "${srcdir}"
+           echo "Checking Out from SVN..."
+           svn co "${_svntrunk}/${_svnmod}"
+         fi
+
+  cd "${srcdir}/${pkgbase}"
+  find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' 
+
+  ./configure --prefix=/usr \
+              --enable-all
+
+  qmake mythplugins.pro || return 1
+  make || return 1
+}
+
+package_mythplugins-mytharchive() {
+  pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows"
+  depends=("mythtv>=${pkgver}" 'libxmu' 'pil' 'dvdauthor')
+  replaces=('mytharchive')
+  cd "${srcdir}/${pkgbase}/mytharchive"
+  make INSTALL_ROOT="${pkgdir}" install || return 1
+}
+
+package_mythplugins-mythbrowser() {
+  pkgdesc="Mini web browser for MythTV"
+  depends=("mythtv>=${pkgver}")
+  replaces=('mythbrowser')
+  cd "${srcdir}/${pkgbase}/mythbrowser"
+  make INSTALL_ROOT="${pkgdir}" install || return 1
+}
+
+package_mythplugins-mythgallery() {
+  pkgdesc="Image gallery plugin for MythTV"
+  depends=("mythtv>=${pkgver}" 'libexif')
+  replaces=('mythgallery')
+  cd "${srcdir}/${pkgbase}/mythgallery"
+  make INSTALL_ROOT="${pkgdir}" install || return 1
+}
+
+package_mythplugins-mythgame() {
+  pkgdesc="Game emulator module for MythTV"
+  depends=("mythtv>=${pkgver}" 'zlib')
+  replaces=('mythgame')
+  cd "${srcdir}/${pkgbase}/mythgame"
+  make INSTALL_ROOT="${pkgdir}" install || return 1
+}
+
+package_mythplugins-mythmusic() {
+  pkgdesc="Music playing plugin for MythTV"
+  depends=("mythtv>=${pkgver}" 'flac' 'libvorbis' 'libcdaudio' 'cdparanoia' 'taglib' 'libvisual')
+  replaces=('mythmusic')
+  cd "${srcdir}/${pkgbase}/mythmusic"
+  make INSTALL_ROOT="${pkgdir}" install || return 1
+}
+
+package_mythplugins-mythnetvision() {
+  pkgdesc="MythNetvision plugin for MythTV"
+  depends=("mythtv>=${pkgver}" 'python-pycurl' 'python-oauth')
+  replaces=('mythnetvision')
+  cd "${srcdir}/${pkgbase}/mythnetvision"
+  make INSTALL_ROOT="${pkgdir}" install || return 1
+}
+
+package_mythplugins-mythnews() {
+  pkgdesc="News checking plugin for MythTV"
+  depends=("mythtv>=${pkgver}")
+  replaces=('mythnews')
+  cd "${srcdir}/${pkgbase}/mythnews"
+  make INSTALL_ROOT="${pkgdir}" install || return 1
+}
+
+package_mythplugins-mythvideo() {
+  pkgdesc="Video playback and browsing plugin for MythTV"
+  depends=("mythtv>=${pkgver}" 'mplayer' 'perl-xml-simple')
+  replaces=('mythvideo')
+  cd "${srcdir}/${pkgbase}/mythvideo"
+  make INSTALL_ROOT="${pkgdir}" install || return 1
+}
+
+package_mythplugins-mythweather() {
+  pkgdesc="Weather checking plugin for MythTV"
+  depends=("mythtv>=${pkgver}" 'perl-xml-xpath' 'perl-image-size' 'perl-class-inspector' 'perl-datetime-format-iso8601')
+  replaces=('mythweather')
+  cd "${srcdir}/${pkgbase}/mythweather"
+  make INSTALL_ROOT="${pkgdir}" install || return 1
+}
+
+package_mythplugins-mythweb() {
+  pkgdesc="Web interface for MythTV's backend"
+  depends=("mythtv>=${pkgver}")
+  optdepends=('php-apache'
+              'lighttpd')
+  replaces=('mythweb')
+  mkdir -p ${pkgdir}/data/srv/httpd/htdocs/mythweb/{image_cache,php_sessions}
+  cp -r ${srcdir}/mythplugins/mythweb/* ${pkgdir}/data/srv/httpd/htdocs/mythweb || return 1
+  chown -R http:http ${pkgdir}/data/srv/httpd/htdocs/mythweb
+  chmod g+rw ${pkgdir}/data/srv/httpd/htdocs/mythweb/{image_cache,php_sessions,data}
+}
+
+package_mythplugins-mythzoneminder() {
+  pkgdesc="Allows for viewing of CCTV cameras through zoneminder"
+  depends=("mythtv>=${pkgver}" zoneminder)
+  replaces=('mythzoneminder')
+#  install=mythplugins-mythzoneminder.install
+  cd "${srcdir}/${pkgbase}/mythzoneminder"
+  make INSTALL_ROOT="${pkgdir}" install || return 1
+}
diff --git a/abs/core/mythtv/stable-0.24/mythplugins/mtd b/abs/core/mythtv/stable-0.24/mythplugins/mtd
new file mode 100644
index 0000000..1f46dfe
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythplugins/mtd
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/bin/mtd`
+case "$1" in
+  start)
+    stat_busy "Starting Myth Transcoding Daemon"
+    [ -z "$PID" ] && /usr/bin/mtd -d
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      echo $PID > /var/run/mtd.pid
+      add_daemon mythtranscode
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Myth Transcoding Daemon"
+    [ ! -z "$PID" ]  && kill $PID &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon mtd 
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/abs/core/mythtv/stable-0.24/mythplugins/mythplugins-mythzoneminder.install b/abs/core/mythtv/stable-0.24/mythplugins/mythplugins-mythzoneminder.install
new file mode 100644
index 0000000..142212b
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythplugins/mythplugins-mythzoneminder.install
@@ -0,0 +1,3 @@
+post_install() {
+  echo "If you want to use this plugin, install zoneminder from AUR."
+}
diff --git a/abs/core/mythtv/stable-0.24/mythplugins/qt-4.7-buildfixes.diff b/abs/core/mythtv/stable-0.24/mythplugins/qt-4.7-buildfixes.diff
new file mode 100644
index 0000000..dcffebe
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythplugins/qt-4.7-buildfixes.diff
@@ -0,0 +1,26 @@
+Index: /branches/release-0-23-fixes/mythplugins/mythnetvision/mythnetvision/netsearch.cpp
+===================================================================
+--- /branches/release-0-23-fixes/mythplugins/mythnetvision/mythnetvision/netsearch.cpp	(revision 24265)
++++ /branches/release-0-23-fixes/mythplugins/mythnetvision/mythnetvision/netsearch.cpp	(revision 26391)
+@@ -45,7 +45,7 @@
+       m_progress(NULL),              m_busyPopup(NULL),
+       m_okPopup(NULL),               m_popupStack(),
+-      m_netSearch(),                 m_currentSearch(NULL),
+-      m_currentGrabber(0),           m_currentCmd(NULL),
+-      m_currentDownload(NULL),       m_pagenum(0),
++      m_netSearch(),                 m_currentSearch(QString()),
++      m_currentGrabber(0),           m_currentCmd(QString()),
++      m_currentDownload(QString()),  m_pagenum(0),
+       m_lock(QMutex::Recursive)
+ {
+Index: /branches/release-0-23-fixes/mythplugins/mythvideo/mythvideo/videodlg.h
+===================================================================
+--- /branches/release-0-23-fixes/mythplugins/mythvideo/mythvideo/videodlg.h	(revision 22916)
++++ /branches/release-0-23-fixes/mythplugins/mythvideo/mythvideo/videodlg.h	(revision 26391)
+@@ -151,5 +151,5 @@
+     QString GetCoverImage(MythGenericTree *node);
+     QString GetFirstImage(MythGenericTree *node, QString type,
+-                          QString gpnode = NULL, int levels = 0);
++                          QString gpnode = QString(), int levels = 0);
+     QString GetImageFromFolder(Metadata *metadata);
+     QString GetScreenshot(MythGenericTree *node);
diff --git a/abs/core/mythtv/stable-0.24/mythsmolt/PKGBUILD b/abs/core/mythtv/stable-0.24/mythsmolt/PKGBUILD
new file mode 100644
index 0000000..d509d30
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythsmolt/PKGBUILD
@@ -0,0 +1,23 @@
+pkgname=mythsmolt
+pkgver=0.24
+pkgrel=6
+pkgdesc="mythsmolt, a hardware profileing tool"
+arch=('i686' 'x86_64')
+url="http://www.mythvantage.com"
+license=('GPL')
+depends=("mythtv>=${pkgver}" urlgrabber python-simplejson python-pycurl)
+#source=("http://jmeyer.us/download/mythsmolt.tar.gz" 'smolt_init_login.sh' 'mythsmolt.patch')
+source=("http://jmeyer.us/download/mythsmolt.tar.gz" 'smolt_init_login.sh' )
+
+groups=('mythtv-extras')
+
+build() {
+   cd $startdir/src/mythsmolt
+#   patch -p1 < ../mythsmolt.patch || return 1
+   ./configure.sh
+   make || return 1
+   make INSTALL_ROOT=$startdir/pkg install
+   install -D -m 755 $srcdir/smolt_init_login.sh $pkgdir/etc/profile.d/smolt_init_login.sh
+}
+md5sums=('17d740c348301ab47ac557ad7402115b'
+         '57a3416d90e59abbd5062436583c17e1')
diff --git a/abs/core/mythtv/stable-0.24/mythsmolt/mythsmolt.patch b/abs/core/mythtv/stable-0.24/mythsmolt/mythsmolt.patch
new file mode 100644
index 0000000..4767865
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythsmolt/mythsmolt.patch
@@ -0,0 +1,8 @@
+diff -ruaN mythsmolt.orig/settings.pro mythsmolt/settings.pro
+--- mythsmolt.orig/settings.pro	2010-01-06 15:49:59.000000000 +0000
++++ mythsmolt/settings.pro	2010-05-28 03:30:59.000000000 +0000
+@@ -1,3 +1,3 @@
+ 
+-LIBVERSION = 0.24
++LIBVERSION = 0.24
+ 
diff --git a/abs/core/mythtv/stable-0.24/mythsmolt/smolt_init_login.sh b/abs/core/mythtv/stable-0.24/mythsmolt/smolt_init_login.sh
new file mode 100644
index 0000000..0b76305
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythsmolt/smolt_init_login.sh
@@ -0,0 +1,39 @@
+if [ $UID = 0  -o  $UID = 1000 ]
+then
+    INIT=`ps -p 1 -o comm=`
+    if [ x$INIT = xrunit ]
+    then
+        if [[ -f /home/mythtv/.configure  &&  $- = *i* ]]
+        then
+            if  [ ! -z "$PS1" ]
+            then
+                if  [ $0 = "-bash" ]
+                then
+                    if [ ! -e /home/mythtv/.mythtv/MythSmolt/hw-uuid ]
+                    then
+                        echo ""
+                        echo "####################################################"
+                        echo "It appears you have not yet run smolt"
+                        echo "Please take the time to submit your hardware profile"
+                        echo ""
+                        echo "press any key to continue:"
+                        echo "####################################################"
+                        read a
+                        mkdir -p /home/mythtv/.mythtv/MythSmolt
+                        chown -R mythtv:users /home/mythtv/.mythtv/MythSmolt
+
+                        if [ $UID = 0 ]
+                        then
+                            su   mythtv -c "/usr/share/mythtv/mythsmolt/scripts/sendProfile.py" &&   su mythtv -c "touch  /home/mythtv/.mythtv/MythSmolt/hw-uuid"
+                        else
+                            /usr/share/mythtv/mythsmolt/scripts/sendProfile.py &&  touch  /home/mythtv/.mythtv/MythSmolt/hw-uuid
+                        fi
+                    fi
+                fi
+            fi
+        fi
+    fi
+fi
+
+
+
diff --git a/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD b/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD
new file mode 100644
index 0000000..7c19e5a
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD
@@ -0,0 +1,51 @@
+# $Id: PKGBUILD 86938 2010-08-06 21:53:33Z ibiru $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Juergen Hoetzel <juergen@archlinux.org> 
+# Contributor: kleptophobiac@gmail.com
+
+pkgname=myththemes
+pkgver=0.24
+pkgrel=6
+pkgdesc="Themes for MythTV"
+arch=('any')
+url="http://www.mythtv.org/"
+license=('GPL')
+depends=("mythtv>=${pkgver}")
+source=(`echo ${patches[@]:0}`)
+
+build() {
+   _svntrunk="http://svn.mythtv.org/svn/branches/release-0-24-fixes"
+   _svnmod="${pkgname}"
+
+     # get clean copy from SVN repo
+     if [ -d "${srcdir}/${pkgname}" ]
+       then
+         cd "${srcdir}/${pkgname}"
+         msg "Clean up from previous build..."
+         make distclean
+         msg "Updating from SVN..."
+         svn up
+       else
+         cd "${srcdir}"
+         msg "Checking Out from SVN..."
+         svn co "${_svntrunk}/${_svnmod}"
+         cd "${srcdir}/${pkgname}"
+     fi
+
+        # apply patches
+        echo "--------------------------applying patches----------------------------------------------------"
+        for i in `echo ${patchs[@]:0} `
+        do
+                echo applying $i
+                echo "-----------------------------"
+                patch -Np0  -i ${startdir}/src/$i  || return 1
+        done
+        echo "--------------------------done applying patches-----------------------------------------------"
+
+  cd "${srcdir}/${pkgname}"
+  ./configure --prefix=/usr || return 1
+}
+package() {
+  cd "${srcdir}/${pkgname}"
+  make INSTALL_ROOT="${pkgdir}" install || return 1
+}
diff --git a/abs/core/mythtv/stable-0.24/mythtv.install b/abs/core/mythtv/stable-0.24/mythtv.install
deleted file mode 100755
index 0524f86..0000000
--- a/abs/core/mythtv/stable-0.24/mythtv.install
+++ /dev/null
@@ -1,47 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-	if [ ! -d /var/log/mythtv ]
-	then
-		mkdir -p /var/log/mythv
-		chown -R mythtv /var/log/mythtv
-		echo "---" > /var/log/mythtv/mythbackend.log
-		chown mythtv /var/log/mythtv/mythbackend.log
-	fi
-	ln -s /usr/share/mythtv/themes/defaultmenu/is.xml /usr/share/mythtv/is.xml
-}
-
-pre_upgrade() {
-	if [ ! -L /usr/share/mythtv/is.xml ]
-	then
-		mv /usr/share/mythtv/is.xml /usr/share/mythtv/is.xml.pre
-	else
-		mv /usr/share/mythtv/themes/defaultmenu/is.xml /usr/share/mythtv/themes/defaultmenu/is.xml.pre
-	fi
-}
-
-post_upgrade() {
-	if [ ! -d /var/log/mythtv ]
-	then
-		mkdir -p /var/log/mythv
-		chown -R mythtv /var/log/mythtv
-	fi
-	if [ -e /usr/share/mythtv/is.xml.pre ]
-	then
-		rm -fr /usr/share/mythtv/themes/defaultmenu/is.xml
-		mv /usr/share/mythtv/is.xml.pre /usr/share/mythtv/themes/defaultmenu/is.xml
-		ln -s /usr/share/mythtv/themes/defaultmenu/is.xml /usr/share/mythtv/is.xml
-	else
-		mv /usr/share/mythtv/themes/defaultmenu/is.xml.pre /usr/share/mythtv/themes/defaultmenu/is.xml
-	fi
-}
-
-
-# arg 1:  the old package version
-post_remove() {
-	/bin/true
-
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD
new file mode 100755
index 0000000..5548edd
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD
@@ -0,0 +1,113 @@
+# $Id: PKGBUILD 91139 2010-09-23 10:45:09Z remy $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor: <kleptophobiac@gmail.com>
+# Contributor: dorphell <dorphell@archlinux.org>
+
+pkgname=mythtv
+pkgver=0.24
+pkgrel=6
+pkgdesc="A Homebrew PVR project"
+arch=('i686' 'x86_64')
+url="http://www.mythtv.org/"
+license=('GPL')
+depends=('mysql-clients' 'qt' 'lame' 'lirc-utils' 'ffmpeg-svn' 'libxvmc'
+         'fribidi' 'perl-soap-lite' 'perl-date-manip' 'perl-xml-sax'
+         'perl-math-round' 'perl-net-upnp' 'perl-dbd-mysql' 'perl-time-hires'
+         'libavc1394' 'wget' 'libiec61883' 'mysql-python' 'python-lxml' 
+         'mesa' 'libxinerama' 'libxrandr' 'faad2' 'libvdpau' 'libcrystalhd-git')
+makedepends=('yasm' 'libgl' 'subversion' 'rsync')
+replaces=()
+groups=('pvr')
+#backup=(/usr/share/mythtv/is.xml)
+#options=(!strip)
+#MAKEFLAGS="-j6"
+install='mythtv.install'
+patchs=('smolt_jump.patch')
+optdepends=('xmltv: to download tv listings')
+#replaces=('mythtv-contrib')
+#conflicts=('mythtv-contrib')
+source=('mythbackend' 'myth.sh' `echo ${patchs[@]:0}` 'mythbackend.lr' 'mythfrontend.lr' 'pretty')
+
+build() {
+   _svntrunk="http://svn.mythtv.org/svn/branches/release-0-24-fixes"
+   _svnmod="${pkgname}"
+
+        # get clean copy from SVN repo
+        if [ -d "${srcdir}/${pkgname}" ]
+         then
+           cd "${srcdir}/${pkgname}"
+           msg "Clean up previous build..."
+           make distclean 
+           msg "Updating from SVN..."
+           svn up
+        else
+           cd "${srcdir}"
+           msg "Checking Out from SVN..."
+           svn co "${_svntrunk}/${_svnmod}"
+           cd "${srcdir}/${pkgname}"
+         fi
+
+        # apply patches
+        echo "--------------------------applying patches----------------------------------------------------"
+        for i in `echo ${patchs[@]:0} `
+        do
+                echo applying $i
+                echo "-----------------------------"
+                patch -Np0  -i ${startdir}/src/$i  || return 1
+        done
+        echo "--------------------------done applying patches-----------------------------------------------"
+
+        sed -i -e "s/\`(svnversion \$\${SVNTREEDIR} 2>\/dev\/null) || echo Unknown\`/$pkgver/" version.pro
+        find bindings/python contrib -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+
+  ARCH=${CARCH/_/-}
+  ./configure --prefix=/usr --cpu=${ARCH} \
+              --disable-audio-jack \
+              --disable-audio-pulse \
+              --disable-altivec \
+              --disable-distcc \
+              --disable-ccache \
+              --enable-vdpau \
+              --enable-crystalhd \
+              --dvb-path=/usr/include \
+              --enable-opengl-vsync \
+              --with-bindings=perl,python --python=python2 || return 1
+
+  make all || return 1
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
+  # basic install
+  make INSTALL_ROOT="${pkgdir}" install
+  # install contrib files
+  rsync -arp --exclude .svn --delete-excluded contrib ${pkgdir}/usr/share/mythtv/ || return 1
+  # install database structure
+  rsync -arp --exclude .svn --delete-excluded database ${pkgdir}/usr/share/mythtv/ || return 1
+  # install docs
+  rsync -arp --exclude .svn --delete-excluded docs ${pkgdir}/usr/share/mythtv/ || return 1
+
+  # patch the xml LinHES style
+  cp -r ${startdir}/menu-xml/*.xml ${pkgdir}/usr/share/mythtv/themes/defaultmenu/
+#  mv ${pkgdir}/usr/share/mythtv/themes/defaultmenu/is.xml ${pkgdir}/usr/share/mythtv/
+  cd ${pkgdir}/usr/share/mythtv
+  patch -p0 < ${startdir}/menu-xml/mainmenu.xml.patch || return 1
+  patch -p0 < ${startdir}/menu-xml/optical_menu.xml.patch || return 1
+  patch -p0 < ${startdir}/menu-xml/library.xml.patch || return 1
+  patch -p0 < ${startdir}/menu-xml/util_menu.xml.patch || return 1
+
+  # make log dir
+  mkdir -p ${pkgdir}/var/log/mythtv
+  chown 1000.1000 ${pkgdir}/var/log/mythtv
+  mkdir -p ${pkgdir}/etc/logrotate.d
+  cp ${srcdir}/*.lr ${pkgdir}/etc/logrotate.d
+  mkdir -p ${pkgdir}/etc/cron.hourly/
+  install -m0755 ${srcdir}/pretty ${pkgdir}/etc/cron.hourly/
+}
+md5sums=('7ef6de58240e7aad389a0b13d91b1cf6'
+         '2babd4b8e146a7538d18dcd55695b0be'
+         'a837de9ccc201994320071e48952b17d'
+         'f735805a80b0d1180dee01f9df1b7004'
+         'f407d6af23e74a49540755420f84fa58'
+         '5469d9921b726db750b991c87d226158')
diff --git a/abs/core/mythtv/stable-0.24/mythtv/__changelog b/abs/core/mythtv/stable-0.24/mythtv/__changelog
new file mode 100644
index 0000000..940f84b
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/__changelog
@@ -0,0 +1 @@
+update to 0.24-fixes
diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/HOST_SETTINGS.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/HOST_SETTINGS.xml
new file mode 100644
index 0000000..ac52497
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/HOST_SETTINGS.xml
@@ -0,0 +1,94 @@
+<mythmenu name="HOST_SETTINGS">
+
+   <button>
+      <type>MV_NETWORK_SETUP_MENU</type>
+      <text>Network Settings</text>
+      <action>EXEC  mythinstall -s network </action>
+   </button>
+
+   <button>
+      <type>MV_NETWORK_SETUP_MENU</type>
+      <text>DDNS Settings</text>
+      <action>EXEC  mythinstall -s ddns </action>
+   </button>
+   <button>
+      <type>MV_SYSTEM_SETUP_MENU</type>
+      <text>System Type</text>
+      <action>EXEC  mythinstall -s hostype </action>
+   </button>
+
+   <button>
+      <type>MV_SCREENSAVER_SETUP_MENU</type>
+      <text>Screensaver Settings</text>
+      <action>EXEC  mythinstall -s screensaver </action>
+   </button>
+
+   <button>
+      <type>MV_IR_SETUP_MENU</type>
+      <text>Remotes</text>
+       <action>EXEC  mythinstall -s ir </action>
+   </button>
+
+   <button>
+      <type>MV_MISC_SETUP_MENU</type>
+      <text>Miscellanous Settings</text>
+      <action>EXEC  mythinstall -s misc </action>
+   </button>
+
+   <button>
+      <type>MV_SOFTWARE_MENU</type>
+      <text>Software</text>
+      <action>EXEC  mythinstall -s  plugins </action>
+   </button>
+
+   <button>
+      <type>MV_SHUTDOWN_SETUP_MENU</type>
+      <text>Shutdown Settings</text>
+      <action>EXEC  mythinstall -s sleep </action>
+   </button>
+
+   <button>
+      <type>MV_ADVANCED_X_SETUP_MENU</type>
+      <text>Display Settings</text>
+      <action>EXEC  mythinstall -s advancedX</action>
+   </button>
+
+   <button>
+      <type>MV_ADVANCED_SETUP_MENU</type>
+      <text>Advanced Settings</text>
+      <action>EXEC  mythinstall -s advanced</action>
+   </button>
+
+   <button>
+      <type>MV_AUDIO_SETUP_MENU</type>
+      <text>Audio Settings</text>
+       <action>EXEC  mythinstall -s sound </action>
+   </button>
+
+   <button>
+      <type>MV_ACCESS_SETUP_MENU</type>
+      <text>Access Control</text>
+      <action>EXEC  mythinstall -s accesscontrol </action>
+   </button>
+
+   <button>
+      <type>MV_USER_SETUP_MENU</type>
+      <text>User Accounts</text>
+      <action>EXEC  mythinstall -s user </action>
+   </button>
+
+   <button>
+      <type>MV_WEBACCESS_SETUP_MENU</type>
+      <text>Web Security</text>
+      <action>EXEC  mythinstall -s webuser </action>
+   </button>
+
+   <!--
+   <button>
+      <type>SETUP_MENU</type>
+      <text>Settings Profile Manager</text>
+      <action>EXEC  mythinstall -t </action>
+   </button>
+   -->
+
+</mythmenu>
diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/is.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/is.xml
new file mode 100644
index 0000000..88b7e6b
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/is.xml
@@ -0,0 +1,3 @@
+<mythmenu name="Internet Steams">
+
+</mythmenu>
diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/library.xml.patch b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/library.xml.patch
new file mode 100644
index 0000000..be06e34
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/library.xml.patch
@@ -0,0 +1,12 @@
+--- themes/defaultmenu/library.xml.orig	2010-11-06 00:39:51.000000000 +0000
++++ themes/defaultmenu/library.xml	2010-11-06 00:44:54.000000000 +0000
+@@ -44,8 +44,7 @@
+         <type>STREAM</type>
+         <text>Play Online Streams</text>
+         <description></description>
+-        <action>PLUGIN mythstream</action>
+-        <depends>mythstream</depends>
++        <action>MENU is.xml</action>
+     </button>
+ 
+     <button>
diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/linhes.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/linhes.xml
new file mode 100644
index 0000000..ebc848b
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/linhes.xml
@@ -0,0 +1,59 @@
+<mythmenu name="LinHES">
+
+    <button>
+        <type>SETUP_GENERAL</type>
+        <text>MythTV Configuration</text>
+        <text lang="IT">Impostazioni</text>
+        <text lang="ES">Configuración</text>
+        <text lang="DE">Zubehör / Konfiguration</text>
+        <text lang="DA">Tilbehør/Indstillinger</text>
+        <text lang="IS">Uppsetning</text>
+        <text lang="NL">Configuratie</text>
+        <text lang="PT">Utensílios</text>
+        <text lang="SV">Verktyg / Inställningar</text>
+        <text lang="JA">設�~Z</text>
+        <text lang="FI">Oheis/Asetukset</text>
+        <text lang="ZH_TW">工�~E�/設�~Z</text>
+        <text lang="SL">Nastavitve</text>
+        <text lang="ET">Utiliidid / sätted</text>
+        <text lang="RU">У�~Bили�~B�~K / �~]а�~A�~B�~@ойки</text>
+        <text lang="AR">تضب�~Jطات</text>
+        <text lang="PL">Narz�~Ydzia / ustawienia</text>
+        <text lang="HE">ע�~Vר�~Y�~] / �~T�~R�~Sר�~Uת</text>
+        <text lang="HU">Eszközök / Beállítások</text>
+        <alttext lang="DE">Verschiedenes</alttext>
+        <alttext lang="SV">Inställningar</alttext>
+        <alttext lang="ET">Sätted</alttext>
+        <alttext lang="RU">�~]а�~A�~B�~@ойки</alttext>
+        <alttext lang="AR">تضب�~Jطات</alttext>
+        <description>Configure MythTV and plugins</description>
+        <description lang="DE">MythTV und Plugins konfigurieren</description>
+        <action>MENU util_menu.xml</action>
+    </button>
+
+   <button>
+     <type>LINHES_SETUP</type>
+     <text>LinHES Configuration</text>
+     <action>MENU HOST_SETTINGS.xml</action>
+   </button>
+
+   <button>
+     <type>BACKUP</type>
+     <text>Backup LinHES</text>
+     <action>MENU mythbackup.xml</action>
+   </button>
+
+   <button>
+     <type>RESTORE</type>
+     <text>Restore LinHES</text>
+     <action>MENU mythrestore.xml</action>
+   </button>
+
+<!--#Check for updates-->
+   <button>
+     <type>UPGRADE</type>
+     <text>Upgrade LinHES</text>
+     <action>MENU update.xml</action>
+   </button>
+<!--#Check for updates-->
+</mythmenu>
diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/mainmenu.xml.patch b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/mainmenu.xml.patch
new file mode 100644
index 0000000..0491803
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/mainmenu.xml.patch
@@ -0,0 +1,37 @@
+--- themes/defaultmenu/mainmenu.xml.orig	2010-11-08 22:30:08.000000000 +0000
++++ themes/defaultmenu/mainmenu.xml	2010-11-08 22:35:51.000000000 +0000
+@@ -2,6 +2,13 @@
+ <mythmenu name="MAIN">
+ 
+     <button>
++        <type>TV_WATCH_TV</type>
++        <text>Watch TV</text>
++        <description>Watch live television</description>
++        <action>TV_WATCH_LIVE</action>
++    </button>
++
++    <button>
+         <type>MENU_MEDIA_LIBRARY</type>
+         <text>Media Library</text>
+         <action>MENU library.xml</action>
+@@ -31,17 +38,10 @@
+     </button>
+ 
+     <button>
+-        <type>TV_WATCH_TV</type>
+-        <text>Watch TV</text>
+-        <description>Watch live television</description>
+-        <action>TV_WATCH_LIVE</action>
+-    </button>
+-
+-    <button>
+         <type>MENU_UTILITIES_SETUP</type>
+-        <text>Utilities / Setup</text>
+-        <description>Configure MythTV and plugins</description>
+-        <action>MENU util_menu.xml</action>
++        <text>Service Menu</text>
++        <description>Configure your system</description>
++        <action>MENU linhes.xml</action>
+     </button>
+ 
+ </mythmenu>
diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/mythbackup.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/mythbackup.xml
new file mode 100644
index 0000000..5914b33
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/mythbackup.xml
@@ -0,0 +1,20 @@
+<mythmenu name="LinHES">
+
+   <button>
+     <type>BACKUP</type>
+     <text>Do you wish to backup?</text>
+     <action>NONE</action>
+   </button>
+
+   <button>
+     <type>BACKUP</type>
+     <text>Yes</text>
+     <action>EXEC sudo /usr/LH/bin/mythbackup</action>
+   </button>
+   
+   <button>
+     <type>BACKUP</type>
+     <text>No</text>
+     <action>UPMENU</action>
+   </button>
+</mythmenu>
diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/mythrestore.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/mythrestore.xml
new file mode 100644
index 0000000..8f5c285
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/mythrestore.xml
@@ -0,0 +1,20 @@
+<mythmenu name="LinHES">
+
+   <button>
+     <type>RESTORE</type>
+     <text>Do you wish to restore?</text>
+     <action>NONE</action>
+   </button>
+
+   <button>
+     <type>RESTORE</type>
+     <text>Yes</text>
+     <action>EXEC sudo /usr/LH/bin/mythrestore</action>
+   </button>
+   
+   <button>
+     <type>BACKUP</type>
+     <text>No</text>
+     <action>UPMENU</action>
+   </button>
+</mythmenu>
diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/optical_menu.xml.patch b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/optical_menu.xml.patch
new file mode 100644
index 0000000..143424f
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/optical_menu.xml.patch
@@ -0,0 +1,16 @@
+--- themes/defaultmenu/optical_menu.xml.orig	2010-11-06 00:39:43.000000000 +0000
++++ themes/defaultmenu/optical_menu.xml	2010-11-06 00:42:59.000000000 +0000
+@@ -26,6 +26,13 @@
+     </button>
+ 
+     <button>
++        <type>DVD_RIP</type>
++        <text>Import video files from DVD</text>
++       <description>Import video files from a data DVD</description>
++        <action>EXEC /usr/LH/bin/importfiles.sh</action>
++    </button>
++
++    <button>
+         <type>MUSIC_RIP</type>
+         <text>Import CD</text>
+         <description>Import music from an audio CD</description>
diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/original/create_patch.sh b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/original/create_patch.sh
new file mode 100755
index 0000000..34d8b8c
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/original/create_patch.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+for i in *.xml
+do
+	diff -u $i.orig $i > ../$i.patch
+done
diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/setup.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/setup.xml
new file mode 100644
index 0000000..f56bb6f
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/setup.xml
@@ -0,0 +1,111 @@
+<mythmenu name="MAIN">
+
+   <button>
+     <type>SETUP_GENERAL</type>
+     <text>1. General</text>
+     <text lang="IT">1. Generale</text>
+     <text lang="PT">1. Geral</text>
+     <text lang="SV">1. Generellt</text>
+     <text lang="JA">1. 一般</text>
+     <text lang="DE">1. Allgemeines</text>
+     <text lang="FI">1. Yleiset</text>
+     <text lang="FR">1. Général</text>
+     <text lang="SI">1. Splošno</text>
+     <text lang="ET">1. Üldine</text>
+     <text lang="NB">1 Generelt</text>
+     <text lang="DK">1. Generelt</text>
+     <text lang="ES">1. General</text>
+     <text lang="CZ">1. Obecný</text>
+     <text lang="RU">1. Общие</text>
+     <action>GENERAL</action>
+   </button>
+
+   <button>
+     <type>SETUP_CAPTURE_CARDS</type>
+     <text>2. Capture cards</text>
+     <text lang="IT">2. Schede di Acquisizione</text>
+     <text lang="PT">2. Placas de Captura</text>
+     <text lang="SV">2. TV-kort</text>
+     <text lang="JA">2. キャプチャカード</text>
+     <text lang="DE">2. TV-Karten</text>
+     <text lang="FI">2. TV-kortit</text>
+     <text lang="FR">2. Cartes d'acquisition</text>
+     <text lang="SI">2. Kartice za zajem</text>
+     <text lang="ET">2. TV-kaardid</text>
+     <text lang="NB">2 TV-kort</text>
+     <text lang="DK">2. TV-kort</text>
+     <text lang="ES">2. Capturadoras</text>
+     <text lang="CZ">2. Zachytávací karty</text>
+     <text lang="RU">2. Карты захвата</text>
+     <action>CAPTURE CARDS</action>
+   </button>
+
+   <button>
+     <type>SETUP_VIDEO_SOURCES</type>
+     <text>3. Video sources</text>
+     <text lang="IT">3. Fonte Video</text>
+     <text lang="PT">3. Fontes de Vídeo</text>
+     <text lang="SV">3. Videokällor</text>
+     <text lang="JA">3. ビデオソース</text>
+     <text lang="DE">3. Videoquellen</text>
+     <text lang="FI">3. Kuvanlähteet</text>
+     <text lang="FR">3. Sources vidéo</text>
+     <text lang="SI">3. Video viri</text>
+     <text lang="ET">3. Videosisendid</text>
+     <text lang="NB">3 Videokilder</text>
+     <text lang="DK">3. Videokilder</text>
+     <text lang="ES">3. Fuentes de Vídeo</text>
+     <text lang="CZ">3. Zdroje obrazu</text>
+     <text lang="RU">3. Видео источники</text>
+     <action>VIDEO SOURCES</action>
+   </button>
+
+   <button>
+     <type>SETUP_INPUT_CONNECTIONS</type>
+     <text>4. Input connections</text>
+     <text lang="IT">4. Connessioni di Ingresso</text>
+     <text lang="PT">4. Ligações de Entrada</text>
+     <text lang="SV">4. Anslutningar</text>
+     <text lang="JA">4. 入力とソースの接続</text>
+     <text lang="DE">4. Verknüpfungen</text>
+     <text lang="FI">4. Sisääntuloasetukset</text>
+     <text lang="FR">4. Entrées Vidéos</text>
+     <text lang="SI">4. Vhodne povezave</text>
+     <text lang="ET">4. Sisendite ühendused</text>
+     <text lang="NB">4 Inndata</text>
+     <text lang="DK">4. Indgange</text>
+     <text lang="ES">4. Conexiones</text>
+     <text lang="CZ">4. Připojení vstupů</text>
+     <text lang="RU">4. Соединение входов</text>
+     <action>CARD INPUTS</action>
+   </button>
+
+   <button>
+     <type>SETUP_CHANNEL_EDITOR</type>
+     <text>5. Channel Editor</text>
+     <text lang="IT">5. Modifica Canali</text>
+     <text lang="SV">5. Kanaleditor</text>
+     <text lang="JA">5. チャンネル設定</text>
+     <text lang="DE">5. Sender bearbeiten</text>
+     <text lang="FI">5. Kanavanviritys</text>
+     <text lang="FR">5. Editeur de chaînes</text>
+     <text lang="SI">5. Urejanje kanalov</text>
+     <text lang="ET">5. Kanaliredaktor</text>
+     <text lang="NB">5 Kanalredigerer</text>
+     <text lang="DK">5. Kanal opsætning</text>
+     <text lang="ES">5. Editor Canales</text>
+     <text lang="CZ">5. Editor kanálů</text>
+     <text lang="RU">5. Редактор каналов</text>
+     <action>CHANNEL EDITOR</action>
+   </button>
+
+   <button>
+     <type>SETUP_STORAGE_GROUPS</type>
+     <text>6. Storage Directories</text>
+     <text lang="IT">6. Cartelle</text>
+     <text lang="FI">Tallennusryhmät</text>
+     <text lang="SV">Lagringsgrupper</text>
+     <action>STORAGE GROUPS</action>
+   </button>
+
+</mythmenu>
diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/siriusmenu.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/siriusmenu.xml
new file mode 100644
index 0000000..e317b36
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/siriusmenu.xml
@@ -0,0 +1,419 @@
+<mythmenu name="SIRIUS">
+   <button>
+      <type>MUSIC</type>
+      <text>Sirius Hits 1</text>
+      <action>EXEC /usr/bin/cliSipie siriushits1</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>StarLite</text>
+      <action>EXEC /usr/bin/cliSipie starlite</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Sirius Love</text>
+      <action>EXEC /usr/bin/cliSipie siriuslove</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Movin EZ</text>
+      <action>EXEC /usr/bin/cliSipie movineasy</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Sirius Gold</text>
+      <action>EXEC /usr/bin/cliSipie siriusgold</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>'60s Vibrations</text>
+      <action>EXEC /usr/bin/cliSipie 60svibrations</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Totally '70s</text>
+      <action>EXEC /usr/bin/cliSipie totally70s</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Big '80s</text>
+      <action>EXEC /usr/bin/cliSipie big80s</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>ThePulse</text>
+      <action>EXEC /usr/bin/cliSipie thepulse</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Bridge</text>
+      <action>EXEC /usr/bin/cliSipie thebridge</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>BBC Radio 1</text>
+      <action>EXEC /usr/bin/cliSipie bbcradio1</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Super Shuffle</text>
+      <action>EXEC /usr/bin/cliSipie supershuffle</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Elvis Radio</text>
+      <action>EXEC /usr/bin/cliSipie elvisradio</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Classic Vinyl</text>
+      <action>EXEC /usr/bin/cliSipie classicvinyl</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Classic Rewind</text>
+      <action>EXEC /usr/bin/cliSipie classicrewind</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>TheVault</text>
+      <action>EXEC /usr/bin/cliSipie thevault</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Jam_ON</text>
+      <action>EXEC /usr/bin/cliSipie jamon</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Spectrum</text>
+      <action>EXEC /usr/bin/cliSipie thespectrum</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>BuzzSaw</text>
+      <action>EXEC /usr/bin/cliSipie buzzsaw</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Octane</text>
+      <action>EXEC /usr/bin/cliSipie octane</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Alt Nation</text>
+      <action>EXEC /usr/bin/cliSipie altnation</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>1st Wave</text>
+      <action>EXEC /usr/bin/cliSipie firstwave</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Hair Nation</text>
+      <action>EXEC /usr/bin/cliSipie hairnation</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>'90s Alternative</text>
+      <action>EXEC /usr/bin/cliSipie 90salternative</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Garage</text>
+      <action>EXEC /usr/bin/cliSipie undergroundgarage</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Left of Center</text>
+      <action>EXEC /usr/bin/cliSipie leftofcenter</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Hard Attack</text>
+      <action>EXEC /usr/bin/cliSipie hardattack</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Faction</text>
+      <action>EXEC /usr/bin/cliSipie faction</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Punk</text>
+      <action>EXEC /usr/bin/cliSipie punk</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>The Coffee House</text>
+      <action>EXEC /usr/bin/cliSipie coffeehouse</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Margaritaville</text>
+      <action>EXEC /usr/bin/cliSipie radiomargaritaville</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Sirius Disorder</text>
+      <action>EXEC /usr/bin/cliSipie siriusdisorder</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Reggae</text>
+      <action>EXEC /usr/bin/cliSipie reggaerhythms</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Area 33</text>
+      <action>EXEC /usr/bin/cliSipie area33</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Boombox</text>
+      <action>EXEC /usr/bin/cliSipie boombox</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Chill</text>
+      <action>EXEC /usr/bin/cliSipie chill</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>The Beat</text>
+      <action>EXEC /usr/bin/cliSipie thebeat</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Strobe</text>
+      <action>EXEC /usr/bin/cliSipie thestrobe</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Hip-Hop Nation</text>
+      <action>EXEC /usr/bin/cliSipie hiphopnation</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>BackSpin</text>
+      <action>EXEC /usr/bin/cliSipie backspin</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Shade 45</text>
+      <action>EXEC /usr/bin/cliSipie shade45</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Hot Jamz</text>
+      <action>EXEC /usr/bin/cliSipie hotjamz</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Heart  &amp; Soul</text>
+      <action>EXEC /usr/bin/cliSipie heartandsoul</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>SoulTown</text>
+      <action>EXEC /usr/bin/cliSipie soultown</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>New Country</text>
+      <action>EXEC /usr/bin/cliSipie newcountry</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Prime Country</text>
+      <action>EXEC /usr/bin/cliSipie primecountry</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Roadhouse</text>
+      <action>EXEC /usr/bin/cliSipie theroadhouse</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Outlaw Country</text>
+      <action>EXEC /usr/bin/cliSipie outlawcountry</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Bluegrass</text>
+      <action>EXEC /usr/bin/cliSipie bluegrass</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Spirit</text>
+      <action>EXEC /usr/bin/cliSipie spirit</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Praise</text>
+      <action>EXEC /usr/bin/cliSipie praise</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Planet Jazz</text>
+      <action>EXEC /usr/bin/cliSipie planetjazz</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>JazzCafe</text>
+      <action>EXEC /usr/bin/cliSipie jazzcafe</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>PureJazz</text>
+      <action>EXEC /usr/bin/cliSipie purejazz</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Spa 73</text>
+      <action>EXEC /usr/bin/cliSipie spa73</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Blues</text>
+      <action>EXEC /usr/bin/cliSipie siriusblues</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Siriusly Sinatra</text>
+      <action>EXEC /usr/bin/cliSipie siriuslysinatra</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Broadway's Best</text>
+      <action>EXEC /usr/bin/cliSipie broadwaysbest</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Symphony Hall</text>
+      <action>EXEC /usr/bin/cliSipie symphonyhall</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Met Opera Radio</text>
+      <action>EXEC /usr/bin/cliSipie metropolitanopera</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Sirius Pops</text>
+      <action>EXEC /usr/bin/cliSipie siriuspops</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Universo Latino</text>
+      <action>EXEC /usr/bin/cliSipie universolatino</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Rumbon</text>
+      <action>EXEC /usr/bin/cliSipie rumbon</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Martha Stewart</text>
+      <action>EXEC /usr/bin/cliSipie marthastewartlivingradio</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Sirius Stars</text>
+      <action>EXEC /usr/bin/cliSipie siriusstars</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>OutQ Gay Radio</text>
+      <action>EXEC /usr/bin/cliSipie siriusoutq</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Patriot</text>
+      <action>EXEC /usr/bin/cliSipie siriuspatriot</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Left</text>
+      <action>EXEC /usr/bin/cliSipie siriusleft</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>CNN</text>
+      <action>EXEC /usr/bin/cliSipie cnn</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>wrn</text>
+      <action>EXEC /usr/bin/cliSipie wrn</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Blue Collar Comedy</text>
+      <action>EXEC /usr/bin/cliSipie bluecollarcomedy</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Raw Dog Comedy</text>
+      <action>EXEC /usr/bin/cliSipie rawdog</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Laugh Break Comedy</text>
+      <action>EXEC /usr/bin/cliSipie laughbreak</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>thefoxxhole</text>
+      <action>EXEC /usr/bin/cliSipie thefoxxhole</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>lime</text>
+      <action>EXEC /usr/bin/cliSipie lime</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Kids Stuff</text>
+      <action>EXEC /usr/bin/cliSipie kidsstuff</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Catholic Channel</text>
+      <action>EXEC /usr/bin/cliSipie thecatholicchannel</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>EWTN</text>
+      <action>EXEC /usr/bin/cliSipie ewtnglobal</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>christiantalk</text>
+      <action>EXEC /usr/bin/cliSipie christiantalk</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Sirius NFL Radio</text>
+      <action>EXEC /usr/bin/cliSipie siriusnflradio</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Maxim Radio</text>
+      <action>EXEC /usr/bin/cliSipie maximradio</action>
+   </button>
+   <button>
+      <type>MUSIC</type>
+      <text>Cosmo Radio</text>
+      <action>EXEC /usr/bin/cliSipie cosmopolitanradio</action>
+   </button>
+   <button>
+     <type>TV_DELETE</type>
+     <text>Stop Listening</text>
+     <action>EXEC /usr/bin/sipie_kill</action>
+  </button>
+
+</mythmenu>
+
diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update.xml
new file mode 100644
index 0000000..5b28833
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update.xml
@@ -0,0 +1,20 @@
+<mythmenu name="LinHES">
+
+   <button>
+     <type>UPGRADE</type>
+     <text>Check for updates?</text>
+     <action>NONE</action>
+   </button>
+
+   <button>
+     <type>UPGRADE</type>
+     <text>Yes</text>
+     <action>EXEC sudo /usr/LH/bin/linhes_update.sh</action>
+   </button>
+   
+   <button>
+     <type>UPGRADE</type>
+     <text>No</text>
+     <action>UPMENU</action>
+   </button>
+</mythmenu>
diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update2.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update2.xml
new file mode 100644
index 0000000..2ab82ea
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update2.xml
@@ -0,0 +1,26 @@
+<mythmenu name="LinHES">
+
+   <button>
+     <type>UPGRADE</type>
+     <text>Perform updates?</text>
+     <action>NONE</action>
+   </button>
+
+   <button>
+     <type>UPGRADE</type>
+     <text>Yes</text>
+     <action>EXEC sudo /usr/LH/bin/linhes_update2.sh</action>
+   </button>
+   
+   <button>
+     <type>UPGRADE</type>
+     <text>No</text>
+     <action>UPMENU</action>
+   </button>
+
+   <button>
+     <type>UPGRADE</type>
+     <text>View files to be upgraded.</text>
+     <action>EXEC sudo /usr/LH/bin/linhes_update3.sh</action>
+   </button>
+</mythmenu>
diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/util_menu.xml.patch b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/util_menu.xml.patch
new file mode 100644
index 0000000..82d303e
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/util_menu.xml.patch
@@ -0,0 +1,16 @@
+--- themes/defaultmenu/util_menu.xml.orig	2010-11-06 00:40:01.000000000 +0000
++++ themes/defaultmenu/util_menu.xml	2010-11-06 00:45:42.000000000 +0000
+@@ -17,6 +17,13 @@
+     </button>
+ 
+     <button>
++        <type>VIDEO_SCREENSHOOTER</type>
++        <text>Thumbnail Generator</text>
++        <description>Generate thumbnail images for videos</description>
++        <action>EXEC /usr/LH/bin/shootscreens-mythtv.sh</action>
++    </button>
++
++    <button>
+         <type>SETUP_MENU</type>
+         <text>Setup</text>
+         <description>Configure MythTV and plugins</description>
diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/xmmenu.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/xmmenu.xml
new file mode 100644
index 0000000..6b26d11
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/xmmenu.xml
@@ -0,0 +1,574 @@
+<!-- Current as of April 25, 2007 -->
+<mythmenu name="XM">
+
+	<button>
+		<type>MUSIC</type>
+		<text>The '40s</text>
+		<action>EXEC /usr/bin/xamp kill 4</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>The '50s</text>
+		<action>EXEC /usr/bin/xamp kill 5</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>The '60s</text>
+		<action>EXEC /usr/bin/xamp kill 6</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>The '70s</text>
+		<action>EXEC /usr/bin/xamp kill 7</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>The '80s</text>
+		<action>EXEC /usr/bin/xamp kill 8</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>The '90s</text>
+		<action>EXEC /usr/bin/xamp kill 9</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>America</text>
+		<action>EXEC /usr/bin/xamp kill 10</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>X Country</text>
+		<action>EXEC /usr/bin/xamp kill 12</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Willie's Place</text>
+		<action>EXEC /usr/bin/xamp kill 13</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Bluegrass Junction</text>
+		<action>EXEC /usr/bin/xamp kill 14</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>The Village</text>
+		<action>EXEC /usr/bin/xamp kill 15</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Highway 16</text>
+		<action>EXEC /usr/bin/xamp kill 16</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>US Country</text>
+		<action>EXEC /usr/bin/xamp kill 17</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>20 on 20</text>
+		<action>EXEC /usr/bin/xamp kill 20</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>The Heart</text>
+		<action>EXEC /usr/bin/xamp kill 23</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>The Blend</text>
+		<action>EXEC /usr/bin/xamp kill 25</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Flight 26</text>
+		<action>EXEC /usr/bin/xamp kill 26</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Cinemagic</text>
+		<action>EXEC /usr/bin/xamp kill 27</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>On Broadway</text>
+		<action>EXEC /usr/bin/xamp kill 28</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>U-Pop</text>
+		<action>EXEC /usr/bin/xamp kill 29</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>XM Hitlist</text>
+		<action>EXEC /usr/bin/xamp kill 30</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Torch</text>
+		<action>EXEC /usr/bin/xamp kill 31</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>The Message</text>
+		<action>EXEC /usr/bin/xamp kill 32</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Spirit</text>
+		<action>EXEC /usr/bin/xamp kill 33</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>enLighten</text>
+		<action>EXEC /usr/bin/xamp kill 34</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Deep Tracks</text>
+		<action>EXEC /usr/bin/xamp kill 40</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Boneyard</text>
+		<action>EXEC /usr/bin/xamp kill 41</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>XM Liquid Metal</text>
+		<action>EXEC /usr/bin/xamp kill 42</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>XMU</text>
+		<action>EXEC /usr/bin/xamp kill 43</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Fred</text>
+		<action>EXEC /usr/bin/xamp kill 44</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>XM Cafe</text>
+		<action>EXEC /usr/bin/xamp kill 45</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Top Tracks</text>
+		<action>EXEC /usr/bin/xamp kill 46</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Ethel</text>
+		<action>EXEC /usr/bin/xamp kill 47</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Squizz</text>
+		<action>EXEC /usr/bin/xamp kill 48</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Big Tracks</text>
+		<action>EXEC /usr/bin/xamp kill 49</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>The Loft</text>
+		<action>EXEC /usr/bin/xamp kill 50</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>XM Music Lab</text>
+		<action>EXEC /usr/bin/xamp kill 51</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>The Verge</text>
+		<action>EXEC /usr/bin/xamp kill 52</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Fungus</text>
+		<action>EXEC /usr/bin/xamp kill 53</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Lucy</text>
+		<action>EXEC /usr/bin/xamp kill 54</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Soul Street</text>
+		<action>EXEC /usr/bin/xamp kill 60</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>The Flow</text>
+		<action>EXEC /usr/bin/xamp kill 61</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Suite 62</text>
+		<action>EXEC /usr/bin/xamp kill 62</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>The Groove</text>
+		<action>EXEC /usr/bin/xamp kill 64</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>The Rhyme</text>
+		<action>EXEC /usr/bin/xamp kill 65</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>RAW</text>
+		<action>EXEC /usr/bin/xamp kill 66</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>The City</text>
+		<action>EXEC /usr/bin/xamp kill 67</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>The Heat</text>
+		<action>EXEC /usr/bin/xamp kill 68</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Real Jazz</text>
+		<action>EXEC /usr/bin/xamp kill 70</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Watercolors</text>
+		<action>EXEC /usr/bin/xamp kill 71</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Beyond Jazz</text>
+		<action>EXEC /usr/bin/xamp kill 72</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>High Standards</text>
+		<action>EXEC /usr/bin/xamp kill 73</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Bluesville</text>
+		<action>EXEC /usr/bin/xamp kill 74</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Hear Music</text>
+		<action>EXEC /usr/bin/xamp kill 75</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Fine Tuning</text>
+		<action>EXEC /usr/bin/xamp kill 76</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Audio Visions</text>
+		<action>EXEC /usr/bin/xamp kill 77</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Escape</text>
+		<action>EXEC /usr/bin/xamp kill 78</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>On The Rocks</text>
+		<action>EXEC /usr/bin/xamp kill 79</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>The Move</text>
+		<action>EXEC /usr/bin/xamp kill 80</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>BPM</text>
+		<action>EXEC /usr/bin/xamp kill 81</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>The System</text>
+		<action>EXEC /usr/bin/xamp kill 82</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Chrome</text>
+		<action>EXEC /usr/bin/xamp kill 83</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>XM-Chill</text>
+		<action>EXEC /usr/bin/xamp kill 84</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Fuego</text>
+		<action>EXEC /usr/bin/xamp kill 90</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Viva</text>
+		<action>EXEC /usr/bin/xamp kill 91</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Aguila</text>
+		<action>EXEC /usr/bin/xamp kill 92</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Caliente</text>
+		<action>EXEC /usr/bin/xamp kill 94</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Luna</text>
+		<action>EXEC /usr/bin/xamp kill 95</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Air Musique</text>
+		<action>EXEC /usr/bin/xamp kill 100</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>The Joint</text>
+		<action>EXEC /usr/bin/xamp kill 101</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Sur La Route</text>
+		<action>EXEC /usr/bin/xamp kill 102</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>World Zone</text>
+		<action>EXEC /usr/bin/xamp kill 103</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Ngoma</text>
+		<action>EXEC /usr/bin/xamp kill 104</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>XM Classics</text>
+		<action>EXEC /usr/bin/xamp kill 110</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Vox</text>
+		<action>EXEC /usr/bin/xamp kill 112</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>XM Pops</text>
+		<action>EXEC /usr/bin/xamp kill 113</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>XM Kids</text>
+		<action>EXEC /usr/bin/xamp kill 116</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Bob Edwards Show</text>
+		<action>EXEC /usr/bin/xamp kill 133</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>XM Comedy</text>
+		<action>EXEC /usr/bin/xamp kill 150</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Laugh USA</text>
+		<action>EXEC /usr/bin/xamp kill 151</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Special X</text>
+		<action>EXEC /usr/bin/xamp kill 154</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>The Agenda</text>
+		<action>EXEC /usr/bin/xamp kill 134</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Oprah and Friends</text>
+		<action>EXEC /usr/bin/xamp kill 156</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>The Virus</text>
+		<action>EXEC /usr/bin/xamp kill 202</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>1 Hit Wonders</text>
+		<action>EXEC /usr/bin/xamp kill 300</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Metalcore</text>
+		<action>EXEC /usr/bin/xamp kill 301</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>New Indie First</text>
+		<action>EXEC /usr/bin/xamp kill 302</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Late Night Mix</text>
+		<action>EXEC /usr/bin/xamp kill 303</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Sessions@AOL</text>
+		<action>EXEC /usr/bin/xamp kill 304</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>Shuffle</text>
+		<action>EXEC /usr/bin/xamp kill 305</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>New Rock First</text>
+		<action>EXEC /usr/bin/xamp kill 306</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>New Country First</text>
+		<action>EXEC /usr/bin/xamp kill 307</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>New Hip Hop First</text>
+		<action>EXEC /usr/bin/xamp kill 308</action>
+	</button>
+
+	<button>
+		<type>MUSIC</type>
+		<text>New Pop First</text>
+		<action>EXEC /usr/bin/xamp kill 309</action>
+	</button>
+
+	<button>
+		<type>TV_DELETE</type>
+		<text>Stop Listening</text>
+		<action>EXEC /usr/bin/xamp kill</action>
+	</button>
+
+</mythmenu>
diff --git a/abs/core/mythtv/stable-0.24/mythtv/myth.sh b/abs/core/mythtv/stable-0.24/mythtv/myth.sh
new file mode 100755
index 0000000..fb7122c
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/myth.sh
@@ -0,0 +1,4 @@
+export PATH=$PATH:/usr/local/bin
+# set core file size to 0
+ulimit -c 0
+export MALLOC_CHECK_=0
\ No newline at end of file
diff --git a/abs/core/mythtv/stable-0.24/mythtv/mythbackend b/abs/core/mythtv/stable-0.24/mythtv/mythbackend
new file mode 100755
index 0000000..93773a2
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/mythbackend
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/bin/mythbackend`
+case "$1" in
+  start)
+    stat_busy "Starting MythTV Backend"
+    [ ! -e /var/run/mysqld.pid ] && echo -n "mysqld not started" && stat_fail && exit
+    [ -z "$PID" ] && /usr/bin/mythbackend -d -l /var/log/mythbackend.log -v important 
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      echo $PID > /var/run/mythbackend.pid
+      add_daemon mythbackend
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping MythTV Backend"
+    [ ! -z "$PID" ]  && kill $PID &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon mythbackend
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1s 
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/abs/core/mythtv/stable-0.24/mythtv/mythbackend.lr b/abs/core/mythtv/stable-0.24/mythtv/mythbackend.lr
new file mode 100644
index 0000000..4f218bc
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/mythbackend.lr
@@ -0,0 +1,9 @@
+/var/log/mythtv/mythbackend.log {
+	copytruncate
+	daily
+	size 10M
+	missingok
+	rotate 7
+	compress
+	notifempty
+}
diff --git a/abs/core/mythtv/stable-0.24/mythtv/mythbackend.sh b/abs/core/mythtv/stable-0.24/mythtv/mythbackend.sh
new file mode 100755
index 0000000..e7a7b70
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/mythbackend.sh
@@ -0,0 +1,117 @@
+#!/bin/bash
+#
+#	/etc/rc.d/init.d/mythbackend
+#
+# Starts the mythbackend as a daemon
+#
+# chkconfig: 345 90 10
+# description: Starts the mythbackend process as a daemon after the XWindows \
+#              system is started, in runlevel 5. This allows scheduled \
+#              recordings to occur without manual intervention.
+# processname: mythbackend
+
+# Copyright (c) by Michael Thomson <linux at m-thomson dot net>
+# With thanks to Stu Tomlinson <stu at nosnilmot dot com>
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+
+# Default values to use if none are supplied in the config file.
+# User who should start the mythbackend processes
+MBE_USER="root"
+# Directory holding the mythbackend binary
+MBE_LOCATION="/usr/local/bin/"
+# Name of mythbackend binary
+MBE_PROG="mythbackend"
+# Full path to mythbackend log file
+MBE_LOGFILE="/var/log/mythtv/mythbackend.log"
+
+# Source function library.
+. /etc/init.d/functions
+
+# Source config file if available
+if [ -f "/etc/sysconfig/mythbackend" ]; then
+  . /etc/sysconfig/mythbackend
+fi
+
+test -x ${MBE_LOCATION}${MBE_PROG} || exit 0
+
+RETVAL=0
+
+#
+#	See how we were called.
+#
+
+start() {
+	# Check if mythbackend is already running
+	if [ ! -f /var/lock/subsys/${MBE_PROG} ]; then
+	    echo -n "Starting ${MBE_PROG}: "
+	    # /usr/local/bin/mythbackend -d -l /some/log/file
+	    #daemon --user ${MBE_USER} ${MBE_LOCATION}${MBE_PROG} -d -l ${MBE_LOGFILE}
+	    ${MBE_LOCATION}${MBE_PROG} -d -l ${MBE_LOGFILE}
+	    RETVAL=$?
+	    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/${MBE_PROG}
+	    echo
+	fi
+	return $RETVAL
+}
+
+stop() {
+	echo -n "Stopping ${MBE_PROG}: "
+	killproc ${MBE_LOCATION}${MBE_PROG}
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/${MBE_PROG}
+	echo
+        return $RETVAL
+}
+
+
+restart() {
+	stop
+	start
+}	
+
+reload() {
+	restart
+}	
+
+status_at() {
+ 	status ${MBE_LOCATION}${MBE_PROG}
+}
+
+case "$1" in
+start)
+	start
+	;;
+stop)
+	stop
+	;;
+reload|restart)
+	restart
+	;;
+condrestart)
+	if [ -f /var/lock/subsys/${MBE_PROG} ]; then
+	    restart
+	fi
+	;;
+status)
+	status_at
+	;;
+*)
+	echo "Usage: $0 {start|stop|restart|condrestart|status}"
+	exit 1
+esac
+
+exit $?
+exit $RETVAL
diff --git a/abs/core/mythtv/stable-0.24/mythtv/mythfrontend.lr b/abs/core/mythtv/stable-0.24/mythtv/mythfrontend.lr
new file mode 100644
index 0000000..1580533
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/mythfrontend.lr
@@ -0,0 +1,9 @@
+/var/log/mythtv/mythfrontend.log {
+	copytruncate
+	daily
+	size 10M
+	missingok
+	rotate 7
+	compress
+	notifempty
+}
diff --git a/abs/core/mythtv/stable-0.24/mythtv/mythtv.install b/abs/core/mythtv/stable-0.24/mythtv/mythtv.install
new file mode 100755
index 0000000..0524f86
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/mythtv.install
@@ -0,0 +1,47 @@
+# arg 1:  the new package version
+post_install() {
+	if [ ! -d /var/log/mythtv ]
+	then
+		mkdir -p /var/log/mythv
+		chown -R mythtv /var/log/mythtv
+		echo "---" > /var/log/mythtv/mythbackend.log
+		chown mythtv /var/log/mythtv/mythbackend.log
+	fi
+	ln -s /usr/share/mythtv/themes/defaultmenu/is.xml /usr/share/mythtv/is.xml
+}
+
+pre_upgrade() {
+	if [ ! -L /usr/share/mythtv/is.xml ]
+	then
+		mv /usr/share/mythtv/is.xml /usr/share/mythtv/is.xml.pre
+	else
+		mv /usr/share/mythtv/themes/defaultmenu/is.xml /usr/share/mythtv/themes/defaultmenu/is.xml.pre
+	fi
+}
+
+post_upgrade() {
+	if [ ! -d /var/log/mythtv ]
+	then
+		mkdir -p /var/log/mythv
+		chown -R mythtv /var/log/mythtv
+	fi
+	if [ -e /usr/share/mythtv/is.xml.pre ]
+	then
+		rm -fr /usr/share/mythtv/themes/defaultmenu/is.xml
+		mv /usr/share/mythtv/is.xml.pre /usr/share/mythtv/themes/defaultmenu/is.xml
+		ln -s /usr/share/mythtv/themes/defaultmenu/is.xml /usr/share/mythtv/is.xml
+	else
+		mv /usr/share/mythtv/themes/defaultmenu/is.xml.pre /usr/share/mythtv/themes/defaultmenu/is.xml
+	fi
+}
+
+
+# arg 1:  the old package version
+post_remove() {
+	/bin/true
+
+}
+
+op=$1
+shift
+$op $*
diff --git a/abs/core/mythtv/stable-0.24/mythtv/pretty b/abs/core/mythtv/stable-0.24/mythtv/pretty
new file mode 100755
index 0000000..7e0ab21
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/pretty
@@ -0,0 +1,9 @@
+#!/bin/bash
+if [ -f /usr/share/mythtv/contrib/user_jobs/mythlink.pl ]
+then
+        su - mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythlink.pl --link /myth/pretty"
+elif [ -f /usr/share/mythtv/contrib/user_jobs/mythrename.pl ]
+then
+        su - mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythrename.pl --link /myth/pretty"
+fi
+
diff --git a/abs/core/mythtv/stable-0.24/mythtv/smolt_jump.patch b/abs/core/mythtv/stable-0.24/mythtv/smolt_jump.patch
new file mode 100644
index 0000000..76f884c
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/smolt_jump.patch
@@ -0,0 +1,10 @@
+--- programs/mythfrontend/networkcontrol.cpp.orig	2010-11-08 23:07:04.000000000 +0000
++++ programs/mythfrontend/networkcontrol.cpp	2010-11-08 23:08:06.000000000 +0000
+@@ -88,6 +88,7 @@
+     jumpMap["zoneminderliveview"]    = "ZoneMinder Live View";
+     jumpMap["zoneminderevents"]      = "ZoneMinder Events";
+     jumpMap["snapshot"]              = "ScreenShot";
++    jumpMap["mythsmolt"]             = "MythSmolt";
+ 
+     jumpMap["channelrecpriority"]    = "Channel Recording Priorities";
+     jumpMap["viewscheduled"]         = "Manage Recordings / Fix Conflicts";
diff --git a/abs/core/mythtv/stable-0.24/pretty b/abs/core/mythtv/stable-0.24/pretty
deleted file mode 100755
index 7e0ab21..0000000
--- a/abs/core/mythtv/stable-0.24/pretty
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-if [ -f /usr/share/mythtv/contrib/user_jobs/mythlink.pl ]
-then
-        su - mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythlink.pl --link /myth/pretty"
-elif [ -f /usr/share/mythtv/contrib/user_jobs/mythrename.pl ]
-then
-        su - mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythrename.pl --link /myth/pretty"
-fi
-
diff --git a/abs/core/mythtv/stable-0.24/smolt_jump.patch b/abs/core/mythtv/stable-0.24/smolt_jump.patch
deleted file mode 100644
index 76f884c..0000000
--- a/abs/core/mythtv/stable-0.24/smolt_jump.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- programs/mythfrontend/networkcontrol.cpp.orig	2010-11-08 23:07:04.000000000 +0000
-+++ programs/mythfrontend/networkcontrol.cpp	2010-11-08 23:08:06.000000000 +0000
-@@ -88,6 +88,7 @@
-     jumpMap["zoneminderliveview"]    = "ZoneMinder Live View";
-     jumpMap["zoneminderevents"]      = "ZoneMinder Events";
-     jumpMap["snapshot"]              = "ScreenShot";
-+    jumpMap["mythsmolt"]             = "MythSmolt";
- 
-     jumpMap["channelrecpriority"]    = "Channel Recording Priorities";
-     jumpMap["viewscheduled"]         = "Manage Recordings / Fix Conflicts";
-- 
cgit v0.12


From d2e98107097492ae1a6cad722141f8b7cbd9b8f0 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Sat, 4 Dec 2010 03:11:37 +0000
Subject: fxload: upgrade

---
 abs/core/fxload/PKGBUILD | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/abs/core/fxload/PKGBUILD b/abs/core/fxload/PKGBUILD
index d27f525..e128688 100644
--- a/abs/core/fxload/PKGBUILD
+++ b/abs/core/fxload/PKGBUILD
@@ -1,20 +1,22 @@
-# Contributor: Jochen Immend�fer <jochen dot immendoerfer at gmail dot com>
+# Contributor: Jochen Immendörfer <jochen dot immendoerfer at gmail dot com>
 pkgname=fxload
-pkgver=2002_04_11
-pkgrel=4
+pkgver=2008_10_13
+pkgrel=1
 pkgdesc="fxload firmware loader. Used with udev or devfs/hotplug."
 url="http://linux-hotplug.sourceforge.net/"
 depends=('glibc')
 makedepends=('sed')
-source=(http://easynews.dl.sourceforge.net/sourceforge/linux-hotplug/$pkgname-$pkgver.tar.gz)
- arch=('i686')
-build() {
-C_INCLUDE_PATH=/usr/src/linux-2.6.24-STB
+source=(http://downloads.sourceforge.net/sourceforge/linux-hotplug/$pkgname-$pkgver.tar.gz)
+md5sums=('4477a2457f064228bef4a93ba2f21692')
+arch=('i686')
+license=('GPL')
 
-  cd $startdir/src/$pkgname-$pkgver
-  sed -i 's|CFLAGS =.*-O -Wall $(RPM_OPT_FLAGS)||' Makefile 
-  sed -i 's/\linux\/usb.h/linux\/usb\/ch9.h/' ezusb.c ||return 1
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make || return 1
   sed -i 's|/usr/bin/install|/bin/install|' Makefile
-  make exec_prefix=$startdir/pkg/ prefix=$startdir/pkg/ install
+}
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make exec_prefix=${pkgdir} prefix=${pkgdir} install || return 1
 }
-- 
cgit v0.12


From f843d05bbbdffb130db0c89915f914efcc7a290d Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Sat, 4 Dec 2010 03:11:59 +0000
Subject: shepherd: upgrade

---
 abs/extra/shepherd/PKGBUILD | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/abs/extra/shepherd/PKGBUILD b/abs/extra/shepherd/PKGBUILD
index f7b3048..34f45ff 100644
--- a/abs/extra/shepherd/PKGBUILD
+++ b/abs/extra/shepherd/PKGBUILD
@@ -1,16 +1,16 @@
 # $Id: PKGBUILD 23123 2009-01-03 02:43:02Z kevin $
 # Maintainer: Greg Frost <gregfrost1@bigpond.com>
 pkgname=shepherd
-pkgver=1
-pkgrel=2
+pkgver=1.45
+pkgrel=1
 pkgdesc="Australian EPG Grabber."
-arch=i686
+license=('unknown')
+arch=('i686')
 depends=(perl-pathtools perl-digest-sha1 perl-algorithm-diff perl-javascript perl-list-compare)
-makedepends=()
 source=(http://www.whuffy.com/shepherd/shepherd)
 
 build() {
-    mkdir -p ${startdir}/pkg/usr/bin/
-    install -m 0755 shepherd ${startdir}/pkg/usr/bin/
+    mkdir -p ${pkgdir}/usr/bin/
+    install -m 0755 shepherd ${pkgdir}/usr/bin/
 }
-md5sums=('2b826e4a08810d360e9f6843beb6aa42')
+md5sums=('09d201253e0a41ed28999a97845001f0')
-- 
cgit v0.12


From 2ddfcdc1360af607e5925afe0e0f3562ad538738 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Sat, 4 Dec 2010 03:12:25 +0000
Subject: transmission-cli: upgrade

---
 abs/extra/community/transmission-cli/PKGBUILD | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/abs/extra/community/transmission-cli/PKGBUILD b/abs/extra/community/transmission-cli/PKGBUILD
index 40af42a..11dbf60 100644
--- a/abs/extra/community/transmission-cli/PKGBUILD
+++ b/abs/extra/community/transmission-cli/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 pkgname=transmission-cli
-pkgver=2.04
+pkgver=2.12
 pkgrel=1
 pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)"
 arch=('i686' 'x86_64')
@@ -25,6 +25,10 @@ build() {
 
   ./configure --prefix=/usr --disable-gtk || return 1
   make || return 1
+}
+
+package() {
+  cd "$srcdir/transmission-$pkgver"
   make DESTDIR="$pkgdir" install || return 1
 
   mkdir -p -m744 "$pkgdir/etc/sv/transmissiond" || return 1
@@ -34,7 +38,7 @@ build() {
   install -D -m644 "$srcdir/transmission.include" "$pkgdir/etc/transmission/transmission.include" || return 1
   install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING" || return 1
 }
-md5sums=('84fe15eb7e000fdc369def513299358b'
+md5sums=('f3d34fdbbf3ae25635f9e7bf7e662cd9'
          'b91534aaf2e403331c611c615ab2c03d'
          'ff22c13dbd52565f9e88b1de22514eb9'
          'b5a49ea375333cd0fee40f70dbac4c2e'
-- 
cgit v0.12