Updated to version 3.24. Drop i686 arch and python2 support.

2 files changed, 24 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a8d18ff0f5e4..0ce07c5ea6d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = libsvm
 	pkgdesc = A library for Support Vector Machines classification (includes binaries and bindings for python and java)
-	pkgver = 3.23
-	pkgrel = 7
+	pkgver = 3.24
+	pkgrel = 1
 	url = https://www.csie.ntu.edu.tw/~cjlin/libsvm/
-	arch = i686
 	arch = x86_64
 	license = BSD
 	makedepends = qt5-base
@@ -11,14 +10,13 @@ pkgbase = libsvm
 	depends = gcc-libs
 	optdepends = qt5-base: for Qt5 interface with svm-toy
 	optdepends = python: for python modules and python CLI tools
-	optdepends = python2: for python2 modules
 	optdepends = gnuplot: for using svm-easy.py
 	optdepends = java-runtime: for java bindings
-	source = libsvm-3.23.tar.gz::https://github.com/cjlin1/libsvm/archive/v323.tar.gz
+	source = libsvm-3.24.tar.gz::https://github.com/cjlin1/libsvm/archive/v324.tar.gz
 	source = 001-libsvm-fix-qt-headers-path.patch
 	source = 002-libsvm-use-archlinux-flags.patch
 	source = 003-libsvm-fix-tools-path.patch
-	sha256sums = 7a466f90f327a98f8ed1cb217570547bcb00077933d1619f3cb9e73518f38196
+	sha256sums = 3ba1ac74ee08c4dd57d3a9e4a861ffb57dab88c6a33fd53eac472fc84fbb2a8f
 	sha256sums = 01d28d48ca955921cff3ee39e6235fbcbe6f13587c056b05797388afc0c45432
 	sha256sums = ba986c03199445ec0a9d1d113f54753e61f691ad4c66cad80b1f7d6ccf0c2d17
 	sha256sums = 58338a8eac252459c665eb6f1f03f4b86cd541b2c6942357329be022f3bb6fce
diff --git a/PKGBUILD b/PKGBUILD
index 1ddd5b0a67d3..47e614cbda74 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,25 +5,24 @@
 # Contributor: Tim Huetz <tim at huetz biz>
 
 pkgname=libsvm
-pkgver=3.23
+pkgver=3.24
 _srcver="${pkgver/./}"
-pkgrel=7
+pkgrel=1
 pkgdesc='A library for Support Vector Machines classification (includes binaries and bindings for python and java)'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='https://www.csie.ntu.edu.tw/~cjlin/libsvm/'
 license=('BSD')
 depends=('gcc-libs')
 makedepends=('qt5-base' 'python')
 optdepends=('qt5-base: for Qt5 interface with svm-toy'
             'python: for python modules and python CLI tools'
-            'python2: for python2 modules'
             'gnuplot: for using svm-easy.py'
             'java-runtime: for java bindings')
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/cjlin1/libsvm/archive/v${_srcver}.tar.gz"
         '001-libsvm-fix-qt-headers-path.patch'
         '002-libsvm-use-archlinux-flags.patch'
         '003-libsvm-fix-tools-path.patch')
