[arch-commits] Commit in cabal-helper/repos (8 files)

Felix Yan fyan at archlinux.org
Wed Jan 20 16:33:08 UTC 2016


    Date: Wednesday, January 20, 2016 @ 17:33:07
  Author: fyan
Revision: 158320

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

Added:
  cabal-helper/repos/community-i686/PKGBUILD
    (from rev 158319, cabal-helper/trunk/PKGBUILD)
  cabal-helper/repos/community-i686/haskell-cabal-helper.install
    (from rev 158319, cabal-helper/trunk/haskell-cabal-helper.install)
  cabal-helper/repos/community-x86_64/PKGBUILD
    (from rev 158319, cabal-helper/trunk/PKGBUILD)
  cabal-helper/repos/community-x86_64/haskell-cabal-helper.install
    (from rev 158319, cabal-helper/trunk/haskell-cabal-helper.install)
Deleted:
  cabal-helper/repos/community-i686/PKGBUILD
  cabal-helper/repos/community-i686/haskell-cabal-helper.install
  cabal-helper/repos/community-x86_64/PKGBUILD
  cabal-helper/repos/community-x86_64/haskell-cabal-helper.install

-----------------------------------------------+
 /PKGBUILD                                     |  104 ++++++++++++++++++++++++
 /haskell-cabal-helper.install                 |   36 ++++++++
 community-i686/PKGBUILD                       |   41 ---------
 community-i686/haskell-cabal-helper.install   |   18 ----
 community-x86_64/PKGBUILD                     |   41 ---------
 community-x86_64/haskell-cabal-helper.install |   18 ----
 6 files changed, 140 insertions(+), 118 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2016-01-20 16:32:37 UTC (rev 158319)
+++ community-i686/PKGBUILD	2016-01-20 16:33:07 UTC (rev 158320)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
-
-_hkgname=cabal-helper
-pkgname=haskell-cabal-helper
-pkgver=0.6.3.1
-pkgrel=1
-pkgdesc="Simple interface to some of Cabal\'s configuration state used by ghc-mod"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=("AGPL3")
-arch=('i686' 'x86_64')
-depends=("ghc=7.10.3" "haskell-mtl" "haskell-temporary" "haskell-utf8-string")
-options=('staticlibs')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=('c19a9a87c54f6649e0f8cbb3a070244bff9fcc5b9ae783c00c049867fb1a7afe')
-
-build() {
-    cd "${srcdir}/${_hkgname}-${pkgver}"
-    
-    runhaskell Setup configure -O --enable-library-profiling --enable-shared \
-        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --libexecdir="/usr/lib" \
-        --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock --hoogle --html
-    runhaskell Setup register --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd "${srcdir}/${_hkgname}-${pkgver}"
-    
-    install -D -m744 register.sh   "${pkgdir}/usr/share/haskell/${pkgname}/register.sh"
-    install    -m744 unregister.sh "${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh"
-    install -d -m755 "${pkgdir}/usr/share/doc/ghc/html/libraries"
-    ln -s "/usr/share/doc/${pkgname}/html" "${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}"
-    runhaskell Setup copy --destdir="${pkgdir}"
-    rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
-}

