config/version: set version to 3.2.4

Signed-off-by: Stephan Raue <stephan@openelec.tv>

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "packages/unofficial"]
+	path = packages/unofficial
+	url = https://github.com/OpenELEC/unofficial-addons.git

CHANGELOG

@@ -1,20 +1,3 @@
-OpenELEC (Version 2.1)
+for a changelog see:
 
-Changelog OpenELEC-2.0 to OpenELEC-2.1
-
-Added packages:
-  - add package 'ppp'
-  - add package 'pptp'
-
-Package updates:
-  - update linux to linux-3.5
-  - update dialog to dialog-1.1-20120215
-  - update connman to connman-1.4
-
-Added functions:
-  - sshd can be enabled via OpenELEC Settings addon
-  - add PPTP support
-
-Changed functions:
-
-Removed functions:
+https://github.com/OpenELEC/OpenELEC.tv/commits/openelec-3.2

CONTRIBUTING.md

@@ -1,14 +1,18 @@
-## Questions about OpenELEC?
+### Questions about OpenELEC?
 
-To get your questions answered, please ask in the OpenELEC [Forum] or on IRC: #openelec on freenode.net or [webchat] 
+To get your questions answered, please ask in the OpenELEC [Forum], on IRC: 
+\#openelec on freenode.net, or [webchat]. 
 
 Do not open an issue.
 
-## Issue Reports
+### Issue Reports
 
-If you are at all unsure whether it's a bug in OpenELEC or a problem with something
-else, post in the OpenELEC [Forum] instead. If it turns out that it is a bug, an issue
-can always bee opend later.
+**BEFORE you report a bug make sure you got the latest testing version of 
+OpenELEC. Your bug might be already fixed.**
+
+If you are at all unsure whether it's a bug in OpenELEC or a problem with 
+something else, post in the OpenELEC [Forum] instead. If it turns out that it is
+a bug, an issue can always be opened later.
 
 If you are sure that it's a bug in OpenELEC and you have not found a [similar issue], open a new [issue]
 and try to answer the following questions:
@@ -16,21 +20,22 @@ and try to answer the following questions:
 - What did you expect to happen?
 - What happened instead?
 
-It is also importent to provide logs for debugging.
-A zip file can be found in the [logfiles] samba share, this will contain all the logs needed.
+**It is also importent to provide logs for debugging.
+A zip file can be found in the [logfiles] samba share, this will contain all the logs needed.**
 
 Make sure to specify which version of OpenELEC you are using.
 - OpenELEC version
 - OpenELEC build
 - OpenELEC arch
 
