reformat python2-requests-git to "new" git format

2 files changed, 23 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d4406c900c76..ffaaff924ad6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python2-requests-git
 	pkgdesc = Python HTTP for Humans.
-	pkgver = 20130206
+	pkgver = v2.3.0.41.gfcb735f
 	pkgrel = 1
 	url = http://python-requests.org
 	arch = any
@@ -13,7 +13,9 @@ pkgbase = python2-requests-git
 	optdepends = python2-simplejson
 	provides = python2-requests
 	conflicts = python2-requests
+	source = requests::git+https://github.com/kennethreitz/requests.git
 	source = certs.patch
+	sha256sums = SKIP
 	sha256sums = 482fc40ba146d2200771a690b3bedf6eddc9c3224d6f7b5ba529124039b07246
 
 pkgname = python2-requests-git
diff --git a/PKGBUILD b/PKGBUILD
index ba9f90b4334e..a2fbaf15ce83 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Cedric Girard <girard.cedric@gmail.com>
 
 pkgname=python2-requests-git
-pkgver=20130206
+pkgver=v2.3.0.41.gfcb735f
 pkgrel=1
 _libname=${pkgname/python2-/}
 pkgdesc="Python HTTP for Humans."
@@ -16,44 +16,40 @@ provides=('python2-requests')
 license=('custom: ISC')
 arch=('any')
 
-source=(certs.patch)
-sha256sums=('482fc40ba146d2200771a690b3bedf6eddc9c3224d6f7b5ba529124039b07246')
+source=('requests::git+https://github.com/kennethreitz/requests.git'
+         certs.patch
+)
+sha256sums=('SKIP'
+            '482fc40ba146d2200771a690b3bedf6eddc9c3224d6f7b5ba529124039b07246'
+)
 
-_gitroot=https://github.com/kennethreitz/requests.git
-_gitname=requests
-
-build() {
-  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"
-  msg "Starting build..."
+pkgver() {
+  cd "$srcdir"/requests
+  git describe --tags | sed 's|-|.|g'
+}
 
-  rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd "$srcdir/$_gitname-build"
+prepare() {
+  cd "$srcdir"/requests
 
   patch -p0 -i "$srcdir/certs.patch"
   find -type f -exec sed -i '1 s|python$|python2|' {} +
   sed -r 's#(\W|^)requests/cacert\.pem(\W|$)##' -i MANIFEST.in
   rm -f requests/cacert.pem
+
+}
+
+build(){
+  cd "$srcdir"/requests
   python2 setup.py build
 }
 
 check() {
-  cd "$srcdir/$_gitname-build"
+  cd "$srcdir"/requests
   test -f "$(python2 -m requests.certs)"
 }
 
 package() {
-  cd "$srcdir/$_gitname-build"
+  cd "$srcdir"/requests
   python2 setup.py install --root="$pkgdir"
   install -m0644 -D "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }