Disable USE=haddock for upcoming haddock.

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

diff --git a/dev-haskell/xhtml/ChangeLog b/dev-haskell/xhtml/ChangeLog
index 650574c49420dad2fa174e73143d330f45793107..43c2c40fce527e37ba9efc6beb23678cfc246609 100644 (file)
--- a/dev-haskell/xhtml/ChangeLog
+++ b/dev-haskell/xhtml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-haskell/xhtml
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xhtml/ChangeLog,v 1.18 2010/07/01 19:59:41 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xhtml/ChangeLog,v 1.19 2011/08/03 08:38:49 slyfox Exp $
+
+  03 Aug 2011; Sergei Trofimovich <slyfox@gentoo.org> xhtml-3000.2.0.1.ebuild:
+  Disable USE=haddock for upcoming haddock.
 
   01 Jul 2010; Jeroen Roovers <jer@gentoo.org> xhtml-3000.0.2.1.ebuild,
   xhtml-3000.2.0.1.ebuild:

diff --git a/dev-haskell/xhtml/Manifest b/dev-haskell/xhtml/Manifest
index 9e7c13024d8e99243151a360e1852a249551a165..74426c2b86df15346a123ee14b789bc812349e4d 100644 (file)
--- a/dev-haskell/xhtml/Manifest
+++ b/dev-haskell/xhtml/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST ghc-6.6-src-extralibs.tar.bz2 2015443 RMD160 63d87d02f42efc032c20de7394f3b29431fd8eed SHA1 b94974e255165703d882bb522ec44c5bdc4b0aec SHA256 1c811695d074c7560ca9bd7773523f817ccb57390044392a1ad92cf0079bea29
 DIST ghc-6.6.1-src-extralibs.tar.bz2 1928527 RMD160 1c18c85d978c4b3369132e247c823aaa90ea8530 SHA1 1398f6c35191d52410a2e066b382635dff0d8d6d SHA256 d162a82fc388fdd48c327b09bb6d778f2313d12d5282f3b120ac08a5d4e78902
 DIST xhtml-3000.0.2.1.tar.gz 13309 RMD160 bc07bd2b61be4a690f59bc13e1399ff81edae5fd SHA1 093a725dbf41007f5ff9e66139ce15e6a4530134 SHA256 4cbb89d34d6b852d39d00aa4fee50824b003597e45d2858ca5dcee54d94bde86
@@ -5,6 +8,13 @@ DIST xhtml-3000.2.0.1.tar.gz 13668 RMD160 96afa674a6049ee460257623308ff5fe1299b2
 EBUILD xhtml-2006.9.13.ebuild 661 RMD160 78bf3040695efc7880712180d96da1d1c61ab590 SHA1 9f853e08f354e533d55110a45811c4aa73f9c425 SHA256 6c3bd0e6fa3857615bb54e9bf8b61f3d3b3c490467a4b28aa70d28cdd401ed75
 EBUILD xhtml-3000.0.2.1.ebuild 551 RMD160 5eef0abedcf66d401f2502806e60031fd7269142 SHA1 204a80d14c2d7798b029223dc804ae74123ad2ba SHA256 3295983b2ef95ff0687610fd27a3c0b60621f87343289dde8f38a62c20e6e081
 EBUILD xhtml-3000.0.2.ebuild 664 RMD160 5ad2989079847d3dd0ec6aabb65a62e2006b778c SHA1 4581c7beb7ca07c8dcb30749912d389a73f1e743 SHA256 8a3413bfdb5a13433f74f61e04372b2b17b6151db92d092bc05b400632cdfdb8
-EBUILD xhtml-3000.2.0.1.ebuild 567 RMD160 0c4f4ae7bd61b19d29c6e71f09dddc21995dcfbd SHA1 80f3dc287c3a9e8c42cb6e49d4c0ade8c539b010 SHA256 7dcc6a30173a630f977ce42836761dc3d87b50efa45b837ded6e67cb810caee1
-MISC ChangeLog 2443 RMD160 74ac22c1442aa5811a06d558a5bd2a38f149fb09 SHA1 f889d82daefaefe6271f26fba85cb259be95e20f SHA256 489102e91487cb3ae1b520db41569a4c439f5dbb16dd9e7851e314aa09c1e7cf
+EBUILD xhtml-3000.2.0.1.ebuild 712 RMD160 ec185354e226cac39624048c60c304f519872bad SHA1 08785f30b8ec9c65f05a5313e8dfae0cdf54c279 SHA256 643b6b1452b3e8f87460aad4d64cec69d9245a548062d6d110685913b6a1b5a7
+MISC ChangeLog 2570 RMD160 09c5de638ac1ade538f574e05a8b9d8dc55b2932 SHA1 8228cac3b161c37f0c0bc9bbde11f21a7fbf5f1f SHA256 e3d401df5a4bb9bd5de1cffcd8cfca5b9406261fee3e6de6b2522ed384ee2d8b
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk45Ce4ACgkQcaHudmEf86pXpQCfT5sKAi8tpBRycJYhv+O4WHKn
+SuQAnRCSx1GhiZz/ym9L+zMPIf1vDO8m
+=Cfgn
+-----END PGP SIGNATURE-----

diff --git a/dev-haskell/xhtml/xhtml-3000.2.0.1.ebuild b/dev-haskell/xhtml/xhtml-3000.2.0.1.ebuild
index c5b517a16519a0f5a69fc853e0c8b43be8b306e9..470148ea6eaaac162c11cf76a870013dc4dadaee 100644 (file)
--- a/dev-haskell/xhtml/xhtml-3000.2.0.1.ebuild
+++ b/dev-haskell/xhtml/xhtml-3000.2.0.1.ebuild
@@ -1,12 +1,17 @@
-# 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/xhtml/xhtml-3000.2.0.1.ebuild,v 1.2 2010/07/01 19:59:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xhtml/xhtml-3000.2.0.1.ebuild,v 1.3 2011/08/03 08:38:49 slyfox Exp $
 
-CABAL_FEATURES="lib profile haddock"
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+# haddock-2.9.2 has xhtml as a dep, so disable haddock feature
+CABAL_FEATURES="lib profile"
 inherit haskell-cabal
 
 DESCRIPTION="An XHTML combinator library"
-HOMEPAGE="http://haskell.org/ghc/"
+HOMEPAGE="http://hackage.haskell.org/package/xhtml"
 SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -14,5 +19,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
-DEPEND=">=dev-lang/ghc-6.6.1
+RDEPEND=">=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
                dev-haskell/cabal"