Remove makepkg internal function. Cosmetic changes.

2 files changed, 31 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 714bd31c39b4..fb91d68f68ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,7 @@
-# Generated by mksrcinfo v8
-# Tue May  2 03:09:52 UTC 2017
 pkgbase = confu-git
-	pkgver = r26.5d28d6e
-	pkgrel = 3
+	pkgdesc = Cross-platform C/C++ configuration system (git version, uses python3)
+	pkgver = r41.5030e44
+	pkgrel = 1
 	url = https://github.com/Maratyszcza/confu/
 	arch = any
 	license = MIT
@@ -11,15 +10,18 @@ pkgbase = confu-git
 	makedepends = python-setuptools
 	makedepends = python-sphinx
 	makedepends = python-sphinx_rtd_theme
+	makedepends = python-yaml
 	makedepends = python2
 	makedepends = python2-setuptools
 	makedepends = python2-sphinx
 	makedepends = python2-sphinx_rtd_theme
+	makedepends = python2-yaml
+	makedepends = python-ninja-syntax
+	makedepends = python2-ninja-syntax
 	source = confu-git::git+https://github.com/Maratyszcza/confu.git
 	sha256sums = SKIP
 
 pkgname = confu-git
-	pkgdesc = Cross-platform C/C++ configuration system (git version, uses python3)
 	depends = python
 	depends = python-six
 	depends = python-yaml
diff --git a/PKGBUILD b/PKGBUILD
index c8261fc44515..92204dae8440 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,24 @@
-# Maintainer : Daniel Bermond < yahoo-com: danielbermond >
+# Maintainer : Daniel Bermond < gmail-com: danielbermond >
 
 pkgbase=confu-git
 pkgname=('confu-git' 'confu2-git')
 _srcname=confu
 _srcname2=confu2
-pkgver=r26.5d28d6e
-pkgrel=3
-_commondesc="Cross-platform C/C++ configuration system (git version, uses python"
+pkgver=r41.5030e44
+pkgrel=1
+pkgdesc='Cross-platform C/C++ configuration system (git version, uses python3)'
 arch=('any')
-url="https://github.com/Maratyszcza/confu/"
+url='https://github.com/Maratyszcza/confu/'
 license=('MIT')
-makedepends=('git' 'python' 'python-setuptools' 'python-sphinx' 'python-sphinx_rtd_theme'
-                   'python2' 'python2-setuptools' 'python2-sphinx' 'python2-sphinx_rtd_theme')
-source=("$pkgname"::"git+https://github.com/Maratyszcza/confu.git")
+makedepends=(
+    # official repositories
+        'git'
+        'python' 'python-setuptools' 'python-sphinx' 'python-sphinx_rtd_theme' 'python-yaml'
+        'python2' 'python2-setuptools' 'python2-sphinx' 'python2-sphinx_rtd_theme' 'python2-yaml'
+    # AUR:
+        'python-ninja-syntax' 'python2-ninja-syntax'
+)
+source=("$pkgname"::'git+https://github.com/Maratyszcza/confu.git')
 sha256sums=('SKIP')
 
 prepare() {
@@ -23,23 +29,22 @@ pkgver() {
     cd "$pkgname"
     
     # git, no tags available
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    printf 'r%s.%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-    msg2 "Building for Python3..."
+    printf '%s\n' '  -> Building for Python3...'
     cd "${pkgname}"
     python setup.py build
     python setup.py build_sphinx --all-files --source-dir="${srcdir}/${pkgbase}/sphinx"
     
-    msg2 "Building for Python2..."
+    printf '%s\n' '  -> Building for Python2...'
     cd "${srcdir}/${pkgname}-py2"
     python2 setup.py build
     python2 setup.py build_sphinx --all-files --source-dir="${srcdir}/${pkgbase}-py2/sphinx"
 }
 
 package_confu-git() {
-    pkgdesc="${_commondesc}3)"
     depends=(
         # binary repositories:
             'python' 'python-six' 'python-yaml'
@@ -56,11 +61,11 @@ package_confu-git() {
     
     # license
     mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
-    install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 
 package_confu2-git() {
-    pkgdesc="${_commondesc}2)"
+    pkgdesc='Cross-platform C/C++ configuration system (git version, uses python2)'
     depends=(
         # binary repositories:
             'python2' 'python2-six' 'python2-yaml'
@@ -70,7 +75,10 @@ package_confu2-git() {
     
     cd "${pkgbase}-py2"
     python2 setup.py install --root="$pkgdir" --optimize=1
-    mv -f "${pkgdir}/usr/bin/confu" "${pkgdir}/usr/bin/confu2"
+    mv "${pkgdir}/usr/bin/confu" "${pkgdir}/usr/bin/confu2"
+    
+    # fix wrong python versions
+    sed -i '1s/python$/python2/' "${pkgdir}/usr/lib/python2.7/site-packages/confu/recipes/"*.py
     
     # doc
     mkdir -p "${pkgdir}/usr/share/doc/${_srcname2}"
@@ -78,5 +86,5 @@ package_confu2-git() {
     
     # license
     mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
-    install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }