Fix build failure against dev-haskell/test-framework-0.8

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 39 insertions, 7 deletions

diff --git a/dev-vcs/darcs/ChangeLog b/dev-vcs/darcs/ChangeLog
index 90bbff78eeeb..63fb59210860 100644
--- a/dev-vcs/darcs/ChangeLog
+++ b/dev-vcs/darcs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/darcs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.42 2012/12/24 21:39:39 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.43 2012/12/28 08:03:56 gienah Exp $
+
+  28 Dec 2012; Mark Wright <gienah@gentoo.org> +files/darcs-2.8.3-tf-0.8.patch,
+  darcs-2.8.3-r1.ebuild:
+  Fix build failure against dev-haskell/test-framework-0.8
 
   24 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org> -darcs-2.4.4-r1.ebuild,
   -darcs-2.5.2-r1.ebuild, -darcs-2.5.2-r2.ebuild,
diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest
index 5bd5952005d8..fad6c2caf8be 100644
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -5,16 +5,17 @@ AUX darcs-2.8.0-mtl-2.1.patch 1289 SHA256 50798b5d69b4600c3c9d15acdf4476b8a3764a
 AUX darcs-2.8.1-tar-0.4.patch 1329 SHA256 feccf9f2e149aa672fa6f32eb61400340a3e2a05013f355a04ce6057746bdb62 SHA512 0e9cc2650dc3b013935ea8db4d1dd9fd7f375c538f636ed5cfa4bdf9851ee4fd857efe4792bf76564b16ac9f93b46652c433d8f63affe29981bd154a40e43970 WHIRLPOOL 54d7e4fb5e89da7e6375144d1cb7741278c765bcd96cb58e5d4fe4b8193cfe35bca118ef205d8f8e93354f5f4be34762b7d49f884a12ec51b7deeea80ccabc50
 AUX darcs-2.8.3-ghc-7.6.patch.bz2 9380 SHA256 edcbcc3d5d0d5c51d5938b4926338241a551a2ccf4bbeb5cd781e36e8353f56e SHA512 c566a11ea08e9b88e24876aaabe08cd4e82dc1f6d2e6e6da24c969f0d3097493bfea6628641b216e3b184946b42032569760fe54a2b5dfb6508707b062248a2b WHIRLPOOL 03cdcd1a496ad9890d45a0bca921fde32d6a213435aafc5478d45490774f2d732255ae6221974d690e337087871dbb0182e4e71041cb00a01da6951759ed678e
 AUX darcs-2.8.3-hack-for-haskeline-0.7-breaks-non-utf8.patch 2425 SHA256 9fbb97f7437fca405c496937463f54cb0a78a0923da04887d05ff03083196a3a SHA512 60d17ca7b620979be0b45dcdec2f9590a86fa4042c5e30d7f9f623cb6653d6e8a2f5ee0541b45184c761a6516d76fc21a74001f1ac5165e0c8b2ab040aa1b456 WHIRLPOOL 8a7bc95bdf903c2531993414ad8fff39aacac9f304d17a466c4494bc59ed0148ba2465dd1d4a56984861cbf618b7adecae0af4185672e01abb753700a92c9b82
+AUX darcs-2.8.3-tf-0.8.patch 1112 SHA256 aa91a2963589b13a32a639b806fabbf1dc84d1ad92ba9fabb5fb2769aee9cb3e SHA512 8e1f5b38f7deb3c44948d7104d2673eb6d2db11126e4e832c3b49243642b5905745d8ac8a1101ac2b40d0bb1a7471d03385dc3aae213a8639d9417723d3ced1b WHIRLPOOL a02ba1b48a765e4ba75989f097215739ab4d65dd16204d59281fe6f69620bec6e8981209f2eaf1ffb11ac7e19ed15f70904747095b0e0009339de9c1bb7e3c99
 DIST darcs-2.8.0.tar.gz 1297733 SHA256 1415c2a1a99db8cf76d5f31f6a3490a2a9d3e13f2abfcc67fc108885cf52ce83 SHA512 a944afad043a4ec21a88f090c7678dfc6790c1fd3ee07e8a10a63e0ee23de05460c585a0b542bf47c2fe1a007125da86c1a45db198b425f866b198eb6b4dcf64 WHIRLPOOL 10eba204757ec859b764cab4f4e2260d67d948f97d2b01c7b4bfc2952f218b9dc0575760e27ce02ba0844e1193a987036a69e6696a7e725ac66a44779bc718d7
 DIST darcs-2.8.3.tar.gz 1289187 SHA256 90750842926750cd60a97c61f8ba08e90faffdcb11478d10617a3d5d62216f59 SHA512 2cb997146077668b082e1302a54f728539c33088a42c034de10b0a87f00b49a95405feeaff58f601265c880f92d5b5fb37a041bb4fbf26c36f6964c0a3a40996 WHIRLPOOL 895a46c8a6d6dae8da9f094f881f830e17613359f3bddfb6d6f08bd11112c796a1139671795729c6e1c58f19f353f35172de5ccc89553698a882d266b1d4e90f
 EBUILD darcs-2.8.0.ebuild 4054 SHA256 9227dbddf1d0167b768ea4ef82ffdf4a81e3e1da7b81ff6af04429f6e92eb654 SHA512 88a7b2bd3e9aec2c2ccf81778cb002fe0135d3302ca26446d86f67b1215959e20e3786cd052643a8c81624451afd8a8a537458ebc10e9d89a63f1f973c4a0477 WHIRLPOOL 9f909b7b5fa4ca4b7f01c24b1b75f22616748d20499a1915a0213d5d542d0f869d2427bc928e598a943293014a9d1e90aed29e86dda5cde0d6ef39a033ebf9f9