Copied: cabal-helper/repos/community-i686/PKGBUILD (from rev 158319, cabal-helper/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2016-01-20 16:33:07 UTC (rev 158320)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+pkgbase=cabal-helper
+pkgname=(cabal-helper haskell-cabal-helper)
+pkgver=0.6.3.1
+pkgrel=2
+pkgdesc="Simple interface to some of Cabals configuration state used by ghc-mod"
+url="http://hackage.haskell.org/package/${pkgbase}"
+license=("AGPL3")
+arch=('i686' 'x86_64')
+makedepends=("ghc=7.10.3" "haskell-mtl" "haskell-temporary" "haskell-utf8-string")
+options=('staticlibs')
+source=("http://hackage.haskell.org/packages/archive/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz")
+sha256sums=('c19a9a87c54f6649e0f8cbb3a070244bff9fcc5b9ae783c00c049867fb1a7afe')
+
+build() {
+    cd "${srcdir}/${pkgbase}-${pkgver}"
+    
+    runhaskell Setup configure -O --enable-library-profiling --enable-shared \
+        --prefix=/usr --docdir="/usr/share/doc/${pkgbase}" --libexecdir="/usr/lib" \
+        --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock --hoogle --html
+    runhaskell Setup register --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package_cabal-helper() {
+    depends=('gmp' 'libffi')
+
+    cd "${srcdir}/${pkgbase}-${pkgver}"
+    runhaskell Setup copy --destdir="${pkgdir}"
+    rm -r "$pkgdir"/usr/{lib/ghc-*,share}
+}
+
+package_haskell-cabal-helper() {
+    pkgdesc="Simple interface to some of Cabal's configuration state used by ghc-mod (docs and libraries)"
+    depends=("${makedepends[@]}" 'cabal-helper')
+    install="haskell-cabal-helper.install"
+    cd "${srcdir}/${pkgbase}-${pkgver}"
+    
+    install -D -m744 register.sh   "${pkgdir}/usr/share/haskell/${pkgname}/register.sh"
+    install    -m744 unregister.sh "${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh"
+    install -d -m755 "${pkgdir}/usr/share/doc/ghc/html/libraries"
+    ln -s "/usr/share/doc/${pkgbase}/html" "${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgbase}"
+    runhaskell Setup copy --destdir="${pkgdir}"
+    rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+    rm -f "$pkgdir/usr/lib/cabal-helper-wrapper"
+}

Deleted: community-i686/haskell-cabal-helper.install
===================================================================
--- community-i686/haskell-cabal-helper.install	2016-01-20 16:32:37 UTC (rev 158319)
+++ community-i686/haskell-cabal-helper.install	2016-01-20 16:33:07 UTC (rev 158320)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-cabal-helper
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}

Copied: cabal-helper/repos/community-i686/haskell-cabal-helper.install (from rev 158319, cabal-helper/trunk/haskell-cabal-helper.install)
===================================================================
--- community-i686/haskell-cabal-helper.install	                        (rev 0)
+++ community-i686/haskell-cabal-helper.install	2016-01-20 16:33:07 UTC (rev 158320)
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-cabal-helper
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2016-01-20 16:32:37 UTC (rev 158319)
+++ community-x86_64/PKGBUILD	2016-01-20 16:33:07 UTC (rev 158320)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
-
-_hkgname=cabal-helper
-pkgname=haskell-cabal-helper
-pkgver=0.6.3.1
-pkgrel=1
-pkgdesc="Simple interface to some of Cabal\'s configuration state used by ghc-mod"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=("AGPL3")
-arch=('i686' 'x86_64')
-depends=("ghc=7.10.3" "haskell-mtl" "haskell-temporary" "haskell-utf8-string")
-options=('staticlibs')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=('c19a9a87c54f6649e0f8cbb3a070244bff9fcc5b9ae783c00c049867fb1a7afe')
-
-build() {
-    cd "${srcdir}/${_hkgname}-${pkgver}"
-    
-    runhaskell Setup configure -O --enable-library-profiling --enable-shared \
-        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --libexecdir="/usr/lib" \
-        --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock --hoogle --html
-    runhaskell Setup register --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd "${srcdir}/${_hkgname}-${pkgver}"
-    
-    install -D -m744 register.sh   "${pkgdir}/usr/share/haskell/${pkgname}/register.sh"
-    install    -m744 unregister.sh "${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh"
-    install -d -m755 "${pkgdir}/usr/share/doc/ghc/html/libraries"
-    ln -s "/usr/share/doc/${pkgname}/html" "${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}"
-    runhaskell Setup copy --destdir="${pkgdir}"
-    rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
-}

Copied: cabal-helper/repos/community-x86_64/PKGBUILD (from rev 158319, cabal-helper/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2016-01-20 16:33:07 UTC (rev 158320)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+pkgbase=cabal-helper
+pkgname=(cabal-helper haskell-cabal-helper)
+pkgver=0.6.3.1
+pkgrel=2
+pkgdesc="Simple interface to some of Cabals configuration state used by ghc-mod"
+url="http://hackage.haskell.org/package/${pkgbase}"
+license=("AGPL3")
+arch=('i686' 'x86_64')
+makedepends=("ghc=7.10.3" "haskell-mtl" "haskell-temporary" "haskell-utf8-string")
+options=('staticlibs')
+source=("http://hackage.haskell.org/packages/archive/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz")
+sha256sums=('c19a9a87c54f6649e0f8cbb3a070244bff9fcc5b9ae783c00c049867fb1a7afe')
+
+build() {
+    cd "${srcdir}/${pkgbase}-${pkgver}"
+    
+    runhaskell Setup configure -O --enable-library-profiling --enable-shared \
+        --prefix=/usr --docdir="/usr/share/doc/${pkgbase}" --libexecdir="/usr/lib" \
+        --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock --hoogle --html
+    runhaskell Setup register --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package_cabal-helper() {
+    depends=('gmp' 'libffi')
+
+    cd "${srcdir}/${pkgbase}-${pkgver}"
+    runhaskell Setup copy --destdir="${pkgdir}"
+    rm -r "$pkgdir"/usr/{lib/ghc-*,share}
+}
+
+package_haskell-cabal-helper() {
+    pkgdesc="Simple interface to some of Cabal's configuration state used by ghc-mod (docs and libraries)"
+    depends=("${makedepends[@]}" 'cabal-helper')
+    install="haskell-cabal-helper.install"
+    cd "${srcdir}/${pkgbase}-${pkgver}"
+    
+    install -D -m744 register.sh   "${pkgdir}/usr/share/haskell/${pkgname}/register.sh"
+    install    -m744 unregister.sh "${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh"
+    install -d -m755 "${pkgdir}/usr/share/doc/ghc/html/libraries"
+    ln -s "/usr/share/doc/${pkgbase}/html" "${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgbase}"
+    runhaskell Setup copy --destdir="${pkgdir}"
+    rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+    rm -f "$pkgdir/usr/lib/cabal-helper-wrapper"
+}

Deleted: community-x86_64/haskell-cabal-helper.install
===================================================================
--- community-x86_64/haskell-cabal-helper.install	2016-01-20 16:32:37 UTC (rev 158319)
+++ community-x86_64/haskell-cabal-helper.install	2016-01-20 16:33:07 UTC (rev 158320)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-cabal-helper
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}

Copied: cabal-helper/repos/community-x86_64/haskell-cabal-helper.install (from rev 158319, cabal-helper/trunk/haskell-cabal-helper.install)
===================================================================
--- community-x86_64/haskell-cabal-helper.install	                        (rev 0)
+++ community-x86_64/haskell-cabal-helper.install	2016-01-20 16:33:07 UTC (rev 158320)
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-cabal-helper
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}



More information about the arch-commits mailing list