Date: Wednesday, May 25, 2016 @ 15:50:22 Author: fyan Revision: 176880
upgpkg: haskell-dataenc 0.14.0.7-8 rebuild with ghc-8.0.1, base-prelude-1.0.1.1, cabal-install-1.24.0.0, cairo-0.13.2.0, cmark-0.5.2.1, data-default-0.7.0, data-default-class-0.1.0, extra-1.4.7, generic-trie-0.3.0.2, glib-0.13.3.0, gtk3-0.14.3, haddock-api-2.17.2, haddock-library-1.4.1, js-jquery-1.12.4, memory-0.13, microlens-0.4.4.0, network-multicast-0.1.1, pango-0.13.2.0, simple-sendfile-0.2.24, stack-1.1.2, texmath-0.8.6.3, wai-3.2.1.1 Modified: haskell-dataenc/trunk/PKGBUILD Deleted: haskell-dataenc/trunk/haskell-dataenc.install haskell-dataenc/trunk/update-build-deps-ghc-7.10.1.patch ------------------------------------+ PKGBUILD | 21 ++++++++++----------- haskell-dataenc.install | 18 ------------------ update-build-deps-ghc-7.10.1.patch | 12 ------------ 3 files changed, 10 insertions(+), 41 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-05-25 13:50:11 UTC (rev 176879) +++ PKGBUILD 2016-05-25 13:50:22 UTC (rev 176880) @@ -6,18 +6,17 @@ _hkgname=dataenc pkgname=haskell-dataenc pkgver=0.14.0.7 -pkgrel=7 +pkgrel=8 pkgdesc="Data encoding library" url="http://hackage.haskell.org/package/dataenc"; license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.10.3' 'sh') -install=${pkgname}.install -options=('staticlibs') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz update-build-deps-ghc-7.10.1.patch) +depends=('ghc=8.0.1' 'sh') +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +md5sums=('28491649dbeafb9512b4ea187cc6fddf') prepare(){ - patch -Np0 -i $srcdir/update-build-deps-ghc-7.10.1.patch + sed -i 's/base >= 3.0.0 && < 4.8/base >= 3.0.0 \&\& < 4.10/' ${_hkgname}-${pkgver}/${_hkgname}.cabal } build() { @@ -30,13 +29,15 @@ runhaskell Setup haddock runhaskell Setup register --gen-script runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh 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 + cd "${srcdir}/${_hkgname}-${pkgver}" + + install -D -m744 register.sh "${pkgdir}/usr/share/haskell/register/${pkgname}.sh" + install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.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} @@ -43,5 +44,3 @@ install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE } -md5sums=('28491649dbeafb9512b4ea187cc6fddf' - '0792888a886449c0ac15183b21c8bc7a') Deleted: haskell-dataenc.install =================================================================== --- haskell-dataenc.install 2016-05-25 13:50:11 UTC (rev 176879) +++ haskell-dataenc.install 2016-05-25 13:50:22 UTC (rev 176880) @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-dataenc -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: update-build-deps-ghc-7.10.1.patch =================================================================== --- update-build-deps-ghc-7.10.1.patch 2016-05-25 13:50:11 UTC (rev 176879) +++ update-build-deps-ghc-7.10.1.patch 2016-05-25 13:50:22 UTC (rev 176880) @@ -1,12 +0,0 @@ -diff -aur dataenc-0.14.0.7/dataenc.cabal dataenc-0.14.0.7.new/dataenc.cabal ---- dataenc-0.14.0.7/dataenc.cabal 2014-04-22 20:38:41.000000000 +0200 -+++ dataenc-0.14.0.7.new/dataenc.cabal 2015-03-31 19:19:16.308257528 +0200 -@@ -21,7 +21,7 @@ - - library - hs-source-dirs: src -- build-depends: array, base >= 3.0.0 && < 4.8, containers -+ build-depends: array, base >= 3.0.0 && < 4.9, containers - exposed-modules: - Codec.Binary.Base16 - Codec.Binary.Base32
