Merge branch 'testing'

# By James Meyer (1091) and others
# Via James Meyer (5) and others
* testing: (1148 commits)
  LinHES-config: during install don't kill off lirc.  This keeps the remote active all the way to the finish
  Change version numbers to 8.0  to match the release number. LinHES-conifg LinHES-system mythdb-initial runit-scripts supplemental-web
  LinHES-conifig: mv_install.py  for the last partition don't go all the way to the end.  Gotta leave room for gpt tables.
  xf86-video-ati: xorg ati driver.
  LinHES-config: timezip.py  add syncing up of parental lvl passwords and starting level with MBE.
  LinHES-system: correct the logic for breaking out of the wmctrl loop.   As written it would break out of the inner loop..but not the 60 iteration loop.
  e16_theme_settings:  remove slide-in prop for new windows.   For whatever reason this was preventing mplayer from being positioned correctly for appletrailers.
  LinHES-config, mythinstall:  change  case of hd_pvr and   serial to all lower refs #902
  zilog-firmware:   firmware for TX support of the hdpvr and pvr-150 In general I can't recommend anybody using these transmitters  but including the firmware just in case someone really wants to
  linhes-udev-rules:  added hdprv_lirc rule. All of these lirc rules are limited to exactly one device.  If more then one device is present then only the last device in init will get the symlink
  runit-scripts:  fix logging for igdeamon,   add support to remote init script so that the blaster is always the first device in the chain. added support specificly for hd_pvr
  LinHES-system:   add lh_system_restore and lh_system_backup.  These scripts are called from the mythmenu. refs #900
  iguanair: rebuild with python 2.7
  LinHES-system: msg_daemon.py fix  init and nasty bug related to timeout. In a nutshell timeout wouldn't work unless a msg without a timeout was called first.
  linhes-udev-rules:  add rules for mce,streamzap,serial  lirc devices.
  mythinstall: recompile for matching libs
  mythtv:  latest .25-fixes  and change mythbackup/restore call lh_system_$op   to replace mythbackup/mythrestore.  mythbackup no longer works correctly with the new windowmanager
  linhes-scripts: myth2mp3, myth2x264, myth2xvid: use mythutil to get cutlist
  LinHES-config, supplimental-web:  Fix proxy numbering for Ceton infiniTV
  linhes-system:  add additional stuff to the system backup and also introduced an exclude file. The exclude/include files are locate in /home/mythtv/backup_config/
  ...

14 files changed, 0 insertions, 313 deletions

