diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2015-02-27 22:51:17 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2015-02-27 22:51:17 +0000 |
| commit | dc044955fcf1dff262f75e6452ff8657816b9549 (patch) | |
| tree | 47bf55907fb66c501923e7ab2af56f15a6f3be71 /dev-vcs | |
| parent | Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in ht... (diff) | |
| download | gentoo-2-dc044955fcf1dff262f75e6452ff8657816b9549.tar.gz gentoo-2-dc044955fcf1dff262f75e6452ff8657816b9549.tar.bz2 gentoo-2-dc044955fcf1dff262f75e6452ff8657816b9549.zip | |
Fallback to automatic libiconv detection (bug #541566 by Allen Parker).
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/darcs/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-vcs/darcs/darcs-2.8.5-r3.ebuild | 6 | ||||
| -rw-r--r-- | dev-vcs/darcs/metadata.xml | 1 |
3 files changed, 8 insertions, 5 deletions
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/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> |