Version bump. Remove old.

Package-Manager: portage-2.2.0_alpha96_p5/cvs/Linux x86_64

4 files changed, 47 insertions, 12 deletions

diff --git a/dev-haskell/c2hs/ChangeLog b/dev-haskell/c2hs/ChangeLog
index 478555511906..7a46cfa48473 100644
--- a/dev-haskell/c2hs/ChangeLog
+++ b/dev-haskell/c2hs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/c2hs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/ChangeLog,v 1.46 2012/03/17 22:06:42 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/ChangeLog,v 1.47 2012/04/09 18:17:31 slyfox Exp $
+
+*c2hs-0.16.3-r1 (09 Apr 2012)
+
+  09 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org> +c2hs-0.16.3-r1.ebuild,
+  +files/c2hs-0.16.3-language-c-0.4.patch, -c2hs-0.16.2.ebuild:
+  Version bump. Remove old.
 
   17 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org> c2hs-0.16.3.ebuild:
   alpha/ia64/sparc stable (bug #399971).
diff --git a/dev-haskell/c2hs/Manifest b/dev-haskell/c2hs/Manifest
index 13a50db4e8db..0118413cb185 100644
--- a/dev-haskell/c2hs/Manifest
+++ b/dev-haskell/c2hs/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST c2hs-0.16.2.tar.gz 135669 RMD160 1ae6d2a8c13a245b4653004118903f6668d11245 SHA1 cbac0963a9860e04526f13c4475a533bb0d2f6fb SHA256 e73ac273aa054dd959b51dd6d4c11612f506fc171b88aaee6abe541493a42768
+AUX c2hs-0.16.3-language-c-0.4.patch 790 RMD160 ce1db979b0af3d49b4b159eb04499e30230ef822 SHA1 b092f27b21c69f1c5fcb2f594f5f871ed61723f0 SHA256 acf72e4f7e18fb3e58772719cf43056efe80e2106c026c86a7f16e7b0c971f5b
 DIST c2hs-0.16.3.tar.gz 137409 RMD160 890e379ceb6879afb903f24a71af06a6a3025c6c SHA1 ade0b47b152a6ee02867b1c92d24ca7f9b244c6c SHA256 a562be4f9c2d2a2c55bc61233f86e129aff1ec6ac588b9eb904e17379beb1ae3
-EBUILD c2hs-0.16.2.ebuild 989 RMD160 fd19bca6f461aa0db0b66667581bde2909794100 SHA1 9bc155168f53559809181ced7806cc7584c5039b SHA256 1a2ba2180d73b5f19244726796b8103b2fe6cd83dbdce58413c135ee9c50ba3d
+EBUILD c2hs-0.16.3-r1.ebuild 1097 RMD160 17dbf6c4ff7c2354d5468dcee15b806f7c3576cc SHA1 4bb2805b2b01b68961afe9e328bb134a2fc30833 SHA256 ce491affd768e8f8f4ba0d580af1104d4c5be7daacf25529d9edc16e5cd0b4c7
 EBUILD c2hs-0.16.3.ebuild 995 RMD160 81c7b27b406891ec3c3fcfdafedff031e750f97f SHA1 518a06fb3f778349876adbe3e9d6544412b997f6 SHA256 27f191f9aca64d4e9cacde5c016b6858289ccaec8449e00a7fdf73c7f1065eec
-MISC ChangeLog 5596 RMD160 a82c643a9b13bdb96078cbf6b4452b65b1c5af51 SHA1 5b1ecab17d8fdcd036ca0659721d426705ed7892 SHA256 bb7640f49303c24dcf30a59b43b598a46ddb88d7db9783614cf20a07918474ac
+MISC ChangeLog 5798 RMD160 90dc26c245de93decf0674838cef4e3c4b0aac63 SHA1 bf8c9aed0b355b551636bba6a8bfd2380426bc14 SHA256 dc0c61a97f1d1edd25b68438005555a94cedad21f999500643d948524719a55b
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9lDBAACgkQcaHudmEf86o3NgCeNOeueIc90lx/zL8TXF9tVBC1
-qcQAn1JiyGSTsUbR4QYWMxp6IKFdBRDK
-=8xUo
+iEYEARECAAYFAk+DKOkACgkQcaHudmEf86r5+gCeObrX7v4jL2oHyILqxPrkMf0/
+m9kAniyKSZ0LfjiY0PHVV/Mk1qcmFx5T
+=ZkvE
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/c2hs/c2hs-0.16.2.ebuild b/dev-haskell/c2hs/c2hs-0.16.3-r1.ebuild
index 75dc807d1f2d..c7aebd6cb050 100644
--- a/dev-haskell/c2hs/c2hs-0.16.2.ebuild
+++ b/dev-haskell/c2hs/c2hs-0.16.3-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/c2hs-0.16.2.ebuild,v 1.8 2011/02/25 12:48:52 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/c2hs-0.16.3-r1.ebuild,v 1.1 2012/04/09 18:17:31 slyfox Exp $
+
+EAPI="3"
 
 CABAL_FEATURES="bin"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
 HOMEPAGE="http://www.cse.unsw.edu.au/~chak/haskell/c2hs/"
@@ -11,17 +13,19 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 DEPEND=">=dev-lang/ghc-6.6.1
 		>=dev-haskell/cabal-1.6
-		>=dev-haskell/language-c-0.3.1.1
+		>=dev-haskell/language-c-0.3.1.1 <dev-haskell/language-c-0.5
 		doc? (  ~app-text/docbook-xml-dtd-4.2
 				app-text/docbook-xsl-stylesheets
 				>=dev-libs/libxslt-1.1.2 )"
 RDEPEND="dev-libs/gmp"
 
+PATCHES=("${FILESDIR}/${PN}"-0.16.3-language-c-0.4.patch)
+
 src_compile() {
 	cabal_src_compile
 
diff --git a/dev-haskell/c2hs/files/c2hs-0.16.3-language-c-0.4.patch b/dev-haskell/c2hs/files/c2hs-0.16.3-language-c-0.4.patch
new file mode 100644
index 000000000000..cdf0fbe547d6
--- /dev/null
+++ b/dev-haskell/c2hs/files/c2hs-0.16.3-language-c-0.4.patch
@@ -0,0 +1,25 @@
+diff --git a/c2hs.cabal b/c2hs.cabal
+index 89f978f..53a96e5 100644
+--- a/c2hs.cabal
++++ b/c2hs.cabal
+@@ -41,7 +41,7 @@ flag base3
+ 
+ Executable c2hs
+     Build-Depends:  base >= 2 && < 5,
+-                    language-c >= 0.3.1.1 && < 0.4.0,
++                    language-c >= 0.3.1.1 && < 0.5,
+                     filepath
+ 
+     if flag(base3)
+diff --git a/src/C2HS/Gen/Bind.hs b/src/C2HS/Gen/Bind.hs
+index 1fd2acc..9c25b42 100644
+--- a/src/C2HS/Gen/Bind.hs
++++ b/src/C2HS/Gen/Bind.hs
+@@ -117,6 +117,7 @@ import Control.Monad (when, unless, liftM, mapAndUnzipM)
+ import Language.C.Data.Position
+ import Language.C.Data.Ident
+ import Language.C.Pretty
++import Language.C.Syntax.AST
+ import Text.PrettyPrint.HughesPJ (render)
+ import Data.Errors
+ import Data.Attributes (newAttrsOnlyPos)