diff options
| -rw-r--r-- | app-pda/coldsync/ChangeLog | 10 | ||||
| -rw-r--r-- | app-pda/coldsync/Manifest | 11 | ||||
| -rw-r--r-- | app-pda/coldsync/coldsync-2.2.5-r1.ebuild | 44 | ||||
| -rw-r--r-- | app-pda/coldsync/files/coldsync-2.2.5-toolchain.patch | 25 |
4 files changed, 75 insertions, 15 deletions
diff --git a/app-pda/coldsync/ChangeLog b/app-pda/coldsync/ChangeLog index 62fc97e5801d..454871521149 100644 --- a/app-pda/coldsync/ChangeLog +++ b/app-pda/coldsync/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-pda/coldsync -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/ChangeLog,v 1.10 2009/07/27 10:12:29 flameeyes Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/ChangeLog,v 1.11 2011/03/31 05:49:22 ssuominen Exp $ + + 31 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> coldsync-2.2.5-r1.ebuild, + +files/coldsync-2.2.5-toolchain.patch: + Fix building with GCC 4.3+ and merge -broken-c++.diff and -gcc3.diff here. + Keyword for ~amd64. Don't use strict aliasing. Respect CC and CXX wrt #243694 + by Diego Elio Pettenò. Use perl-module.eclass wrt #297204 by Diego Elio Pettenò. 27 Jul 2009; Diego E. Pettenò <flameeyes@gentoo.org> coldsync-3.0_pre4.ebuild: diff --git a/app-pda/coldsync/Manifest b/app-pda/coldsync/Manifest index dac0ed98f242..b7e4011f6931 100644 --- a/app-pda/coldsync/Manifest +++ b/app-pda/coldsync/Manifest @@ -3,16 +3,17 @@ Hash: SHA256 AUX coldsync-2.2.5-broken-c++.diff 447 RMD160 379838fc7c731357f9c42b7285447dfbb7ec4639 SHA1 4375d58f842adb8e75e31d5bb0181eebe2907b17 SHA256 354b29bc9fe0ca8c0476ff6e4398bd168eaee698bbd447c0f6af9903481c15c0 AUX coldsync-2.2.5-gcc3.diff 222 RMD160 c89350b26844e4302aacf25deda2e3563196248f SHA1 e5be6eae159d578346aeb090e2bb97d7994366fa SHA256 ef51d68a6759e3e28f6db7efce38925747c8b231fe95d2cfbfa924602fc92cdd +AUX coldsync-2.2.5-toolchain.patch 589 RMD160 b4cd03e0e6b3c0747decc1f06471ca077cba4002 SHA1 0a5c965e217323245e1f3b4dad89f1841333f5cd SHA256 70321f6b822fc16ef91620d6bef2ef6026fdc5295c920c45a3580916b592924e DIST coldsync-2.2.5.tar.gz 663307 RMD160 76d1065c3558f26f22a94d67e26e0ed25a2367fd SHA1 0f12142d468d35974e11682848f9a949957ed739 SHA256 635575e2175a865827319ad21cbfbac95a42a7256730898ae9e9104b63b4fef6 DIST coldsync-3.0-pre4.tar.gz 657305 RMD160 b4bc230a4056e2825d466dfbde2e05458c8ae8af SHA1 c6210b020ba51d3d101c82c2bf77257cb22d8e23 SHA256 ca32dbcd1b2d3cbce8ee4e34aafb1183fc09c3ead69d308e76454a9c4c4728c3 -EBUILD coldsync-2.2.5-r1.ebuild 1068 RMD160 bc2ad220640d7b74d48601e3dec30bfede3e8635 SHA1 1ff3f4e665e525bfe6c5bfbe2696838022616765 SHA256 8a781870f9052168557292088d6e0ba89c4131374cb9751bcd168532e10f301a +EBUILD coldsync-2.2.5-r1.ebuild 1520 RMD160 936625c967b5d2292043bc5ccb6928c1b1d89076 SHA1 850e19e940368e79461cdb677e728c3cc786ca2e SHA256 70be6d5f191e093758e12679ef8d70b9584302dd79ca5ef1a85e341e8a7787f6 EBUILD coldsync-3.0_pre4.ebuild 1392 RMD160 c6e9d515e3d918a11b16d8902cacc8f6c287f3c2 SHA1 663a27c8d1ca1ee10d929b64a2969bc85838e688 SHA256 39f1c7fbe01767f674a74f8d18649ecb3128d6d0cf8de34ddfeaab16076594d5 -MISC ChangeLog 1792 RMD160 0f45d84e81e59ce966fa614f31c2de30e8de81ea SHA1 a06022102eee50c435909b99aea406746d9e802b SHA256 bb0984a70e9cc5c8ca3372b6d65b29814b3a289fd5644f144feceb79441d3854 +MISC ChangeLog 2156 RMD160 c1fe84a09b41e55bc5bbc32ac12d4e139552c3b3 SHA1 acbd3c7cf39aa8c96d896513cffa1cbb65171726 SHA256 188761d55a5e3fef88126098a339f8c2391e4e149b20ea787f803ea52ca37561 MISC metadata.xml 156 RMD160 6a6d0f6bfe83e3a54c2d72444564ed6ab19857fe SHA1 5b9cb277159d763c133920e483df8d3d587cf7e2 SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk2UD7QACgkQXkR9YqOcLPF1oQEAlaugl5iIJSdAe2e9pt7FDeSm -J75bXVlO3Be0EwqElJAA/3eXITRB4wl1l+mJtnOOFurdQC4Ls3wLlFasZHFK+zQx -=p5AV +iF4EAREIAAYFAk2UFhIACgkQXkR9YqOcLPF1SQEAkCW37t5xfrbVOi2/q2+sXINn +6Sv2S7yJYrUkBRCJq7EA/0fXBuyorJXVXlQubEqJ3ItBEP9X/ppS18u4UXJeY0iQ +=Aq9V -----END PGP SIGNATURE----- diff --git a/app-pda/coldsync/coldsync-2.2.5-r1.ebuild b/app-pda/coldsync/coldsync-2.2.5-r1.ebuild index c301da434a57..8ea9becf97dc 100644 --- a/app-pda/coldsync/coldsync-2.2.5-r1.ebuild +++ b/app-pda/coldsync/coldsync-2.2.5-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/coldsync-2.2.5-r1.ebuild,v 1.11 2011/03/31 04:38:40 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/coldsync-2.2.5-r1.ebuild,v 1.12 2011/03/31 05:49:22 ssuominen Exp $ EAPI=2 -inherit eutils +inherit eutils flag-o-matic perl-module toolchain-funcs DESCRIPTION="A command-line tool to synchronize PalmOS PDAs with Unix workstations" HOMEPAGE="http://www.coldsync.org/" @@ -11,19 +11,41 @@ SRC_URI="http://www.coldsync.org/download/${P}.tar.gz" LICENSE="Artistic" SLOT="0" -KEYWORDS="~ppc sparc x86" +KEYWORDS="~amd64 ~ppc sparc x86" IUSE="nls perl" +RDEPEND="perl? ( dev-lang/perl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-2.2.5-gcc3.diff \ - "${FILESDIR}"/${PN}-2.2.5-broken-c++.diff + epatch "${FILESDIR}"/${P}-toolchain.patch } src_configure() { + tc-export CC CXX + append-cflags -fno-strict-aliasing + + # TODO: i18n: msgfmt fails but doesn't || die econf \ $(use_with nls i18n) \ - $(use_with perl) + --without-perl + + if use perl; then + pushd perl/ColdSync + perl-module_src_configure + popd + fi +} + +src_compile() { + default + + if use perl; then + pushd perl/ColdSync + perl-module_src_compile + popd + fi } src_install() { @@ -38,5 +60,11 @@ src_install() { INSTALLVENDORMAN3DIR="${D}"/usr/share/man/man3 \ install || die - dodoc AUTHORS ChangeLog HACKING NEWS README TODO + if use perl; then + pushd perl/ColdSync + perl-module_src_install + popd + fi + + dodoc AUTHORS ChangeLog FAQ HACKING NEWS README* TODO } diff --git a/app-pda/coldsync/files/coldsync-2.2.5-toolchain.patch b/app-pda/coldsync/files/coldsync-2.2.5-toolchain.patch new file mode 100644 index 000000000000..1a5392d97f0b --- /dev/null +++ b/app-pda/coldsync/files/coldsync-2.2.5-toolchain.patch @@ -0,0 +1,25 @@ +--- src/symboltable.cc ++++ src/symboltable.cc +@@ -11,8 +11,11 @@ + #include <string> + #include <map> + #include <cstdlib> // For malloc() and friends ++#include <cstring> // For strlen() and friends + #include "symboltable.h" + ++using namespace std; ++ + static char *make_c_string(const string &s); + + map<string,string> table; /* XXX - Is this going to cause problems on +--- src/symboltable.h ++++ src/symboltable.h +@@ -26,7 +26,7 @@ + /* Initialize the symbol table based on the + * arguments. */ + #ifdef __cplusplus +-}; ++} + #endif /* __cplusplus */ + + /* This is for Emacs's benefit: |