Merge remote-tracking branch 'origin/testing' into testing

# By Cecil (6) and Britney Fransen (2)
# Via Britney Fransen (1) and Cecil (1)
* origin/testing:
  LinHES-system: myth_status.py: fix conflicted recordings
  mythtv: bump to latest fixes to get python bindings fix
  pyxis:Initial inclusion. Needed for pyxis to close #63/4).
  python-distribute:Needed for python-beautifulsoup (to close #63/4).
  python-beautifulsoup4:Needed for pyxis (to close #63/4).
  python-libconcord:Moved to core with rest of python modules.
  gdb:Recompile against Python 2.6. Closes 850.
  mythappletrailers:Closes 849. Adds Play All, Shuffle and Play Random trailer to the menu.

Conflicts were set to 64 bit versions, except for appletrailers

Conflicts:
	abs/core/LinHES-system/PKGBUILD
	abs/core/gdb/PKGBUILD
	abs/core/gdb/__changelog
	abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
	abs/core/python_modules/python-distribute/PKGBUILD
	abs/core/python_modules/python-distribute/__changelog
	abs/extra/mythappletrailers/PKGBUILD

3 files changed, 119 insertions, 0 deletions

diff --git a/abs/extra/pyxis/PKGBUILD b/abs/extra/pyxis/PKGBUILD
new file mode 100644
index 0000000..436db6e
--- /dev/null
+++ b/abs/extra/pyxis/PKGBUILD
@@ -0,0 +1,27 @@
+# Contributor: Corey Ling <kasuko@gmail.com>
+
+pkgname=pyxis
+pkgver=0.2.3
+pkgrel=2
+pkgdesc="SIRIUS/XM Internet Radio Player for Command Line"
+url="http://www.ionshard.com/pyxis"
+arch=(i686 x86_64)
+license=('GPL')
+depends=('python2-beautifulsoup4' 'mplayer' 'python2')
+makedepends=('python2' 'setuptools')
+optdepends=('python-notify: for OSD notifications')
+conflicts=()
+replaces=()
+backup=()
+options=(!emptydirs)
+install=
+source=( "https://github.com/Kasuko/pyxis/tarball/v$pkgver" "python2.patch" )
+
+build() {
+	cd $srcdir/Kasuko-pyxis*
+	patch -p0 < ../../python2.patch
+	python2 setup.py install --root=$pkgdir
+}
+
+md5sums=('b2f42dc7bb5e2a0a6c0ef0ff6f327790'
+         '3096a832aac9e155cd21e2d108168516')
diff --git a/abs/extra/pyxis/__changelog b/abs/extra/pyxis/__changelog
new file mode 100644
index 0000000..2410a63
--- /dev/null
+++ b/abs/extra/pyxis/__changelog
@@ -0,0 +1,2 @@
+9/3/12 chw
+Changed dep from python-beautiful to python2-beautifulsoup4.
diff --git a/abs/extra/pyxis/python2.patch b/abs/extra/pyxis/python2.patch
new file mode 100644
index 0000000..e53cf99
--- /dev/null
+++ b/abs/extra/pyxis/python2.patch
@@ -0,0 +1,90 @@
+diff --git bin/pyxis bin/pyxis
+index 9b447fb..0350278 100755
+--- bin/pyxis
++++ bin/pyxis
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ #Pyxis and Original Sipie: Sirius Command Line Player
+ #Copyright (C) Corey Ling, Eli Criffield
+ #
+diff --git pyxis/Config.py pyxis/Config.py
+index d4d6d29..a36778e 100644
+--- pyxis/Config.py
++++ pyxis/Config.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #Pyxis and Original Sipie: Sirius Command Line Player
+ #Copyright (C) Corey Ling, Eli Criffield
+ #
+diff --git pyxis/Debug.py pyxis/Debug.py
+index d4af851..bf1bd6e 100644
+--- pyxis/Debug.py
++++ pyxis/Debug.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #Pyxis
+ #Copyright (C) Corey Ling
+ #
+diff --git pyxis/Exceptions.py pyxis/Exceptions.py
+index a1b5f8d..0270a02 100644
+--- pyxis/Exceptions.py
++++ pyxis/Exceptions.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #Pyxis and Original Sipie: Sirius Command Line Player
+ #Copyright (C) Corey Ling, Eli Criffield
+ #
+diff --git pyxis/Interface.py pyxis/Interface.py
+index 3c60a7c..1b0c05c 100644
+--- pyxis/Interface.py
++++ pyxis/Interface.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #Pyxis and Original Sipie: Sirius Command Line Player
+ #Copyright (C) Corey Ling, Eli Criffield
+ #
+diff --git pyxis/Player.py pyxis/Player.py
+index 8e945ba..c467acd 100644
+--- pyxis/Player.py
++++ pyxis/Player.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #Pyxis and Original Sipie: Sirius Command Line Player
+ #Copyright (C) Corey Ling, Eli Criffield
+ #
+diff --git pyxis/ProviderCanada.py pyxis/ProviderCanada.py
+index 4d84952..9ff2aa6 100644
+--- pyxis/ProviderCanada.py
++++ pyxis/ProviderCanada.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #Pyxis and Original Sipie: Sirius Command Line Player
+ #Copyright (C) Corey Ling, Eli Criffield
+ #
+diff --git pyxis/ProviderUSA.py pyxis/ProviderUSA.py
+index 7c30eaf..b1fb950 100644
+--- pyxis/ProviderUSA.py
++++ pyxis/ProviderUSA.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #Pyxis and Original Sipie: Sirius Command Line Player
+ #Copyright (C) Corey Ling, Eli Criffield
+ #
+diff --git pyxis/Sirius.py pyxis/Sirius.py
+index 30a25d6..75f1fb6 100644
+--- pyxis/Sirius.py
++++ pyxis/Sirius.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #Pyxis and Original Sipie: Sirius Command Line Player
+ #Copyright (C) Corey Ling, Eli Criffield
+ #