| 1 |
voyageur 14/02/10 13:41:28 |
| 2 |
|
| 3 |
Modified: ChangeLog ocsync-0.91.4.ebuild |
| 4 |
Log: |
| 5 |
Fix compilation with USE=-iconv (and enable USE=iconv by default), restrict tests to USE=iconv, bug #500860 |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C74525F2) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 net-misc/ocsync/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ocsync/ChangeLog?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ocsync/ChangeLog?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ocsync/ChangeLog?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/ocsync/ChangeLog,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- ChangeLog 7 Feb 2014 17:30:56 -0000 1.2 |
| 23 |
+++ ChangeLog 10 Feb 2014 13:41:28 -0000 1.3 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for net-misc/ocsync |
| 26 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ocsync/ChangeLog,v 1.2 2014/02/07 17:30:56 voyageur Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ocsync/ChangeLog,v 1.3 2014/02/10 13:41:28 voyageur Exp $ |
| 29 |
+ |
| 30 |
+ 10 Feb 2014; Bernard Cafarelli <voyageur@g.o> ocsync-0.91.4.ebuild: |
| 31 |
+ Fix compilation with USE=-iconv (and enable USE=iconv by default), restrict |
| 32 |
+ tests to USE=iconv, bug #500860 |
| 33 |
|
| 34 |
07 Feb 2014; Bernard Cafarelli <voyageur@g.o> ocsync-0.91.4.ebuild: |
| 35 |
Only needs asciidoc with USE=doc |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.3 net-misc/ocsync/ocsync-0.91.4.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ocsync/ocsync-0.91.4.ebuild?rev=1.3&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ocsync/ocsync-0.91.4.ebuild?rev=1.3&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ocsync/ocsync-0.91.4.ebuild?r1=1.2&r2=1.3 |
| 44 |
|
| 45 |
Index: ocsync-0.91.4.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/ocsync/ocsync-0.91.4.ebuild,v |
| 48 |
retrieving revision 1.2 |
| 49 |
retrieving revision 1.3 |
| 50 |
diff -u -r1.2 -r1.3 |
| 51 |
--- ocsync-0.91.4.ebuild 7 Feb 2014 17:30:56 -0000 1.2 |
| 52 |
+++ ocsync-0.91.4.ebuild 10 Feb 2014 13:41:28 -0000 1.3 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2014 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ocsync/ocsync-0.91.4.ebuild,v 1.2 2014/02/07 17:30:56 voyageur Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ocsync/ocsync-0.91.4.ebuild,v 1.3 2014/02/10 13:41:28 voyageur Exp $ |
| 58 |
|
| 59 |
EAPI=5 |
| 60 |
|
| 61 |
@@ -13,7 +13,10 @@ |
| 62 |
LICENSE="GPL-2" |
| 63 |
SLOT="0" |
| 64 |
KEYWORDS="~amd64 ~x86" |
| 65 |
-IUSE="doc iconv samba +sftp test" |
| 66 |
+IUSE="doc +iconv samba +sftp test" |
| 67 |
+ |
| 68 |
+# Tests only work with iconv |
| 69 |
+REQUIRED_USE="test? ( iconv )" |
| 70 |
|
| 71 |
RDEPEND=">=dev-db/sqlite-3.4:3 |
| 72 |
net-libs/neon[ssl] |
| 73 |
@@ -34,6 +37,9 @@ |
| 74 |
# proper docdir |
| 75 |
sed -e "s:/doc/${PN}:/doc/${PF}:" \ |
| 76 |
-i doc/CMakeLists.txt || die |
| 77 |
+ # Fix compilation with USE=-iconv, #500860 |
| 78 |
+ sed -e "s/_TCHAR/mbchar_t/" \ |
| 79 |
+ -i src/std/c_string.c || die |
| 80 |
} |
| 81 |
|
| 82 |
src_configure() { |
Archives