[arch-commits] Commit in shiboken2/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Thursday, June 28, 2018 @ 14:10:11
  Author: arojas
Revision: 327719

Simplify packaging by not caring for python2

Modified:
  shiboken2/trunk/PKGBUILD

----------+
 PKGBUILD |   32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-28 12:29:32 UTC (rev 327718)
+++ PKGBUILD	2018-06-28 14:10:11 UTC (rev 327719)
@@ -2,21 +2,21 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgbase=shiboken2
-pkgname=(shiboken2 python-shiboken2 python2-shiboken2)
+pkgname=(shiboken2 python-shiboken2)
 _qtver=5.11.0
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=(x86_64)
 url='http://qt-project.org/'
 license=(GPL2 LGPL)
 pkgdesc='Generates bindings for C++ libraries using CPython source code'
-makedepends=(clang llvm cmake libxslt qt5-xmlpatterns python python2)
+makedepends=(clang llvm cmake libxslt qt5-xmlpatterns python)
 _pkgfqn=pyside-setup-everywhere-src-${_qtver}
 source=("http://download.qt.io/official_releases/QtForPython/pyside2/PySide2-$pkgver-src/${_pkgfqn}.tar.xz")
 sha256sums=('fbc412c4544bca308291a08a5173a949ca530d801f00b8337902a5067e490922')
 
 prepare() {
-  mkdir -p build{,2}
+  mkdir -p build
 }
 
 build() {
@@ -26,13 +26,6 @@
     -DBUILD_TESTS=OFF \
     -DUSE_PYTHON_VERSION=3
   make
-
-  cd ../build2
-  cmake ../${_pkgfqn}/sources/shiboken2 \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_TESTS=OFF \
-    -DUSE_PYTHON_VERSION=2
-  make
 }
 
 package_shiboken2() {
@@ -40,8 +33,8 @@
 
   cd build
   make DESTDIR="$pkgdir" install
-# Provided in python-shiboken
-  rm -r "$pkgdir"/usr/lib/{cmake/*/*python*,python*,libshiboken*}
+# Provided in python-shiboken2
+  rm -r "$pkgdir"/usr/lib/{python*,libshiboken*}
 }
 
 package_python-shiboken2() {
@@ -49,15 +42,6 @@
 
   cd build
   make DESTDIR="$pkgdir" install
-# Provided in shiboken
-  rm -r "$pkgdir"/usr/{bin,include,lib/{cmake/*/Shiboken2Config{,Version}.cmake,pkgconfig},share}
+# Provided in shiboken2
+  rm -r "$pkgdir"/usr/{bin,include,lib/{cmake,pkgconfig},share}
 }
-
-package_python2-shiboken2() {
-  depends=(python2)
-
-  cd build2
-  make DESTDIR="$pkgdir" install
-# Provided in shiboken
-  rm -r "$pkgdir"/usr/{bin,include,lib/{cmake/*/Shiboken2Config{,Version}.cmake,pkgconfig},share}
-}