[arch-commits] Commit in cmake/repos/extra-x86_64 (4 files)

[Antonio Rojas]

    Date: Tuesday, August 27, 2019 @ 17:55:56
  Author: arojas
Revision: 361281

archrelease: copy trunk to extra-x86_64

Added:
  cmake/repos/extra-x86_64/PKGBUILD
    (from rev 361280, cmake/trunk/PKGBUILD)
  cmake/repos/extra-x86_64/rebuild.list
    (from rev 361280, cmake/trunk/rebuild.list)
Deleted:
  cmake/repos/extra-x86_64/PKGBUILD
  cmake/repos/extra-x86_64/rebuild.list

--------------+
 PKGBUILD     |  111 ++++++++++++++++++++++++++++++---------------------------
 rebuild.list |    4 +-
 2 files changed, 61 insertions(+), 54 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-27 17:55:32 UTC (rev 361280)
+++ PKGBUILD	2019-08-27 17:55:56 UTC (rev 361281)
@@ -1,52 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=cmake
-pkgver=3.15.2
-pkgrel=1
-pkgdesc='A cross-platform open-source make system'
-arch=('x86_64')
-url="https://www.cmake.org/"
-license=('custom')
-depends=('curl' 'libarchive' 'shared-mime-info' 'jsoncpp' 'libuv' 'rhash')
-makedepends=('qt5-base' 'python-sphinx' 'emacs')
-optdepends=('qt5-base: cmake-gui')
-source=("https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz")
-sha512sums=('154494fe4c8673c3b17a6f1823c55f06fbb35d7ea048b63a5c3e3157108f222693cf1606c879a3cf425edea686dfe19e27974b338e5d281ec118b1a51c632ccc')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  ./bootstrap --prefix=/usr \
-    --mandir=/share/man \
-    --docdir=/share/doc/cmake \
-    --sphinx-man \
-    --system-libs \
-    --qt-gui \
-    --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN)
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  vimpath="${pkgdir}/usr/share/vim/vimfiles"
-  install -d "${vimpath}"/{indent,syntax}
-  ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/indent/cmake.vim \
-    "${vimpath}"/indent/
-  ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/syntax/cmake.vim \
-    "${vimpath}"/syntax/
-
-  install -d "${pkgdir}"/usr/share/emacs/site-lisp/
-  emacs -batch -f batch-byte-compile \
-    "${pkgdir}"/usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el
-  ln -s /usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el \
-    "${pkgdir}"/usr/share/emacs/site-lisp/
-  ln -s /usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.elc \
-    "${pkgdir}"/usr/share/emacs/site-lisp/
-
-  install -Dm644 Copyright.txt \
-    "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}

Copied: cmake/repos/extra-x86_64/PKGBUILD (from rev 361280, cmake/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-08-27 17:55:56 UTC (rev 361281)
@@ -0,0 +1,59 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=cmake
+pkgver=3.15.2
+pkgrel=2
+pkgdesc='A cross-platform open-source make system'
+arch=('x86_64')
+url="https://www.cmake.org/"
+license=('custom')
+depends=('curl' 'libarchive' 'shared-mime-info' 'jsoncpp' 'libuv' 'rhash')
+makedepends=('qt5-base' 'python-sphinx' 'emacs')
+optdepends=('qt5-base: cmake-gui')
+source=("https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz"
+        cmake-default-libdir.patch::"https://gitlab.kitware.com/cmake/cmake/commit/18365587.diff")
+sha512sums=('154494fe4c8673c3b17a6f1823c55f06fbb35d7ea048b63a5c3e3157108f222693cf1606c879a3cf425edea686dfe19e27974b338e5d281ec118b1a51c632ccc'
+            '9e9fcb9cb104fd1c679c41d0c7ac6c7184ef7fb9c44bfe807926f96b1f4afd3c86a7bbe486d306c1384f27c9141363543a2a9e63bc585e30f09731d9f7533b08')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i ../cmake-default-libdir.patch # Set lib as default LIBDIR
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./bootstrap --prefix=/usr \
+    --mandir=/share/man \
+    --docdir=/share/doc/cmake \
+    --sphinx-man \
+    --system-libs \
+    --qt-gui \
+    --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN)
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  vimpath="${pkgdir}/usr/share/vim/vimfiles"
+  install -d "${vimpath}"/{indent,syntax}
+  ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/indent/cmake.vim \
+    "${vimpath}"/indent/
+  ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/syntax/cmake.vim \
+    "${vimpath}"/syntax/
+
+  install -d "${pkgdir}"/usr/share/emacs/site-lisp/
+  emacs -batch -f batch-byte-compile \
+    "${pkgdir}"/usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el
+  ln -s /usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el \
+    "${pkgdir}"/usr/share/emacs/site-lisp/
+  ln -s /usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.elc \
+    "${pkgdir}"/usr/share/emacs/site-lisp/
+
+  install -Dm644 Copyright.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}

Deleted: rebuild.list
===================================================================
--- rebuild.list	2019-08-27 17:55:32 UTC (rev 361280)
+++ rebuild.list	2019-08-27 17:55:56 UTC (rev 361281)
@@ -1,2 +0,0 @@
-cmake-fedora
-uranium

Copied: cmake/repos/extra-x86_64/rebuild.list (from rev 361280, cmake/trunk/rebuild.list)
===================================================================
--- rebuild.list	                        (rev 0)
+++ rebuild.list	2019-08-27 17:55:56 UTC (rev 361281)
@@ -0,0 +1,2 @@
+cmake-fedora
+uranium