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

# By Britney Fransen (10) and others
# Via Britney Fransen
* origin/testing:
  mythdb-initial: add MiscStatusScript value to initial db. refs #845.
  LinHES-system: remove dup .install
  keylaunch: update .keylaunchrc to run mythtv-setup as user
  rsyslog: increase log retention to 2 weeks
  runit-scripts: enable cron logging to syslog
  premake:initial inclusion. closes #801
  libaacs-git:initial inclusion. closes #801
  aacskeys:initial inclusion. closes #801
  LinHES-system: Add scripts for misc status in MythWeb. closes #845.
  linhes-scripts: tweak myth2mkv. Update version to 0.25-004
  dvb-firmware: add xc5000c firmware. change xc5000 modprobe options. closes #844
  v4l-dvb: update to snapshot from 20120828. refs #844
  LinHES-system: update myth_status.py to work with tuners in error. closes #843
  curlftpfs: Initial Inclusion.
  linhes-scripts: minor changes to myth2mkv
  mythtv:Bumped to latest fixes. Added ./configure items to close #842.
  LinHES-config:7.4 rdt 9th anniversary release.

Conflicts:
	abs/core/LinHES-config/LinHES-release
	abs/core/LinHES-config/PKGBUILD
	abs/core/LinHES-system/PKGBUILD
	abs/core/keylaunch/PKGBUILD
	abs/core/linhes-scripts/PKGBUILD
	abs/core/mythdb-initial/PKGBUILD
	abs/core/mythdb-initial/mc.sql
	abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
	abs/core/runit-scripts/PKGBUILD

1 files changed, 51 insertions, 0 deletions

diff --git a/abs/extra/aacskeys/PKGBUILD b/abs/extra/aacskeys/PKGBUILD
new file mode 100644
index 0000000..977aef5
--- /dev/null
+++ b/abs/extra/aacskeys/PKGBUILD
@@ -0,0 +1,51 @@
+# Submitter: Paul Burton <paulburton89@gmail.com>
+# Maintainer: Zebulon <zeb@zebulon.org.uk>
+pkgname=aacskeys
+pkgver="0.4.0e"
+pkgrel=2
+pkgdesc="A library and program to retrieve decryption keys for HD discs"
+arch=('i686' 'x86_64')
+url="http://forum.doom9.org/showthread.php?t=123311"
+license=('custom')
+depends=('openssl')
+makedepends=('java-environment' 'premake')
+source=(http://debian-multimedia.org/pool/main/a/aacskeys/${pkgname}_0.4.0e.orig.tar.gz
+	http://deb-multimedia.org/pool/main/a/aacskeys/aacskeys_0.4.0e-dmo2.diff.gz)
+sha1sums=('8790f0d4098d6bc83304ad2136cc9681374df83a'
+	  '325504f38a5ac1e9f7be740a602faa2c8d4b812c')
+
+build() {
+
+  cd "${srcdir}/$pkgname-$pkgver"
+  patch -Np1 -i ../${pkgname}_$pkgver-dmo2.diff
+
+  # Paranoia: remove binaries, make sure they aren't used
+   rm -rf bin lib
+
+  # If java-environement is installed for the first time
+  # we need to source profile to set JAVA_HOME
+  # source /etc/profile
+
+  sed -i 's|/usr/local/ssl/include|/usr/include|' premake.lua
+  sed -i 's|/usr/local/ssl/lib|/usr/lib|' premake.lua
+  sed -i "s|/usr/lib/jvm/java-6-sun/include|$JAVA_HOME/include|" premake.lua
+  
+  make || return 1
+}
+
+package() {
+  cd "${srcdir}/$pkgname-$pkgver"
+
+  # Install lib
+  mkdir -p ${pkgdir}/usr/lib
+  cp lib/linux/libaacskeys.so ${pkgdir}/usr/lib/ || return 1
+
+  # Install program
+  mkdir -p ${pkgdir}/usr/bin
+  cp bin/linux/aacskeys ${pkgdir}/usr/bin || return 1
+
+  # Install resources
+  mkdir -p ${pkgdir}/usr/share/$pkgname
+  cp ./debian/HostKeyCertificate_PS3.txt ${pkgdir}/usr/share/$pkgname/HostKeyCertificate.txt || return 1
+  cp ./debian/ProcessingDeviceKeysSimple.txt ${pkgdir}/usr/share/$pkgname/ || return 1
+}