diff --git a/abs/core/java-sun/PKGBUILD b/abs/core/java-sun/PKGBUILD
deleted file mode 100644
index 24f1aa1..0000000
--- a/abs/core/java-sun/PKGBUILD
+++ /dev/null
@@ -1,140 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Guillaume ALAUX <Guillaume at alaux dot net>
-
-pkgname=('jre' 'jdk')
-pkgbase=java-sun
-pkgver=6u23
-pkgrel=4
-pkgdesc="Sun/Oracle's implementation of tha Java 6 specification"
-arch=('i686' 'x86_64')
-  [ "${CARCH}" = 'i686' ]   && _arch=i586
-  [ "${CARCH}" = 'x86_64' ] && _arch=amd64
-url='http://java.sun.com'
-license=('custom')
-makedepends=('java-runtime')
-source=("http://download.java.net/dlj/binaries/jdk-${pkgver}-dlj-linux-${_arch}.bin"
-        'https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh'
-        'jdk.profile'
-        'java-control-panel.desktop'
-        'java-monitoring-and-management-console.desktop'
-        'java-policy-settings.desktop'
-        'java-visualvm.desktop'
-        'java-web-start.desktop'
-        'jre.profile'
-        'jre.profile.csh'
-        'jdk.profile.csh'
-        'derby-network-server'
-        'derby-network-server.conf')
-
-build() {
-  mkdir unbundle-jdk
-  cd unbundle-jdk
-  sh ../jdk-${pkgver}-dlj-linux-$_arch.bin --accept-license
-  cd ..
-  sh construct.sh unbundle-jdk linux-jdk linux-jre
-}
-
-package_jre() {
-  pkgdesc="Sun/Oracle's Java Runtime Environment"
-  depends=('glibc' 'libxtst')
-  provides=('j2re' 'java-runtime=6')
-  conflicts=('j2re' 'java-runtime')
-  replaces=('j2re')
-  install='jre.install'
-
-  # main files
-  mkdir -p ${pkgdir}/opt/java
-  cp -R linux-jdk/jre ${pkgdir}/opt/java
-
-  # profiles
-  install -D ${srcdir}/jre.profile \
-    ${pkgdir}/etc/profile.d/jre.sh
-  install -D ${srcdir}/jre.profile.csh \
-    ${pkgdir}/etc/profile.d/jre.csh
-
-  mkdir -p ${pkgdir}/usr/lib/mozilla/plugins
-
-  if [ "$CARCH" = "i686" ]; then
-    ln -s /opt/java/jre/lib/i386/libnpjp2.so ${pkgdir}/usr/lib/mozilla/plugins
-  else ln -s /opt/java/jre/lib/amd64/libnpjp2.so ${pkgdir}/usr/lib/mozilla/plugins
-  fi
-
-  # licenses
-  install -d ${pkgdir}/usr/share/licenses/jre
-  install -m644 ${pkgdir}/opt/java/jre/COPYRIGHT \
-    ${pkgdir}/usr/share/licenses/jre
-  install -m644 ${pkgdir}/opt/java/jre/LICENSE \
-    ${pkgdir}/usr/share/licenses/jre
-  install -m644 ${pkgdir}/opt/java/jre/THIRDPARTYLICENSEREADME.txt \
-    ${pkgdir}/usr/share/licenses/jre
-
-  # Fix system prefs folder (FS#18872)
-  install -d ${pkgdir}/etc/.java/.systemPrefs
-}
-
-package_jdk() {
-  pkgdesc="Sun/Oracle's Java Development Kit"
-  depends=('glibc' 'jre')
-  provides=('java-environment=6' 'j2sdk')
-  conflicts=('java-environment' 'j2sdk')
-  replaces=('j2sdk')
-  install='jdk.install'
-
-  #copy icon
-  install -D -m644 ${srcdir}/linux-jdk/jre/lib/desktop/icons/hicolor/48x48/apps/sun-java.png \
-    ${pkgdir}/usr/share/pixmaps/java.png
-
-  # main files
-  rm -rf linux-jdk/jre
-  install -d ${pkgdir}/opt
-  mv linux-jdk ${pkgdir}/opt/java
-
-  # profiles
-  install -D ${srcdir}/jdk.profile \
-    ${pkgdir}/etc/profile.d/jdk.sh
-  install -D ${srcdir}/jdk.profile.csh \
-    ${pkgdir}/etc/profile.d/jdk.csh
-
-  # licenses
-  install -d ${pkgdir}/usr/share/licenses/jdk
-  install -m644 ${pkgdir}/opt/java/COPYRIGHT \
-    ${pkgdir}/usr/share/licenses/jdk
-  install -m644 ${pkgdir}/opt/java/LICENSE \
-    ${pkgdir}/usr/share/licenses/jdk
-  install -m644 ${pkgdir}/opt/java/THIRDPARTYLICENSEREADME.txt \
-    ${pkgdir}/usr/share/licenses/jdk
-
-  # desktop entries
-  install -Dm644 ${srcdir}/java-control-panel.desktop \
-    ${pkgdir}/usr/share/applications/java-control-panel.desktop
-  install -Dm644 ${srcdir}/java-monitoring-and-management-console.desktop \
-    ${pkgdir}/usr/share/applications/java-monitoring-and-management-console.desktop
-  install -Dm644 ${srcdir}/java-policy-settings.desktop \
-    ${pkgdir}/usr/share/applications/java-policy-settings.desktop
-  install -Dm644 ${srcdir}/java-visualvm.desktop \
-    ${pkgdir}/usr/share/applications/java-visualvm.desktop
-  install -Dm644 ${srcdir}/java-web-start.desktop \
-    ${pkgdir}/usr/share/applications/java-web-start.desktop
-
-  # javadb (apache derby) daemon files
-  install -D ${srcdir}/derby-network-server \
-    ${pkgdir}/etc/rc.d/derby-network-server
-  install -D -m644 ${srcdir}/derby-network-server.conf \
-    ${pkgdir}/etc/conf.d/derby-network-server
-}
-md5sums=('cd02f6e8f46fb4171811150cb820c6ed'
-         '94065b612df0046d9ae758943f9f6a75'
-         'b83ab5742651b4234b7d2e20785c6693'
-         'e4d814c0f310d77ed6990c731bccd0fb'
-         '4bc2b0be93f76ed07b471e3c89eb5a8a'
-         '8e3cec7ab641ec449cabd068be583f5c'
-         '9ba148ebabce8ed3351b813a9a66b6e5'
-         '568451cf45fc8c7adb83a222a61ca2c6'
-         '50b4f5ac4129097461d246645d73a622'
-         '3d3fe0a598a53df1d6bec6b416e3b9d0'
-         '6f4cbf332816d2c4e9578ecd1d0dce7f'
-         'a279e195e249000646895d93e199860d'
-         '4bdff6982c66d24a879c424aaac3d04d')
diff --git a/abs/core/java-sun/derby-network-server b/abs/core/java-sun/derby-network-server
deleted file mode 100644
index f2b36ea..0000000
--- a/abs/core/java-sun/derby-network-server
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/profile.d/jdk.sh
-. $DERBY_HOME/bin/derby_common.sh
-
-DAEMON_NAME="derby-network-server"
-DAEMON_CONF="/etc/conf.d/$DAEMON_NAME"
-DAEMON_PID="/var/run/$DAEMON_NAME.pid"
-
-[ -f $DAEMON_CONF ] && . $DAEMON_CONF
-
-DERBY_START_CMD="$JAVACMD $DERBY_OPTS -classpath \"$LOCALCLASSPATH\" org.apache.derby.drda.NetworkServerControl start"
-DERBY_STOP_CMD="$JAVACMD $DERBY_OPTS -classpath \"$LOCALCLASSPATH\" org.apache.derby.drda.NetworkServerControl shutdown"
-
-case "$1" in
-  start)
-    stat_busy "Starting Derby Network Server"
-
-    if ck_daemon $DAEMON_NAME; then
-        $DERBY_START_CMD > /dev/null &
-
-        PID=`ps ax | grep -v grep | grep derby | grep org.apache.derby.drda.NetworkServerControl | awk '{print $1}'`
-        
-        if [ -z "$PID" ]; then
-            stat_fail
-        else
-            echo $PID > $DAEMON_PID
-            add_daemon $DAEMON_NAME
-            sleep 2
-            stat_done
-        fi    
-    else
-        stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Derby Network Server"
-
-    if ck_daemon $DAEMON_NAME; then
-        stat_fail
-    else
-        $DERBY_STOP_CMD > /dev/null &
-
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm -f $DAEMON_PID
-            rm_daemon $DAEMON_NAME
-            stat_done
-        fi
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 5
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
diff --git a/abs/core/java-sun/derby-network-server.conf b/abs/core/java-sun/derby-network-server.conf
deleted file mode 100644
index ef74782..0000000
--- a/abs/core/java-sun/derby-network-server.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-DERBY_OPTS="-Dderby.stream.error.file=/var/log/derby.log"
-
diff --git a/abs/core/java-sun/java-control-panel.desktop b/abs/core/java-sun/java-control-panel.desktop
deleted file mode 100644
index 476e04a..0000000
--- a/abs/core/java-sun/java-control-panel.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Exec=/opt/java/bin/jcontrol
-GenericName[cs]=Nastavení prostředí Java
-GenericName=Java Environment Settings
-Icon=java
-Name[cs]=Nastavení Javy
-Name=Java Control Panel
-Path=
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Settings;Java;
diff --git a/abs/core/java-sun/java-monitoring-and-management-console.desktop b/abs/core/java-sun/java-monitoring-and-management-console.desktop
deleted file mode 100644
index c0e1e59..0000000
--- a/abs/core/java-sun/java-monitoring-and-management-console.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Exec=/opt/java/bin/jconsole
-Icon=java
-Name[cs]=Konzole monitorování a správy prostředí Java
-Name=Java Monitoring and Management Console
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Development;Java;
diff --git a/abs/core/java-sun/java-policy-settings.desktop b/abs/core/java-sun/java-policy-settings.desktop
deleted file mode 100644
index 1009301..0000000
--- a/abs/core/java-sun/java-policy-settings.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Exec=/opt/java/bin/policytool
-Icon=java
-Name[cs]=Nastavení politiky Java aplikací
-Name=Java Policy Settings
-Path=
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Settings;Java;
diff --git a/abs/core/java-sun/java-visualvm.desktop b/abs/core/java-sun/java-visualvm.desktop
deleted file mode 100644
index 8aa9527..0000000
--- a/abs/core/java-sun/java-visualvm.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Exec=/opt/java/bin/jvisualvm
-GenericName[cs]=Nástroj pro monitorování a sledování výkonu Java aplikací
-GenericName=Java Monitoring and Performance Monitoring Tool
-Icon=java
-Name=Java VisualVM
-Path=
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Development;Java;
diff --git a/abs/core/java-sun/java-web-start.desktop b/abs/core/java-sun/java-web-start.desktop
deleted file mode 100644
index 573ddc0..0000000
--- a/abs/core/java-sun/java-web-start.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Exec=/opt/java/bin/javaws -viewer
-GenericName[cs]=Spravovat a spouštět aplikace Java Web Start
-GenericName=Manage and run Java Web Start Applications
-Icon=java
-MimeType=application/x-java-jnlp-file;
-Name[cs]=Java Web Start
-Name=Java Web Start
-Path=
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Network;Java;
diff --git a/abs/core/java-sun/jdk.install b/abs/core/java-sun/jdk.install
deleted file mode 100644
index 1f1e483..0000000
--- a/abs/core/java-sun/jdk.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_upgrade() {
-	post_install $1
-}
-
-post_install() {
-   echo "The jdk package is licensed software."
-	echo "You MUST read and agree to the license stored in"
-	echo "/opt/java/LICENSE before using it."
-
-  echo 'Please relogin to include jdk in your PATH'
-}
-
diff --git a/abs/core/java-sun/jdk.profile b/abs/core/java-sun/jdk.profile
deleted file mode 100644
index f9d5deb..0000000
--- a/abs/core/java-sun/jdk.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-export J2SDKDIR=/opt/java
-export PATH=$PATH:/opt/java/bin:/opt/java/db/bin
-export JAVA_HOME=/opt/java
-export DERBY_HOME=/opt/java/db
diff --git a/abs/core/java-sun/jdk.profile.csh b/abs/core/java-sun/jdk.profile.csh
deleted file mode 100644
index 3626e72..0000000
--- a/abs/core/java-sun/jdk.profile.csh
+++ /dev/null
@@ -1,4 +0,0 @@
-setenv J2SDKDIR /opt/java
-setenv PATH ${PATH}:/opt/java/bin:/opt/java/db/bin
-setenv JAVA_HOME /opt/java
-setenv DERBY_HOME /opt/java/db
diff --git a/abs/core/java-sun/jre.install b/abs/core/java-sun/jre.install
deleted file mode 100644
index 7dfc547..0000000
--- a/abs/core/java-sun/jre.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_upgrade() {
-	post_install $1
-}
-
-post_install() {
-   echo "The jre package is licensed software."
-	echo "You MUST read and agree to the license stored in"
-	echo "/opt/java/jre/LICENSE before using it."
-	if [ -f /etc/mailcap ] ; then
-		sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap
-	fi
-	echo 'application/x-java-jnlp-file;/opt/java/jre/bin/javaws %s' >>/etc/mailcap
-
-  echo 'Please relogin to include jre in your PATH.'
-}
-
-post_remove() {
-	mailcap=$(grep -v 'application/x-java-jnlp-file' /etc/mailcap)
-	if [ "$mailcap" != "" ] ; then
-		sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap
-	else
-		rm /etc/mailcap
-	fi
-}
diff --git a/abs/core/java-sun/jre.profile b/abs/core/java-sun/jre.profile
deleted file mode 100644
index af3e373..0000000
--- a/abs/core/java-sun/jre.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-export PATH=$PATH:/opt/java/jre/bin
-if [ ! -f /etc/profile.d/jdk.sh ]; then
-        export JAVA_HOME=/opt/java/jre
-fi
diff --git a/abs/core/java-sun/jre.profile.csh b/abs/core/java-sun/jre.profile.csh
deleted file mode 100644
index 8f58896..0000000
--- a/abs/core/java-sun/jre.profile.csh
+++ /dev/null
@@ -1,4 +0,0 @@
-setenv PATH ${PATH}:/opt/java/jre/bin
-if (! -e /etc/profile.d/jdk.sh ) then
-  setenv JAVA_HOME /opt/java/jre
-endif