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/
  ...

3 files changed, 9 insertions, 112 deletions

diff --git a/abs/core/xorg-server-utils/LICENSE.iceauth b/abs/core/xorg-server-utils/LICENSE.iceauth
deleted file mode 100644
index 06941b3..0000000
--- a/abs/core/xorg-server-utils/LICENSE.iceauth
+++ /dev/null
@@ -1,25 +0,0 @@
-  Copyright 1989, 1998  The Open Group
-  
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation.
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  
-  Except as contained in this notice, the name of The Open Group shall not be
-  used in advertising or otherwise to promote the sale, use or other dealings
-  in this Software without prior written authorization from The Open Group.
-   * *
-   * Original Author of "xauth" : Jim Fulton, MIT X Consortium
-   * Modified into "iceauth"    : Ralph Mor, X Consortium
-   */
diff --git a/abs/core/xorg-server-utils/LICENSE.xcmsdb b/abs/core/xorg-server-utils/LICENSE.xcmsdb
deleted file mode 100644
index 132ace6..0000000
--- a/abs/core/xorg-server-utils/LICENSE.xcmsdb
+++ /dev/null
@@ -1,18 +0,0 @@
-   (c) Copyright 1990 Tektronix Inc.
-   	All Rights Reserved
-   
-   Permission to use, copy, modify, and distribute this software and its
-   documentation for any purpose and without fee is hereby granted,
-   provided that the above copyright notice appear in all copies and that
-   both that copyright notice and this permission notice appear in
-   supporting documentation, and that the name of Tektronix not be used
-   in advertising or publicity pertaining to distribution of the software
-   without specific, written prior permission.
-   
-   Tektronix disclaims all warranties with regard to this software, including
-   all implied warranties of merchantability and fitness, in no event shall
-   Tektronix be liable for any special, indirect or consequential damages or
-   any damages whatsoever resulting from loss of use, data or profits,
-   whether in an action of contract, negligence or other tortious action,
-   arising out of or in connection with the use or performance of this
-   software.
diff --git a/abs/core/xorg-server-utils/PKGBUILD b/abs/core/xorg-server-utils/PKGBUILD
index 0bae947..1c77a49 100644
--- a/abs/core/xorg-server-utils/PKGBUILD
+++ b/abs/core/xorg-server-utils/PKGBUILD
@@ -1,73 +1,13 @@
-# $Id: PKGBUILD 88717 2010-08-24 14:40:21Z jgc $
+# $Id: PKGBUILD 150987 2012-02-24 12:44:03Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-server-utils
-pkgver=7.5
-pkgrel=7
-pkgdesc="X.Org utilities required by xorg-server"
-arch=('i686' 'x86_64')
+pkgver=7.6
+pkgrel=3
+pkgdesc="Transition package depending on xorg server utilities"
+arch=('any')
 url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('libxfontcache>=1.0.5' 'libxi>=1.3' 'libxaw>=1.0.6' 'libxrandr>=1.3.0' 'libxxf86vm>=1.1.0' 'mcpp>=2.7.2')
-makedepends=('pkgconfig' 'xbitmaps' 'bigreqsproto' 'xtrans')
-groups=('xorg')
-source=(${url}/releases/individual/app/iceauth-1.0.3.tar.bz2
-        ${url}/releases/individual/app/rgb-1.0.3.tar.bz2
-        ${url}/releases/individual/app/sessreg-1.0.6.tar.bz2
-        ${url}/releases/individual/app/xcmsdb-1.0.2.tar.bz2
-        ${url}/releases/individual/app/xbacklight-1.1.1.tar.bz2
-        ${url}/releases/individual/app/xgamma-1.0.3.tar.bz2
-        ${url}/releases/individual/app/xhost-1.0.3.tar.bz2
-        ${url}/releases/individual/app/xinput-1.5.2.tar.bz2
-        ${url}/releases/individual/app/xmodmap-1.0.4.tar.bz2
-        ${url}/releases/individual/app/xrandr-1.3.3.tar.bz2
-        ${url}/releases/individual/app/xrdb-1.0.6.tar.bz2
-        ${url}/releases/individual/app/xrefresh-1.0.3.tar.bz2
-        ${url}/releases/individual/app/xset-1.2.0.tar.bz2
-        ${url}/releases/individual/app/xsetmode-1.0.0.tar.bz2
-        ${url}/releases/individual/app/xsetroot-1.0.3.tar.bz2
-        ${url}/releases/individual/app/xvidtune-1.0.2.tar.bz2
-        LICENSE.iceauth
-        LICENSE.xcmsdb)
-md5sums=('975ade3f238c1eb10705da0a91e6e8e7'
-         '44ea16cc3104de6401bc74035f642357'
-         '8c8fcda19f4cffe573d43ec9b8255f8e'
-         '7f2bed9f4dd3301d18d83eb296c3be0d'
-         '3e39eec6d0fd5c587ca6d55aa7bb8fe1'
-         'e8a88bf1a18f35b724619849dca97f4f'
-         'c7f91b4a750d297f269c2a0a3206a1b2'
-         '8cec6023f90180cb8e4be31d98c43fda'
-         'bbe021f812e0014a8ee3692317788119'
-         '5b2dcfb0d9b736afaf78f6ce7651259c'
-         '8dd881cd5a7dcb6e456549817f0fb475'
-         '8f4fafcfb77b3c6972cc44bb3f1c899c'
-         '88ff2d390695366fa53e5d746fe86ad5'
-         'd074e79d380b031d2f60e4cd56538c93'
-         'cbda9b9b8da5af4614110883d5a276b8'
-         'e40eeb4454f2a7cdde3a14f5dfd3aadd'
-         '65695dc24c24958190724a23655ffda7'
-         'b6235416dca2205f0ba83c0c4b3ddeb8')
-
-build() {
-  cd "${srcdir}"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  for i in *; do
-    if [ -d "${i}" ]; then
-      pushd "${i}"
-      case "${i}" in
-        xrdb*)
-          ./configure --prefix=/usr --mandir=/usr/share/man --with-cpp=/usr/bin/mcpp
-          ;;
-        *)
-          ./configure --prefix=/usr --mandir=/usr/share/man
-          ;;
-      esac
-      make
-      make DESTDIR="${pkgdir}" install
-      install -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE.${i%-*}
-      popd
-    fi
-  done
-# Replacing stub license files
-  install -m644 "${srcdir}"/LICENSE.* "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
+license=('GPL')
+depends=('xorg-iceauth' 'xorg-sessreg' 'xorg-xcmsdb' 'xorg-xbacklight' 'xorg-xgamma' 'xorg-xhost' 'xorg-xinput' 'xorg-xmodmap' 'xorg-xrandr' 'xorg-xrdb' 'xorg-xrefresh' 'xorg-xset' 'xorg-xsetroot')
+#removed: rgb, xsetmode, xvidtune
+md5sums=()