rewrote PKGBUILD

3 files changed, 24 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fc4bd59e6831..a33cf152440c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,9 @@
-# Generated by mksrcinfo v8
-# Wed Jun 14 03:19:36 UTC 2017
 pkgbase = python-ruamel-yaml-hg
 	pkgdesc = YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order
-	pkgver = 0.15.6.r1.498e40e91a0c
+	pkgver = 0.16.12.r4.7858379dfa6e
 	pkgrel = 1
-	url = https://bitbucket.org/ruamel/yaml
-	arch = i686
-	arch = x86_64
+	url = https://sourceforge.net/projects/ruamel-yaml/
+	arch = any
 	groups = devel
 	license = MIT
 	makedepends = python-pip
@@ -15,7 +12,7 @@ pkgbase = python-ruamel-yaml-hg
 	depends = python
 	provides = python-ruamel-yaml
 	conflicts = python-ruamel-yaml-hg
-	source = hg+https://bitbucket.org/ruamel/yaml
+	source = yaml::hg+http://hg.code.sf.net/p/ruamel-yaml/code
 	md5sums = SKIP
 
 pkgname = python-ruamel-yaml-hg
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..e662c8473fe6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.log
+*/
+*.pkg*
diff --git a/PKGBUILD b/PKGBUILD
index 090309b10810..ff6fb42e6de4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,18 @@
 
 pkgname=python-ruamel-yaml-hg
 _hgname=yaml
-pkgver=0.15.6.r1.498e40e91a0c
+pkgver=0.16.12.r4.7858379dfa6e
 pkgrel=1
 pkgdesc="YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"
-arch=('i686' 'x86_64')
-url="https://bitbucket.org/ruamel/yaml"
+arch=('any')
+url="https://sourceforge.net/projects/ruamel-yaml/"
 license=('MIT')
 groups=('devel')
 depends=('python')
 makedepends=('python-pip' 'mercurial' 'wget')
 provides=('python-ruamel-yaml')
 conflicts=('python-ruamel-yaml-hg')
-source=("hg+$url")
+source=("${_hgname}::hg+http://hg.code.sf.net/p/ruamel-yaml/code")
 md5sums=('SKIP')
 
 pkgver() {
@@ -21,16 +21,23 @@ pkgver() {
 	hg log -r . --template '{latesttag}.r{latesttagdistance}.{node|short}\n'
 }
 
+#prepare() {
+#	_pkgver=${pkgver/.r*/}
+#	cd $srcdir
+#	[ ! -f ruamel.yaml-$_pkgver.tar.gz ] && wget -O ruamel.yaml-$_pkgver.tar.gz "https://pypi.io/packages/source/r/ruamel.yaml/ruamel.yaml-$_pkgver.tar.gz"
+#	tar zxvf ruamel.yaml-$_pkgver.tar.gz
+#	cp ruamel.yaml-$_pkgver/setup.py $_hgname
+#}
+
 build() {
-	_pkgver=${pkgver/.r*/}
-	cd $srcdir
-	[ ! -f ruamel.yaml-$_pkgver.tar.gz ] && wget -O ruamel.yaml-$_pkgver.tar.gz "https://pypi.io/packages/source/r/ruamel.yaml/ruamel.yaml-$_pkgver.tar.gz"
-	tar zxvf ruamel.yaml-$_pkgver.tar.gz
-	cp ruamel.yaml-$_pkgver/setup.py $_hgname
+	cd "$srcdir/$_hgname"
+	python setup.py build
 }
 
 package() {
 	cd "$srcdir/$_hgname"
-	pip install . --root="$pkgdir"
+	RUAMEL_NO_PIP_INSTALL_CHECK=1 \
+	python setup.py install --root="$pkgdir"/ --optimize=1
+	#pip install --root="$pkgdir" --ignore-installed --no-dependencies
 	install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }