Version bump.

Package-Manager: portage-2.2.1_p20/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

3 files changed, 79 insertions, 16 deletions

diff --git a/dev-haskell/cabal/ChangeLog b/dev-haskell/cabal/ChangeLog
index 0eb99a376f3e..699eed8f0c0c 100644
--- a/dev-haskell/cabal/ChangeLog
+++ b/dev-haskell/cabal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/cabal
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.91 2013/06/29 16:30:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.92 2013/09/09 20:10:58 slyfox Exp $
+
+*cabal-1.18.0 (09 Sep 2013)
+
+  09 Sep 2013; Sergei Trofimovich <slyfox@gentoo.org> +cabal-1.18.0.ebuild:
+  Version bump.
 
   29 Jun 2013; Agostino Sarubbo <ago@gentoo.org> cabal-1.16.0.3.ebuild:
   Stable for sparc, wrt bug #472668
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index 03a3db7ea40a..b39a587b8f5b 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1,26 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST Cabal-1.14.0.tar.gz 276517 SHA256 72540a9db8b329121b7815ef207098f4b394f76d11d154d36baf54054327abe4 SHA512 6e31f44cfafd44e1e3987ed0b116a52e12495228cb1de89e9f4ded8dbc06a0d1537bf647c4576c606d623b7d58d10367d243258b500b8c8329db6c48afd9eee3 WHIRLPOOL 22225d5923bc454e2fa24bcc9fe845b07c41c56ea67f45a0815597f0dffc4d60027117d38bdd1eccd4e61cd24d682bd8b3f4026cfaf62481712234fc9cea5321
 DIST Cabal-1.16.0.3.tar.gz 284665 SHA256 ef27629d540e46c77cabac08c008583abee4e4a04ed5a5ecb1a84725dbc39f86 SHA512 7dd365c44b5ea489fcc990e0deca8ffcfdd6b867a35b85b422fc0fe9e3c70739df393cacf425575e5e4977729ef875eb0737aaa13a0f20cfaff9d22b39027a85 WHIRLPOOL 84fbe4c41c14377685c89a93b79e03920d19e65c3c8c51a4ef590bfb8ad331e1ae85d224c1cd820e90262a579131c823510a2e62f4566d452af8e67d5cf26be2
+DIST Cabal-1.18.0.tar.gz 323177 SHA256 0ef5b8a8b36d6f93ed1e6d31d2b180781849504e85f2bc2c51bafb29a79bbbdb SHA512 061aa1cb56b9c0b52b751a6188b1c361b068524c6840b9c8dd83301fd55f288cc3fc20ef125d37e2d816d01723a68bf59487d03b3b157cad759b5cd1f9269105 WHIRLPOOL 17a4bf261edfeb96cc6b99f81aca6f21ecb6d4d800751b683692f5bcf4dc6709a0c4be17c86143d7e0630df9907d1fa0d22f9631475b00768ac7319563dd2da6
 EBUILD cabal-1.14.0.ebuild 1420 SHA256 db82ecfdd49dd7c1e40d536251cc96298d60ead0894c7cf168f905f1b24c2cc1 SHA512 fe0e3263e0dae85e999270fd648284e3055c5b48bccc97bee1b888c9fd095bece556acc7a8a65290e7f58c570f30fa0c24a2de87705ad931566e707416fe1354 WHIRLPOOL c80ecb247bc7351d4877ca7528b6baf55599cc45b608c178208d87bdaaa6a1da451592fddab2ded559c87e9e415dd83cb52e6419cddd6de71ef8c10278371ac8
 EBUILD cabal-1.16.0.3.ebuild 1588 SHA256 f239733044adef867c2879a22183d26ddf10d1f85f299c5cdd56f2629a142a69 SHA512 4a06197dd7bc66915b58edd84119cfb50fcb7c4793838289a109e5a4b9420ef2fc9af544813cc558e2f603d34d680772437408ad64af096bda7c1e81cba413a2 WHIRLPOOL 689b876d939d9f62c67d29935eebd40a32221a1c5eb2d875d9c525a8e8ecea681c0b5453a5fb4fec11581cbbeb7eec7c1e6e049b8a03f97ef9e5bb07b6119eb5
