[arch-commits] Commit in clingo/repos (4 files)

[Alexander Rødseth]

    Date: Monday, June 5, 2017 @ 14:11:54
  Author: arodseth
Revision: 234205

archrelease: copy trunk to community-x86_64, community-i686

Added:
  clingo/repos/community-i686/PKGBUILD
    (from rev 234204, clingo/trunk/PKGBUILD)
  clingo/repos/community-x86_64/PKGBUILD
    (from rev 234203, clingo/trunk/PKGBUILD)
Deleted:
  clingo/repos/community-i686/PKGBUILD
  clingo/repos/community-x86_64/PKGBUILD

---------------------------+
 /PKGBUILD                 |   70 ++++++++++++++++++++++++++++++++++++++++++++
 community-i686/PKGBUILD   |   40 -------------------------
 community-x86_64/PKGBUILD |   40 -------------------------
 3 files changed, 70 insertions(+), 80 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-06-05 14:11:23 UTC (rev 234204)
+++ community-i686/PKGBUILD	2017-06-05 14:11:54 UTC (rev 234205)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
-# Contributor: Vincent Bernardoff <vb at luminar.eu.org>
-
-pkgname=clingo
-pkgver=5.1.0
-pkgrel=1
-pkgdesc='Grounding tools for (disjunctive) logic programs'
-arch=('x86_64' 'i686')
-url='https://potassco.org/'
-license=('GPL3')
-depends=('python2')
-makedepends=('bison' 're2c' 'scons')
-source=("https://github.com/potassco/$pkgname/archive/v$pkgver.tar.gz")
-sha256sums=('c1afa83142d727d18bdab68fd6d7e1341dcb25d2e9a1aea3abc672ecbae6c72a')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  scons --build-dir=release
-}
-
-package() {
-  cd "$pkgname-$pkgver/build/release"
-
-  install -D gringo ${pkgdir}/usr/bin/gringo
-  install -D clingo ${pkgdir}/usr/bin/clingo
-  install -D reify ${pkgdir}/usr/bin/reify
-  install -D lpconvert ${pkgdir}/usr/bin/lpconvert
-
-  if [ -x "python/clingo.so" ]; then
-      install -D "python/clingo.so" ${pkgdir}/usr/lib/libclingo_python.so
-  fi
-
-  if [ -x "lua/clingo.so" ]; then
-      install -D "lua/clingo.so" ${pkgdir}/usr/lib/libclingo_lua.so
-  fi
-}
-
-# vim:set ts=2 sw=2 et:

Copied: clingo/repos/community-i686/PKGBUILD (from rev 234204, clingo/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-06-05 14:11:54 UTC (rev 234205)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
+# Contributor: Vincent Bernardoff <vb at luminar.eu.org>
+
+pkgname=clingo
+pkgver=5.2.0
+pkgrel=1
+pkgdesc='Grounding tools for (disjunctive) logic programs'
+arch=('x86_64' 'i686')
+url='https://potassco.org/'
+license=('GPL3')
+depends=('python' 'lua')
+makedepends=('bison' 're2c' 'cmake' 'ninja' 'python' 'lua')
+source=("https://github.com/potassco/$pkgname/archive/v$pkgver.tar.gz")
+sha256sums=('57d8979b0972a091e1921309ca9ba9c18dd0cf83afcfb1586a8c0bff54ed8b9b')
+
+build() {
+  mkdir -p build
+  cd build
+  cmake "../$pkgname-$pkgver" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCLINGO_REQUIRE_PYTHON=ON \
+    -DCLINGO_BUILD_PY_SHARED=ON \
+    -DPYCLINGO_USER_INSTALL=OFF \
+    -DCLINGO_REQUIRE_LUA=ON \
+    -DCLINGO_BUILD_LUA_SHARED=ON \
+    -G Ninja
+  ninja
+}
+
+package() {
+  DESTDIR="$pkgdir" ninja -C build install
+}
+
+# vim: ts=2 sw=2 et:

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-06-05 14:11:23 UTC (rev 234204)
+++ community-x86_64/PKGBUILD	2017-06-05 14:11:54 UTC (rev 234205)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
-# Contributor: Vincent Bernardoff <vb at luminar.eu.org>
-
-pkgname=clingo
-pkgver=5.1.0
-pkgrel=1
-pkgdesc='Grounding tools for (disjunctive) logic programs'
-arch=('x86_64' 'i686')
-url='https://potassco.org/'
-license=('GPL3')
-depends=('python2')
-makedepends=('bison' 're2c' 'scons')
-source=("https://github.com/potassco/$pkgname/archive/v$pkgver.tar.gz")
-sha256sums=('c1afa83142d727d18bdab68fd6d7e1341dcb25d2e9a1aea3abc672ecbae6c72a')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  scons --build-dir=release
-}
-
-package() {
-  cd "$pkgname-$pkgver/build/release"
-
-  install -D gringo ${pkgdir}/usr/bin/gringo
-  install -D clingo ${pkgdir}/usr/bin/clingo
-  install -D reify ${pkgdir}/usr/bin/reify
-  install -D lpconvert ${pkgdir}/usr/bin/lpconvert
-
-  if [ -x "python/clingo.so" ]; then
-      install -D "python/clingo.so" ${pkgdir}/usr/lib/libclingo_python.so
-  fi
-
-  if [ -x "lua/clingo.so" ]; then
-      install -D "lua/clingo.so" ${pkgdir}/usr/lib/libclingo_lua.so
-  fi
-}
-
-# vim:set ts=2 sw=2 et:

Copied: clingo/repos/community-x86_64/PKGBUILD (from rev 234203, clingo/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-06-05 14:11:54 UTC (rev 234205)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
+# Contributor: Vincent Bernardoff <vb at luminar.eu.org>
+
+pkgname=clingo
+pkgver=5.2.0
+pkgrel=1
+pkgdesc='Grounding tools for (disjunctive) logic programs'
+arch=('x86_64' 'i686')
+url='https://potassco.org/'
+license=('GPL3')
+depends=('python' 'lua')
+makedepends=('bison' 're2c' 'cmake' 'ninja' 'python' 'lua')
+source=("https://github.com/potassco/$pkgname/archive/v$pkgver.tar.gz")
+sha256sums=('57d8979b0972a091e1921309ca9ba9c18dd0cf83afcfb1586a8c0bff54ed8b9b')
+
+build() {
+  mkdir -p build
+  cd build
+  cmake "../$pkgname-$pkgver" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCLINGO_REQUIRE_PYTHON=ON \
+    -DCLINGO_BUILD_PY_SHARED=ON \
+    -DPYCLINGO_USER_INSTALL=OFF \
+    -DCLINGO_REQUIRE_LUA=ON \
+    -DCLINGO_BUILD_LUA_SHARED=ON \
+    -G Ninja
+  ninja
+}
+
+package() {
+  DESTDIR="$pkgdir" ninja -C build install
+}
+
+# vim: ts=2 sw=2 et: