diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2014-02-10 13:41:37 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2014-02-10 13:41:37 +0000 |
| commit | 00a5086388743cb0fc9b94df9561d63cfb77310e (patch) | |
| tree | cb63edf3cf5da15faec76cba5df0ef45cb73f960 /net-misc/ocsync | |
| parent | Version bump, remove old (diff) | |
| download | historical-00a5086388743cb0fc9b94df9561d63cfb77310e.tar.gz historical-00a5086388743cb0fc9b94df9561d63cfb77310e.tar.bz2 historical-00a5086388743cb0fc9b94df9561d63cfb77310e.zip | |
Fix compilation with USE=-iconv (and enable USE=iconv by default), restrict tests to USE=iconv, bug #500860
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2
Diffstat (limited to 'net-misc/ocsync')
| -rw-r--r-- | net-misc/ocsync/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/ocsync/Manifest | 10 | ||||
| -rw-r--r-- | net-misc/ocsync/ocsync-0.91.4.ebuild | 10 |
3 files changed, 18 insertions, 8 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/Manifest b/net-misc/ocsync/Manifest index bff934a3560e..93452b5f4d41 100644 --- a/net-misc/ocsync/Manifest +++ b/net-misc/ocsync/Manifest @@ -2,13 +2,13 @@ Hash: SHA256 DIST ocsync-0.91.4.tar.bz2 6010999 SHA256 9ce5d04ff0475be4c3d3bfff43a554980d88277e95de4128a3f18611529b2cb6 SHA512 ec942ace1a215120cb8c764abe35b81ae48d979469c87feee8fcacb00740b35479095ed1a913f711736acd6fc8d83e148e4d597baff6d7a2de721981410ac896 WHIRLPOOL 7a8db0fa94ffa690863e51d3c58201f6d63803a6af00a2124c03c68ed4ece911bf5bf8862158c86c372caf02ee1bea7bbf4a2cfb3473a36f08e605a515ccde60 -EBUILD ocsync-0.91.4.ebuild 1210 SHA256 26d77ef0dc3b281c8ef472ec8b70228fb1ebf056d6627a27ee496015e9dad86c SHA512 7a76c91b59b8f8b7d87d86679f084eaf4df326316323549befc03b456db2a2e24f6a70d14d4bf7e4b1ac0da2aee0752e980d9d88b8df60ed7400620f08fff6fb WHIRLPOOL 8e000d8ad2ff7884882b19a20fd4a5118a773e0229a6c0dc47db6f636b4e79985a7acadd93c9a65f43c17696427a86183747b9e9abf54e47b470d946f5a6f7ff -MISC ChangeLog 535 SHA256 86e3cfece793e0228ebbcaf9a4dbfaf6a4a949de261080cd72bf523760c87335 SHA512 be78d22aa0a64318932cfe8557b97d31509b245f5d44307af0b54e7514b51d82a6868f628b979ff0a2e1d673bc1109f645d564e4fc8ee1ed8a2603474f559b47 WHIRLPOOL 724b0b82153cd7f3dcf8460260ea9436c231b15c68b7350ef863b7732c910510b93264d52069cc8dad4030236b7deaa275be6c92a57a94385af6d6534cfee2f8 +EBUILD ocsync-0.91.4.ebuild 1378 SHA256 ed008dc6c86cbd66ca6349861952bc4efad9c3aab49e3c123e6af003f2093a39 SHA512 0c0eae79ad84c024de8706e15374b789f4bfe08722bf2c7c586e1dd0f0b7fb10c9c8ec22205f18796ce5e6b94975d13a6e69a75e3e090b6c4b064ca97a25a922 WHIRLPOOL d80d3dbcdaa2d8ee32fb59940728d6b7d4fac9c9439629eb8b765268cc0e6ea463a75f0406cf6c903a64bcedca557367ac33c651514c94361e5ffc8669539c18 +MISC ChangeLog 725 SHA256 fb40461edfd7770fa608e8757f9534624aceba89605259bc864ba51250486f32 SHA512 61adbf03dbae80c6252514aae4386d5bc61340bcc2ec550452bead62200b132af9bf6bcab34e78c17b525b002a509e57fbaf2b37f9802be965fab2d41e1dc726 WHIRLPOOL 311dfb5383ec74c7766b5977de3f3d5165e6270c43877536b0a0c52117c18288d11c06f5487738e22045ec605b434dd25e5104ef7e3d5de1ca1941875dfbc684 MISC metadata.xml 340 SHA256 c5c40a72df05ec9d8dfc3ecb271645226480e30f635847dfa0192fdf868104b8 SHA512 ca9a12a90e3d0a254a64c64529bd66bc427afb8161685b2dedcc433aec208a5c6b68bd501cdfddf137171ff90d57e8a416815f562ec5fee9bf466e389815dd08 WHIRLPOOL baab644f7192bb71a79fc60d12766c196169863686da3c9a3fd388d079798bb7e8bb55fb956899b27f431ac741fbfecdf11bf17b3aa9184b555cb1fafc639db7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iF4EAREIAAYFAlL1GFkACgkQFYEBGcdFJfIBqgD/c32LsurhRbf05JXFg8Z9TS5E -D1wl6ShB/dPa4Gyn5CIA/2Oqvuh97PcLlRfg6hEcaV+q4+g2MRy9ZQfMaQsx5Y7k -=XOmr +iF4EAREIAAYFAlL41w4ACgkQFYEBGcdFJfLz3QD/Re8WreqEJ7nXVvlQiw3YQ98Q +bNqKJRZ+DEhrcJq92EsA/08OOew8sKwwYAzzHpEPzLg+SfGF9xtHKOcTnJTD/o0Z +=5YXY -----END PGP SIGNATURE----- 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() { |