-MISC ChangeLog 12154 SHA256 aefbc83186265cc9e98aad7ff6c7cf4c7325eca070e5a6ec648a1ced1dab2df8 SHA512 28c19da74d668d668763d3576f4dedaef4cfc8eac9def41908e7a0561f7d5cee99078b0935948d3acbb09fb541e2e59992a96675def6aa8849b3a52132a31f9d WHIRLPOOL b87821b2c396c026a9d5e4f1c9b9dea7e9f8f206f5ea83ef4ea0b2b4fd2ba93ab50721e9cc571d9648c140642f5490a9ed5e64c349196b65c5ca77e3d28b1d5b
+EBUILD cabal-1.18.0.ebuild 1675 SHA256 095c5d05fd210f421f2251b8ad52de48b968ea0a8e3ab469e4dd615ad1f26c68 SHA512 1b8be2834987e4d39874e43cdd5c75255254f85d5bc9e9c6931bd178f295708013ba06c86d6c54b73237383a9f96f2032bd8ccb05bac910377b263d6b238228c WHIRLPOOL 38e4b75c4ecfb70d3c6c4621624f35778e2e6ef8ba31e12c99ad07aaf24184f5d76e192da4f7d0234d7461e82cb8c270257d77e2958693dcadb30fa1056577fe
+MISC ChangeLog 12279 SHA256 31a23ca3bd39dc0c4c3c23bc7b4b5eb7fbce129981a871b3ba350930e36b2b4d SHA512 b266ae0a20fd59b4cd14e191562b75820aa2d6007ae0414ce07757813350376822f437feead9ae298cb159d5178e8417b3c03c27e0542a11694ea165026898e8 WHIRLPOOL ed3d9a41596c6defc187604ae1ce175e68873ecce26e3b93539bd64efb735abd11118cefeadaef4df87b6356c775e40faf48154f831f6336dddbe00b3fbf0376
 MISC metadata.xml 231 SHA256 b1bacb51e08eb7f067d6a30020b5c45e4f4e48b5ec4640402ecaa34b78e2ae34 SHA512 22e25963ad8954ee117efcd37bb2bb9cd0cd8e24a801509b93c320e36ff5feb4b192b61c4a4c8132822651e125a37058cf51efe661229af11159313831a09554 WHIRLPOOL 6ce3a763671d06fe156b4a57eb66b1d888bf33cfd29826884b3d34c724a300dcfd0a527217e0525c3f7806a07e7fdee85289ac3ef202234298f630845803c194
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRzwrhAAoJELp701BxlEWf0QMQAI2D9nvYjCAXOGfM+Nyeo/dg
-N6DPp/IXmMfCJC6EJS6pOcXfJmOYS9b89SmVzY/7YoA6LrBBrsDl+OZ7AcZn1pvB
-mqhYMWly2bXeQkToTgo6aTwRXooITP5qgWb5cbBCwYgEk4PXn5LFuxvFBX/7jnUR
-AtZL/YFUygr+l9Gvka6x621qvgEPg2UgN2Ls24c+vxo/XCEidX0PF5zi0S/Mga37
-k7Oq3qqo6NRAeLzTFiDy1mieW8xeP7zDMFtztLvqbTxS8oQqZ71D6l2i3mx+8pjp
-YK1tQZAXixMOakQcEbFtUXgaag00ztzxHg2Fnv+3HiCWQ8J3aabyvFL9lRDX62xr
-TJzvrjkSiLRcsu1bfMRMCr9E82O+wSOqjXDUgwWh8Fz05zVca4zQQhJjlXM3If0m
-jeEadBQXciTdmQ2Qoch64m7ipWpedCJ6Gf98N91Y8XUIWv/Rkt0YISjJU1ulzUsV
-zrn2XxMRNQF6llwrg02hPtMVuFEqyLNjxacaa53KsSnBW1t0IDs7gX+czstUOFMz
-aJsOpExlcYGZoE9wQ9pWipxMeXzrTzn6D5fAl9KspwgUxflWOkveKoaDVLW9fkhZ
-/e64xdIsquowrp0CJjYM8l82KNm5KQmcrRL1Ks1jIb6eqjuC1ScUTgP0SJO6FItO
-APb8YfpifTuG35nz+hUi
-=9syl
+iEYEAREIAAYFAlIuKnUACgkQcaHudmEf86qHnACghV3DTEKa03AC+32hXriDCfe8
+rNoAoIWrvOJnLCTefebxIhDn73snW8Uv
+=v7Sa
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/cabal/cabal-1.18.0.ebuild b/dev-haskell/cabal/cabal-1.18.0.ebuild
new file mode 100644
index 000000000000..12d46f426d9e
--- /dev/null
+++ b/dev-haskell/cabal/cabal-1.18.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.18.0.ebuild,v 1.1 2013/09/09 20:10:58 slyfox Exp $
+
+EAPI=5
+
+CABAL_FEATURES="bootstrap lib profile test-suite"
+inherit eutils haskell-cabal versionator
+
+if [[ ${PV} == *9999* ]]; then
+	LIVE_EBUILD=yes
+	inherit git-2
+fi
+
+MY_PN=Cabal
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A framework for packaging Haskell software"
+HOMEPAGE="http://www.haskell.org/cabal/"
+EGIT_REPO_URI="git://github.com/haskell/cabal.git"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="doc"
+
+if [[ -n ${LIVE_EBUILD} ]]; then
+	# Cabal's subdir
+	EGIT_SOURCEDIR=${S}
+	S="${S}"/${MY_PN}
+else
+	SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+RDEPEND=">=dev-lang/ghc-6:="
+DEPEND="${RDEPEND}
+		test? ( dev-haskell/extensible-exceptions
+			dev-haskell/hunit
+			>=dev-haskell/quickcheck-2.1.0.1
+			dev-haskell/regex-posix
+			dev-haskell/test-framework
+			dev-haskell/test-framework-hunit
+			>=dev-haskell/test-framework-quickcheck2-0.2.12
+		)"
+
+src_prepare() {
+	if [[ -n ${LIVE_EBUILD} ]]; then
+		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
+	fi
+}
+
+src_configure() {
+	cabal-is-dummy-lib && return
+
+	einfo "Bootstrapping Cabal..."
+	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
+		-o setup || die "compiling Setup.hs failed"
+	cabal-configure
+}
+
+src_compile() {
+	cabal-is-dummy-lib && return
+
+	cabal-build
+}