diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2014-02-10 13:41:28 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2014-02-10 13:41:28 +0000 |
| commit | eaf93e746c55320667b593fc6f4045932066fee2 (patch) | |
| tree | a248c98d4be5fb61523a80789ca5a355fa67fc2b /net-misc | |
| parent | Version bump, remove old (diff) | |
| download | gentoo-2-eaf93e746c55320667b593fc6f4045932066fee2.tar.gz gentoo-2-eaf93e746c55320667b593fc6f4045932066fee2.tar.bz2 gentoo-2-eaf93e746c55320667b593fc6f4045932066fee2.zip | |
Fix compilation with USE=-iconv (and enable USE=iconv by default), restrict tests to USE=iconv, bug #500860
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C74525F2)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/ocsync/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/ocsync/ocsync-0.91.4.ebuild | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/net-misc/ocsync/ChangeLog b/net-misc/ocsync/ChangeLog index 49a1614ebe5c..d6b7a5b25431 100644 --- a/net-misc/ocsync/ChangeLog +++ b/net-misc/ocsync/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/ocsync # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ocsync/ChangeLog,v 1.2 2014/02/07 17:30:56 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ocsync/ChangeLog,v 1.3 2014/02/10 13:41:28 voyageur Exp $ + + 10 Feb 2014; Bernard Cafarelli <voyageur@gentoo.org> ocsync-0.91.4.ebuild: + Fix compilation with USE=-iconv (and enable USE=iconv by default), restrict + tests to USE=iconv, bug #500860 07 Feb 2014; Bernard Cafarelli <voyageur@gentoo.org> ocsync-0.91.4.ebuild: Only needs asciidoc with USE=doc diff --git a/net-misc/ocsync/ocsync-0.91.4.ebuild b/net-misc/ocsync/ocsync-0.91.4.ebuild index c9f5ee375152..949fc7343834 100644 --- a/net-misc/ocsync/ocsync-0.91.4.ebuild +++ b/net-misc/ocsync/ocsync-0.91.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ocsync/ocsync-0.91.4.ebuild,v 1.2 2014/02/07 17:30:56 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ocsync/ocsync-0.91.4.ebuild,v 1.3 2014/02/10 13:41:28 voyageur Exp $ EAPI=5 @@ -13,7 +13,10 @@ SRC_URI="http://download.owncloud.com/desktop/stable/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc iconv samba +sftp test" +IUSE="doc +iconv samba +sftp test" + +# Tests only work with iconv +REQUIRED_USE="test? ( iconv )" RDEPEND=">=dev-db/sqlite-3.4:3 net-libs/neon[ssl] @@ -34,6 +37,9 @@ src_prepare() { # proper docdir sed -e "s:/doc/${PN}:/doc/${PF}:" \ -i doc/CMakeLists.txt || die + # Fix compilation with USE=-iconv, #500860 + sed -e "s/_TCHAR/mbchar_t/" \ + -i src/std/c_string.c || die } src_configure() { |