From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Fri, 27 Feb 2015 22:51:21 +0000 (+0000)
Subject: Fallback to automatic libiconv detection (bug #541566 by Allen Parker).
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e85a49dba04440c9770017003f2be2b8fe9ed2fa;p=gentoo.git

Fallback to automatic libiconv detection (bug #541566 by Allen Parker).

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

diff --git a/dev-vcs/darcs/ChangeLog b/dev-vcs/darcs/ChangeLog
index 36d0fad312c4..bd57cf537134 100644
--- a/dev-vcs/darcs/ChangeLog
+++ b/dev-vcs/darcs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/darcs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.58 2015/01/03 02:28:30 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.59 2015/02/27 22:51:17 slyfox Exp $
+
+  27 Feb 2015; Sergei Trofimovich <slyfox@gentoo.org> darcs-2.8.5-r3.ebuild,
+  metadata.xml:
+  Fallback to automatic libiconv detection (bug #541566 by Allen Parker).
 
   03 Jan 2015; Mark Wright <gienah@gentoo.org>
   +files/darcs-2.8.5-ghc-7.10.patch, darcs-2.8.5-r3.ebuild:
diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest
index daaab3e65bb2..a42f18bd2c28 100644
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -12,13 +12,13 @@ DIST darcs-2.8.5.tar.gz 1306525 SHA256 064310ed589c89500e224ad5254ab88de815c349f
 EBUILD darcs-2.8.4-r3.ebuild 4518 SHA256 02f691062bdd148c0bc42bd9b805de612f05cc53354a73e063542814e2926498 SHA512 6adbf8b0217e1d7e2b0455896b194e256cbc019962037f592491d77bf338167277093ccc66ef359f9e7edc84c2629159406c0a91af93bdbc4f4a58bcfe24bb89 WHIRLPOOL 270679efd2794d8322c85f56dcc8c40021bd2eaba5d6fea89e792bc1be6786733f78c1069025cad6b034c57f4055261674e70b05fc95d348b46dbd6ece72e739
 EBUILD darcs-2.8.4-r6.ebuild 4857 SHA256 696ea07f05ea63db3d30be597bc4cd0188caf2a19d7d9c28dc3cfa6def2c1779 SHA512 5c2ed391ca9720a7ab0a6146d0044c36b6897df9b41285d4a925c2a2966b0ef4666ccfd5b51260c5e89de2b459fde93fb484fbf3c9d8e4e9484d86cbc1ba067a WHIRLPOOL 7d876a4202566a9ddcc579fb46858ade5d8a19235c3fa10ec5054ae6c77391eedd47f443dd7deff45cbc4dd45b6c2de773f053fc89e5b16e503e2ddc7e701ee7
 EBUILD darcs-2.8.4.ebuild 4007 SHA256 da954f2190488bf79281f4fb886e4905449b4558f60fb011702eb4c13a2f6166 SHA512 c4a5ffc93b719eb33cf43f869a4b2db67b3bc96a6296188900c15020fe536670f1eee4ff33605fb6a193ac0a0d533a6d47dd6bb79edf266065f50405634c31ba WHIRLPOOL ed40c3cc1e73a2bcc87d59a645e99f107387d104e553ccc515ab7c11aa5dc06473395ac6753ea20c0fc5bd2c667ed777b39a6939a20f6c730f6cb7223dda544b
-EBUILD darcs-2.8.5-r3.ebuild 3981 SHA256 adfa51dd607fd846d0179956a5a2ee0899bf59edd68a1756350848e81abd125f SHA512 8a64e213e9b477026c69811e036dfade4215895bef9bfd2356ed65866d255d935fefa74fc60cdcecd3555e8a317edfbf0cfffa2ef5aa489ba630db5b3de1d348 WHIRLPOOL 0ef01a8e4d206e8bd7ecfeb4a8dca09e2b69b4639b27fdf7f62b7f25b3ea588a3711228986e8ed617e89aab683f5489170c520df223b378a6d6ce2b436b26d42
-MISC ChangeLog 27466 SHA256 fa0927020e2eafb6a77a43609cb78d401eb01b8c5876366c0b3627fd58889897 SHA512 fd3093e43c836662bed927edb04724b55dd32ee008e2980ce675dd601446cf2d74849f99691282a88c915054de3ae9a33aecc965e737101d7fb72c969f7b68e0 WHIRLPOOL 4b250e1ec1d6dfa9c45443cb6a01dc4daf4efaf8fbc03b6208b60e6dbd5b76d089d1566d45c9f4e6c1bb7b3d92643d51532300c93babd49a1496310f4c4fe9c1
-MISC metadata.xml 735 SHA256 82bf82ce859b26febe80df14ae3af5fed3865bab2a364c64f23ac197a43b2c1d SHA512 a942de2931a4ac42aa3ccd37867459c0775977994c6333e0847aa461ddd4c600d769f8213a00601888682471b0e1ecf2ad5cfaae90f3f13f0e33b4cd9b938144 WHIRLPOOL a9577eb48518bae820e4030f7adee6c8f1d461018945d2d6f25f2da0bf5db06ae0f5d0eb67b64b21e0ce5bb1cc3871b51fdc0f526df7feb8fb187b738489e7e5
+EBUILD darcs-2.8.5-r3.ebuild 3954 SHA256 814dfc1db175d16f6a73f72ea0fe535b7a8c031b3a2d565bc97633d83b41f454 SHA512 20ef49f37f806fa0dcb38873f731d97b3a92a1e9b530f08949f715da6c9daacb4445b9eb391fd3b8655fb16b27edeb920301c02ac27bbd35da1a3fa31b102ce0 WHIRLPOOL 5829fe4c681a1443cf83a54ccf871416faf0c99ae92b5cbe1dd9e69aa8089e8f3c454c29b439b8e8e682f82875056ffd22b95e0fce8f6829d59f58ef5b740218
+MISC ChangeLog 27634 SHA256 700cc5d6522f51eefcab678f0a49f3645363adbb3a7a61deb58cc10ac1f41a20 SHA512 065503da1a5c0c7e8027b6e3ae86abf6898ae17fe776228b4ac0d30e345a43d2acb26beccbfa17f82efe192d6bf419aab246523a9552f7cdea2d1a5cce388eb0 WHIRLPOOL 50139198465de030bb1a831ff4cff05f5bf82c99ac53e01ff95a5c3b76be34ea7e6801829ffc3716e42d3cde0770830b0b798238e13789fbaf29e89f120e12bc
+MISC metadata.xml 658 SHA256 2b88dfa6478c987c89bea68395e3aaae3e2c27da154fdeecb8d42666a4216d0d SHA512 dc02d85ca156604f7de0fc1c8669e6333a6d5f6bd24d16609a4308724d10bec51ab1b454de682657cc68e0d97a29897a64c34afa5c9b7ebf87c9a7c54f6bfb73 WHIRLPOOL 1c3abd8bf0177497c1f51372ab45df732639a8ffe244a0c30268e4a431c29ab3172156de5803600c013d6507677cfe433625c451794342acbc71decf977636c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSnU9YACgkQoBEVQmGOlx+RIwD/XcjG/pir9KLXfJW9MwnRrr6Q
-AFZBigEMaZXr7Zzk+4EA/iM4O2NYo9q5UgSwDIM4J9jiAM04AEUeMQZ1qH+UvlsX
-=fFOd
+iEYEAREIAAYFAlTw9N4ACgkQcaHudmEf86pSJgCfUt+RDg3YtA0xIJ5nvQhqe/w3
+XcwAnjo0kwMEjBrzXGOi76VcvS5HE3ec
+=JNWp
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/darcs/darcs-2.8.5-r3.ebuild b/dev-vcs/darcs/darcs-2.8.5-r3.ebuild
index 2cd6abc71408..49f6d2bce613 100644
--- a/dev-vcs/darcs/darcs-2.8.5-r3.ebuild
+++ b/dev-vcs/darcs/darcs-2.8.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.8.5-r3.ebuild,v 1.2 2015/01/03 02:28:30 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.8.5-r3.ebuild,v 1.3 2015/02/27 22:51:17 slyfox Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="+color +curl +http libiconv +mmap +network-uri +optimize static +terminfo test +threaded"
+IUSE="+color +curl +http +mmap +network-uri +optimize static +terminfo test +threaded"
 
 RDEPEND=">=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
 	>=dev-haskell/hashed-storage-0.5.6:=[profile?] <dev-haskell/hashed-storage-0.6:=[profile?]
@@ -33,6 +33,7 @@ RDEPEND=">=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extens
 	>=dev-haskell/vector-0.7:=[profile?]
 	>=dev-haskell/zlib-0.5.1.0:=[profile?] <dev-haskell/zlib-0.6.0.0:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
+	virtual/libiconv
 	curl? ( net-misc/curl )
 	http? ( >=dev-haskell/http-4000.0.8:=[profile?] <dev-haskell/http-4000.3:=[profile?]
 		network-uri? ( >=dev-haskell/network-2.6:=[profile?]
@@ -73,7 +74,6 @@ src_configure() {
 		--flag=executable \
 		--flag=-hpc \
 		$(cabal_flag http http) \
-		$(cabal_flag libiconv libiconv) \
 		--flag=library \
 		$(cabal_flag mmap mmap) \
 		$(cabal_flag network-uri network-uri) \
diff --git a/dev-vcs/darcs/metadata.xml b/dev-vcs/darcs/metadata.xml
index e38d4d954e77..d469a3f04348 100644
--- a/dev-vcs/darcs/metadata.xml
+++ b/dev-vcs/darcs/metadata.xml
@@ -8,7 +8,6 @@
 <use>
   <flag name="color">Use ansi color escapes.</flag>
   <flag name="http">Use the pure Haskell HTTP package for HTTP support.</flag>
-  <flag name="libiconv">Explicitly link against the libiconv library.</flag>
   <flag name="optimize">Build with optimizations (-O2).</flag>
   <flag name="network-uri">Get Network.URI from the network-uri package.</flag>
   <flag name="terminfo">Use the terminfo package for enhanced console support.</flag>