From 4f150e68d3234d2d24c3d531784300c977609eac Mon Sep 17 00:00:00 2001 From: Mark Wright Date: Fri, 2 Jan 2015 02:51:27 +0000 Subject: [PATCH] Fix Bug 534180 - dev-haskell/dataenc-0.14.0.5 - setup: At least the following dependencies are missing: array >=0.1.0 && <0.5, base >=3.0.0 && <4.7. Change IUSE tests to test in dataenc-0.14.0.7, move test stuff from RDEPEND to DEPEND, restore the missing KEYWORDS. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x618E971F --- dev-haskell/dataenc/ChangeLog | 11 ++++++++-- dev-haskell/dataenc/Manifest | 16 +++++++------- dev-haskell/dataenc/dataenc-0.14.0.5.ebuild | 10 +++++++-- dev-haskell/dataenc/dataenc-0.14.0.7.ebuild | 23 +++++++++++++-------- dev-haskell/dataenc/metadata.xml | 3 --- 5 files changed, 39 insertions(+), 24 deletions(-) diff --git a/dev-haskell/dataenc/ChangeLog b/dev-haskell/dataenc/ChangeLog index 598e374a1572..9f57c3acf487 100644 --- a/dev-haskell/dataenc/ChangeLog +++ b/dev-haskell/dataenc/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-haskell/dataenc -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/dataenc/ChangeLog,v 1.42 2014/07/25 08:58:51 slyfox Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/dataenc/ChangeLog,v 1.43 2015/01/02 02:51:19 gienah Exp $ + + 02 Jan 2015; Mark Wright dataenc-0.14.0.5.ebuild, + dataenc-0.14.0.7.ebuild, metadata.xml: + Fix Bug 534180 - dev-haskell/dataenc-0.14.0.5 - setup: At least the following + dependencies are missing: array >=0.1.0 && <0.5, base >=3.0.0 && <4.7. Change + IUSE tests to test in dataenc-0.14.0.7, move test stuff from RDEPEND to + DEPEND, restore the missing KEYWORDS. 25 Jul 2014; Sergei Trofimovich metadata.xml: Drop redundant '' field, leave only ''. diff --git a/dev-haskell/dataenc/Manifest b/dev-haskell/dataenc/Manifest index ae9b0bf54571..584745f96b9f 100644 --- a/dev-haskell/dataenc/Manifest +++ b/dev-haskell/dataenc/Manifest @@ -8,14 +8,14 @@ DIST dataenc-0.14.0.7.tar.gz 12813 SHA256 f9d370a1ac1b9cd3c66abd13ad351270d020a2 EBUILD dataenc-0.14.0.3.ebuild 717 SHA256 1a0cc25d1c85fe20097ba6aaf97da40e145edc2f15dd8961d469028cc4f20771 SHA512 ac708b30be4c23b62cdcc10bffa1114de32edc579663686b1fa58b46ee6fb728c9c45396b98ca2f03fabce07116dd427acdc728804aaeebd82d90449b2b437a9 WHIRLPOOL 911ccde33ff9134902d296445b830f809beb5c0e48bc1f9710fd35287aac6006ccba65db2ac58f436019c6ae402482411a6ff46b4ae13007bc6fb720969606b4 EBUILD dataenc-0.14.0.4.ebuild 733 SHA256 7d674e56b40da5c8706610fdd798a5b16740c2e49b5da6f727fcbffd1a681cc3 SHA512 4ea32a3ac1abcf603bb14eff7beedea47f4329172534980e521954e586d78ad03ee409a6ebc550827154e5552c0f88e5803ca7f53da0eaf08b5307755a3ebae6 WHIRLPOOL b56d480314e7173d27558fd6fc9b9bc86518b9a74533ee9d115b54677b6ecea9082ed05dff19a73ddb502766dc7d1f76729b8c086afdc790614b2a3329d3dda7 EBUILD dataenc-0.14.0.5-r1.ebuild 1358 SHA256 009115d36b44fbc8b760b6d5a7728de9d994fc09b9cdbe391ee251e9850f3e65 SHA512 672e3bf177a0ab84bf4901e504b2530b878484ece4a31cb42e0146d96539691314d3509cb202b1565c1ab9842af20bfe8dc66fbffe622293b9eba696536553b4 WHIRLPOOL 2de4985c4119375fd83e220ddd72513246b798fa53d8d24590a87ce878e8e22840209675e9c1a01332127ad04bfc8340f6fc3a9b98df665bb654144a43407bf2 -EBUILD dataenc-0.14.0.5.ebuild 809 SHA256 118bbf1fffac19b3ea249a1fdd0eeafadb06507a8924e495e23cfd824263968d SHA512 af4ba8291ecb117acf84a23a6b5f3245a0af87bbfe5b5d01133b7cf296e14b8e4cad919ea60c20c93d48d1f3a436c14459665ff19aa20a51a506cafcc2507875 WHIRLPOOL 627702154d436879eb9abc394bc611f5a400dca05fcdd3abf62c8f41ed67d03f293c8b1570b4e0a86468fe98c6bd382db7b5db70200762c22cb5106767fd2e06 -EBUILD dataenc-0.14.0.7.ebuild 1072 SHA256 605ddb657e861973a23070332ff26316611865036aa4bc94510da3731743ce57 SHA512 f166ad0dd6ad9a2027f5b8bbf9e78685479a32af2df8e9f7ae4361213d92a6373e30943fac896c72eeec1f2ef1099997e36513be66fd5caebecda511188a7a0e WHIRLPOOL b0d777bd501d9dfd9626190ffcbe656daf75ed60dee48f4ebe4361e64db06e655153ad0f2284ce8193ccbbbcf641c7895a9bfd73cb31af39ae7869c3cfce996d -MISC ChangeLog 5778 SHA256 2d4593472e91fc5845e8453242e62b682f138c1f5eec79c0082546329a0a70e1 SHA512 ec20d93abdcb58d7f3e4135a9ccad3cae854b42875a18f692a2fa5ccac260f47cba52757676ceebe77b153fa43bd3e982649fe33faf5ad474d8a7b84f73ae660 WHIRLPOOL 7ac9a5e423092ae7aab01f62e1f1ddf1c0874198c59bece568f07a3cce5e9c2c032dcaa30ee22097c943984b84028029fd4b83836801db368df6cc12930c65a0 -MISC metadata.xml 467 SHA256 6c689506bfddf6d1fcc1c1b14bf82cb16e4d360b07a26cad9a19dc013d4339bb SHA512 a369694b7a6615f2c4c411494916e79509fd31feb36c11d478b844faf0f73119850b24482b725ecaec387125faef067dd5fd39c321b982520077382a2ff583ad WHIRLPOOL 567f027aa7c84b4c290c92b75a7578fa1e48b9f07402c89fcc58e42951f5f7521e43e35d291b3f1bfb0e4352996d7830836e60b45fdb320565a2e87df5220da4 +EBUILD dataenc-0.14.0.5.ebuild 944 SHA256 0fdec12d444f7bb193c4de4cb1dba5f8b6da90fabd3e2e55c95bebbd652ff215 SHA512 e9329282286728fe24463ae3c509c15561a07a9456eee4fceadf75ad57371c3051f9cb78c03b9d8902807314add3f72bab5fe2c76f68e3cc99d2b647fc2f0fd2 WHIRLPOOL 9ca00fd6bf5f6a710ccd396ffd812569746848e755cbad00e547dbdbd12ed86cef12db3eb3aedc2e62464fdeb4dc57dc2f24993d25e4ff9104e1b8f110adbd95 +EBUILD dataenc-0.14.0.7.ebuild 1223 SHA256 e9037710b28aeb7f0aa61aa3c5a338ac816da40ccff46b1083eca270edb7720d SHA512 f5f409e503b98d9be5e03be1f8ab59b61d05301bbd531c92bbaaca2da915bb2570c2b8412623493abf73fdadba12f5ac58498b6e216944eab2d3694c07285ec1 WHIRLPOOL 3419a98f7aa684d6d2a0d5f1b7ff46ae1b0e7708a8b4008b82937e6e9141e9419f7a7a3dbc0243df7f9edc2bba5d9ced1c38bd642d118a59ce0c3c3be249b2f5 +MISC ChangeLog 6166 SHA256 a7c78ef797fa2c2738158a44d0ef012125615960c0c7d3f9816017b9c9ef75b0 SHA512 5f9d68bda844424759356b40026dca3bf46f605116c37882b9c39d81928dc54d67f143f83e5534cf099fa5f8130b3af3b58fdc4a13ff6d66e3fda1c5e057e156 WHIRLPOOL 940fd6272cb09b890a0ca8dfe4cd1082c1c3edda163e8ea521c48b6ad6e4b6bb3feca4a0a08c219c99ff781729a18ac783dfe576819716672fc9ede6f27d2724 +MISC metadata.xml 393 SHA256 a96a329c229cef4bb213770e2fb4d635134dc068a8a2e93e43132659e3cab8b1 SHA512 84307f66127ff2d41c726c32f3e99e6ebe52c6668d1201aa99662d17c07a35a3562a59b6e52aed87bb31ac4bfa8dd0a40cdf77b2e1c2afaeb9a38395dac33e0f WHIRLPOOL 326261fc001c7c16e14ebcae53b61a388dae02602811ec9520edc76f1d12ce7a1798028ece044e3b610ba0d9eff959c4728ec972190791347de66eae79ec1d06 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlPSHIcACgkQcaHudmEf86r+PQCeLDP+TYK0NAsUFdylAvR9XAC6 -wMMAoIMRMjS/h2ZC1erR7XJ31gSDGX94 -=KItp +iF4EAREIAAYFAlSmB60ACgkQoBEVQmGOlx+KYgD/aiXR4tLdKZvLQO0ZzSchV2ZA +a3AbfnRHVSQX5kGoVYUBAIG0jkAdkqERLzCMn2/7KLz9dY1IBdbP4arNQPcOBlkg +=JAbO -----END PGP SIGNATURE----- diff --git a/dev-haskell/dataenc/dataenc-0.14.0.5.ebuild b/dev-haskell/dataenc/dataenc-0.14.0.5.ebuild index 86ff18f6e867..330a60575633 100644 --- a/dev-haskell/dataenc/dataenc-0.14.0.5.ebuild +++ b/dev-haskell/dataenc/dataenc-0.14.0.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/dataenc/dataenc-0.14.0.5.ebuild,v 1.9 2013/07/21 17:48:44 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/dataenc/dataenc-0.14.0.5.ebuild,v 1.10 2015/01/02 02:51:19 gienah Exp $ EAPI=5 @@ -22,6 +22,12 @@ RDEPEND=">=dev-lang/ghc-6.10.4:=" DEPEND="${RDEPEND} >=dev-haskell/cabal-1.6" +src_prepare() { + cabal_chdeps \ + 'array >= 0.1.0 && < 0.5' 'array >= 0.1.0 && < 0.6' \ + 'base >= 3.0.0 && < 4.7' 'base >= 3.0.0' +} + src_configure() { haskell-cabal_src_configure \ --flag=-tests diff --git a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild b/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild index b82b8ea92d6c..e820a184aac8 100644 --- a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild +++ b/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild,v 1.2 2014/07/09 03:04:29 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild,v 1.3 2015/01/02 02:51:19 gienah Exp $ EAPI=5 @@ -15,22 +15,27 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="tests" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos" +IUSE="test" RDEPEND=">=dev-lang/ghc-7.4.1:= - tests? ( dev-haskell/hunit:=[profile?] +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.6 + test? ( dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.5:2=[profile?] = 3.0.0 && < 4.8' 'base >= 3.0.0' +} src_configure() { haskell-cabal_src_configure \ - $(cabal_flag tests tests) + $(cabal_flag test tests) } diff --git a/dev-haskell/dataenc/metadata.xml b/dev-haskell/dataenc/metadata.xml index ccfc7555824c..7b979a0b1c25 100644 --- a/dev-haskell/dataenc/metadata.xml +++ b/dev-haskell/dataenc/metadata.xml @@ -7,7 +7,4 @@ Base32Hex, Base64, Base64Url, Base85, Python string escaping, Quoted-Printable, URL encoding, uuencode, xxencode, and yEncoding. - - Build unit and quickcheck tests. - -- 2.26.2