-EBUILD darcs-2.8.3-r1.ebuild 4714 SHA256 2dcf99391c6b502f81d94bee46d50b8da5eec92282746da649a79291a242c0fa SHA512 8d953e9bbc2d13f87c4a6b609ab2096d9c80762d72e484ce58f72a4c082eb26fb68b0038a78c43cba96e48a1866c8a556a2545350d784669963e57152fb07632 WHIRLPOOL 89536bb48d49951330dabb2603eccfec9b566bba131480cebf5218022649fc998e84294284b7c30b661ea91d4915d2502ee8e7a0a24e5b3ea6eb049e437bff57
-MISC ChangeLog 24957 SHA256 97b51ed3bdaca3b654ee69adf58f9b3f8cb8748309d30309c64c3c6775b10c63 SHA512 639324e6164607179cbdbfde62f483edb17c630fa8111f5e04005d94d58d737e7337ba7e789bf1ec8e6f352b5090a6b5dd40706688142b257c5980353168b98a WHIRLPOOL 8959cb29dbd80db575bfed1dd7bd37689a58ed67d0c5d9f3f8cb9c2efd68e9bf0ba7978e09f11bda7bb803f497b456f4e43ca8b6735957848521054bd669db99
+EBUILD darcs-2.8.3-r1.ebuild 4754 SHA256 91e10d2bafede132ac67b1a5215f9b397c76b6eb5509398f194de4c4dfa2da56 SHA512 4933c67d2206eb63ebdbf742d0f324c631e4313d2bd657c1579953c22f13f8fafa7c004007b0e2e089ef8cf0a9f15e41fa7f646aaa6ca05f3bbdb1b8272b40c8 WHIRLPOOL e6dd061f57b18c7f90936df797c55e625e90d1a842b28ef96b15c26dc49014916583db02021baf02d9f5aa238f42dcb76d415ecf43c5cf9c5957d050f819aaa1
+MISC ChangeLog 25122 SHA256 12bd24c74bc2503b3be472aadadb011f4c46d57d16ae5a6827574b37064385f7 SHA512 4eab762a3845e3ccf3dde26c6a62891721b31654245661371bb7d5809c46e5ec81dc25c9bd50c5396cd53d489ae046e921473a2b99c5a741ca36a68747461bb9 WHIRLPOOL 9412edbad9e05ac53c2c38bc6d5f40222cc698cd6a09739cf51fe8b152b3b9b097ec1110fc6afeceb01f9048822607cfe9c9298c6e54ca4882fda6e60ffa5f29
 MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDYy4oACgkQcaHudmEf86qqfACcCn9BGs9UlQAJaUFFH1Ac1khj
-SCUAn3z+ZXMWN0dJEGNASegaYbiv3ZAU
-=Ev5Y
+iF4EAREIAAYFAlDdUnMACgkQoBEVQmGOlx/LoAD9G1OhgPo59DX/yd1AGs7xqeXf
+39iWvtv/cuVw9mvZEssBANn3Z3vbChzcoAeffoLkL3A1jOAXaR8VDl8DytCpKfP0
+=tyOz
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/darcs/darcs-2.8.3-r1.ebuild b/dev-vcs/darcs/darcs-2.8.3-r1.ebuild
index 49324bb95f68..33c9dbb4cddb 100644
--- a/dev-vcs/darcs/darcs-2.8.3-r1.ebuild
+++ b/dev-vcs/darcs/darcs-2.8.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.8.3-r1.ebuild,v 1.2 2012/12/10 07:55:45 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.8.3-r1.ebuild,v 1.3 2012/12/28 08:03:56 gienah Exp $
 
 EAPI=5
 
@@ -71,6 +71,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${PN}-2.8.1-tar-0.4.patch"
 	epatch "${FILESDIR}"/${P}-hack-for-haskeline-0.7-breaks-non-utf8.patch
+	epatch "${FILESDIR}"/${P}-tf-0.8.patch
 
 	# ghc-7.6
 	cabal_chdeps \
diff --git a/dev-vcs/darcs/files/darcs-2.8.3-tf-0.8.patch b/dev-vcs/darcs/files/darcs-2.8.3-tf-0.8.patch
new file mode 100644
index 000000000000..18f0bc5f55b9
--- /dev/null
+++ b/dev-vcs/darcs/files/darcs-2.8.3-tf-0.8.patch
@@ -0,0 +1,26 @@
+Fix build failure against dev-haskell/test-framework-0.8
+
+[147 of 147] Compiling Main             ( src/test.hs, dist/build/darcs-test/darcs-test-tmp/Main.o )
+
+src/test.hs:100:30:
+    No instance for (Typeable ShellTest) arising from a use of `Test'
+    Possible fix: add an instance declaration for (Typeable ShellTest)
+    In the expression: Test (file ++ " (" ++ show fmt ++ ")")
+    In the expression:
+      Test (file ++ " (" ++ show fmt ++ ")") $ ShellTest fmt file tdir dp
+    In an equation for `shellTest':
+        shellTest dp fmt tdir file
+          = Test (file ++ " (" ++ show fmt ++ ")")
+            $ ShellTest fmt file tdir dp
+diff --git a/src/test.hs b/src/test.hs
+index 39adcc1..9687074 100644
+--- a/src/test.hs
++++ b/src/test.hs
+@@ -49,6 +49,7 @@ data ShellTest = ShellTest { format :: Format
+                            , testdir  :: Maybe FilePath -- ^ only if you want to set it explicitly
+                            , _darcspath :: FilePath
+                            }
++    deriving Typeable
+ 
+ runtest' :: ShellTest -> FilePath -> ShIO Result
+ runtest' (ShellTest fmt _ _ dp) srcdir =