Migrate source to ladish.org

3 files changed, 22 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8da8366e2a0f..dca572300dfe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,20 @@
-# Generated by mksrcinfo v8
-# Sat Jan 27 19:29:45 UTC 2018
 pkgbase = laditools
 	pkgdesc = Utilities to improve integration and workflow with JACK and LASH.
-	pkgver = 1.1.0
+	pkgver = 1.1
 	pkgrel = 1
-	url = https://github.com/LADI/laditools
+	url = https://gitea.ladish.org/LADI/laditools
 	arch = any
 	license = GPL3
 	makedepends = git
-	makedepends = python2-distutils-extra
-	depends = glade
-	depends = jack
-	depends = pygtk
-	depends = python2
-	depends = python2-enum34
-	depends = python2-yaml
-	source = https://github.com/alessio/laditools/archive/v1.1.0.tar.gz
-	source = enum34.diff
-	sha512sums = 7f56d669cc1e468e0aa68b541f0da8b98cfdcceb6fd9e55a054d7622c4066f6422d367034697a4838bcd2f2caf14a1281f66b70f6ff4adff7de3c91f51f1bcdb
-	sha512sums = b406924a4b59ec15e7db4af926d7ec1e8c8802cede7d77d8d524592aa99c858e24cc9ce5f513d592dbecb9f3614404250e5a7963425d00b435cd8f6eb103a362
+	makedepends = glade
+	makedepends = python-distutils-extra
+	depends = gtk3
+	depends = ladish
+	depends = python
+	depends = python-gobject
+	depends = python-pyxdg
+	depends = python-yaml
+	source = git+https://gitea.ladish.org/LADI/laditools.git#tag=1.1
+	sha256sums = SKIP
 
 pkgname = laditools
-
diff --git a/PKGBUILD b/PKGBUILD
index d92f65ed7fae..c71c404fc0b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,23 @@
 # Maintainer: WoefulDerelict <WoefulDerelict at GMail dot com>
 
 pkgname=laditools
-pkgver=1.1.0
+pkgver=1.1
 pkgrel=1
 pkgdesc="Utilities to improve integration and workflow with JACK and LASH."
 arch=('any')
-url="https://github.com/LADI/laditools"
+url="https://gitea.ladish.org/LADI/laditools"
 license=('GPL3')
-depends=('glade' 'jack' 'pygtk' 'python2' 'python2-enum34' 'python2-yaml')
-makedepends=('git' 'python2-distutils-extra')
-source=("https://github.com/alessio/laditools/archive/v${pkgver}.tar.gz"
-        "enum34.diff")
-sha512sums=('7f56d669cc1e468e0aa68b541f0da8b98cfdcceb6fd9e55a054d7622c4066f6422d367034697a4838bcd2f2caf14a1281f66b70f6ff4adff7de3c91f51f1bcdb'
-            'b406924a4b59ec15e7db4af926d7ec1e8c8802cede7d77d8d524592aa99c858e24cc9ce5f513d592dbecb9f3614404250e5a7963425d00b435cd8f6eb103a362')
-
-prepare() {
-  cd "${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/enum34.diff
-}
+depends=('gtk3' 'ladish' 'python' 'python-gobject' 'python-pyxdg' 'python-yaml')
+makedepends=('git' 'glade' 'python-distutils-extra')
+source=("git+https://gitea.ladish.org/LADI/laditools.git#tag=$pkgver")
+sha256sums=('SKIP')
 
 build() {
-  cd "${pkgname}-${pkgver}"
-  python2 setup.py build
+  cd "$pkgname"
+  python setup.py build
 }
 
 package() {
-  cd "${pkgname}-${pkgver}"
-  python2 setup.py install --prefix=/usr --root="${pkgdir}/"
+  cd "$pkgname"
+  python setup.py install --prefix=/usr --root="$pkgdir"
 }
diff --git a/enum34.diff b/enum34.diff
deleted file mode 100644
index 08d735132ea5..000000000000
--- a/enum34.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur laditools-1.1.0.orig/INSTALL laditools-1.1.0/INSTALL
---- laditools-1.1.0.orig/INSTALL	2015-09-13 14:38:51.000000000 -0700
-+++ laditools-1.1.0/INSTALL	2018-01-27 10:23:41.606495560 -0800
-@@ -29,7 +29,7 @@
- Plus, the following dependencies must be satisfied:
- 
-  - GTK+3            (>= 3.2.2,  http://www.gtk.org/)
-- - python-enum      (>= 0.4.4,  http://pypi.python.org/pypi/enum/)
-+ - python-enum34    (>= 1.1.2,  https://pypi.python.org/pypi/enum34/)
-  - VTE              (>= 0.30.1, http://ftp.gnome.org/pub/GNOME/sources/vte/)
- 
- Here is a list of optional dependencies:
-diff -Naur laditools-1.1.0.orig/laditools/ladish.py laditools-1.1.0/laditools/ladish.py
---- laditools-1.1.0.orig/laditools/ladish.py	2015-09-13 14:38:51.000000000 -0700
-+++ laditools-1.1.0/laditools/ladish.py	2018-01-27 10:23:41.629828859 -0800
-@@ -28,10 +28,8 @@
- studio_obj_path = "/org/ladish/Studio"
- service_name = name_base
- 
--LadishStatusType = Enum("STUDIO_STOPPED",
--                        "NOT_AVAILABLE",
--                        "NO_STUDIO_LOADED",
--                        "STUDIO_RUNNING")
-+LadishStatusType = Enum("LadishStatusType",
-+                        "STUDIO_STOPPED NOT_AVAILABLE NO_STUDIO_LOADED STUDIO_RUNNING")
- 
- class LadishProxyError(Exception): pass
- class LadishStudioException(Exception): pass