Version bump.

Package-Manager: portage-2.2.0_alpha149_p1/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

6 files changed, 16 insertions, 183 deletions

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 <slyfox@gentoo.org> +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 <gienah@gentoo.org>
   +files/crypto-4.2.5-ghc-7.6.patch, crypto-4.2.5.ebuild:
diff --git a/dev-haskell/crypto/Manifest b/dev-haskell/crypto/Manifest
index 96c6a1e6098b..6f4b9b8f3ab9 100644
--- a/dev-haskell/crypto/Manifest
+++ b/dev-haskell/crypto/Manifest
@@ -1,18 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX crypto-4.2.4-ghc-7.4.patch 1131 SHA256 a605b20502db870d68362256f0d6ee9f8ebdd200517f0d2f82755567c143cbca SHA512 1e5832abfb9ba054a4b46fdb33f2b516a0b92dac4b6bfa7cef1595e66ce3889b47447d62ee61572404889b8cffc089ebd1cbde4520d521d31045781becccbf09 WHIRLPOOL 8419557c98994adcac64d4096a5cf9a116dfecdb06468cd3ee7ff942a7b08f8d26a3db452d4ec8cca72f08fbc91dd423ae883e2032be17b3f3cd7b00e6c17555
-AUX crypto-4.2.5-ghc-7.6.patch 4081 SHA256 2461cd18c7c5baaa876ba4be6719983b7b73d7e532ea773e973d71a0140244b8 SHA512 5b951abad4a25e4d3c242e8b8501625276fe669d99fff0d895263c26a730d0ac028ac268f25086029cea71b780da4f03b45267172e0298ed58dcc9d996ce5d45 WHIRLPOOL ca86a65c776a344231ef2a42165019dce378d1e873e763ea319561ca9bd13e6d354fa5286dbed038234cfbbc8463efc7c201c0e58ae64a0361b94bd2a68543ea
-DIST Crypto-4.2.4.tar.gz 57027 SHA256 77986dd8100b678adc784e682180ba659617ff5708089847420166ead0768a17 SHA512 c840237c2df7c05882176d78e808e125b50b5ef5c26420822d1e5c4d6d0664d939f74591005bf781f61e19e875aa33b8a730e741b4c01b84821ba764f0e37f55 WHIRLPOOL 1f5146976a9240d998967d4cf81411e08acd4cfb621d8eab133d4dbafd58de7b3f50d20963e1e4cde8a4a567e02dfa175099289b97ec4c33e51737de9c523c79
-DIST Crypto-4.2.5.tar.gz 57486 SHA256 68754f0827f067707a1bf3d62f61e2b42f05ebf0c560a31a442a622974446473 SHA512 9e0f41953dd8b8460ea4b49232d539af655f2f05ebfd6e04964b1372845bc9530140232048757ec0fbe4ab37334d1331662e999687b40361022b33a7a8a3f247 WHIRLPOOL 13ffb5bb8ccdac5b78602c355fb4199ab73bc0287551295bd9790038607a7f03bc28dc4b3e4cbcc3649cc85a47eaf1b1967e617935c23202967c9f93b635508c
-EBUILD crypto-4.2.4.ebuild 1207 SHA256 d490bc89f3385f22d4e8096fa13506c5471af0888538029f2cb00b5c1164e50a SHA512 31fb01b94e72158e8aa333edd500b5ef555499cf05ad11d13edf65f0e7b83c5aade36a768b928a23bd2a4db1beb1e8a8eaf42426632df0339cf20a36d993f764 WHIRLPOOL deeaed91fc7ba8c3d60b22568766322b5767f1928fd306f59cc2ffcc20642314a5fc0c7a3734ee6cff8bd742381cc16fcfd54658d54b68ed6a4652c27abf6b03
-EBUILD crypto-4.2.5.ebuild 1273 SHA256 807e4a172748578053bd671af97abcf32e3023c7f8558df7d3fc3a7726c0e468 SHA512 8adf379be01d6097c77ee4d2109d43c96de7795b7a93468ee3aaafd178987c05e9da14425118a8bf87b36f01c6a6ad73c4fb43c323d200c5297b92ac80ee7575 WHIRLPOOL a03033e719ba34bac926db00d0e4c4fdf95893d89e7afbb3b12c7642c99c2f81a8b5a4cba2cd66a66b5fec535c753b4e5d60dc2781ef4a277deafb8980a3f28e
-MISC ChangeLog 1137 SHA256 964f5cd6fa2de5b6c57192bc158d16e142a041f1bcdc13b21fe8d44291acab28 SHA512 ce73a5e03157f82e1837933a1fb84a607288899cc3db27c357cf21caa83d712d563e5af2765e02cb0106870fbed60a0b246745ba3c9b5e96970f1b6a59f9a712 WHIRLPOOL b7ec406a18e815ef6568fafe14530df3f4b971374d7ba70086e98b709659e6f03533214bbd436e00e3c7b5419a319a02dae2af16443a9929fc662679b7eec4f4
+DIST Crypto-4.2.5.1.tar.gz 56474 SHA256 6ad5e0533d0aaaf2f30049d166881a845cc190780798661815da9b4914a0af66 SHA512 3b965f6a06784d3e8996aaae2622fa5b8e4a645a324618ff497f565230a8db525a0a5305d5cc5166283b2a24242df4554b29eb015326d416dc705f252ef456ac WHIRLPOOL d5d384c3995a1666a16b26dcd55f4c0821110a1945f05ce9203478333496b6407bb1670efad6ea2b56c9f8f2a2c5146d59055c2aec1b19933e5885455f57e3f4
+EBUILD crypto-4.2.5.1.ebuild 1219 SHA256 19d98390c5f67f345ffc447fbb19ff8ee4a5f507fd283ef2207d81dba94680e9 SHA512 a38875c5f955f03238b2c2f3c98c244d579c3b4f2f4aa4b5651511c8705dbedf7c8a35c6082263a4dbfd5503cc6938d897203e93a5ee1209e9950874dbdaa7ed WHIRLPOOL f0a046248344040d7e80a6aeffcd6d1d68dc5cce36db080514f009227515506c38269cc838055505cdfcfdaa1eee4b7f75cd353d72cfdf3dae499425fd90ff3e
+MISC ChangeLog 1381 SHA256 3d09b8a071f103cebd9e5bd17271011d3988693f9a24cb8d8ac35d1ad27298ff SHA512 e86d29b557591ca0114b90eb9947060678abaeab01a79ee3a44178e34df8dd579612033746d36a3bf6f7be935f87a6bcf14406f63ea63ffd87830ff6768ce4ad WHIRLPOOL 37ea6df1f1921efc08f90159e1320054f80e39c40b06f2ca71eb046cbee7cb6c1d053008b2c54a5014185895cc4cbe8221c6007250f4d8dcf385441974fdd7bd
 MISC metadata.xml 524 SHA256 6e4fe6685f2ad27aefe3301b24596392951c117d2fab8aeaa738844eea605b8c SHA512 b24cedc57690060d1c5e7a32ca3d730354dae03ffc1c547adfbf108c123cad3e031ee4a3f45781e2a9bb4ba1c0681198986f52c2cffadfe6447e42eb3c6fd3bf WHIRLPOOL 78ddb6bd8b9552938454c1594fd9856174d5f946e73715313537e7e248f6eaeb947ea917a17d86cd6cd53e0ab2740ed874461858fc04d9ea3168fba1a5541594
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlCoykUACgkQoBEVQmGOlx9dAAEAtxI6D/TpybntY5odGVxdzXVB
-WY9LvjD11AjqzKdHfAkBAOKpeaqqhCilz/hf8/zMOT2MsArErTum7Afu/4932ert
-=A8hY
+iEYEAREIAAYFAlDWJMEACgkQcaHudmEf86oiMwCfVSA10aOfznL1qWUytR36HIMd
+MSwAnAli3YDQbowWsqxOrwYtxNgtMG7Z
+=458J
 -----END PGP SIGNATURE-----
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.ebuild b/dev-haskell/crypto/crypto-4.2.5.1.ebuild
index dede2783b9f0..bdc64cbd7a34 100644
--- a/dev-haskell/crypto/crypto-4.2.5.ebuild
+++ b/dev-haskell/crypto/crypto-4.2.5.1.ebuild
@@ -1,13 +1,13 @@
 # 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 $
+# $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 base haskell-cabal
+inherit haskell-cabal
 
 MY_PN="Crypto"
 MY_P="${MY_PN}-${PV}"
@@ -30,8 +30,6 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=("${FILESDIR}/${PN}-4.2.5-ghc-7.6.patch")
-
 src_test() {
 	TESTS="SymmetricTest SHA1Test RSATest QuickTest HMACTest WordListTest"
 
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)