Initial import

2 files changed, 17 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2f862a7f1690..83d1c69f09b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,24 @@
 # Generated by mksrcinfo v7
-# Mon Sep 28 16:01:30 UTC 2015
+# Thu Oct  1 13:35:24 UTC 2015
 pkgbase = pyrescene-hg
 	pkgdesc = pyReScene is a port of ReScene .NET to the Python programming language.
-	pkgver = 423.d5037d93293c
+	pkgver = 606
 	pkgrel = 1
 	url = https://bitbucket.org/Gfy/pyrescene
 	arch = any
-	license = MIT,
+	license = MIT
+	license = GPL
 	license = Custom
 	makedepends = mercurial
 	makedepends = git
-	makedepends = dos2unix
 	depends = python2
 	depends = chromaprint
 	depends = python2-numpy
 	depends = unrar
-	conflicts = awescript
-	conflicts = rescene-bin
-	conflicts = resample-bin
+	source = hg+https://bitbucket.org/Gfy/pyrescene/
+	source = git://github.com/d2yes/rarlinux.git
+	md5sums = SKIP
+	md5sums = SKIP
 
 pkgname = pyrescene-hg
 
diff --git a/PKGBUILD b/PKGBUILD
index 7e4b7eed3b62..09a1c1597f2e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,70 +1,31 @@
 # Maintainer: dryes <joswiseman@cock.li>
 pkgname='pyrescene-hg'
-pkgver=423.d5037d93293c
+pkgver=606
 pkgrel=1
 pkgdesc='pyReScene is a port of ReScene .NET to the Python programming language.'
 url='https://bitbucket.org/Gfy/pyrescene'
 arch=('any')
-license=('MIT', 'Custom')
+license=('MIT' 'GPL' 'Custom')
 depends=('python2' 'chromaprint' 'python2-numpy' 'unrar')
-makedepends=('mercurial' 'git' 'dos2unix')
-conflicts=('awescript' 'rescene-bin' 'resample-bin')
-
-_hgrepo='pyrescene'
-_hgroot="${url%/*}"
-
-_gitroot='git://github.com/d2yes/rarlinux.git'
-_gitname='rarlinux'
+makedepends=('mercurial' 'git')
+source=('hg+https://bitbucket.org/Gfy/pyrescene/' 'git://github.com/d2yes/rarlinux.git')
+md5sums=('SKIP' 'SKIP')
 
 pkgver() {
-  cd "$_hgrepo"
-  hg tip | head -n1 | tr -d ' ' | cut -d: --output-delimiter=. -f 2,3
-}
-
-build() {
-  cd "${srcdir}"
-  
-  msg 'Connecting to hg server...'
-  
-  if [ -d "${_hgrepo}/.hg" ]; then
-    cd "${_hgrepo}" && hg pull -u
-  else
-    hg clone "${_hgroot}/${_hgrepo}"
-  fi
-  
-  cd "${srcdir}"
-  
-  msg 'Connecting to GIT server....'
-  
-  if [ -d "${_gitname}" ] ; then
-    cd "${_gitname}" && git pull origin
-    msg 'The local files are updated.'
-  else
-    git clone "${_gitroot}" "${_gitname}"
-  fi
-  
-  msg 'GIT checkout done or server timeout'
+  cd "${srcdir}/${pkgname%-hg}"
+  hg identify -n
 }
 
 package() {
-  cd "${srcdir}/${_hgrepo}"
-  
+  cd "${srcdir}/${pkgname%-hg}"
+
   cp 'rescene/srr.py' 'rescene/srr.py~'
   sed -i -r 's|(dest=\"rar_executable_dir\",)|\1 default=\"/opt/rarlinux\",|' 'rescene/srr.py'
   python2 'setup.py' install --root="${pkgdir}"
   mv 'rescene/srr.py~' 'rescene/srr.py'
 
-  cp 'rescene/unrar.py' 'rescene/unrar.py~'
-  sed -i -r 's/^(from awescript import unrar)/\#\1/' 'rescene/unrar.py'
-  sed -i -r 's|(unrar = )locate_unix\(\)|\1\"/usr/bin/unrar"|g' 'rescene/unrar.py'
   mkdir -p "${pkgdir}/opt/rarlinux"
   python2 'bin/preprardir.py' "${srcdir}/rarlinux" "${pkgdir}/opt/rarlinux"
-  mv 'rescene/unrar.py~' 'rescene/unrar.py'
 
-  cp 'awescript/awescript.py' 'awescript/awescript.py~'
-  sed -i -r 's|/usr/local/bin/sr([rs])|sr\1|ig' 'awescript/awescript.py'
-  sed -i -r 's/(print \"glob.glob \" \+ path)/None\#\1/g' 'awescript/awescript.py'
-  dos2unix 'awescript/awescript.py'
   install -D -m755 "awescript/awescript.py" "${pkgdir}/usr/bin/awescript"
-  mv 'awescript/awescript.py~' 'awescript/awescript.py'
 }