Add dev-util/pkgconfig as a runtime dependency to dev-haskell/cabal

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 54 insertions, 5 deletions

diff --git a/dev-haskell/cabal/ChangeLog b/dev-haskell/cabal/ChangeLog
index c17f0e9db044..2dabd1470f4a 100644
--- a/dev-haskell/cabal/ChangeLog
+++ b/dev-haskell/cabal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/cabal
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.56 2010/06/15 21:16:41 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.57 2010/06/20 12:51:22 kolmodin Exp $
+
+*cabal-1.8.0.6-r1 (18 Jun 2010)
+
+  18 Jun 2010; Lennart Kolmodin <kolmodin@gentoo.org>
+  +cabal-1.8.0.6-r1.ebuild:
+  Add dev-util/pkgconfig as a runtime dependency, cabal does resolving using
+  this tool.
 
 *cabal-1.8.0.6 (15 Jun 2010)
 
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index da723aaf91c6..79c582d2fd45 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -24,13 +24,14 @@ EBUILD cabal-1.6.0.1.ebuild 1618 RMD160 ead45103285c7d8671c5d0b045992cfc1aeba46b
 EBUILD cabal-1.6.0.2.ebuild 1587 RMD160 2a28cb7fb7a772052c4c217247ed8e504b0d6fc0 SHA1 7ce0c4fb3a744b420fffd931b925ed228733dd95 SHA256 59794344d50e8dd4fa698db47489c01b138676e2d54e2a80449255b5f2130bde
 EBUILD cabal-1.6.0.3.ebuild 1715 RMD160 0ec4e723511784ae26b16b3a589656cd53c0de4d SHA1 c5a9d6e8b28a62b5cc352d46fd31af95e3e96744 SHA256 3c63459825ad1e052afe0011e8059e9d4a8323a46b66892091cf9a59bab58314
 EBUILD cabal-1.8.0.2.ebuild 1206 RMD160 2fbe8b04e8b1bf380a5170b3d02eb6eb50b7cde5 SHA1 a669e685bb8ef8fec118a9e75a85be58a4a9597b SHA256 402ab5b051aee6ac455f092be5898e16de22e4cd8211d42f31e2bf6c3ee1d0cf
+EBUILD cabal-1.8.0.6-r1.ebuild 1357 RMD160 79b3586c9b21b9f4900715b95f28f7da5a736075 SHA1 a6edf18e060f708aa8f7760695d882ad457bb02b SHA256 86de7b441cee6551a45a74d1cf08115c5ff24d5149a663a9a7d169daaabb4e34
 EBUILD cabal-1.8.0.6.ebuild 1206 RMD160 fcb3b6aadc070e7a3af91ff5e0e043ef20c86d0c SHA1 6766a288be1291146822f803682680619f2d2488 SHA256 cbf2eb0bb0f9910c48a58b8242abc89f9382c54172deed5e9cb30589d14f6835
-MISC ChangeLog 7412 RMD160 3bf065f7abe5d929d2f49e72befb89a0e2e30804 SHA1 ec9bf49721e9dd3e058bf3f62ef55897a935370e SHA256 365388e8f0773275ae10cafaf1103feefbc549109ac0e8ba25568c654e7a5f2f
+MISC ChangeLog 7618 RMD160 7977c0d30375a0c012ecd6494916881bb03c6bb9 SHA1 b473d54352495a90f2254c5a4dbc4e8ae0b73a01 SHA256 2ce2bb3dbdad9ef3132ec621ece913e69351214be096fe0b9f4d1430550bfc73
 MISC metadata.xml 231 RMD160 8b37a8901d230433c69ffa03eeed903bca89249b SHA1 b77d396c72fd66ec7c09ae8de996a5ba50d9e482 SHA256 b1bacb51e08eb7f067d6a30020b5c45e4f4e48b5ec4640402ecaa34b78e2ae34
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwX7bsACgkQ1n/CYbXjntKxBACfelibFVx3STFfk31Qwd6TUUGQ
-OooAoKMKd14ikMqOXy40PuOBogZBoGlI
-=Oh5X
+iEYEARECAAYFAkweDs8ACgkQ1n/CYbXjntK6LACfQ/enUUSZwoKEl/a00wLelbQa
+SDkAnjnVJ9+kh3NYqhliDqBC0lLp0Vmj
+=+gnm
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/cabal/cabal-1.8.0.6-r1.ebuild b/dev-haskell/cabal/cabal-1.8.0.6-r1.ebuild
new file mode 100644
index 000000000000..1314450f1809
--- /dev/null
+++ b/dev-haskell/cabal/cabal-1.8.0.6-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.8.0.6-r1.ebuild,v 1.1 2010/06/20 12:51:22 kolmodin Exp $
+
+CABAL_FEATURES="bootstrap lib profile"
+inherit haskell-cabal eutils
+
+MY_PN="Cabal"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A framework for packaging Haskell software"
+HOMEPAGE="http://www.haskell.org/cabal/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc"
+
+# Cabal.cabal only depends on base>=1&&<5 and filepath>=1&&<1.2
+# filepath has been a ghc core library since ghc 6.6.1, so let's use that as the
+# lowest possible ghc version
+DEPEND=">=dev-lang/ghc-6.6.1"
+RDEPEND="${DEPEND}
+		dev-util/pkgconfig"
+# cabal uses dev-util/pkgconfig using runtime to resolve C dependencies, so
+# repoman's RDEPEND.suspect QA does not apply here
+
+S="${WORKDIR}/${MY_P}"
+
+CABAL_CORE_LIB_GHC_PV="6.12.3"
+
+src_compile() {
+	if ! cabal-is-dummy-lib; then
+		einfo "Bootstrapping Cabal..."
+		$(ghc-getghc) -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
+			-o setup || die "compiling Setup.hs failed"
+		cabal-configure
+		cabal-build
+	fi
+}