-Please don't paste log messages in the issue reports or issue comments use [sprunge.us](http://sprunge.us) instead
+Please don't paste log messages in the issue reports or issue comments - use 
+[sprunge.us](http://sprunge.us) instead.
 
 Feature requests are great, but they usually end up lying around the issue
 tracker indefinitely. Sending a pull request is a much better way of getting a
 particular feature into OpenELEC.
 
-## Pull Requests
+### Pull Requests
 
 - **Create topic branches**. Don't ask us to pull from your master branch.
 

Makefile

@@ -8,6 +8,9 @@ system:
 release:
 	./scripts/image release
 
+noobs:
+	./scripts/image noobs
+
 clean:
 	rm -rf $(BUILD_DIRS)/* $(BUILD_DIRS)/.stamps
 

config/addon/addon.xml

@@ -2,7 +2,7 @@
 <addon id="@PKG_ADDON_ID@"
        name="@PKG_NAME@"
        version="@ADDON_VERSION@"
-       provider-name="openelec.tv">
+       provider-name="@PROVIDER_NAME@">
   <requires>
     <import addon="os.openelec.tv" version="@OS_VERSION@"/>
     <import addon="xbmc.python" version="2.0"/>

config/functions

@@ -328,7 +328,7 @@ show_config() {
   config_message="$config_message\n - XBMC Airtunes support:\t\t $AIRTUNES_SUPPORT"
   config_message="$config_message\n - XBMC AFP support:\t\t\t $AFP_SUPPORT"
   config_message="$config_message\n - XBMC NFS support:\t\t\t $NFS_SUPPORT"
-  config_message="$config_message\n - XBMC SAMBA client support:\t\t $SAMBA_CLIENT"
+  config_message="$config_message\n - XBMC SAMBA client support:\t\t $SAMBA_SUPPORT"
   config_message="$config_message\n - XBMC Webserver support:\t\t $WEBSERVER"
 
   # OS configuration
@@ -344,7 +344,8 @@ if [ "$BOOTLOADER" = "u-boot" ]; then
   config_message="$config_message\n - U-Boot configuration:\t\t $UBOOT_CONFIG"
   config_message="$config_message\n - U-Boot config file:\t\t\t $UBOOT_CONFIGFILE"
 fi
-  config_message="$config_message\n - UDisks support:\t\t\t $UDISKS"
+  config_message="$config_message\n - UDevil support:\t\t\t $UDEVIL"
+  config_message="$config_message\n - Parted support:\t\t\t $PARTED"
   config_message="$config_message\n - UPower support:\t\t\t $UPOWER"
   config_message="$config_message\n - Installer support:\t\t\t $INSTALLER_SUPPORT"
 

config/graphic

@@ -52,12 +52,14 @@ get_graphicdrivers() {
       DRI_DRIVERS="$DRI_DRIVERS,i915"
 #      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i915"
       XORG_DRIVERS="$XORG_DRIVERS intel"
+      COMPOSITE_SUPPORT="yes"
 #      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "i965" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i965"
       XORG_DRIVERS="$XORG_DRIVERS intel"
+      COMPOSITE_SUPPORT="yes"
     fi
 
     if [ "$drv" = "nouveau" ]; then
@@ -93,18 +95,21 @@ get_graphicdrivers() {
     if [ "$drv" = "r200" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,r200"
       XORG_DRIVERS="$XORG_DRIVERS ati"
+      COMPOSITE_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r300" ]; then
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300"
       XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
+      COMPOSITE_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r600" ]; then
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r600"
       XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
+      COMPOSITE_SUPPORT="yes"
     fi
 
     if [ "$drv" = "vmware" ]; then

config/noobs/os.json

@@ -0,0 +1,7 @@
+{
+  "name": "@DISTRONAME@",
+  "version": "@OPENELEC_VERSION@",
+  "release_date": "@RELEASE_DATE@",
+  "kernel": "@KERNEL_VERSION@",
+  "description": "@DESCRIPTION@"
+}

config/noobs/partition_setup.sh

@@ -0,0 +1,69 @@
+#!/bin/sh -x
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2013 Stephan Raue (stephan@openelec.tv)
+#
+#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+MOUNTPOINT="/tmp/OpenELEC-System"
+
+md5sumCheck() {
+  ( cd $MOUNTPOINT
+    echo "checking MD5: $1"
+    md5sum -c $1.md5
+    if [ "$?" = "1" ]; then
+      echo "######################################################"
+      echo "#                                                    #"
+      echo "# OpenELEC failed md5 check - Installation will quit #"
+      echo "#                                                    #"
+      echo "#    Your original download was probably corrupt.    #"
+      echo "#  Please visit www.openelec.tv and get another copy #"
+      echo "#                                                    #"
+      echo "######################################################"
+      exit 1
+    fi
+    rm -rf $1.md5
+  )
+}
+
+if [ -z $part1 -o -z $part2 -o -z $id1 -o -z $id2]; then
+  echo "error: part1, part2, id1 or id2 not specified"
+  echo "actual values:"
+  echo "part1:" $part1
+  echo "part2:" $part2
+  echo "id1  :" $id1
+  echo "id2  :" $id2
+  exit 1
+fi
+
+# create mountpoint
+  mkdir -p $MOUNTPOINT
+
+# mount needed partition
+  mount $part1 $MOUNTPOINT
+
+# check md5sum
+  md5sumCheck kernel.img
+  md5sumCheck SYSTEM
+
+# create bootloader configuration
+  echo "creating bootloader configuration..."
+  echo "boot=$id1 disk=$id2 quiet" > $MOUNTPOINT/cmdline.txt
+
+# cleanup mountpoint
+  umount $MOUNTPOINT
+  rmdir $MOUNTPOINT

config/noobs/partitions.json

@@ -0,0 +1,20 @@
+{
+  "partitions": [
+    {
+      "label":                     "System",
+      "filesystem_type":           "FAT",
+      "partition_size_nominal":    128,
+      "want_maximised":            false,
+      "uncompressed_tarball_size": 110,
+      "mkfs_options":              ""
+    },
+    {
+      "label":                     "Storage",
+      "filesystem_type":           "ext4",
+      "partition_size_nominal":    864,
+      "want_maximised":            true,
+      "uncompressed_tarball_size": 10,
+      "mkfs_options":              ""
+    }
+  ]
+}

config/path

@@ -32,6 +32,10 @@ TARGET_PREFIX=$ROOT/$TOOLCHAIN/bin/$TARGET_NAME-
 
 FAKEROOT_SCRIPT=$ROOT/.fakeroot.$PROJECT.$TARGET_ARCH
 
+if [ -z "$INSTALL" ]; then
+  INSTALL=$BUILD/image/system
+fi
+
 . config/sources
 
 MAKE="$ROOT/$TOOLCHAIN/bin/make"
@@ -55,21 +59,49 @@ SED="sed -i"
   PKG_IS_ADDON="no"
 
   if [ -n "$1" ]; then
-    PKG_DIR=`find $PACKAGES -type d -name $1 ! -wholename \*\/source\/\* 2>/dev/null`
-    if [ "${PKG_DIR}" != "$(echo $PKG_DIR | tr -d '\n')" ]; then
+    FOUND=0
+    for DIR in $ROOT/`find $PACKAGES -type d -name $(echo $1| awk -F : '{print $1}') ! -wholename \*\/source\/\* 2>/dev/null` ; do
+      # keep track of dirs with meta for debugging
+      if [ -z "$ALL_DIRS" ] ; then
+        ALL_DIRS="$DIR"
+      else
+        ALL_DIRS="$ALL_DIRS\\n$DIR"
+      fi
+      if [ -f "$DIR/package.mk" -o -f "$DIR/meta" -o -f "$DIR/install" -o -f "$DIR/build" ] ; then
+        FOUND=$((FOUND+1))
+        # found first. set $PKG_DIR
+        PKG_DIR="$DIR"
+        if [ $FOUND -gt 1 ] ; then
+          # found more ? fail
           echo "Error - multiple package folders:"
-      echo "$PKG_DIR"
+          echo -e "$ALL_DIRS"
           exit 1
         fi
       fi
+    done
+  fi
+
+  if [ -r $PKG_DIR/package.mk ]; then
+    . $PKG_DIR/package.mk
+  elif [ -r $PKG_DIR/meta ]; then
+    . $PKG_DIR/meta
+  fi
 
-  [ -r $PKG_DIR/meta ] && . $PKG_DIR/meta
   if [ "$PKG_IS_ADDON" = "yes" ] ; then
     [ -z $PKG_SECTION ] && PKG_ADDON_ID="$PKG_NAME" || PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"
   fi
 
-  [ -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}`
-  [ -d $BUILD/${PKG_NAME}${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}`
+  if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
+  elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
+  elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
+  elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
+  elif [ -d "$BUILD/${PKG_NAME}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}"
+  fi
 
 XORG_PATH_DRI=/usr/lib/dri
 XORG_PATH_XKB=/usr/share/X11/xkb
@@ -147,3 +179,6 @@ else
   exec 4>/dev/null
 fi
 BUILD_INDENT_SIZE=4
+
+# multilib? nah
+unset CONFIG_SITE

config/version

@@ -1,5 +1,5 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="3.1.2"
+  OPENELEC_VERSION="3.2.4"
 
 # OS_VERSION: OS Version
   OS_VERSION="3.2"

packages/3rdparty/download/CouchPotatoServer/meta

@@ -1,38 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="CouchPotatoServer"
-PKG_VERSION="5c0d8a7"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="https://github.com/RuudBurger/CouchPotatoServer"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="Python SABnzbd"
-PKG_BUILD_DEPENDS="toolchain Python"
-PKG_PRIORITY="optional"
-PKG_SECTION="service/downloadmanager"
-PKG_SHORTDESC="CouchPotatoServer: automated movie downloading."
-PKG_LONGDESC="CouchPotatoServer: automated movie downloading."
-
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-move-cache.patch

@@ -1,13 +0,0 @@
-diff --git a/couchpotato/runner.py b/couchpotato/runner.py
-index c0b7eb8..3a550f9 100644
---- a/couchpotato/runner.py
-+++ b/couchpotato/runner.py
-@@ -112,7 +112,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
-     Env.set('data_dir', data_dir)
-     Env.set('log_path', os.path.join(log_dir, 'CouchPotato.log'))
-     Env.set('db_path', 'sqlite:///' + db_path)
--    Env.set('cache_dir', os.path.join(data_dir, 'cache'))
-+    Env.set('cache_dir', os.path.join(data_dir, 'cache.cpv2'))
-     Env.set('cache', FileSystemCache(os.path.join(Env.get('cache_dir'), 'python')))
-     Env.set('console_log', options.console_log)
-     Env.set('quiet', options.quiet)

packages/3rdparty/download/Headphones/meta

@@ -1,38 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="Headphones"
-PKG_VERSION="452cf15"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://github.com/rembo10/headphones"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="Python SABnzbd"
-PKG_BUILD_DEPENDS="toolchain Python"
-PKG_PRIORITY="optional"
-PKG_SECTION="service/downloadmanager"
-PKG_SHORTDESC="Headphones: Automatic music downloader for SABnzbd."
-PKG_LONGDESC="Headphones: This a pretty early release of a third-party add-on for SABnzbd."
-
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

packages/3rdparty/download/SABnzbd/meta

@@ -1,37 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="SABnzbd"
-PKG_VERSION="0.7.11"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://sabnzbd.org/"
-PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/sabnzbdplus/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}-src.tar.gz"
-PKG_DEPENDS="Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline"
-PKG_BUILD_DEPENDS="toolchain Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline configobj"
-PKG_PRIORITY="optional"
-PKG_SECTION="service/downloadmanager"
-PKG_SHORTDESC="SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can."
-PKG_LONGDESC="SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add a .nzb file. SABnzbd+ takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction."
-
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.11-001_remove_default_settings-0.3.patch

@@ -1,234 +0,0 @@
-diff --git a/interfaces/Plush/templates/config_folders.tmpl b/interfaces/Plush/templates/config_folders.tmpl
-index 92bb5d1..94c1502 100644
---- a/interfaces/Plush/templates/config_folders.tmpl
-+++ b/interfaces/Plush/templates/config_folders.tmpl
-@@ -76,16 +76,6 @@
-           <span class="component-desc">$T('explain-dirscan_speed')</span>
-         </label>
-       </div>
--      <div class="field-pair">
--        <label class="nocheck clearfix" for="script_dir">
--          <span class="component-title">$T('opt-script_dir')</span>
--          <input type="text" size="50" name="script_dir" id="script_dir" value="$script_dir">
--        </label>
--        <label class="nocheck clearfix">
--          <span class="component-title">&nbsp;</span>
--          <span class="component-desc">$T('explain-script_dir')</span>
--        </label>
--      </div>
-       <div class="field-pair alt">
-         <label class="nocheck clearfix" for="email_dir">
-           <span class="component-title">$T('opt-email_dir')</span>
-@@ -109,49 +99,6 @@
-     </fieldset>
-   </div><!-- /component-group1 -->
- 
--  <div id="core-component-group2" class="component-group clearfix">
--    <div class="component-group-desc">
--      <h3>$T('systemFolders')</h3>
--      <p><small>$T('base-folder'):<br/>$my_lcldata</small></p>
--    </div>
--    <fieldset class="component-group-list">
--      <div class="field-pair">
--        <label class="nocheck clearfix" for="admin_dir">
--          <span class="component-title">$T('opt-admin_dir')</span>
--          <input type="text" size="50" name="admin_dir" id="admin_dir" value="$admin_dir">
--        </label>
--        <label class="nocheck clearfix">
--          <span class="component-title">&nbsp;</span>
--          <span class="component-desc">$T('explain-admin_dir1')</span>
--        </label>
--        <label class="nocheck clearfix">
--          <span class="component-title">&nbsp;</span>
--          <span class="component-desc">$T('explain-admin_dir2')</span>
--        </label>
--      </div>
--      <div class="field-pair alt">
--        <label class="nocheck clearfix" for="log_dir">
--          <span class="component-title">$T('opt-log_dir')</span>
--          <input type="text" size="50" name="log_dir" id="log_dir" value="$log_dir">
--        </label>
--        <label class="nocheck clearfix">
--          <span class="component-title">&nbsp;</span>
--          <span class="component-desc">$T('explain-log_dir')</span>
--        </label>
--      </div>
--      <div class="field-pair">
--        <label class="nocheck clearfix" for="nzb_backup_dir">
--          <span class="component-title">$T('opt-nzb_backup_dir')</span>
--          <input type="text" size="50" name="nzb_backup_dir" id="nzb_backup_dir" value="$nzb_backup_dir">
--        </label>
--        <label class="nocheck clearfix">
--          <span class="component-title">&nbsp;</span>
--          <span class="component-desc">$T('explain-nzb_backup_dir')</span>
--        </label>
--      </div>
--    </fieldset>
--  </div><!-- /component-group2 -->
--
-   <div class="component-group-last clearfix">
-     <div class="component-group-desc">
-       <h3>&nbsp;</h3>
-diff --git a/interfaces/Plush/templates/config_general.tmpl b/interfaces/Plush/templates/config_general.tmpl
-index 0c293ec..56f9488 100644
---- a/interfaces/Plush/templates/config_general.tmpl
-+++ b/interfaces/Plush/templates/config_general.tmpl
-@@ -14,82 +14,6 @@
-     </div>
-     <fieldset class="component-group-list">
-       <div class="field-pair">
--        <label class="nocheck clearfix" for="host">
--          <span class="component-title">$T('opt-host')</span>
--          <input type="text" name="host" id="host" value="$host"/>
--        </label>
--        <label class="nocheck clearfix">
--          <span class="component-title">&nbsp;</span>
--          <span class="component-desc">$T('explain-host')</span>
--        </label>
--      </div>
--      <div class="field-pair alt">
--        <label class="nocheck clearfix" for="port">
--          <span class="component-title">$T('opt-port')</span>
--          <input type="text" name="port" id="port" size=8 value="$port"/>
--        </label>
--        <label class="nocheck clearfix">
--          <span class="component-title">&nbsp;</span>
--          <span class="component-desc">$T('explain-port')</span>
--        </label>
--      </div>
--      <div class="field-pair">
--        <label class="nocheck clearfix" for="username">
--          <span class="component-title">$T('opt-web_username')</span>
--          <input type="text" name="username" id="username" value="$username"/>
--        </label>
--        <label class="nocheck clearfix">
--          <span class="component-title">&nbsp;</span>
--          <span class="component-desc">$T('explain-web_username')</span>
--        </label>
--      </div>
--      <div class="field-pair alt">
--        <label class="nocheck clearfix" for="password">
--          <span class="component-title">$T('opt-web_password')</span>
--          <input type="password" name="password" id="password" value="$password"/>
--        </label>
--        <label class="nocheck clearfix">
--          <span class="component-title">&nbsp;</span>
--          <span class="component-desc">$T('explain-web_password')</span>
--        </label>
--      </div>
--      <div class="field-pair">
--        <label class="nocheck clearfix" for="web_dir">
--          <span class="component-title">$T('opt-web_dir')</span>
--          <select name="web_dir" id="web_dir">
--          <!--#for $webline in $web_list#-->
--          <!--#if $webline.lower() == $web_dir.lower()#-->
--            <option value="$webline" selected>$webline</option>
--          <!--#else#-->
--            <option value="$webline">$webline</option>
--          <!--#end if#-->
--          <!--#end for#-->
--          </select>
--        </label>
--        <label class="nocheck clearfix">
--          <span class="component-title">&nbsp;</span>
--          <span class="component-desc">$T('explain-web_dir')</span>
--        </label>
--      </div>
--      <div class="field-pair alt">
--        <label class="nocheck clearfix" for="web_dir2">
--          <span class="component-title">$T('opt-web_dir2')</span>
--          <select name="web_dir2" id="web_dir2">
--          <!--#for $webline in $web_list2#-->
--          <!--#if $webline.lower() == $web_dir2.lower()#-->
--            <option value="$webline" selected>$webline</option>
--          <!--#else#-->
--            <option value="$webline">$webline</option>
--          <!--#end if#-->
--          <!--#end for#-->
--          </select>
--        </label>
--        <label class="nocheck clearfix">
--          <span class="component-title">&nbsp;</span>
--          <span class="component-desc">$T('explain-web_dir2')</span>
--        </label>
--      </div>
--      <div class="field-pair">
-         <label class="nocheck clearfix" for="language">
-           <span class="component-title">$T('opt-language')</span>
-           <select name="language" id="language" id="language" class="select">
-@@ -131,13 +55,6 @@
-           <span class="component-desc">$T('explain-nzbkey')</span>
-         </label>
-       </div>
--      <div class="field-pair alt">
--        <label class="clearfix" for="disable_api_key">
--          <input type="checkbox" name="disable_api_key" id="disable_api_key" value="1" <!--#if $disable_api_key > 0 then 'checked="1"' else ""#--> />
--          <span class="component-title">$T('opt-disableApikey')</span>
--          <span class="component-desc">$T('explain-disableApikey')</span>
--        </label>
--      </div>
-     </fieldset>
-   </div><!-- /component-group1 -->
- 
-@@ -154,36 +71,6 @@
-           <span class="component-desc">$T('explain-enable_https')</span>
-         </label>
-       </div>
--      <div class="field-pair alt">
--        <label class="nocheck clearfix" for="https_port">
--          <span class="component-title">$T('opt-https_port')</span>
--          <input type="text" name="https_port" id="https_port" size="8" value="$https_port"/>
--        </label>
--        <label class="nocheck clearfix">
--          <span class="component-title">&nbsp;</span>
--          <span class="component-desc">$T('explain-https_port')</span>
--        </label>
--      </div>
--      <div class="field-pair">
--        <label class="nocheck clearfix" for="https_cert">
--          <span class="component-title">$T('opt-https_cert')</span>
--          <input type="text" name="https_cert" id="https_cert" value="$https_cert"/>
--        </label>
--        <label class="nocheck clearfix">
--          <span class="component-title">&nbsp;</span>
--          <span class="component-desc">$T('explain-https_cert')</span>
--        </label>
--      </div>
--      <div class="field-pair alt">
--        <label class="nocheck clearfix" for="https_key">
--          <span class="component-title">$T('opt-https_key')</span>
--          <input type="text" name="https_key" id="https_key" value="$https_key"/>
--        </label>
--        <label class="nocheck clearfix">
--          <span class="component-title">&nbsp;</span>
--          <span class="component-desc">$T('explain-https_key')</span>
--        </label>
--      </div>
-     </fieldset>
-   </div><!-- /component-group2 -->
- 
-diff --git a/interfaces/Plush/templates/config_switches.tmpl b/interfaces/Plush/templates/config_switches.tmpl
-index a8f1069..6f50b49 100644
---- a/interfaces/Plush/templates/config_switches.tmpl
-+++ b/interfaces/Plush/templates/config_switches.tmpl
-@@ -12,20 +12,6 @@
-       <h3>$T('swtag-general')</h3>
-     </div>
-     <fieldset class="component-group-list">
--      <div class="field-pair">
--        <input type="checkbox" name="check_new_rel" id="check_new_rel" value="1" <!--#if $check_new_rel > 0 then "checked=1" else ""#--> />
--        <label class="clearfix" for="check_new_rel">
--          <span class="component-title">$T('opt-check_new_rel')</span>
--          <span class="component-desc">$T('explain-check_new_rel')</span>
--        </label>
--      </div>
--      <div class="field-pair alt">
--        <input type="checkbox" name="auto_browser" id="auto_browser" value="1" <!--#if $auto_browser > 0 then "checked=1" else ""#--> />
--        <label class="clearfix" for="auto_browser">
--          <span class="component-title">$T('opt-auto_browser')</span>
--          <span class="component-desc">$T('explain-auto_browser')</span>
--        </label>
--      </div>
-       <!--#if $have_ampm#-->
-       <div class="field-pair">
-         <input type="checkbox" name="ampm" id="ampm" value="1" <!--#if $ampm > 0 then "checked=1" else ""#--> />

packages/3rdparty/download/SickBeard/meta

@@ -1,38 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="SickBeard"
-PKG_VERSION="fb37d33"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="https://github.com/midgetspy/Sick-Beard"
-PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS="Python SABnzbd Cheetah"
-PKG_BUILD_DEPENDS="toolchain Python Cheetah"
-PKG_PRIORITY="optional"
-PKG_SECTION="service/downloadmanager"
-PKG_SHORTDESC="SickBeard: automated TV show downloading."
-PKG_LONGDESC="SickBeard: automated TV show downloading."
-
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

packages/3rdparty/download/SickBeard/patches/SickBeard-001-remove_logo_update-header_and_donate_button-0.1.patch

@@ -1,55 +0,0 @@
-diff --git a/data/interfaces/default/config.tmpl b/data/interfaces/default/config.tmpl
-index ec28766..fdf3e30 100644
---- a/data/interfaces/default/config.tmpl
-+++ b/data/interfaces/default/config.tmpl
-@@ -36,13 +36,4 @@
-     </table>
- </div>
- 
--<div class="container padding" style="width: 600px;">
--    <table class="infoTable">
--        <tr>
--            <td><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donateCC_LG.gif" alt="[donate]" /></a></td>
--            <td>Sick Beard is free, but you can contribute by giving a <b><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;">donation</a></b>.</td>
--        </tr>
--    </table>
--</div>
--
- #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_bottom.tmpl")
-diff --git a/data/interfaces/default/inc_top.tmpl b/data/interfaces/default/inc_top.tmpl
-index f791be8..fb38f17 100644
---- a/data/interfaces/default/inc_top.tmpl
-+++ b/data/interfaces/default/inc_top.tmpl
-@@ -108,20 +108,6 @@
- 
- <body>
-     <header>
--#if $sickbeard.NEWEST_VERSION_STRING:
--<div id="upgrade-notification">
--    <div>
--        <span class="notify-text">$sickbeard.NEWEST_VERSION_STRING</span>
--    </div>
--</div>
--<div id="header-fix"></div>
--#end if
--<div id="header">
--    <a name="top"></a>
--    <span id="logo"><a href="$sbRoot/home/" title="Sick Beard homepage"><img alt="Sick Beard" src="$sbRoot/images/sickbeard.png" width="150" height="72" /></a></span>
--    <span id="versiontext">alpha <a href="https://github.com/midgetspy/Sick-Beard/wiki/ChangeLog" onclick="window.open(this.href, '_blank'); return false;">$sickbeard.version.SICKBEARD_VERSION</a></span>
--</div>
--
-     <div class="navbar">
-         <div class="navbar-inner">
-             <div class="container">
-@@ -208,11 +194,6 @@
-                         </li>
-                         <li class="divider-vertical"></li>
-                     </ul>
--                    <ul class="nav pull-right">
--                        <li>
--                            <a id="navDonate" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donate_LG.gif" alt="[donate]" height="26" width="92" /></a>
--                        </li>
--                    </ul>
-                 </div><!-- /nav-collapse -->
- 
-             </div><!-- /container -->

packages/3rdparty/download/SickBeard/patches/SickBeard-002-remove_default_settings-0.3.patch

@@ -1,75 +0,0 @@
-diff --git a/data/interfaces/default/config_notifications.tmpl b/data/interfaces/default/config_notifications.tmpl
-index 2144a0f..703c99e 100755
---- a/data/interfaces/default/config_notifications.tmpl
-+++ b/data/interfaces/default/config_notifications.tmpl
-@@ -639,45 +639,6 @@
- 
-                 <div class="component-group clearfix">
-                     <div class="component-group-desc">
--                        <img class="notifier-icon" src="$sbRoot/images/notifiers/libnotify.png" alt="" title="Libnotify" />
--                        <h3><a href="http://library.gnome.org/devel/libnotify/" onclick="window.open(this.href, '_blank'); return false;">Libnotify</a></h3>
--                        <p>The standard desktop notification API for Linux/*nix systems.  This notifier will only function if the pynotify module is installed (Ubuntu/Debian package <a href="apt:python-notify">python-notify</a>).</p>
--                    </div>
--                    <fieldset class="component-group-list">
--                        <div class="field-pair">
--                            <input type="checkbox" class="enabler" name="use_libnotify" id="use_libnotify" #if $sickbeard.USE_LIBNOTIFY then "checked=\"checked\"" else ""# />
--                            <label class="clearfix" for="use_libnotify">
--                                <span class="component-title">Enable</span>
--                                <span class="component-desc">Should Sick Beard send Libnotify notifications?</span>
--                            </label>
--                        </div>
--
--                        <div id="content_use_libnotify">
--                            <div class="field-pair">
--                                <input type="checkbox" name="libnotify_notify_onsnatch" id="libnotify_notify_onsnatch" #if $sickbeard.LIBNOTIFY_NOTIFY_ONSNATCH then "checked=\"checked\"" else ""# />
--                                <label class="clearfix" for="libnotify_notify_onsnatch">
--                                    <span class="component-title">Notify on Snatch</span>
--                                    <span class="component-desc">Send notification when we start a download?</span>
--                                </label>
--                            </div>
--                            <div class="field-pair">
--                                <input type="checkbox" name="libnotify_notify_ondownload" id="libnotify_notify_ondownload" #if $sickbeard.LIBNOTIFY_NOTIFY_ONDOWNLOAD then "checked=\"checked\"" else ""# />
--                                <label class="clearfix" for="libnotify_notify_ondownload">
--                                    <span class="component-title">Notify on Download</span>
--                                    <span class="component-desc">Send notification when we finish a download?</span>
--                                </label>
--                            </div>
--                            <div class="testNotification" id="testLibnotify-result">Click below to test.</div>
--                            <input type="button" class="btn" value="Test Libnotify" id="testLibnotify" />
--                            <input type="submit" class="btn config_submitter" value="Save Changes" />
--                        </div><!-- /content_use_libnotify //-->
--
--                    </fieldset>
--                </div><!-- /libnotify component-group //-->
--
--
--                <div class="component-group clearfix">
--                    <div class="component-group-desc">
-                         <img class="notifier-icon" src="$sbRoot/images/notifiers/pushover.png" alt="" title="Pushover" />
-                         <h3><a href="http://pushover.net/" onclick="window.open(this.href, '_blank'); return false;">Pushover</a></h3>
-                         <p>Pushover makes it easy to send real-time notifications to your Android and iOS devices.</p>
-diff --git a/data/interfaces/default/inc_top.tmpl b/data/interfaces/default/inc_top.tmpl
-index fb38f17..4ead36f 100644
---- a/data/interfaces/default/inc_top.tmpl
-+++ b/data/interfaces/default/inc_top.tmpl
-@@ -172,8 +172,6 @@
-                             <ul class="dropdown-menu">
-                                 <li><a href="$sbRoot/config/"><i class="icon-question-sign"></i> Help &amp; Info</a></li>
-                                 <li class="divider"></li>
--                                <li><a href="$sbRoot/config/general/"><i class="icon-cog"></i> General</a></li>
--                                <li class="divider"></li>
-                                 <li><a href="$sbRoot/config/search/"><i class="icon-cog"></i> Search Settings</a></li>
-                                 <li class="divider"></li>
-                                 <li><a href="$sbRoot/config/providers/"><i class="icon-cog"></i> Search Providers</a></li>
-diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
-index da9ff7f..36b608e 100644
---- a/sickbeard/webserve.py
-+++ b/sickbeard/webserve.py
-@@ -613,7 +613,6 @@ class History:
- 
- 
- ConfigMenu = [
--    { 'title': 'General',           'path': 'config/general/'          },
-     { 'title': 'Search Settings',   'path': 'config/search/'           },
-     { 'title': 'Search Providers',  'path': 'config/providers/'        },
-     { 'title': 'Post Processing',   'path': 'config/postProcessing/'   },

packages/3rdparty/graphics/imlib2/build

@@ -1,50 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-VDR_ADDON_DIR="/storage/.xbmc/addons/service.multimedia.vdr-addon"
-
-cd $PKG_BUILD
-
-case "$TARGET_ARCH" in
-  i386)
-    MMX_ARG="--enable-mmx --disable-amd64"
-    ;;
-  x86_64)
-    MMX_ARG="--enable-mmx --enable-amd64"
-    ;;
-  *)
-    MMX_ARG="--disable-mmx --disable-amd64"
-    ;;
-esac
-
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            $MMX_ARG
-
-sed -i "s|#define SYS_LOADERS_PATH .*|#define SYS_LOADERS_PATH \"$VDR_ADDON_DIR/lib/imlib2\"|" src/lib/loaderpath.h
-
-make
-$MAKEINSTALL

packages/3rdparty/graphics/imlib2/meta

@@ -1,35 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="imlib2"
-PKG_VERSION="1.4.5"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://web.enlightenment.org/"
-PKG_URL="$SOURCEFORGE_SRC/enlightenment/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain libjpeg-turbo libpng tiff zlib bzip2 libX11 libXext"
-PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="Imlib2 is a graphics library."
-PKG_LONGDESC="Imlib2 is a graphics library for file loading, saving, rendering, manipulation."
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"

packages/3rdparty/lib/ccid/build

@@ -1,36 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --enable-shared \
-            --enable-static \
-            --enable-twinserial
-
-make
-make -C src/ Info.plist
-$MAKEINSTALL

packages/3rdparty/lib/ccid/meta

@@ -1,35 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="ccid"
-PKG_VERSION="1.4.10"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="LGPL"
-PKG_SITE="http://pcsclite.alioth.debian.org/ccid.html"
-PKG_URL="https://alioth.debian.org/frs/download.php/3897/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain pcsc-lite"
-PKG_PRIORITY="optional"
-PKG_SECTION="driver"
-PKG_SHORTDESC="CCID free software driver"
-PKG_LONGDESC="CCID free software driver"
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"

packages/3rdparty/lib/libdvbcsa/build

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+. config/options $1
+
+cd $PKG_BUILD
+
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --disable-shared \
+            --enable-static \
+            --with-sysroot=$SYSROOT_PREFIX \
+
+$MAKEINSTALL

packages/3rdparty/lib/libdvbcsa/meta

@@ -18,19 +18,20 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="json-c"
-PKG_VERSION="0.9"
+PKG_NAME="libdvbcsa"
+PKG_VERSION="1.1.0"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="MIT"
-PKG_SITE="http://oss.metaparadigm.com/json-c/"
-PKG_URL="http://oss.metaparadigm.com/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_LICENSE="LGPL"
+PKG_SITE="http://www.videolan.org/developers/libdvbcsa.html"
+PKG_URL="http://download.videolan.org/pub/videolan/libdvbcsa/${PKG_VERSION}/libdvbcsa-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
-PKG_SECTION="devel"
-PKG_SHORTDESC="json-c: A JSON implementation in C"
-PKG_LONGDESC="JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects."
+PKG_SECTION="lib"
+PKG_SHORTDESC="libdvbcsa is a free implementation of the DVB Common Scrambling Algorithm - DVB/CSA - with encryption and decryption capabilities"
+PKG_LONGDESC="libdvbcsa is a free implementation of the DVB Common Scrambling Algorithm - DVB/CSA - with encryption and decryption capabilities"
+
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="yes"

packages/3rdparty/multimedia/vdr-plugin-dvbapi/build

@@ -36,5 +36,6 @@ cd $PKG_BUILD
        VDRSRC="../$VDR_DIR" \
        LIBDIR="." \
        LOCALEDIR="./locale" \
+       LIBDVBCSA=1 \
        CSAFLAGS="$CFLAGS -Wall -fomit-frame-pointer -fexpensive-optimizations -funroll-loops"
 

packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/manio/vdr-plugin-dvbapi"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="vdr openssl"
-PKG_BUILD_DEPENDS="toolchain vdr openssl"
+PKG_BUILD_DEPENDS="toolchain vdr openssl libdvbcsa"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="TV"

packages/3rdparty/security/nss/build

@@ -1,64 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-# dont build parallel
-  MAKEFLAGS=-j1
-
-cd $PKG_BUILD/mozilla/security/nss
-
-setup_toolchain host
-
-[ "`uname -m`" = "x86_64" ] && HOST_USE_64="USE_64=1"
-
-# make host part for nsinstall binary and created library signatures
-make nss_build_all CC=$CC LDFLAGS="$LDFLAGS" $HOST_USE_64
-
-# save host binary
-cp ../coreconf/nsinstall/Linux*_DBG.OBJ/nsinstall nsinstall-host
-NSINSTALL_HOST=`pwd`/nsinstall-host
-
-# save library signatures to be used on target
-# the .chk file format is cross platform (so I read)
-find ./ -name "lib*.chk" -exec cp {} ../../dist/ \;
-
-# can't run in crosscompile (remove it from target)
-sed -i "/shlibsign/d" cmd/manifest.mn
-
-# clean up host part
-rm -rf `find ../../../ -type d -name Linux*_DBG.OBJ`
-
-[ "$TARGET_ARCH" = "x86_64" ] && TARGET_USE_64="USE_64=1"
-
-setup_toolchain target
-
-NSPR_CONFIGURE_OPTS="--host=$TARGET_NAME --build=$HOST_NAME --target=$TARGET_NAME"
-NSPR_CONFIGURE_OPTS="$NSPR_CONFIGURE_OPTS --prefix=/usr --enable-strip --with-pthreads" \
-make nss_build_all \
-  NSINSTALL=$NSINSTALL_HOST \
-  BUILD_OPT=1 $TARGET_USE_64 \
-  OS_TEST=$TARGET_ARCH \
-  CPU_ARCH_TAG=$TARGET_ARCH \
-  USE_SYSTEM_ZLIB=1 ZLIB_LIBS=-lz \
-  CC=$CC CCC=$CXX RANLIB=$RANLIB \
-  V=1

packages/3rdparty/security/nss/meta

@@ -1,35 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="nss"
-PKG_VERSION="3.13.3"
-PKG_REV="1"
-PKG_ARCH="i386 x86_64"
-PKG_LICENSE="Mozilla Public License"
-PKG_SITE="http://ftp.mozilla.org/"
-PKG_URL="http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_3_RTM/src/$PKG_NAME-$PKG_VERSION-with-nspr-4.9.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="security"
-PKG_SHORTDESC="nss: Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server applications."
-PKG_LONGDESC="Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server applications."
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"

packages/3rdparty/system/pcsc-lite/meta

@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#      Copyright (C) 2011-2011 Gregor Fuis (gujs@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="pcsc-lite"
-PKG_VERSION="1.8.8"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://pcsclite.alioth.debian.org/pcsclite.html"
-PKG_URL="https://alioth.debian.org/frs/download.php/3862/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain libusb"
-PKG_PRIORITY="optional"
-PKG_SECTION="service/system"
-PKG_SHORTDESC="Middleware to access a smart card using SCard API (PC/SC)"
-PKG_LONGDESC="Middleware to access a smart card using SCard API (PC/SC)"
-PKG_IS_ADDON="yes"
-PKG_AUTORECONF="yes"

packages/3rdparty/web/pycurl/meta

@@ -1,35 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="pycurl"
-PKG_VERSION="7.19.0"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL-2"
-PKG_SITE="http://pycurl.sourceforge.net/"
-PKG_URL="http://pycurl.sourceforge.net/download/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="Python curl"
-PKG_BUILD_DEPENDS="toolchain Python distutilscross curl libgcrypt"
-PKG_PRIORITY="optional"
-PKG_SECTION="python/web"
-PKG_SHORTDESC="pycurl: a Python interface to libcurl"
-PKG_LONGDESC="PycURL is a Python interface to libcurl. PycURL can be used to fetch objects identified by a URL from a Python program, similar to the urllib Python module. PycURL is mature, very fast, and supports a lot of features."
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"

packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-fix-do_curl_reset-refcount.patch

@@ -1,24 +0,0 @@
---- a/src/pycurl.c	
-+++ a/src/pycurl.c	
-@@ -1452,6 +1452,7 @@ do_curl_reset(CurlObject *self)
-         }
-     }
- 
-+    Py_INCREF(Py_None);
-     return Py_None;
- }
- 
---- a/tests/test_internals.py	
-+++ a/tests/test_internals.py	
-@@ -245,6 +245,11 @@ if 1 and gc:
-     if opts.verbose >= 1:
-         print "Tracked objects:", len(gc.get_objects())
- 
-+if 1:
-+    # Ensure that the refcounting error in "reset" is fixed:
-+    for i in xrange(100000):
-+        c = Curl()
-+        c.reset()
- 
- # /***********************************************************************
- # // done

packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-linking_with_gcrypt.patch

@@ -1,11 +0,0 @@
-diff -uNr pycurl-7.19.0-orig/setup.py pycurl-7.19.0-new/setup.py
---- pycurl-7.19.0-orig/setup.py	2012-12-21 19:20:27.000000000 +0100
-+++ pycurl-7.19.0-new/setup.py	2012-12-21 19:31:11.000000000 +0100
-@@ -104,6 +104,7 @@
-             if e[2:] == 'ssl':
-                 define_macros.append(('HAVE_CURL_OPENSSL', 1))
-             if e[2:] == 'gnutls':
-+                libraries.append("gcrypt")
-                 define_macros.append(('HAVE_CURL_GNUTLS', 1))
-         elif e[:2] == "-L":
-             library_dirs.append(e[2:])

packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-no-static-libs.patch

@@ -1,12 +0,0 @@
---- pycurl/setup.py~	2008-04-22 17:00:45.000000000 +0300
-+++ pycurl/setup.py	2008-07-03 21:53:36.000000000 +0300
-@@ -97,8 +97,7 @@
-         else:
-             extra_compile_args.append(e)
-     libs = split_quoted(
--        os.popen("'%s' --libs" % CURL_CONFIG).read()+\
--        os.popen("'%s' --static-libs" % CURL_CONFIG).read())
-+        os.popen("'%s' --libs" % CURL_CONFIG).read())
-     for e in libs:
-         if e[:2] == "-l":
-             libraries.append(e[2:])

packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-setuptools-0.1.patch

@@ -1,14 +0,0 @@
-diff -Naur pycurl-7.19.0/setup.py pycurl-7.19.0.patch/setup.py
---- pycurl-7.19.0/setup.py	2008-09-09 19:40:34.000000000 +0200
-+++ pycurl-7.19.0.patch/setup.py	2011-09-29 02:07:22.584412664 +0200
-@@ -11,8 +11,8 @@
- 
- import glob, os, re, sys, string
- import distutils
--from distutils.core import setup
--from distutils.extension import Extension
-+from setuptools import setup
-+from setuptools import Extension
- from distutils.util import split_quoted
- from distutils.version import LooseVersion
- 

packages/3rdparty/x11/app/xdotool/meta

@@ -1,35 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="xdotool"
-PKG_VERSION="2.20110530.1"
-PKG_REV="1"
-PKG_ARCH=""
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.semicomplete.com/projects/xdotool/"
-PKG_URL="http://semicomplete.googlecode.com/files/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain libXtst libXinerama"
-PKG_PRIORITY="optional"
-PKG_SECTION="x11/app"
-PKG_SHORTDESC="This tool lets you simulate keyboard input and mouse activity, move and resize windows, etc.."
-PKG_LONGDESC="This tool lets you simulate keyboard input and mouse activity, move and resize windows, etc.."
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"

packages/3rdparty/x11/lib/libXcursor/build

@@ -1,35 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared
-
-make
-$MAKEINSTALL

packages/3rdparty/x11/lib/libXcursor/meta

@@ -1,35 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="libXcursor"
-PKG_VERSION="1.1.13"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://www.X.org"
-PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="libXfixes libXrender libX11"
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="x11/lib"
-PKG_SHORTDESC="libXcursor: X Cursor Library"
-PKG_LONGDESC="X11 Cursor management library"
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"

packages/accessibility/atk/build

@@ -1,67 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-
-ac_cv_func_posix_getpwuid_r=yes \
-glib_cv_stack_grows=no glib_cv_uscore=no \
-ac_cv_func_strtod=yes ac_fsusage_space=yes \
-fu_cv_sys_stat_statfs2_bsize=yes ac_cv_func_closedir_void=no \
-ac_cv_func_getloadavg=no ac_cv_lib_util_getloadavg=no \
-ac_cv_lib_getloadavg_getloadavg=no ac_cv_func_getgroups=yes \
-ac_cv_func_getgroups_works=yes ac_cv_func_chown_works=yes \
-ac_cv_have_decl_euidaccess=no ac_cv_func_euidaccess=no \
-ac_cv_have_decl_strnlen=yes ac_cv_func_strnlen_working=yes \
-ac_cv_func_lstat_dereferences_slashed_symlink=yes ac_cv_func_lstat_empty_string_bug=no \
-ac_cv_func_stat_empty_string_bug=no vb_cv_func_rename_trailing_slash_bug=no \
-ac_cv_have_decl_nanosleep=yes jm_cv_func_nanosleep_works=yes \
-gl_cv_func_working_utimes=yes ac_cv_func_utime_null=yes \
-ac_cv_have_decl_strerror_r=yes ac_cv_func_strerror_r_char_p=no \
-jm_cv_func_svid_putenv=yes ac_cv_func_getcwd_null=yes \
-ac_cv_func_getdelim=yes ac_cv_func_mkstemp=yes \
-utils_cv_func_mkstemp_limitations=no utils_cv_func_mkdir_trailing_slash_bug=no \
-ac_cv_func_memcmp_working=yes ac_cv_have_decl_malloc=yes \
-gl_cv_func_malloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull=yes \
-ac_cv_func_calloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes \
-jm_cv_func_gettimeofday_clobber=no gl_cv_func_working_readdir=yes \
-jm_ac_cv_func_link_follows_symlink=no utils_cv_localtime_cache=no \
-ac_cv_struct_st_mtim_nsec=no gl_cv_func_tzset_clobber=no \
-gl_cv_func_getcwd_null=yes gl_cv_func_getcwd_path_max=yes \
-ac_cv_func_fnmatch_gnu=yes am_getline_needs_run_time_check=no \
-am_cv_func_working_getline=yes gl_cv_func_mkdir_trailing_slash_bug=no \
-gl_cv_func_mkstemp_limitations=no ac_cv_func_working_mktime=yes \
-jm_cv_func_working_re_compile_pattern=yes ac_use_included_regex=no \
-gl_cv_c_restrict=no ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \
-ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_PKG_CONFIG="$ROOT/$TOOLCHAIN/bin/pkg-config" \
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-            --disable-glibtest \
-
-make
-$MAKEINSTALL

packages/accessibility/atk/meta

@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="atk"
-PKG_VERSION="2.6.0"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://library.gnome.org/devel/atk/"
-PKG_URL="http://ftp.gnome.org/pub/gnome/sources/$PKG_NAME/2.6/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="glib"
-PKG_BUILD_DEPENDS="toolchain glib"
-PKG_PRIORITY="optional"
-PKG_SECTION="accessibility"
-PKG_SHORTDESC="ATK - Accessibility Toolkit"
-PKG_LONGDESC="ATK provides the set of accessibility interfaces that are implemented by other toolkits and applications. Using the ATK interfaces, accessibility tools have full access to view and control running applications."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="yes"

packages/addons/driver/hdhomerun/changelog.txt

@@ -1,3 +1,12 @@
+3.1.6
+  rebuild
+3.1.5
+  get tuner id with command 'hdhomerun_config discover' and
+  set number of tuners manually
+3.1.4
+  get tuner id from /var/log/messages
+3.1.3
+  fixed parsing dvbhdhomerun.log file with timestamp
 3.1.2
   new addon settings option to enable suspend/resume driver actions
   new addon settings option to enable logging

packages/addons/driver/hdhomerun/meta

@@ -20,13 +20,13 @@
 
 PKG_NAME="hdhomerun"
 PKG_VERSION="3.2"
-PKG_REV="2"
+PKG_REV="6"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
+PKG_BUILD_DEPENDS=""
 PKG_PRIORITY="optional"
 PKG_SECTION="driver/dvb"
 PKG_SHORTDESC="A linux DVB driver for the HDHomeRun (http://www.silicondust.com)."

packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh

@@ -63,14 +63,20 @@ if [ -z "$(pidof userhdhomerun)" ]; then
     cp $HDHR_ADDON_HOME/dvbhdhomerun.conf $DVBHDHOMERUN_CONF_TMP
 
     # get tuner serial numbers
-    SERIALS=$(cat /var/config/hdhomerun-addon.conf | sed -n 's|^ATTACHED_TUNER_\(.*\)_\(.*\)_DVBMODE=.*|\1-\2|gp' | sort | uniq)
+    SERIALS=$(cat /var/config/hdhomerun-addon.conf | sed -n 's|^ATTACHED_TUNER_\(.*\)_DVBMODE=.*|\1|gp' | sort | uniq)
     . /var/config/hdhomerun-addon.conf
 
-    for SERIAL in $SERIALS; do
-      SERIAL_VAR=$(echo $SERIAL | sed 's|-|_|')
-      DVBMODE=$(eval echo \$ATTACHED_TUNER_${SERIAL_VAR}_DVBMODE)
-      FULLNAME=$(eval echo \$ATTACHED_TUNER_${SERIAL_VAR}_FULLNAME)
-      DISABLE=$(eval echo \$ATTACHED_TUNER_${SERIAL_VAR}_DISABLE)
+    for SERIAL_UNIQ in $SERIALS; do
+      DVBMODE=$(eval echo \$ATTACHED_TUNER_${SERIAL_UNIQ}_DVBMODE)
+      FULLNAME=$(eval echo \$ATTACHED_TUNER_${SERIAL_UNIQ}_FULLNAME)
+      DISABLE=$(eval echo \$ATTACHED_TUNER_${SERIAL_UNIQ}_DISABLE)
+      NUMBERS=$(eval echo \$ATTACHED_TUNER_${SERIAL_UNIQ}_NUMBERS)
+
+      NUMBERS=$(( $NUMBERS -1 ))
+      NUMBERS=$(( $NUMBERS *1 ))
+
+      for i in $(seq 0 $NUMBERS); do
+        SERIAL="$SERIAL_UNIQ-$i"
 
         [ "$DVBMODE" = "auto" ] && DVBMODE=""
 
@@ -97,6 +103,7 @@ if [ -z "$(pidof userhdhomerun)" ]; then
 
         echo "" >>$DVBHDHOMERUN_CONF_TMP
       done
+    done
 
     # remove logging from libhdhomerun library
     awk -v val="[libhdhomerun]" '$0 == val {flag=1; next} /^enable=|^logfile=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $DVBHDHOMERUN_CONF_TMP >${DVBHDHOMERUN_CONF_TMP}-log

packages/addons/driver/hdhomerun/source/default.py

@@ -27,10 +27,8 @@ __cwd__           = __settings__.getAddonInfo('path')
 __resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib'))
 __settings_xml__  = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml'))
 
-__hdhomerun_log__ = '/var/log/dvbhdhomerun.log'
-
 if __name__ == "__main__" and len(sys.argv) == 2 and sys.argv[1] == 'refresh_tuners':
   sys.path.append(__resources_lib__)
   from functions import refresh_hdhomerun_tuners
-  refresh_hdhomerun_tuners(__settings_xml__, __hdhomerun_log__)
+  refresh_hdhomerun_tuners(__settings_xml__)
   __settings__.openSettings()

packages/addons/driver/hdhomerun/source/resources/language/English/strings.xml

@@ -11,5 +11,6 @@
   <string id="9005">Enable modifying settings</string>
   <string id="9010">Refresh tuners... (press me)</string>
   <string id="9020">    use full name</string>
+  <string id="9025">    number of tuners</string>
   <string id="9030">    disabled</string>
 </strings>

packages/addons/driver/hdhomerun/source/resources/lib/functions.py

@@ -20,6 +20,8 @@
 
 import os
 import sys
+import re
+import subprocess
 import shutil
 import xmlpp
 from xml.dom import minidom
@@ -44,25 +46,28 @@ def settings_restore(settings_xml):
 
 ######################################################################################################
 # get hdhomerun supported devices on a system (only name like 101ADD2B-0)
-def get_devices_hdhomerun(hdhomerun_log):
+def get_devices_hdhomerun():
   tuners = []
   try:
-    for line in open(hdhomerun_log, 'r'):
-      line = line.strip()
-      if line.startswith('Registered tuner'):
-        name = line.split(':');
-        name = name[2].strip()
+    p = os.popen("hdhomerun_config discover", "r")
+    while 1:
+      line = p.readline()
+      if not line:
+        break
+      else:
+        str = line.strip()
+        match = re.search(r'hdhomerun device (.+) found at .+', line)
+        if match:
+          name = match.group(1)
+          print name
           tuners.append(name)
   except IOError:
-    print 'Error reading hdhomerun log file', hdhomerun_log
+    print 'Error getting hdhomerun tuners info'
   return tuners
 
   """
-root ~ # grep "Registered tuner" /var/log/dvbhdhomerun.log
-Registered tuner, id from kernel: 0 name: 101ADD2B-0
-Registered tuner, id from kernel: 1 name: 101ADD2B-1
-Registered tuner, id from kernel: 2 name: 1031D75A-0
-Registered tuner, id from kernel: 3 name: 1031D75A-1
+openelec:~ # hdhomerun_config discover
+hdhomerun device 12345678 found at 192.168.0.3
   """
 
 ######################################################################################################
@@ -152,11 +157,13 @@ def remove_old_tuners(xmldoc):
 # add new hdhomerun tuners
 def add_hdhomerun(xmldoc, node_cat, tuners):
   for ix, tuner in enumerate(tuners):
-    tuner_var = tuner.replace('-', '_')
+    #tuner_var = tuner.replace('-', '_')
+    tuner_var = tuner
+    print tuner
 
     node1 = xmldoc.createElement("setting")
     node1.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_DVBMODE')
-    node1.setAttribute("label", tuner)
+    node1.setAttribute("label", "tuner serial " + tuner_var)
     node1.setAttribute("type", 'labelenum')
     node1.setAttribute("default", 'auto')
     node1.setAttribute("values", 'auto|ATSC|DVB-C|DVB-T')
@@ -170,12 +177,20 @@ def add_hdhomerun(xmldoc, node_cat, tuners):
     node_cat.appendChild(node2)
 
     node3 = xmldoc.createElement("setting")
-    node3.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_DISABLE')
-    node3.setAttribute("label", '9030')
-    node3.setAttribute("type", 'bool')
-    node3.setAttribute("default", 'false')
+    node3.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_NUMBERS')
+    node3.setAttribute("label", '9025')
+    node3.setAttribute("type", 'labelenum')
+    node3.setAttribute("default", '2')
+    node3.setAttribute("values", '1|2|3|4|5|6|7|8')
     node_cat.appendChild(node3)
 
+    node4 = xmldoc.createElement("setting")
+    node4.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_DISABLE')
+    node4.setAttribute("label", '9030')
+    node4.setAttribute("type", 'bool')
+    node4.setAttribute("default", 'false')
+    node_cat.appendChild(node4)
+
   # for tuner
 
 ######################################################################################################
@@ -247,9 +262,9 @@ def save_settings(settings_xml, xmldoc):
 
 ######################################################################################################
 # refresh hdhomerun tuners in settings.xml file
-def refresh_hdhomerun_tuners(settings_xml, hdhomerun_log):
+def refresh_hdhomerun_tuners(settings_xml):
   settings_backup(settings_xml)
-  tuners = get_devices_hdhomerun(hdhomerun_log)
+  tuners = get_devices_hdhomerun()
   xmldoc = parse_settings(settings_xml)
   if xmldoc == None:
     print 'No hdhomerun tuners found'

packages/addons/driver/hdhomerun/source/sleep.d/hdhomerun.power

@@ -39,7 +39,7 @@ if [ "$SUSPEND_DRIVER" = "true" ]; then
   LOCKFILE="$LOCKDIR/hdhomerun"
 
   case "$1" in
-    hibernate|suspend)
+    hibernate|suspend|pre)
       if [ -n "$(pidof userhdhomerun)" ]; then
         progress "Shutting down HDHomeRun driver for suspending..."
         mkdir -p "$LOCKDIR"
@@ -48,7 +48,7 @@ if [ "$SUSPEND_DRIVER" = "true" ]; then
       fi
       ;;
 
-    thaw|resume)
+    thaw|resume|post)
       if [ -f "$LOCKFILE" ]; then
         # driver started within Tvheadend/VDR
         rm -f "$LOCKFILE"

packages/addons/driver/sundtek-mediatv/changelog.txt

@@ -1,3 +1,5 @@
+3.1.3
+  rebuild
 3.1.2
   new addon settings option to enable suspend/resume driver actions
 3.1.1

packages/addons/driver/sundtek-mediatv/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="sundtek-mediatv"
 PKG_VERSION="3.1"
-PKG_REV="2"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"

packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power

@@ -39,7 +39,7 @@ if [ "$SUSPEND_DRIVER" = "true" ]; then
   LOCKFILE="$LOCKDIR/sundtek-mediatv"
 
   case "$1" in
-    hibernate|suspend)
+    hibernate|suspend|pre)
       if [ -n "$(pidof mediasrv)" ]; then
         progress "Shutting down Sundtek DVB driver for suspending..."
         mkdir -p "$LOCKDIR"
@@ -48,7 +48,7 @@ if [ "$SUSPEND_DRIVER" = "true" ]; then
       fi
       ;;
 
-    thaw|resume)
+    thaw|resume|post)
       if [ -f "$LOCKFILE" ]; then
         # driver started within Tvheadend/VDR
         rm -f "$LOCKFILE"

packages/addons/multimedia/makemkv/addon

@@ -1,34 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-MAKEMKV_ARCH=i386
-[ "$TARGET_ARCH" = x86_64 ] && MAKEMKV_ARCH=amd64
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_BUILD/bin/bin/$MAKEMKV_ARCH/makemkvcon $ADDON_BUILD/$PKG_ADDON_ID/bin/makemkvcon.bin
-  chmod 755 $ADDON_BUILD/$PKG_ADDON_ID/bin/makemkvcon.bin
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp $PKG_BUILD/lib/out/libmakemkv.so.[0-9] $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp $PKG_BUILD/lib/out/libdriveio.so.[0-9] $ADDON_BUILD/$PKG_ADDON_ID/lib

packages/addons/multimedia/makemkv/build

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD/lib
-
-make GCC=$CC -f makefile.linux

packages/addons/multimedia/makemkv/changelog.txt

@@ -1,63 +0,0 @@
-3.1.1
-- rebuild for OpenELEC-3.2
-
-3.0.6
-- update to makemkv-1.8.3
-
-3.0.5
-- update to makemkv-1.8.2
-
-3.0.4
-- update to makemkv-1.8.0
-
-3.0.3
-- update to makemkv-1.7.10
-
-3.0.2
-- update to makemkv-1.7.9
-
-3.0.1
-- bump addon version
-- update to makemkv-1.7.8
-
-2.1.4
-- update to makemkv-1.7.7
-
-2.1.3
-- update to makemkv-1.7.6
-
-2.1.2
-- update to makemkv-1.7.4
-
-2.1.1
-- update to addon version 2.1
-
-2.0.2
-- update to makemkv-1.7.2
-
-2.0.1
-- update to makemkv-1.7.0
-
-2.0.0
-- prepare for OpenELEC-2.0 release
-
-1.90.2
-- depends on xbmc.python API 2.0
-
-1.90.1
-- update to makemkv-1.6.16
-
-1.90.0
-- prepare for OpenELEC-1.90 release
-
-1.0.0
-- prepare for OpenELEC-1.0 release
-
-0.99.3
-- update to makemkv-1.6.15
-
-0.99.2
-- change icon
-
-0.99.1
-- initial addon based on makemkv-1.6.10

packages/addons/multimedia/makemkv/meta

@@ -1,39 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="makemkv"
-PKG_VERSION="1.8.3"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3"
-PKG_URL="http://www.makemkv.com/download/${PKG_NAME}-oss-${PKG_VERSION}.tar.gz"
-PKG_URL="$PKG_URL http://www.makemkv.com/download/${PKG_NAME}-bin-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS="openssl"
-PKG_BUILD_DEPENDS="toolchain openssl expat"
-PKG_PRIORITY="optional"
-PKG_SECTION="lib/multimedia"
-PKG_SHORTDESC="MakeMKV converts the video clips from proprietary (and usually encrypted) disc into a set of MKV files, preserving most information but not changing it in any way."
-PKG_LONGDESC="MakeMKV can instantly stream decrypted video without intermediate conversion to wide range of players, so you may watch Blu-ray and DVD discs with your favorite player on your favorite OS or on your favorite device."
-
-PKG_IS_ADDON="yes"
-PKG_ADDON_TYPE="xbmc.python.script"
-
-PKG_AUTORECONF="no"

packages/addons/multimedia/makemkv/patches.upstream/makemkv-000-crosscompiling-0.1.patch

@@ -1,26 +0,0 @@
-diff --git a/lib/makefile.linux b/lib/makefile.linux
-index b3b5afa..07322ad 100644
---- a/lib/makefile.linux
-+++ b/lib/makefile.linux
-@@ -1,10 +1,10 @@
- 
- include makefile.common
- 
--GCC=gcc
-+GCC:=gcc
- MOC=$(strip $(shell which moc-qt4))
- ifeq ($(MOC),)
--MOC=moc
-+MOC:=moc
- endif
- 
- CXXOPTS=-Os -D_GNU_SOURCE -D_linux_
-@@ -16,7 +16,7 @@ PREFIX=/usr
- LIBDIR=${PREFIX}/lib
- 
- 
--all: out/libdriveio.so.0 out/libmakemkv.so.1 out/makemkv
-+all: out/libdriveio.so.0 out/libmakemkv.so.1
- 	@echo "type \"sudo make -f makefile.linux install\" to install"
- 
- clean:

packages/addons/multimedia/makemkv/patches.upstream/makemkv-001-crosscompiling-objcopy.patch

@@ -1,13 +0,0 @@
-diff --git a/lib/makefile.linux b/lib/makefile.linux
-index dedf8cf..5fac196 100644
---- a/lib/makefile.linux
-+++ b/lib/makefile.linux
-@@ -38,7 +38,7 @@ endif
- 	install -D -m 644 makemkvgui/src/img/128/mkv_icon.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/makemkv.png
- 
- out/%: out/%.full
--	objcopy --strip-all --strip-debug --strip-unneeded --discard-all $< $@ 
-+	$(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@ 
- 
- out/libdriveio.so.0.full:
- 	mkdir -p out

packages/addons/multimedia/makemkv/source/bin/makemkvcon

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. /etc/profile
-
-ADDON_DIR="/storage/.xbmc/addons/lib.multimedia.makemkv"
-
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ADDON_DIR/lib"
-
-makemkvcon.bin $@

packages/addons/multimedia/makemkv/unpack

@@ -1,38 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-require_eglibc $1
-
-[ -d $PKG_BUILD ] && rm -rf $PKG_BUILD
-
-mkdir -p $BUILD/$PKG_NAME-$PKG_VERSION
-mv $BUILD/${PKG_NAME}-oss-${PKG_VERSION} $BUILD/$PKG_NAME-$PKG_VERSION/lib
-mv $BUILD/${PKG_NAME}-bin-${PKG_VERSION} $BUILD/$PKG_NAME-$PKG_VERSION/bin
-
-echo "### Applying upstream patches ###"
-
-for patch in `ls $PKG_DIR/patches.upstream/*.patch`; do
-  cat $patch | patch -d \
-    `echo $BUILD/$PKG_NAME-$PKG_VERSION | cut -f1 -d\ ` -p1
-done

packages/addons/networking/backup/rsync/addon

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_BUILD/rsync $ADDON_BUILD/$PKG_ADDON_ID/bin

packages/addons/networking/backup/rsync/build

@@ -1,35 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-acl-support \
-            --disable-xattr-support \
-            --with-included-popt \
-
-make

packages/addons/networking/backup/rsync/changelog.txt

@@ -1,39 +0,0 @@
-3.1.2
-- use internal popt
-
-3.1.1
-- rebuild for OpenELEC-3.2
-
-3.0.2
-- rebuild against static libpopt
-
-3.0.1
-- bump addon version
-
-2.1.1
-- update to addon version 2.1
-
-2.0.1
-- rebuild for libiconv changes
-
-2.0.0
-- prepare for OpenELEC-2.0 release
-
-1.90.1
-- depends on xbmc.python API 2.0
-
-1.90.0
-- prepare for OpenELEC-1.90 release
-
-1.0.0
-- update to rsync-3.0.9
-- prepare for OpenELEC-1.0 release
-
-0.99.3
-- change icon
-
-0.99.2
-- prepare for release
-
-0.99.1
-- initial addon based on rsync-3.0.8

packages/addons/networking/backup/rsync/meta

@@ -1,38 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="rsync"
-PKG_VERSION="3.0.9"
-PKG_REV="2"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://www.samba.org/ftp/rsync/rsync.html"
-PKG_URL="ftp://rsync.samba.org/pub/rsync/src/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="network/backup"
-PKG_SHORTDESC="rsync: A replacement for rcp that has many more features"
-PKG_LONGDESC="Rsync uses an own 'rsync' algorithm which provides a very fast method for bringing remote files into sync. It does this by sending just the differences in the files across the link, without requiring that both sets of files are present at one of the ends of the link beforehand. At first glance this may seem impossible because the calculation of diffs between two files normally requires local access to both files."
-
-PKG_IS_ADDON="yes"
-PKG_ADDON_TYPE="xbmc.python.script"
-
-PKG_AUTORECONF="yes"

packages/addons/networking/testing/iperf/addon

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_BUILD/src/iperf $ADDON_BUILD/$PKG_ADDON_ID/bin

packages/addons/networking/testing/iperf/build

@@ -1,35 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-ac_cv_func_malloc_0_nonnull=yes \
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-acl-support \
-            --disable-xattr-support \
-
-make

packages/addons/networking/testing/iperf/changelog.txt

@@ -1,11 +0,0 @@
-3.1.1
-- rebuild for OpenELEC-3.2
-
-3.0.2
-- rebuild
-
-3.0.1
-- bump addon version
-
-2.1.1
-- initial addon based on iperf-2.0.5

packages/addons/networking/testing/iperf/meta

@@ -1,38 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="iperf"
-PKG_VERSION="2.0.5"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://sourceforge.net/projects/iperf/"
-PKG_URL="$SOURCEFORGE_SRC/iperf/files/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="network/testing"
-PKG_SHORTDESC="iperf: A modern alternative for measuring maximum TCP and UDP bandwidth performance"
-PKG_LONGDESC="Iperf was developed by NLANR/DAST as a modern alternative for measuring maximum TCP and UDP bandwidth performance. Iperf allows the tuning of various parameters and UDP characteristics. Iperf reports bandwidth, delay jitter, datagram loss."
-
-PKG_IS_ADDON="yes"
-PKG_ADDON_TYPE="xbmc.python.script"
-
-PKG_AUTORECONF="yes"

packages/addons/service/downloadmanager/SABnzbd-Suite/addon

@@ -1,49 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
-  cp -PR $PKG_DIR/config/settings.xml* $ADDON_BUILD/$PKG_ADDON_ID/settings-default.xml
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $BUILD/par2cmdline-*/par2 $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $BUILD/unrar/unrar $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $BUILD/unzip*/unzip $ADDON_BUILD/$PKG_ADDON_ID/bin
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib
-  cp -R $BUILD/Cheetah*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
-  cp -R $BUILD/pyOpenSSL*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
-  cp -R $BUILD/yenc*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
-  cp -R $BUILD/configobj*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/SABnzbd
-  cp -PR $BUILD/SABnzbd-*/* $ADDON_BUILD/$PKG_ADDON_ID/SABnzbd
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/SickBeard
-  cp -PR $BUILD/SickBeard-*/* $ADDON_BUILD/$PKG_ADDON_ID/SickBeard
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/CouchPotatoServer
-  cp -PR $BUILD/CouchPotatoServer-*/* $ADDON_BUILD/$PKG_ADDON_ID/CouchPotatoServer
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/Headphones
-  cp -PR $BUILD/Headphones-*/* $ADDON_BUILD/$PKG_ADDON_ID/Headphones

packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt

@@ -1,127 +0,0 @@
-3.1.1
-- rebuild for OpenELEC-3.2
-
-3.0.9
-- update to CouchPotatoServe-5c0d8a7
-- update to Headphones-452cf15
-- remove CouchPotato (v1)
-
-3.0.8
-- update to CouchPotatoServe-f1dde5c
-- update to Headphones-ebbe908
-- update to SickBeard-fb37d33
-
-3.0.7
-- update to CouchPotatoServe-5a23be2
-- update to SickBeard-ebec1de
-- fix executehttpapi startup error
-
-3.0.6
-- fix configobj error n startup
-
-3.0.5
-- rebuild. configobj included
-
-3.0.4
-- update to SickBeard-4e57625
-- update to CouchPotatoServer-a49a00a
-- fix keep awake option
-
-3.0.3
-- update to SABnzbd-0.7.11
-- update to CouchPotatoServer-811f35b
-- update to SickBeard-6cb5e76
-- added option to restart the suite on suspend / resume
-
-3.0.2
-- Fixed bug causing configobj to throw an exception with Couchpotato v2s config
-- corrected a bug causing most of the suite to crash on first launch in certain circumstances
-- update to SABnzbd-0.7.9
-- update to CouchPotatoServer-393c14d
-- update to Headphones-263272c
-- update to SickBeard-e6dcfb3
-
-3.0.1
-- bump addon version
-
-2.1.8
-- update to SABnzbd-0.7.3
-- update to CouchPotato-806bed6
-- update to CouchPotatoServer-e1d7440
-- update to Headphones-d07dc39
-- update to SickBeard-b7cf06e
-
-2.1.7
-- update to SABnzbd-0.7.0
-- update to Headphones-89c2a8c
-- perform "Keep awake while downloading" and "Wake up periodically" only if sabnzbd is enabled
-- updated Turkish translation
-
-2.1.6
-- fixed another startup bug
-
-2.1.5
-- fixed bug in startup (caused by couchpotatoserver / configobj)
-- add possibilty to start / stop addon from addon manager with enable / disable
-
-2.1.4
-- fixes bug in sleep control
-- added couchpotato v2
-- added ability to enable or disable parts of the Suite from the addon settings page
-
-2.1.3
-- fix so python dont steal xbmc's webserver port (again)
-- add option to wake up periodically
-- update to SickBeard-a24eac6
-- update to Headphones-298463a
-
-2.1.2
-- improve startup script
-
-2.1.1
-- update to addon version 2.1
-- update to SABnzbd-0.6.15
-- update to SickBeard-a24eac6
-- update to CouchPotato-46dbb59
-- update to Headphones-818458e
-
-2.0.1
-- fix so python dont steal xbmc's webserver port
-
-2.0.0
-- prepare for OpenELEC-2.0 release
-- update to SABnzbd-0.6.14
-- update to SickBeard-9b43f71 
-- update to CouchPotato-75f12fa
-- update to Headphones-8d80c6d
-
-1.90.2
-- depends on xbmc.python API 2.0
-
-1.90.1
-- rebuild for OpenSSL upgrade
-
-1.90.0
-- prepare for OpenELEC-1.90 release
-
-1.0.0
-- update to unrar-4.0.7
-- update to CouchPotato-4eec8e0
-- update to Headphones-e9a1e55
-- update to SickBeard-9f64728
-- update to SABnzbd-0.6.10
-- prepare for OpenELEC-1.0 release
-
-0.99.4
-- add Headphones-ee3326e
-
-0.99.3
-- rebuild against fixed 'yenc', 'Cheetah' and 'pyOpenSSL'
-
-0.99.2
-- update to SABnzbd-0.6.7
-- update to SickBeard-e0e8f0e
-- update to CouchPotato-6cd66ae 
-
-0.99.1
-- initial version SABnzbd-Suite

packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml

@@ -1,13 +0,0 @@
-<settings>
-    <setting id="SABNZBD_IP" value="0.0.0.0" />
-    <setting id="SABNZBD_PWD" value="" />
-    <setting id="SABNZBD_USER" value="" />
-    <setting id="SABNZBD_KEEP_AWAKE" value="false" />
-    <setting id="SABNZBD_PERIODIC_WAKE" value="false" />
-    <setting id="SABNZBD_WAKE_AT" value="1" />
-    <setting id="SABNZBD_LAUNCH" value="true" />
-    <setting id="SICKBEARD_LAUNCH" value="true" />
-    <setting id="COUCHPOTATO_LAUNCH" value="true" />
-    <setting id="HEADPHONES_LAUNCH" value="true" />
-    <setting id="RESTART_ON_RESUME" value="false" />
-</settings>

packages/addons/service/downloadmanager/SABnzbd-Suite/meta

@@ -1,38 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="SABnzbd-Suite"
-PKG_VERSION="3.1"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://www.openelec.tv"
-PKG_URL=""
-PKG_DEPENDS="Python"
-PKG_BUILD_DEPENDS="toolchain Python SABnzbd SickBeard Headphones CouchPotatoServer"
-PKG_PRIORITY="optional"
-PKG_SECTION="service/downloadmanager"
-PKG_SHORTDESC="SABnzbd-Suite is a Metapackage which combines SABnzbd, SickBeard, Couchpotato and Headphones in one Addon"
-PKG_LONGDESC="SABnzbd-Suite makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add a .nzb file. SABnzbd+ takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction."
-
-PKG_IS_ADDON="yes"
-PKG_ADDON_TYPE="xbmc.service"
-
-PKG_AUTORECONF="no"

packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.py

@@ -1,466 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2012 Lukas Heiniger
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-# Initializes and launches SABnzbd, Couchpotato, Sickbeard and Headphones
-
-import os
-import shutil
-import xbmc
-import signal
-import subprocess
-import urllib2
-import hashlib
-import sys
-from xml.dom.minidom import parseString
-import logging
-import traceback
-
-logging.basicConfig(filename='/var/log/sabnzbd-suite.log',
-                    filemode='w',
-                    format='%(asctime)s SABnzbd-Suite: %(message)s',
-                    level=logging.WARNING)
-
-# helper functions
-# ----------------
-
-def createDir(dir):
-    if not os.path.isdir(dir):
-        os.makedirs(dir)
-
-def getAddonSetting(doc,id):
-    for element in doc.getElementsByTagName('setting'):
-        if element.getAttribute('id')==id:
-            return element.getAttribute('value')
-
-def loadWebInterface(url,user,pwd):
-    passman = urllib2.HTTPPasswordMgrWithDefaultRealm()
-    passman.add_password(None, url, user, pwd)
-    authhandler = urllib2.HTTPBasicAuthHandler(passman)
-    opener = urllib2.build_opener(authhandler)
-    urllib2.install_opener(opener)
-    pagehandle = urllib2.urlopen(url)
-    return pagehandle.read()
-
-# define some things that we're gonna need, mainly paths
-# ------------------------------------------------------
-
-# addon
-pAddon                = os.path.expanduser('~/.xbmc/addons/service.downloadmanager.SABnzbd-Suite')
-pAddonHome            = os.path.expanduser('~/.xbmc/userdata/addon_data/service.downloadmanager.SABnzbd-Suite')
-
-# settings
-pDefaultSuiteSettings = os.path.join(pAddon, 'settings-default.xml')
-pSuiteSettings        = os.path.join(pAddonHome, 'settings.xml')
-pXbmcSettings         = '/storage/.xbmc/userdata/guisettings.xml'
-pSabNzbdSettings      = os.path.join(pAddonHome, 'sabnzbd.ini')
-pSickBeardSettings    = os.path.join(pAddonHome, 'sickbeard.ini')
-pCouchPotatoServerSettings  = os.path.join(pAddonHome, 'couchpotatoserver.ini')
-pHeadphonesSettings   = os.path.join(pAddonHome, 'headphones.ini')
-pTransmission_Addon_Settings  ='/storage/.xbmc/userdata/addon_data/service.downloadmanager.transmission/settings.xml'
-
-# directories
-pSabNzbdComplete      = '/storage/downloads'
-pSabNzbdCompleteMov   = '/storage/downloads/movies'
-pSabNzbdCompleteMusic = '/storage/downloads/music'
-pSabNzbdIncomplete    = '/storage/downloads/incomplete'
-pSickBeardTvScripts   = os.path.join(pAddon, 'SickBeard/autoProcessTV')
-pSabNzbdScripts       = os.path.join(pAddonHome, 'scripts')
-
-# pylib
-pPylib                = os.path.join(pAddon, 'pylib')
-
-# service commands
-sabnzbd               = ['python', os.path.join(pAddon, 'SABnzbd/SABnzbd.py'),
-                         '-d', '-f',  pSabNzbdSettings, '-l 0']
-sickBeard             = ['python', os.path.join(pAddon, 'SickBeard/SickBeard.py'),
-                         '--daemon', '--datadir', pAddonHome, '--config', pSickBeardSettings]
-couchPotatoServer     = ['python', os.path.join(pAddon, 'CouchPotatoServer/CouchPotato.py'),
-                         '--daemon', '--pid_file', os.path.join(pAddonHome, 'couchpotato.pid'), '--config_file', pCouchPotatoServerSettings]
-headphones            = ['python', os.path.join(pAddon, 'Headphones/Headphones.py'),
-                         '-d', '--datadir', pAddonHome, '--config', pHeadphonesSettings]
-
-# Other stuff
-sabNzbdHost           = '127.0.0.1:8081'
-addonId               = 'service.downloadmanager.SABnzbd-Suite'
-
-# create directories and settings on first launch
-# -----------------------------------------------
-
-firstLaunch = not os.path.exists(pSabNzbdSettings)
-if firstLaunch:
-    logging.debug('First launch, creating directories')
-    createDir(pAddonHome)
-    createDir(pSabNzbdComplete)
-    createDir(pSabNzbdCompleteMov)
-    createDir(pSabNzbdCompleteMusic)
-    createDir(pSabNzbdIncomplete)
-    createDir(pSabNzbdScripts)
-    shutil.copy(os.path.join(pSickBeardTvScripts,'sabToSickBeard.py'), pSabNzbdScripts)
-    shutil.copy(os.path.join(pSickBeardTvScripts,'autoProcessTV.py'), pSabNzbdScripts)
-    os.chmod(os.path.join(pSabNzbdScripts,'sabToSickBeard.py'), 0755)
-    # the settings file already exists if the user set settings before the first launch
-    if not os.path.exists(pSuiteSettings):
-        shutil.copy(pDefaultSuiteSettings, pSuiteSettings)
-    # make utilities executable
-    for utility in {'par2','unrar','unzip'}:
-        try:
-            os.chmod(os.path.join(pAddon, 'bin', utility), 0755)
-        except:
-            pass
-
-# read addon and xbmc settings
-# ----------------------------
-
-# Transmission-Daemon
-if os.path.exists(pTransmission_Addon_Settings):
-    fTransmission_Addon_Settings = open(pTransmission_Addon_Settings, 'r')
-    data = fTransmission_Addon_Settings.read()
-    fTransmission_Addon_Settings.close
-    transmission_addon_settings = parseString(data)
-    transuser                          = getAddonSetting(transmission_addon_settings, 'TRANSMISSION_USER')
-    transpwd                           = getAddonSetting(transmission_addon_settings, 'TRANSMISSION_PWD')
-    transauth                          = getAddonSetting(transmission_addon_settings, 'TRANSMISSION_AUTH')
-else:
-    transauth                          = 'false'
-
-# SABnzbd-Suite
-fSuiteSettings = open(pSuiteSettings, 'r')
-data = fSuiteSettings.read()
-fSuiteSettings.close
-suiteSettings = parseString(data)
-user                 = getAddonSetting(suiteSettings, 'SABNZBD_USER')
-pwd                  = getAddonSetting(suiteSettings, 'SABNZBD_PWD')
-host                 = getAddonSetting(suiteSettings, 'SABNZBD_IP')
-sabNzbdKeepAwake     = getAddonSetting(suiteSettings, 'SABNZBD_KEEP_AWAKE')
-sabnzbd_launch       = getAddonSetting(suiteSettings, 'SABNZBD_LAUNCH')
-sickbeard_launch     = getAddonSetting(suiteSettings, 'SICKBEARD_LAUNCH')
-couchpotato_launch   = getAddonSetting(suiteSettings, 'COUCHPOTATO_LAUNCH')
-headphones_launch    = getAddonSetting(suiteSettings, 'HEADPHONES_LAUNCH')
-
-# merge defaults
-fDefaultSuiteSettings = open(pDefaultSuiteSettings, 'r')
-data = fDefaultSuiteSettings.read()
-fDefaultSuiteSettings.close
-DefaultSuiteSettings = parseString(data)
-if not sabnzbd_launch:
-    sabnzbd_launch       = getAddonSetting(DefaultSuiteSettings, 'SABNZBD_LAUNCH')
-if not sickbeard_launch:
-    sickbeard_launch     = getAddonSetting(DefaultSuiteSettings, 'SICKBEARD_LAUNCH')
-if not couchpotato_launch:
-    couchpotato_launch   = getAddonSetting(DefaultSuiteSettings, 'COUCHPOTATO_LAUNCH')
-if not headphones_launch:
-    headphones_launch    = getAddonSetting(DefaultSuiteSettings, 'HEADPHONES_LAUNCH')
-
-# XBMC
-fXbmcSettings = open(pXbmcSettings, 'r')
-data = fXbmcSettings.read()
-fXbmcSettings.close
-xbmcSettings = parseString(data)
-xbmcServices = xbmcSettings.getElementsByTagName('services')[0]
-xbmcPort         = xbmcServices.getElementsByTagName('webserverport')[0].firstChild.data
-try:
-    xbmcUser     = xbmcServices.getElementsByTagName('webserverusername')[0].firstChild.data
-except:
-    xbmcUser = ''
-try:
-    xbmcPwd      = xbmcServices.getElementsByTagName('webserverpassword')[0].firstChild.data
-except:
-    xbmcPwd = ''
-
-# prepare execution environment
-# -----------------------------
-
-signal.signal(signal.SIGCHLD, signal.SIG_DFL)
-os.environ['PYTHONPATH'] = str(os.environ.get('PYTHONPATH')) + ':' + pPylib
-sys.path.append(pPylib)
-
-from configobj import ConfigObj
-
-# SABnzbd start
-try:
-    # write SABnzbd settings
-    # ----------------------
-    sabNzbdConfig = ConfigObj(pSabNzbdSettings,create_empty=True)
-    defaultConfig = ConfigObj()
-    defaultConfig['misc'] = {}
-    defaultConfig['misc']['disable_api_key']   = '0'
-    defaultConfig['misc']['check_new_rel']     = '0'
-    defaultConfig['misc']['auto_browser']      = '0'
-    defaultConfig['misc']['username']          = user
-    defaultConfig['misc']['password']          = pwd
-    defaultConfig['misc']['port']              = '8081'
-    defaultConfig['misc']['https_port']        = '9081'
-    defaultConfig['misc']['https_cert']        = 'server.cert'
-    defaultConfig['misc']['https_key']         = 'server.key'
-    defaultConfig['misc']['host']              = host
-    defaultConfig['misc']['web_dir']           = 'Plush'
-    defaultConfig['misc']['web_dir2']          = 'Plush'
-    defaultConfig['misc']['web_color']         = 'gold'
-    defaultConfig['misc']['web_color2']        = 'gold'
-    defaultConfig['misc']['log_dir']           = 'logs'
-    defaultConfig['misc']['admin_dir']         = 'admin'
-    defaultConfig['misc']['nzb_backup_dir']    = 'backup'
-    defaultConfig['misc']['script_dir']        = 'scripts'
-
-    if firstLaunch:
-        defaultConfig['misc']['download_dir']  = pSabNzbdIncomplete
-        defaultConfig['misc']['complete_dir']  = pSabNzbdComplete
-        servers = {}
-        servers['localhost'] = {}
-        servers['localhost']['host']           = 'localhost'
-        servers['localhost']['port']           = '119'
-        servers['localhost']['enable']         = '0'
-        categories = {}
-        categories['tv'] = {}
-        categories['tv']['name']               = 'tv'
-        categories['tv']['script']             = 'sabToSickBeard.py'
-        categories['tv']['priority']           = '-100'
-        categories['movies'] = {}
-        categories['movies']['name']           = 'movies'
-        categories['movies']['dir']            = 'movies'
-        categories['movies']['priority']       = '-100'
-        categories['music'] = {}
-        categories['music']['name']            = 'music'
-        categories['music']['dir']             = 'music'
-        categories['music']['priority']        = '-100'
-        defaultConfig['servers'] = servers
-        defaultConfig['categories'] = categories
-
-    sabNzbdConfig.merge(defaultConfig)
-    sabNzbdConfig.write()
-
-    # also keep the autoProcessTV config up to date
-    autoProcessConfig = ConfigObj(os.path.join(pSabNzbdScripts, 'autoProcessTV.cfg'), create_empty=True)
-    defaultConfig = ConfigObj()
-    defaultConfig['SickBeard'] = {}
-    defaultConfig['SickBeard']['host']         = 'localhost'
-    defaultConfig['SickBeard']['port']         = '8082'
-    defaultConfig['SickBeard']['username']     = user
-    defaultConfig['SickBeard']['password']     = pwd
-    autoProcessConfig.merge(defaultConfig)
-    autoProcessConfig.write()
-
-    # launch SABnzbd and get the API key
-    # ----------------------------------
-    if firstLaunch or "true" in sabnzbd_launch:
-        logging.debug('Launching SABnzbd...')
-        subprocess.call(sabnzbd,close_fds=True)
-        logging.debug('...done')
-
-        # SABnzbd will only complete the .ini file when we first access the web interface
-        if firstLaunch:
-            loadWebInterface('http://' + sabNzbdHost,user,pwd)
-        sabNzbdConfig.reload()
-        sabNzbdApiKey = sabNzbdConfig['misc']['api_key']
-        logging.debug('SABnzbd api key: ' + sabNzbdApiKey)
-        if firstLaunch and "false" in sabnzbd_launch:
-            urllib2.urlopen('http://' + sabNzbdHost + '/api?mode=shutdown&apikey=' + sabNzbdApiKey)
-except Exception,e:
-    print 'SABnzbd: exception occurred:', e
-    print traceback.format_exc()
-# SABnzbd end
-
-# SickBeard start
-try:
-    # write SickBeard settings
-    # ------------------------
-    sickBeardConfig = ConfigObj(pSickBeardSettings,create_empty=True)
-    defaultConfig = ConfigObj()
-    defaultConfig['General'] = {}
-    defaultConfig['General']['launch_browser'] = '0'
-    defaultConfig['General']['version_notify'] = '0'
-    defaultConfig['General']['log_dir']        = 'logs'
-    defaultConfig['General']['web_port']       = '8082'
-    defaultConfig['General']['web_host']       = host
-    defaultConfig['General']['web_username']   = user
-    defaultConfig['General']['web_password']   = pwd
-    if "true" in sabnzbd_launch:
-        defaultConfig['SABnzbd'] = {}
-        defaultConfig['SABnzbd']['sab_username']   = user
-        defaultConfig['SABnzbd']['sab_password']   = pwd
-        defaultConfig['SABnzbd']['sab_apikey']     = sabNzbdApiKey
-        defaultConfig['SABnzbd']['sab_host']       = 'http://' + sabNzbdHost + '/'
-    defaultConfig['XBMC'] = {}
-    defaultConfig['XBMC']['use_xbmc']          = '1'
-    defaultConfig['XBMC']['xbmc_host']         = '127.0.0.1:' + xbmcPort
-    defaultConfig['XBMC']['xbmc_username']     = xbmcUser
-    defaultConfig['XBMC']['xbmc_password']     = xbmcPwd
-
-    if firstLaunch:
-        defaultConfig['General']['metadata_xbmc']         = '1|1|1|1|1|1'
-        defaultConfig['General']['nzb_method']            = 'sabnzbd'
-        defaultConfig['General']['keep_processed_dir']    = '0'
-        defaultConfig['General']['use_banner']            = '1'
-        defaultConfig['General']['rename_episodes']       = '1'
-        defaultConfig['General']['naming_ep_name']        = '0'
-        defaultConfig['General']['naming_use_periods']    = '1'
-        defaultConfig['General']['naming_sep_type']       = '1'
-        defaultConfig['General']['naming_ep_type']        = '1'
-        defaultConfig['General']['root_dirs']             = '0|/storage/tvshows'
-        defaultConfig['SABnzbd']['sab_category']          = 'tv'
-        # workaround: on first launch, sick beard will always add 
-        # 'http://' and trailing '/' on its own
-        defaultConfig['SABnzbd']['sab_host']              = sabNzbdHost
-        defaultConfig['XBMC']['xbmc_notify_ondownload']   = '1'
-        defaultConfig['XBMC']['xbmc_update_library']      = '1'
-        defaultConfig['XBMC']['xbmc_update_full']         = '1'
-
-    sickBeardConfig.merge(defaultConfig)
-    sickBeardConfig.write()
-
-    # launch SickBeard
-    # ----------------
-    if "true" in sickbeard_launch:
-        logging.debug('Launching SickBeard...')
-        subprocess.call(sickBeard,close_fds=True)
-        logging.debug('...done')
-except Exception,e:
-    print 'SickBeard: exception occurred:', e
-    print traceback.format_exc()
-# SickBeard end
-
-# CouchPotatoServer start
-try:
-    # empty password hack
-    if pwd == '':
-        md5pwd = ''
-    else:
-        #convert password to md5
-        md5pwd =  hashlib.md5(str(pwd)).hexdigest()
-
-    # write CouchPotatoServer settings
-    # --------------------------
-    couchPotatoServerConfig = ConfigObj(pCouchPotatoServerSettings,create_empty=True, list_values=False)
-    defaultConfig = ConfigObj()
-    defaultConfig['core'] = {}
-    defaultConfig['core']['username']            = user
-    defaultConfig['core']['password']            = md5pwd
-    defaultConfig['core']['port']                = '8083'
-    defaultConfig['core']['launch_browser']      = '0'
-    defaultConfig['core']['host']                = host
-    defaultConfig['core']['data_dir']            = pAddonHome
-    defaultConfig['core']['permission_folder']   = '0644'
-    defaultConfig['core']['permission_file']     = '0644'
-    defaultConfig['core']['show_wizard']         = '0'
-    defaultConfig['core']['debug']               = '0'
-    defaultConfig['core']['development']         = '0'
-    defaultConfig['updater'] = {}
-    defaultConfig['updater']['enabled']          = '0'
-    defaultConfig['updater']['notification']     = '0'
-    defaultConfig['updater']['automatic']        = '0'
-    if "true" in sabnzbd_launch:
-        defaultConfig['Sabnzbd'] = {}
-        defaultConfig['Sabnzbd']['username']     = user
-        defaultConfig['Sabnzbd']['password']     = pwd
-        defaultConfig['Sabnzbd']['api_key']      = sabNzbdApiKey
-        defaultConfig['Sabnzbd']['host']         = sabNzbdHost
-    defaultConfig['xbmc'] = {}
-    defaultConfig['xbmc']['enabled']         = '1'
-    defaultConfig['xbmc']['host']            = '127.0.0.1:' + xbmcPort
-    defaultConfig['xbmc']['username']        = xbmcUser
-    defaultConfig['xbmc']['password']        = xbmcPwd
-
-    if 'true' in transauth:
-        defaultConfig['transmission'] = {}
-        defaultConfig['transmission']['username']         = transuser
-        defaultConfig['transmission']['password']         = transpwd
-        defaultConfig['transmission']['directory']        = pSabNzbdCompleteMov
-        defaultConfig['transmission']['host']             = 'localhost:9091'
-
-    if firstLaunch:
-        defaultConfig['xbmc']['xbmc_update_library']      = '1'
-        defaultConfig['xbmc']['xbmc_update_full']         = '1'
-        defaultConfig['xbmc']['xbmc_notify_onsnatch']     = '1'
-        defaultConfig['xbmc']['xbmc_notify_ondownload']   = '1'
-        defaultConfig['Sabnzbd']['category']     = 'movies'
-        defaultConfig['Sabnzbd']['pp_directory'] = pSabNzbdCompleteMov
-        defaultConfig['Renamer'] = {}
-        defaultConfig['Renamer']['enabled']      = '1'
-        defaultConfig['Renamer']['download']     = pSabNzbdCompleteMov
-        defaultConfig['Renamer']['destination']  = '/storage/videos'
-        defaultConfig['Renamer']['separator']    = '.'
-        defaultConfig['Renamer']['cleanup']      = '0'
-
-    couchPotatoServerConfig.merge(defaultConfig)
-    couchPotatoServerConfig.write()
-
-    # launch CouchPotatoServer
-    # ------------------
-    if "true" in couchpotato_launch:
-        logging.debug('Launching CouchPotatoServer...')
-        subprocess.call(couchPotatoServer,close_fds=True)
-        logging.debug('...done')
-except Exception,e:
-    print 'CouchPotatoServer: exception occurred:', e
-    print traceback.format_exc()
-# CouchPotatoServer end
-
-# Headphones start
-try:
-    # write Headphones settings
-    # -------------------------
-    headphonesConfig = ConfigObj(pHeadphonesSettings,create_empty=True)
-    defaultConfig = ConfigObj()
-    defaultConfig['General'] = {}
-    defaultConfig['General']['launch_browser']            = '0'
-    defaultConfig['General']['http_port']                 = '8084'
-    defaultConfig['General']['http_host']                 = host
-    defaultConfig['General']['http_username']             = user
-    defaultConfig['General']['http_password']             = pwd
-    defaultConfig['General']['check_github']              = '0'
-    defaultConfig['General']['check_github_on_startup']   = '0'
-    defaultConfig['General']['log_dir']                   = pAddonHome + '/logs'
-    defaultConfig['General']['folder_permissions']        = '0644'
-    defaultConfig['XBMC'] = {}
-    defaultConfig['XBMC']['xbmc_enabled']                 = '1'
-    defaultConfig['XBMC']['xbmc_host']                    = '127.0.0.1:' + xbmcPort
-    defaultConfig['XBMC']['xbmc_username']                = xbmcUser
-    defaultConfig['XBMC']['xbmc_password']                = xbmcPwd
-    defaultConfig['SABnzbd'] = {}
-
-    if "true" in sabnzbd_launch:
-        defaultConfig['SABnzbd']['sab_apikey']       = sabNzbdApiKey
-        defaultConfig['SABnzbd']['sab_host']         = sabNzbdHost
-        defaultConfig['SABnzbd']['sab_username']     = user
-        defaultConfig['SABnzbd']['sab_password']     = pwd
-
-    if firstLaunch:
-        defaultConfig['SABnzbd']['sab_category']     = 'music'
-        defaultConfig['XBMC']['xbmc_update']         = '1'
-        defaultConfig['XBMC']['xbmc_notify']         = '1'
-        defaultConfig['General']['music_dir']        = '/storage/music'
-        defaultConfig['General']['destination_dir']  = '/storage/music'
-        defaultConfig['General']['download_dir']     = '/storage/downloads/music'
-        defaultConfig['General']['move_files']       = '1'
-        defaultConfig['General']['rename_files']     = '1'
-
-    headphonesConfig.merge(defaultConfig)
-    headphonesConfig.write()
-
-    # launch Headphones
-    # -----------------
-    if "true" in headphones_launch:
-        logging.debug('Launching Headphones...')
-        subprocess.call(headphones,close_fds=True)
-        logging.debug('...done')
-except Exception,e:
-    print 'Headphones: exception occurred:', e
-    print traceback.format_exc()
-# Headphones end

packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.stop

@@ -1,2 +0,0 @@
-#!/bin/sh
-kill `ps | grep -E 'python.*service.downloadmanager.SABnzbd-Suite' | awk '{print $1}'` 2>/dev/null

packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py

@@ -1,139 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-import os
-import sys
-import xbmcaddon
-import time
-import subprocess
-import xbmc
-import urllib2
-import socket
-import time
-import datetime
-
-__scriptname__ = "SABnzbd Suite"
-__author__     = "OpenELEC"
-__url__        = "http://www.openelec.tv"
-__settings__   = xbmcaddon.Addon(id='service.downloadmanager.SABnzbd-Suite')
-__cwd__        = __settings__.getAddonInfo('path')
-__start__      = xbmc.translatePath( os.path.join( __cwd__, 'bin', "SABnzbd-Suite.py") )
-__stop__       = xbmc.translatePath( os.path.join( __cwd__, 'bin', "SABnzbd-Suite.stop") )
-
-#make binary files executable in adson bin folder
-subprocess.Popen("chmod -R +x " + __cwd__ + "/bin/*" , shell=True, close_fds=True)
-
-checkInterval  = 240
-timeout        = 20
-wake_times     = ['01:00','03:00','05:00','07:00','09:00','11:00','13:00','15:00','17:00','19:00','21:00','23:00']
-idleTimer      = 0
-
-# Launch Suite
-subprocess.call(['python',__start__])
-
-# check for launching sabnzbd
-sabNzbdLaunch = (__settings__.getSetting('SABNZBD_LAUNCH').lower() == 'true')
-
-sys.path.append(os.path.join(__cwd__, 'pylib'))
-from configobj import ConfigObj
-
-if sabNzbdLaunch:
-    # SABnzbd addresses and api key
-    sabNzbdAddress    = '127.0.0.1:8081'
-    sabNzbdConfigFile = '/storage/.xbmc/userdata/addon_data/service.downloadmanager.SABnzbd-Suite/sabnzbd.ini'
-    sabConfiguration  = ConfigObj(sabNzbdConfigFile)
-    sabNzbdApiKey     = sabConfiguration['misc']['api_key']
-    sabNzbdUser       = sabConfiguration['misc']['username']
-    sabNzbdPass       = sabConfiguration['misc']['password']
-    sabNzbdQueue      = 'http://' + sabNzbdAddress + '/api?mode=queue&output=xml&apikey=' + sabNzbdApiKey + '&ma_username=' + sabNzbdUser + '&ma_password=' + sabNzbdPass
-    sabNzbdHistory    = 'http://' + sabNzbdAddress + '/api?mode=history&output=xml&apikey=' + sabNzbdApiKey + '&ma_username=' + sabNzbdUser + '&ma_password=' + sabNzbdPass
-    sabNzbdQueueKeywords = ['<status>Downloading</status>', '<status>Fetching</status>', '<priority>Force</priority>']
-    sabNzbdHistoryKeywords = ['<status>Repairing</status>', '<status>Verifying</status>', '<status>Extracting</status>']
-
-    # start checking SABnzbd for activity and prevent sleeping if necessary
-    socket.setdefaulttimeout(timeout)
-
-    # perform some initial checks and log essential settings
-    shouldKeepAwake = (__settings__.getSetting('SABNZBD_KEEP_AWAKE').lower() == 'true')
-    wakePeriodically = (__settings__.getSetting('SABNZBD_PERIODIC_WAKE').lower() == 'true')
-    wakeHourIdx = int(__settings__.getSetting('SABNZBD_WAKE_AT'))
-    if shouldKeepAwake:
-        xbmc.log('SABnzbd-Suite: will prevent idle sleep/shutdown while downloading')
-    if wakePeriodically:
-        xbmc.log('SABnzbd-Suite: will try to wake system daily at ' + wake_times[wakeHourIdx])
-
-
-while (not xbmc.abortRequested):
-
-    if sabNzbdLaunch:
-        # reread setting in case it has changed
-        shouldKeepAwake = (__settings__.getSetting('SABNZBD_KEEP_AWAKE').lower() == 'true')
-        wakePeriodically = (__settings__.getSetting('SABNZBD_PERIODIC_WAKE').lower() == 'true')
-        wakeHourIdx = int(__settings__.getSetting('SABNZBD_WAKE_AT'))
-
-        # check if SABnzbd is downloading
-        if shouldKeepAwake:
-            idleTimer += 1
-            # check SABnzbd every ~60s (240 cycles)
-            if idleTimer == checkInterval:
-                sabIsActive = False
-                idleTimer = 0
-                req = urllib2.Request(sabNzbdQueue)
-                try: handle = urllib2.urlopen(req)
-                except IOError, e:
-                    xbmc.log('SABnzbd-Suite: could not determine SABnzbds queue status', level=xbmc.LOGERROR)
-                else:
-                    queue = handle.read()
-                    handle.close()
-                    if any(x in queue for x in sabNzbdQueueKeywords):
-                        sabIsActive = True
-
-                req = urllib2.Request(sabNzbdHistory)
-                try: handle = urllib2.urlopen(req)
-                except IOError, e:
-                    xbmc.log('SABnzbd-Suite: could not determine SABnzbds history status', level=xbmc.LOGERROR)
-                else:
-                    history = handle.read()
-                    handle.close()
-                    if any(x in history for x in sabNzbdHistoryKeywords):
-                        sabIsActive = True
-
-                # reset idle timer if queue is downloading/reparing/verifying/extracting
-                if sabIsActive:
-                    xbmc.executebuiltin('InhibitIdleShutdown(true)')
-                else:
-                    xbmc.executebuiltin('InhibitIdleShutdown(false)')
-
-        # calculate and set the time to wake up at (if any)
-        if wakePeriodically:
-            wakeHour = wakeHourIdx * 2 + 1
-            timeOfDay = datetime.time(hour=wakeHour)
-            now = datetime.datetime.now()
-            wakeTime = now.combine(now.date(),timeOfDay)
-            if now.time() > timeOfDay:
-                wakeTime += datetime.timedelta(days=1)
-            secondsSinceEpoch = time.mktime(wakeTime.timetuple())
-            open("/sys/class/rtc/rtc0/wakealarm", "w").write("0")
-            open("/sys/class/rtc/rtc0/wakealarm", "w").write(str(secondsSinceEpoch))
-
-    time.sleep(0.250)
-
-subprocess.Popen(__stop__, shell=True, close_fds=True)
-

packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/Dutch/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings>
-
-	<!-- SABnzbd-Suite -->
-	<string id="1000">SABnzbd-Suite</string>
-	<string id="1010">Gebruikers instellingen</string>
-	<string id="1022">Gebruikersnaam</string>
-	<string id="1023">Wachtwoord</string>
-	<string id="2010">Netwerk instellingen</string>
-	<string id="2021">Toegestane IP adressen</string>
-
-</strings>

packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/English/strings.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings>
-
-	<!-- SABnzbd-Suite -->
-	<string id="1000">SABnzbd-Suite</string>
-	<string id="1010">User Settings</string>
-	<string id="1022">Username</string>
-	<string id="1023">Password</string>
-	<string id="1024">Enable SABnzbd</string>
-	<string id="1025">Enable Sickbeard</string>
-	<string id="1026">Enable Couchpotato</string>
-	<string id="1028">Enable Headphones</string>
-	<string id="2010">Network Settings</string>
-	<string id="2021">Allowed IP addresses</string>
-    <string id="3010">Sleep</string>
-    <string id="3021">Keep awake while downloading</string>
-	<string id="3030">Wake up periodically</string>
-	<string id="3031">Wake up at</string>
-	<string id="3032">Restart on suspend / resume</string>
-
-</strings>

packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/French/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings>
-
-	<!-- SABnzbd-Suite -->
-	<string id="1000">SABnzbd-Suite</string>
-	<string id="1010">Préférences utilisateur</string>
-	<string id="1022">Nom d'utilisateur</string>
-	<string id="1023">Mot de passe</string>
-	<string id="2010">Préférences réseau</string>
-	<string id="2021">Adresses IP autorisées</string>
-
-</strings>

packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/German/strings.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings>
-
-	<!-- SABnzbd-Suite -->
-	<string id="1000">SABnzbd-Suite</string>
-	<string id="1010">Benutzer Einstellungen</string>
-	<string id="1022">Benutzername</string>
-	<string id="1023">Passwort</string>
-	<string id="2010">Netzwerk Einstellungen</string>
-	<string id="2021">Erlaubte IP Adressen</string>
-	<string id="3010">Ruhezustand</string>
-    <string id="3021">Verhindere Ruhezustand wenn aktiv</string>
-    <string id="3030">Periodisch aufwachen</string>
-	<string id="3031">Aufwachen um</string>
-
-</strings>

packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/Norwegian/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings>
-
-	<!-- SABnzbd-Suite -->
-	<string id="1000">SABnzbd-Suite</string>
-	<string id="1010">Bruker Instillinger</string>
-	<string id="1022">Brukernavn</string>
-	<string id="1023">Passord</string>
-	<string id="2010">Nettverksinstillinger</string>
-	<string id="2021">Tilatte IP addresser</string>
-
-</strings>

packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/Turkish/strings.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings>
-
-	<!-- SABnzbd-Suite -->
-	<string id="1000">SABnzbd-Suite</string>
-	<string id="1010">Kullanıcı Ayarları</string>
-	<string id="1022">Kullanıcı adı</string>
-	<string id="1023">Parola</string>
-	<string id="1024">SABnzbd'yi Etkinleştir</string>
-	<string id="1025">Sickbeard'ı Etkinleştir</string>
-	<string id="1026">Couchpotato'yu Etkinleştir</string>
-	<string id="1028">Headphones'u Etkinleştir</string>
-	<string id="2010">Ağ Ayarları</string>
-	<string id="2021">İzin verilen IP adresleri</string>
-	<string id="3010">Uyku</string>
-	<string id="3021">İndirilirken uyanık tut</string>
-	<string id="3030">Düzenli olarak uyandır</string>
-	<string id="3031">Uyandırma zamanı</string>
-
-</strings>

packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<settings>
-
-   <!-- SABnzbd-Suite -->
-    <category label="1000">
-		<setting label="1010" type="lsep"/>
-		<setting type="sep" />
-		<setting id="SABNZBD_USER" type="text" label="1022" default="openelec"/>
-		<setting id="SABNZBD_PWD" type="text" label="1023" default="openelec"/>
-		<setting id="SABNZBD_LAUNCH" type="bool" label="1024" default="true" />
-		<setting id="SICKBEARD_LAUNCH" type="bool" label="1025" default="true" />
-		<setting id="COUCHPOTATO_LAUNCH" type="bool" label="1026" default="true" />
-		<setting id="HEADPHONES_LAUNCH" type="bool" label="1028" default="true" />
-
-		<setting label="2010" type="lsep"/>
-		<setting type="sep" />
-		<setting id="SABNZBD_IP" type="text" label="2021" default="0.0.0.0"/>
-        
-		<setting label="3010" type="lsep"/>
-		<setting type="sep" />
-		<setting id="SABNZBD_KEEP_AWAKE" type="bool" label="3021" default="false" enable="eq(-10,true)" />
-		<setting id="SABNZBD_PERIODIC_WAKE" type="bool" label="3030" default="false" enable="eq(-11,true)" />
-		<setting id="SABNZBD_WAKE_AT" type="enum" subsetting="true" enable="eq(-1,true)" 
-		         label="3031" default="01" 
-		         values="|01:00|03:00|05:00|07:00|09:00|11:00|13:00|15:00|17:00|19:00|21:00|23:00"/>
-		<setting id="RESTART_ON_RESUME" type="bool" label="3032" default="false" />
-		
-    </category>
-</settings>

packages/addons/service/downloadmanager/SABnzbd-Suite/source/sleep.d/SABnzbd-Suite.power

@@ -1,51 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. /etc/profile
-
-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.downloadmanager.SABnzbd-Suite"
-ADDON_SETTINGS="$ADDON_HOME/settings.xml"
-RESTART_ON_RESUME=`grep RESTART_ON_RESUME $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
-
-LOCKFILE="/var/lock/SABnzbd-Suite.sleep"
-
-if [ "$RESTART_ON_RESUME" == "true" ] ; then
-  case "$1" in
-    hibernate|suspend)
-      if [ ! -z "`ps | grep -E 'python.*service.downloadmanager.SABnzbd-Suite' | awk '{print $1}'`" ] ; then
-        progress "Shutting down SABnzbd-Suite for suspending..."
-        SABnzbd-Suite.stop
-        touch $LOCKFILE
-      fi
-      ;;
-
-    thaw|resume)
-      progress "Restarting SABnzbd-Suite for wakeup..."
-      if [ -f "$LOCKFILE" ] ; then
-        rm -rf "$LOCKFILE"
-        python $HOME/.xbmc/addons/service.downloadmanager.SABnzbd-Suite/bin/SABnzbd-Suite.py
-      fi
-      ;;
-    *) exit $NA
-      ;;
-  esac
-fi

packages/addons/service/downloadmanager/pyload/addon

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $BUILD/unrar/unrar $ADDON_BUILD/$PKG_ADDON_ID/bin
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib
-  cp -R $BUILD/pycurl*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pyload
-  cp -PR $PKG_BUILD/pyload/* $ADDON_BUILD/$PKG_ADDON_ID/pyload

packages/addons/service/downloadmanager/pyload/changelog.txt

@@ -1,17 +0,0 @@
-3.1.1
-- rebuild for OpenELEC-3.2
-
-3.0.2
-- pycrypto is installed per default now
-
-3.0.1
-- bump addon version
-
-2.1.1
-- update to addon version 2.1
-
-2.0.1
-- update to pyload-0.4.9
-
-0.99.1
-- initial version pyload-0.4.7