-sha256sums=('7a466f90f327a98f8ed1cb217570547bcb00077933d1619f3cb9e73518f38196'
+sha256sums=('3ba1ac74ee08c4dd57d3a9e4a861ffb57dab88c6a33fd53eac472fc84fbb2a8f'
             '01d28d48ca955921cff3ee39e6235fbcbe6f13587c056b05797388afc0c45432'
             'ba986c03199445ec0a9d1d113f54753e61f691ad4c66cad80b1f7d6ccf0c2d17'
             '58338a8eac252459c665eb6f1f03f4b86cd541b2c6942357329be022f3bb6fce')
@@ -37,13 +36,13 @@ prepare() {
 }
 
 build() {
-    printf '%s\n' '  -> Building library and CLI binaries...'
     cd "${pkgname}-${_srcver}"
+    
+    printf '%s\n' '  -> Building library and CLI binaries...'
     make lib all
     
     printf '%s\n' '  -> Building Qt5 interface...'
-    cd svm-toy/qt
-    make
+    make -C svm-toy/qt
 }
 
 package() {
@@ -51,9 +50,8 @@ package() {
     
     local _pyver
     local _sover
-    
     _pyver="$(python -c 'import sys; print("%s.%s" %sys.version_info[0:2])')"
-    _sover="$(find . -maxdepth 1 -type f -regextype posix-basic -regex '.*libsvm.so.[0-9]$' | awk -F'.' '{ print $NF }')"
+    _sover="$(find . -maxdepth 1 -type f -regextype posix-basic -regex '.*/libsvm.so.[0-9]*$' | awk -F'.' '{ print $NF }')"
     
     # binaries
     install -D -m755 svm-predict        -t "${pkgdir}/usr/bin"
@@ -63,41 +61,29 @@ package() {
     
     # library
     install -D -m755 "libsvm.so.${_sover}" -t "${pkgdir}/usr/lib"
-    cd "${pkgdir}/usr/lib"
-    ln -s "libsvm.so.${_sover}" libsvm.so
+    ln -s "libsvm.so.${_sover}" "${pkgdir}/usr/lib/libsvm.so"
     
     # header
-    cd "${srcdir}/${pkgname}-${_srcver}"
     install -D -m644 svm.h -t "${pkgdir}/usr/include/libsvm"
     
     # python modules
     ## NOTE: 'grid.py' can be used either as a python module or a CLI/tool
-    ## https://github.com/cjlin1/libsvm/blob/v323/tools/README#L163-L164
-    cd "${srcdir}/${pkgname}-${_srcver}/python"
-    install -D -m644 commonutil.py -t "${pkgdir}/usr/lib/python${_pyver}/site-packages/libsvm"
-    install -D -m644 commonutil.py -t "${pkgdir}/usr/lib/python2.7/site-packages/libsvm"
-    install -D -m644 svm.py        -t "${pkgdir}/usr/lib/python${_pyver}/site-packages/libsvm"
-    install -D -m644 svm.py        -t "${pkgdir}/usr/lib/python2.7/site-packages/libsvm"
-    install -D -m644 svmutil.py    -t "${pkgdir}/usr/lib/python${_pyver}/site-packages/libsvm"
-    install -D -m644 svmutil.py    -t "${pkgdir}/usr/lib/python2.7/site-packages/libsvm"
-    cd "${srcdir}/${pkgname}-${_srcver}/tools"
-    install -D -m644 grid.py  -t "${pkgdir}/usr/lib/python${_pyver}/site-packages/libsvm"
-    install -D -m644 grid.py  -t "${pkgdir}/usr/lib/python2.7/site-packages/libsvm"
-    sed -i '1s/python$/python2/' "${pkgdir}/usr/lib/python2.7/site-packages/libsvm/"{commonutil,grid,svm,svmutil}.py
-    printf '' | install -D -m644 /dev/stdin "${pkgdir}/usr/lib/python${_pyver}/site-packages/libsvm/__init__.py"
-    printf '' | install -D -m644 /dev/stdin "${pkgdir}/usr/lib/python2.7/site-packages/libsvm/__init__.py"
+    ## https://github.com/cjlin1/libsvm/blob/v324/tools/README#L163-L164
+    install -D -m644 python/commonutil.py -t "${pkgdir}/usr/lib/python${_pyver}/site-packages/libsvm"
+    install -D -m644 python/svm.py        -t "${pkgdir}/usr/lib/python${_pyver}/site-packages/libsvm"
+    install -D -m644 python/svmutil.py    -t "${pkgdir}/usr/lib/python${_pyver}/site-packages/libsvm"
+    ln -s ../../../../bin/svm-grid.py        "${pkgdir}/usr/lib/python${_pyver}/site-packages/libsvm/grid.py"
+    printf '' | install -D -m644 /dev/stdin  "${pkgdir}/usr/lib/python${_pyver}/site-packages/libsvm/__init__.py"
     
     # python CLI/tools
-    install -D -m755 checkdata.py "${pkgdir}/usr/bin/svm-checkdata.py"
-    install -D -m755 easy.py      "${pkgdir}/usr/bin/svm-easy.py"
-    install -D -m755 grid.py      "${pkgdir}/usr/bin/svm-grid.py"
-    install -D -m755 subset.py    "${pkgdir}/usr/bin/svm-subset.py"
+    install -D -m755 tools/checkdata.py "${pkgdir}/usr/bin/svm-checkdata.py"
+    install -D -m755 tools/easy.py      "${pkgdir}/usr/bin/svm-easy.py"
+    install -D -m755 tools/grid.py      "${pkgdir}/usr/bin/svm-grid.py"
+    install -D -m755 tools/subset.py    "${pkgdir}/usr/bin/svm-subset.py"
     
     # java
-    cd "${srcdir}/${pkgname}-${_srcver}/java"
-    install -D -m644 libsvm.jar -t "${pkgdir}/usr/share/java"
+    install -D -m644 java/libsvm.jar -t "${pkgdir}/usr/share/java"
     
     # license
-    cd "${srcdir}/${pkgname}-${_srcver}"
     install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }