run 2to3 in prepare

2 files changed, 35 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d19718d271dd..cd1720b64fd4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sat Mar  5 23:58:19 UTC 2016
+# Sun Mar  6 02:47:15 UTC 2016
 pkgbase = airtime
 	pkgdesc = Open broadcast software for scheduling and station management.
 	pkgver = 2.5.2.1
@@ -63,12 +63,12 @@ pkgbase = airtime
 	backup = etc/airtime/apache24.vhost.tpl
 	backup = etc/logrotate.d/airtime-liquidsoap
 	backup = etc/logrotate.d/airtime-php
-	source = airtime::git+https://github.com/sourcefabric/Airtime.git#tag=airtime-2.5.2.1
+	source = airtime.tar.gz::https://github.com/sourcefabric/airtime/archive/airtime-2.5.2.1.tar.gz
 	source = airtime-media-monitor.service
 	source = airtime-liquidsoap.service
 	source = airtime-playout.service
 	source = airtime.tmpfiles.conf
-	sha256sums = SKIP
+	sha256sums = ba3ed67f1a60032e1624a021fffa4bb11d9055ddc4c3773b40f334854adf6930
 	sha256sums = 8257cca5eef976ab9f42f0c6210b24c417b961ca4a05316da48a8ee306e2bf9a
 	sha256sums = e13f3a4e25d9ff732a1936d8e6c2301186096405bec0594f1590fc273b47e25d
 	sha256sums = 349dd02f50d5bb283004954c1566055dc81f4972679861264b6fe88819208511
diff --git a/PKGBUILD b/PKGBUILD
index a7bed340dc8c..92b82807acb4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -37,21 +37,25 @@ backup=('etc/airtime/airtime.conf'
         'etc/logrotate.d/airtime-php')
 options=()
 install=airtime.install
