From 6af918e0903c3a55e20e96f50b0c99d915f9c4d6 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 22 Dec 2012 21:23:35 +0000 Subject: Version bump. (Portage version: 2.2.0_alpha149_p1/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA) --- dev-haskell/crypto/ChangeLog | 9 ++- dev-haskell/crypto/crypto-4.2.4.ebuild | 48 ----------- dev-haskell/crypto/crypto-4.2.5.1.ebuild | 47 +++++++++++ dev-haskell/crypto/crypto-4.2.5.ebuild | 49 ------------ .../crypto/files/crypto-4.2.4-ghc-7.4.patch | 27 ------- .../crypto/files/crypto-4.2.5-ghc-7.6.patch | 93 ---------------------- 6 files changed, 55 insertions(+), 218 deletions(-) delete mode 100644 dev-haskell/crypto/crypto-4.2.4.ebuild create mode 100644 dev-haskell/crypto/crypto-4.2.5.1.ebuild delete mode 100644 dev-haskell/crypto/crypto-4.2.5.ebuild delete mode 100644 dev-haskell/crypto/files/crypto-4.2.4-ghc-7.4.patch delete mode 100644 dev-haskell/crypto/files/crypto-4.2.5-ghc-7.6.patch (limited to 'dev-haskell/crypto') diff --git a/dev-haskell/crypto/ChangeLog b/dev-haskell/crypto/ChangeLog index 31ac2c0b62cb..0bc6894c2140 100644 --- a/dev-haskell/crypto/ChangeLog +++ b/dev-haskell/crypto/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-haskell/crypto # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/crypto/ChangeLog,v 1.6 2012/11/18 11:45:02 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/crypto/ChangeLog,v 1.7 2012/12/22 21:23:34 slyfox Exp $ + +*crypto-4.2.5.1 (22 Dec 2012) + + 22 Dec 2012; Sergei Trofimovich +crypto-4.2.5.1.ebuild, + -crypto-4.2.4.ebuild, -crypto-4.2.5.ebuild, -files/crypto-4.2.4-ghc-7.4.patch, + -files/crypto-4.2.5-ghc-7.6.patch: + Version bump. 18 Nov 2012; Mark Wright +files/crypto-4.2.5-ghc-7.6.patch, crypto-4.2.5.ebuild: diff --git a/dev-haskell/crypto/crypto-4.2.4.ebuild b/dev-haskell/crypto/crypto-4.2.4.ebuild deleted file mode 100644 index 185fb72eacef..000000000000 --- a/dev-haskell/crypto/crypto-4.2.4.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/crypto/crypto-4.2.4.ebuild,v 1.4 2012/09/12 15:42:29 qnikst Exp $ - -# ebuild generated by hackport 0.2.13 - -EAPI="3" - -CABAL_FEATURES="bin lib profile haddock hoogle hscolour" -inherit base haskell-cabal - -MY_PN="Crypto" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Collects together existing Haskell cryptographic functions into a package" -HOMEPAGE="http://hackage.haskell.org/package/Crypto" -SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-haskell/hunit - >=dev-haskell/quickcheck-2.4.0.1 - >=dev-lang/ghc-6.8.2" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.2" - -S="${WORKDIR}/${MY_P}" - -PATCHES=("${FILESDIR}/${PN}-4.2.4-ghc-7.4.patch") - -src_test() { - TESTS="SymmetricTest SHA1Test RSATest QuickTest HMACTest WordListTest" - - for t in $TESTS; do - einfo "Running test $t..." - # the quickcheck tests doesn't fail when the test fails... - "${S}/dist/build/$t/$t" || die "Test $t failed" - done -} - -src_install() { - cabal_src_install - - rm -rf "${D}/usr/bin" 2>/dev/null -} diff --git a/dev-haskell/crypto/crypto-4.2.5.1.ebuild b/dev-haskell/crypto/crypto-4.2.5.1.ebuild new file mode 100644 index 000000000000..bdc64cbd7a34 --- /dev/null +++ b/dev-haskell/crypto/crypto-4.2.5.1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/crypto/crypto-4.2.5.1.ebuild,v 1.1 2012/12/22 21:23:34 slyfox Exp $ + +EAPI=5 + +# ebuild generated by hackport 0.3.9999 + +CABAL_FEATURES="bin lib profile haddock hoogle hscolour" +inherit haskell-cabal + +MY_PN="Crypto" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Collects together existing Haskell cryptographic functions into a package" +HOMEPAGE="http://hackage.haskell.org/package/Crypto" +SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz" + +LICENSE="BSD GPL-2" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-haskell/hunit:=[profile?] + >=dev-haskell/quickcheck-2.4.0.1:=[profile?] + dev-haskell/random:=[profile?] + >=dev-lang/ghc-6.10.4:=" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.2" + +S="${WORKDIR}/${MY_P}" + +src_test() { + TESTS="SymmetricTest SHA1Test RSATest QuickTest HMACTest WordListTest" + + for t in $TESTS; do + einfo "Running test $t..." + # the quickcheck tests doesn't fail when the test fails... + "${S}/dist/build/$t/$t" || die "Test $t failed" + done +} + +src_install() { + cabal_src_install + + rm -rf "${D}/usr/bin" 2>/dev/null +} diff --git a/dev-haskell/crypto/crypto-4.2.5.ebuild b/dev-haskell/crypto/crypto-4.2.5.ebuild deleted file mode 100644 index dede2783b9f0..000000000000 --- a/dev-haskell/crypto/crypto-4.2.5.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/crypto/crypto-4.2.5.ebuild,v 1.3 2012/11/18 11:45:02 gienah Exp $ - -EAPI=5 - -# ebuild generated by hackport 0.3.9999 - -CABAL_FEATURES="bin lib profile haddock hoogle hscolour" -inherit base haskell-cabal - -MY_PN="Crypto" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Collects together existing Haskell cryptographic functions into a package" -HOMEPAGE="http://hackage.haskell.org/package/Crypto" -SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz" - -LICENSE="BSD GPL-2" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-haskell/hunit:=[profile?] - >=dev-haskell/quickcheck-2.4.0.1:=[profile?] - dev-haskell/random:=[profile?] - >=dev-lang/ghc-6.10.4:=" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.2" - -S="${WORKDIR}/${MY_P}" - -PATCHES=("${FILESDIR}/${PN}-4.2.5-ghc-7.6.patch") - -src_test() { - TESTS="SymmetricTest SHA1Test RSATest QuickTest HMACTest WordListTest" - - for t in $TESTS; do - einfo "Running test $t..." - # the quickcheck tests doesn't fail when the test fails... - "${S}/dist/build/$t/$t" || die "Test $t failed" - done -} - -src_install() { - cabal_src_install - - rm -rf "${D}/usr/bin" 2>/dev/null -} diff --git a/dev-haskell/crypto/files/crypto-4.2.4-ghc-7.4.patch b/dev-haskell/crypto/files/crypto-4.2.4-ghc-7.4.patch deleted file mode 100644 index a4ca6a702b68..000000000000 --- a/dev-haskell/crypto/files/crypto-4.2.4-ghc-7.4.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- Crypto-4.2.4-orig/Data/Digest/SHA2.hs 2011-09-08 10:30:07.000000000 +1000 -+++ Crypto-4.2.4/Data/Digest/SHA2.hs 2011-12-20 13:28:26.401971284 +1100 -@@ -106,7 +106,7 @@ - data Hash384 = Hash384 !Word64 !Word64 !Word64 !Word64 !Word64 !Word64 deriving (Eq, Ord) - data Hash224 = Hash224 !Word32 !Word32 !Word32 !Word32 !Word32 !Word32 !Word32 deriving (Eq, Ord) - --instance (Integral a) => Show (Hash8 a) where -+instance (Integral a, Show a) => Show (Hash8 a) where - showsPrec _ (Hash8 a b c d e f g h) = - (showHex a) . (' ':) . - (showHex b) . (' ':) . -@@ -146,7 +146,7 @@ - where - bs = bitSize (head r) - --instance (Integral h, Bits h) => Hash (Hash8 h) where -+instance (Integral h, Bits h, Show h) => Hash (Hash8 h) where - toOctets (Hash8 x0 x1 x2 x3 x4 x5 x6 x7) = bitsToOctets =<< [x0, x1, x2, x3, x4, x5, x6, x7] - - instance Hash Hash384 where -@@ -282,4 +282,4 @@ - - -- Test with: - -- ghc -no-recomp -O --make Data/Digest/SHA2.hs -main-is Data.Digest.SHA2.moduleTest -o moduleTest && ./moduleTest && rm moduleTest --moduleTest = runTestTT test_sha2 -\ No newline at end of file -+moduleTest = runTestTT test_sha2 diff --git a/dev-haskell/crypto/files/crypto-4.2.5-ghc-7.6.patch b/dev-haskell/crypto/files/crypto-4.2.5-ghc-7.6.patch deleted file mode 100644 index 23bc1ec43f26..000000000000 --- a/dev-haskell/crypto/files/crypto-4.2.5-ghc-7.6.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- Crypto-4.2.5-orig/Data/Digest/SHA1.hs 2012-05-14 21:58:24.000000000 +1000 -+++ Crypto-4.2.5/Data/Digest/SHA1.hs 2012-11-18 22:00:46.168927637 +1100 -@@ -93,7 +93,7 @@ - g [] = Nothing - g xs = Just (splitAt 64 xs) - --fromBytes :: (Bits a) => [a] -> a -+fromBytes :: (Num a, Bits a) => [a] -> a - fromBytes input = - let dofb accum [] = accum - dofb accum (x:xs) = dofb ((shiftL accum 8) .|. x) xs ---- Crypto-4.2.5-orig/Data/Digest/SHA2.hs 2012-05-14 21:58:24.000000000 +1000 -+++ Crypto-4.2.5/Data/Digest/SHA2.hs 2012-11-18 22:00:46.169927666 +1100 -@@ -80,7 +80,7 @@ - -- | 'padding' currently requires that the bitSize of @a@ divide the bitSize - -- of @w@ - ----------------------------------------------------------------------------- --padding :: (ShaData w, Bits a, Integral a) => [a] -> [[w]] -+padding :: (ShaData w, Bits a, Num w, Integral a) => [a] -> [[w]] - padding x = unfoldr block $ paddingHelper x 0 (0::Int) (0::Integer) - where - block [] = Nothing -@@ -155,7 +155,7 @@ - instance Hash Hash224 where - toOctets (Hash224 x0 x1 x2 x3 x4 x5 x6) = bitsToOctets =<< [x0, x1, x2, x3, x4, x5, x6] - --shaStep :: (ShaData w) => Hash8 w -> [w] -> Hash8 w -+shaStep :: (ShaData w, Num w) => Hash8 w -> [w] -> Hash8 w - shaStep h m = (foldl' (flip id) h (zipWith mkStep3 ks ws)) `plus` h - where - ws = m++zipWith4 smallSigma (drop (blockSize-2) ws) (drop (blockSize-7) ws) -@@ -173,7 +173,7 @@ - -- | Due to the limitations of 'padding', 'sha' currently requires that the - -- bitSize of @a@ divide the bitSize of @w@ - ----------------------------------------------------------------------------- --sha :: (ShaData w, Bits a, Integral a) => Hash8 w -> [a] -> Hash8 w -+sha :: (ShaData w, Num w, Bits a, Integral a) => Hash8 w -> [a] -> Hash8 w - sha h0 x = foldl' shaStep h0 $ padding x - - stringToOctets :: String -> [Word8] -@@ -282,4 +282,4 @@ - - -- Test with: - -- ghc -no-recomp -O --make Data/Digest/SHA2.hs -main-is Data.Digest.SHA2.moduleTest -o moduleTest && ./moduleTest && rm moduleTest --moduleTest = runTestTT test_sha2 -\ No newline at end of file -+moduleTest = runTestTT test_sha2 ---- Crypto-4.2.5-orig/Data/LargeWord.hs 2012-05-14 21:58:24.000000000 +1000 -+++ Crypto-4.2.5/Data/LargeWord.hs 2012-11-18 22:00:46.169927666 +1100 -@@ -62,7 +62,7 @@ - data LargeKey a b = LargeKey a b - deriving (Eq, Ord) - --instance (Ord a, Bits a, LargeWord a, Bits b, LargeWord b) => -+instance (Num a, Ord a, Bits a, LargeWord a, Num b, Bits b, LargeWord b) => - LargeWord (LargeKey a b) where - largeWordToInteger (LargeKey lo hi) = - largeWordToInteger lo + (2^(bitSize lo)) * largeWordToInteger hi -@@ -96,17 +96,17 @@ - where conv = integerToLargeWord . largeWordToInteger - largeBitSize ~(LargeKey lo hi) = largeBitSize lo + largeBitSize hi - --instance (Ord a, Bits a, LargeWord a, Bits b, LargeWord b) => Show (LargeKey a b) where -+instance (Num a, Ord a, Bits a, LargeWord a, Num b, Bits b, LargeWord b) => Show (LargeKey a b) where - showsPrec p = showInt . largeWordToInteger - --instance (Ord a, Bits a, LargeWord a, Bits b, LargeWord b) => -+instance (Num a, Ord a, Bits a, LargeWord a, Num b, Bits b, LargeWord b) => - Num (LargeKey a b) where - (+) = largeWordPlus - fromInteger = integerToLargeWord - - -- Larger keys are instances of Bits provided their constituents are keys. - --instance (Ord a, Bits a, LargeWord a, Bits b, LargeWord b) => -+instance (Num a, Ord a, Bits a, LargeWord a, Num b, Bits b, LargeWord b) => - Bits (LargeKey a b) where - (.&.) = largeWordAnd - (.|.) = largeWordOr -@@ -130,11 +130,11 @@ - boflk :: (LargeKey a b) -> b - boflk = undefined - --instance (Ord a, Bits a, LargeWord a, Ord b, Bits b, LargeWord b) => -+instance (Num a, Ord a, Bits a, LargeWord a, Num b, Ord b, Bits b, LargeWord b) => - Integral (LargeKey a b) where - toInteger = largeWordToInteger - --instance (Ord a, Bits a, LargeWord a, Ord b, Bits b, LargeWord b) => -+instance (Num a, Ord a, Bits a, LargeWord a, Num b, Ord b, Bits b, LargeWord b) => - Real (LargeKey a b) - - instance Enum (LargeKey a b) -- cgit v1.2.3-65-gdbad