From: Sergei Trofimovich Date: Sun, 4 Dec 2011 18:20:15 +0000 (+0000) Subject: Verison bump. Fixes FEATURES=test case (bug #294306 by Diego Elio Pettenò) X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=36c51c517061b8bf03279466ba103088d8e28f4b;p=gentoo.git Verison bump. Fixes FEATURES=test case (bug #294306 by Diego Elio Pettenò) Package-Manager: portage-2.2.0_alpha77_p1/cvs/Linux x86_64 --- diff --git a/dev-haskell/hs3/Manifest b/dev-haskell/hs3/Manifest new file mode 100644 index 000000000000..ae7bf030442c --- /dev/null +++ b/dev-haskell/hs3/Manifest @@ -0,0 +1,14 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +DIST hS3-0.5.6.tar.gz 19626 RMD160 53c74e2ab19a09d69176cd976b7601585995f37f SHA1 1ff5380800f8fe129cbc350b4187eef755a2ed3a SHA256 ec0be701f8e46d725b2ceb5d54a1889823cb41668e53c43f05d74d07f76fa6b1 +EBUILD hs3-0.5.6.ebuild 937 RMD160 982d965e3b755c98b274fc47d19905a26210cc21 SHA1 0158f3518c9375c4a0b05342e2856648c31576a3 SHA256 9c1c1e0cd3451bb65c07f9dc16a93e5a0bd315de578303220355634a7aaf1e22 +MISC ChangeLog 420 RMD160 7c6b0b3df99182008d0d1ac42c815a29e0d9b5a3 SHA1 2bfb195d76e089d44118b30328fddc0f5af7f797 SHA256 58833addf89bd19db10933a29955ffcb7ee6e31b220f3e9db6d3f754fd4e81a3 +MISC metadata.xml 492 RMD160 f18a291f521781ead183a7c1a1b2da7be917dc0d SHA1 d528fd38058b6e44e71aa136f59ea785f344ee8d SHA256 98c966b77f439568158381d27d4bc7f52e56b7eddc326e73af1173f1f534502c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk7bu9wACgkQcaHudmEf86rt6gCfXX19mmpkvHiRFN6jVhpx62yt +3BQAn3sv8B5B2K5NjhcI1m2ZGIjrnqb4 +=wl+F +-----END PGP SIGNATURE----- diff --git a/dev-haskell/missingh/ChangeLog b/dev-haskell/missingh/ChangeLog index 86b74becba29..a7d52d8d2485 100644 --- a/dev-haskell/missingh/ChangeLog +++ b/dev-haskell/missingh/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-haskell/missingh -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/missingh/ChangeLog,v 1.16 2010/08/09 17:46:14 kolmodin Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/missingh/ChangeLog,v 1.17 2011/12/04 18:20:15 slyfox Exp $ + +*missingh-1.1.1.0 (04 Dec 2011) + + 04 Dec 2011; Sergei Trofimovich +missingh-1.1.1.0.ebuild, + -missingh-1.1.0.3.ebuild: + Verison bump. Fixes FEATURES=test case (bug #294306 by Diego Elio Pettenò) 09 Aug 2010; Lennart Kolmodin missingh-1.1.0.3.ebuild: diff --git a/dev-haskell/missingh/Manifest b/dev-haskell/missingh/Manifest index 1db12fafb1c7..0567320d7d8a 100644 --- a/dev-haskell/missingh/Manifest +++ b/dev-haskell/missingh/Manifest @@ -1,14 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -DIST MissingH-1.1.0.3.tar.gz 122038 RMD160 1c260087edbb3bd7f52417e8750d7a9b093fb480 SHA1 1064de9d936cd5acf4c2b5792fc8b3bcd5b9863e SHA256 2d566511e8a347189cf864188d97f8406c6958c6f0a6fcf8cb1593c6bae13dbf -EBUILD missingh-1.1.0.3.ebuild 1279 RMD160 ea970821299f4ec4f2fde82f6fad6bc07c663377 SHA1 d12eb3d5eb6ccf614d8b051b5f66dccf2b98b4fe SHA256 fa10d9e5c3f17d6a668d02cc9483d7a2ba9807c78d9b11a7e6a7ebd4c2fc9a2b -MISC ChangeLog 2402 RMD160 541dca1e7cd33decf281c5b44d6437563217bb5c SHA1 cfc8b3522070f2ab6a661fd893e04ab22745d4c6 SHA256 224131d98307289563d47ec176750c332613afe26e2cac8fbbf463a7c49932e7 +DIST MissingH-1.1.1.0.tar.gz 115901 RMD160 16c223376f4a071f3de23f2fe5ace843e49c349b SHA1 14721d50925835bfe1c09534d201c66fe20dc216 SHA256 3e87293e00c57f28e1df8425d7b6ddb92abd2063f2d962104fd64a704d6e4ec4 +EBUILD missingh-1.1.1.0.ebuild 1755 RMD160 3bcf9735b20a7b33df2a1479d956cfbf8432792c SHA1 7a08eeb10bcfcac6a4e18ed20fe8d125896e38c2 SHA256 a07288ddcac1e5c8b5126538b15c8c2909892a4636bf2db0e5fd9e762c8ae034 +MISC ChangeLog 2620 RMD160 29e46ab375b03c956b21fd2bdc5c75989704bd74 SHA1 48faf33fbce95064aca9fda661483303eae07c71 SHA256 94f2195d674549e582277f60440c4b8f33d12be6c7233e8be5871267c03634ac MISC metadata.xml 231 RMD160 8b37a8901d230433c69ffa03eeed903bca89249b SHA1 b77d396c72fd66ec7c09ae8de996a5ba50d9e482 SHA256 b1bacb51e08eb7f067d6a30020b5c45e4f4e48b5ec4640402ecaa34b78e2ae34 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAkxgPu8ACgkQ1n/CYbXjntLEYgCgkwgHaG8TzkSgpV1mm1eq//nP -5VQAnAhqfKZe2zsYftvk85t7Yk0GZhUY -=gYDP +iEYEARECAAYFAk7butcACgkQcaHudmEf86qTVQCfWDNqqMEZs/vizBebxzoftih2 +qZoAnRDPu2jivErTgnPPfsDwYzKJu2cQ +=4EJH -----END PGP SIGNATURE----- diff --git a/dev-haskell/missingh/missingh-1.1.0.3.ebuild b/dev-haskell/missingh/missingh-1.1.1.0.ebuild similarity index 60% rename from dev-haskell/missingh/missingh-1.1.0.3.ebuild rename to dev-haskell/missingh/missingh-1.1.1.0.ebuild index ccbe43f1c83d..3fe1f8911ce4 100644 --- a/dev-haskell/missingh/missingh-1.1.0.3.ebuild +++ b/dev-haskell/missingh/missingh-1.1.1.0.ebuild @@ -1,9 +1,11 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/missingh/missingh-1.1.0.3.ebuild,v 1.2 2010/08/09 17:46:14 kolmodin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/missingh/missingh-1.1.1.0.ebuild,v 1.1 2011/12/04 18:20:14 slyfox Exp $ -CABAL_FEATURES="bin lib profile haddock" -inherit haskell-cabal +EAPI="3" + +CABAL_FEATURES="bin lib profile haddock hscolour hoogle" +inherit eutils haskell-cabal MY_PN="MissingH" MY_P="${MY_PN}-${PV}" @@ -15,7 +17,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar. LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~sparc ~x86" -IUSE="" +IUSE="test" # testpack dependency is a workaround for cabal-1.8 bug, which pulls # depends even for 'Buildable: false' target @@ -29,18 +31,37 @@ RDEPEND=">=dev-lang/ghc-6.10 DEPEND=">=dev-haskell/cabal-1.2.3 virtual/libiconv - ${RDEPEND}" + ${RDEPEND} + test? ( dev-haskell/testpack + dev-haskell/quickcheck:1 + dev-haskell/hunit )" # libiconv is needed for the trick below to make it compile with ghc-6.12 S="${WORKDIR}/${MY_P}" -src_unpack() { - unpack $A - cd "${S}" - +src_prepare() { # (non-ASCII non-UTF-8 source breaks hscolour) cd src/System/Time mv ParseDate.hs ParseDate.hs.ISO-8859-1 iconv -f ISO-8859-1 -t UTF-8 -c ParseDate.hs.ISO-8859-1 > ParseDate.hs || die "unable to recode ParseDate.hs to UTF-8" } + +src_configure() { + cabal_src_configure $(cabal_flag test buildtests) +} + +src_test() { + # default tests + haskell-cabal_src_test || die "cabal test failed" + + # built custom tests + "${S}/dist/build/runtests/runtests" || die "unit tests failed" +} + +src_install() { + cabal_src_install + + # if tests were enabled, make sure the unit test driver is deleted + rm -f "${D}/usr/bin/runtests" +}