-source=("${pkgname}::git+https://github.com/sourcefabric/Airtime.git#tag=airtime-${pkgver}"
+source=("${pkgname}.tar.gz::https://github.com/sourcefabric/airtime/archive/airtime-${pkgver}.tar.gz"
         'airtime-media-monitor.service'
         'airtime-liquidsoap.service'
         'airtime-playout.service'
         'airtime.tmpfiles.conf')
 noextract=()
-sha256sums=('SKIP'
+sha256sums=('ba3ed67f1a60032e1624a021fffa4bb11d9055ddc4c3773b40f334854adf6930'
             '8257cca5eef976ab9f42f0c6210b24c417b961ca4a05316da48a8ee306e2bf9a'
             'e13f3a4e25d9ff732a1936d8e6c2301186096405bec0594f1590fc273b47e25d'
             '349dd02f50d5bb283004954c1566055dc81f4972679861264b6fe88819208511'
             'a95e7236ab741140cafdd987cf485395de6b997ad1241411c8e7fa731dfaa137')
 
-#prepare() {
-# 	cd "$srcdir/${pkgname%-git}"
-#}
+prepare() {
+	cd "$srcdir/${pkgname}/python_apps"
+  2to3 -w api_clients
+  2to3 -w media-monitor
+  2to3 -w pypo
+  2to3 -w std_err_override
+}
 #
 # build() {
 # 	cd "$srcdir/${pkgname%-git}"
@@ -64,33 +68,33 @@ sha256sums=('SKIP'
 # }
 
 package() {
-	cd "$srcdir/${pkgname}"
+	cd "$srcdir/"
 
   web_user=http
 
   # web frontend
   mkdir -p "${pkgdir}/usr/share/airtime"
-  cp -r airtime_mvc "${pkgdir}/usr/share/airtime"
-  cp -r python_apps "${pkgdir}/usr/share/airtime"
-  cp -r utils "${pkgdir}/usr/share/airtime"
+  cp -r "${pkgname}/airtime_mvc" "${pkgdir}/usr/share/airtime"
+  cp -r "${pkgname}/python_apps" "${pkgdir}/usr/share/airtime"
+  cp -r "${pkgname}/utils" "${pkgdir}/usr/share/airtime"
   chmod -R 755 "${pkgdir}/usr/share/airtime"
 
   mkdir -p "${pkgdir}/usr/share/doc/airtime/examples/"
-  cp -r widgets "${pkgdir}/usr/share/doc/${pkgname}/examples/"
+  cp -r "${pkgname}/widgets" "${pkgdir}/usr/share/doc/${pkgname}/examples/"
   chmod -R 755 "${pkgdir}/usr/share/doc/${pkgname}/examples/"
-  install -D -m644 CREDITS "${pkgdir}/usr/share/doc/${pkgname}/CREDITS"
-  install -D -m644 README "${pkgdir}/usr/share/doc/${pkgname}/README"
-  install -D -m644 changelog "${pkgdir}/usr/share/doc/${pkgname}/changelog"
+  install -D -m644 "${pkgname}/CREDITS" "${pkgdir}/usr/share/doc/${pkgname}/CREDITS"
+  install -D -m644 "${pkgname}/README" "${pkgdir}/usr/share/doc/${pkgname}/README"
+  install -D -m644 "${pkgname}/changelog" "${pkgdir}/usr/share/doc/${pkgname}/changelog"
 
-  install -D -m644 LICENSE "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
-  install -D -m644 LICENSE_3RD_PARTY "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE_3RD_PARTY"
+  install -D -m644 "${pkgname}/LICENSE" "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+  install -D -m644 "${pkgname}/LICENSE_3RD_PARTY" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE_3RD_PARTY"
 
   install -D -m644 "airtime.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/airtime.conf"
 
   mkdir -p "${pkgdir}/var/tmp/airtime/show-recorder/"
 
-  install -D -m644 "airtime_mvc/build/airtime-php.logrotate" "${pkgdir}/etc/logrotate.d/airtime-php"
-  install -D -m644 "python_apps/pypo/pypo/liquidsoap_scripts/airtime-liquidsoap.logrotate" "${pkgdir}/etc/logrotate.d/airtime-liquidsoap"
+  install -D -m644 "${pkgname}/airtime_mvc/build/airtime-php.logrotate" "${pkgdir}/etc/logrotate.d/airtime-php"
+  install -D -m644 "${pkgname}/python_apps/pypo/liquidsoap/airtime-liquidsoap.logrotate" "${pkgdir}/etc/logrotate.d/airtime-liquidsoap"
 
   mkdir -p "${pkgdir}/var/log/airtime"
   chmod -R a+x "${pkgdir}/var/log/airtime"
@@ -102,25 +106,25 @@ package() {
 
   mkdir -p "${pkgdir}/etc/airtime"
 
-  install -m 755 installer/php/airtime.ini "${pkgdir}/etc/airtime"
-  install -m 755 installer/apache/airtime-vhost "${pkgdir}/etc/airtime/apache.vhost.tpl"
-  install -m 755 installer/apache/airtime-vhost-2.4 "${pkgdir}/etc/airtime/apache24.vhost.tpl"
-  install -m 755 airtime_mvc/build/airtime.example.conf "${pkgdir}/etc/airtime/airtime.conf"
+  install -D -m 755 "${pkgname}/installer/php/airtime.ini" "${pkgdir}/etc/airtime"
+  install -D -m 755 "${pkgname}/installer/apache/airtime-vhost" "${pkgdir}/etc/airtime/apache.vhost.tpl"
+  install -D -m 755 "${pkgname}/installer/apache/airtime-vhost-2.4" "${pkgdir}/etc/airtime/apache24.vhost.tpl"
+  install -D -m 755 "${pkgname}/airtime_mvc/build/airtime.example.conf" "${pkgdir}/etc/airtime/airtime.conf"
 
   chown -R ${web_user}:${web_user} "${pkgdir}/etc/airtime"
 
-  install -m 755 airtime-media-monitor.service "${pkgdir}/usr/lib/systemd/system"
-  install -m 755 airtime-liquidsoap.service "${pkgdir}/usr/lib/systemd/system"
-  install -m 755 airtime-playout.service "${pkgdir}/usr/lib/systemd/system"
+  install -D -m 755 airtime-media-monitor.service "${pkgdir}/usr/lib/systemd/system"
+  install -D -m 755 airtime-liquidsoap.service "${pkgdir}/usr/lib/systemd/system"
+  install -D -m 755 airtime-playout.service "${pkgdir}/usr/lib/systemd/system"
 
   # python apps
-  python python_apps/std_err_override/setup.py install \
+  python2 "${pkgname}/python_apps/std_err_override/setup.py" install \
       --root="${pkgdir}/" --optimize=1 --install-scripts=/usr/bin
-  python python_apps/api_clients/setup.py install \
+  python2 "${pkgname}/python_apps/api_clients/setup.py" install \
       --root="${pkgdir}/" --optimize=1 --install-scripts=/usr/bin
-  python python_apps/media-monitor/setup.py install \
+  python2 "${pkgname}/python_apps/media-monitor/setup.py" install \
       --root="${pkgdir}/" --optimize=1 --install-scripts=/usr/bin
-  python python_apps/pypo/setup.py install \
+  python2 "${pkgname}/python_apps/pypo/setup.py" install \
       --root="${pkgdir}/" --optimize=1 --install-scripts=/usr/bin