summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-03-31 05:50:44 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-03-31 05:50:44 +0000
commit9c6cd95c461121bfec4511e85e6cd5f3db96ad8d (patch)
tree80f2c0162bf73cee435c6aeca444443411889952 /app-pda
parentFix building with GCC 4.3+ and merge -broken-c++.diff and -gcc3.diff here. Ke... (diff)
downloadhistorical-9c6cd95c461121bfec4511e85e6cd5f3db96ad8d.tar.gz
historical-9c6cd95c461121bfec4511e85e6cd5f3db96ad8d.tar.bz2
historical-9c6cd95c461121bfec4511e85e6cd5f3db96ad8d.zip
clean up more
Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64
Diffstat (limited to 'app-pda')
-rw-r--r--app-pda/coldsync/Manifest10
-rw-r--r--app-pda/coldsync/coldsync-2.2.5-r1.ebuild8
-rw-r--r--app-pda/coldsync/files/coldsync-2.2.5-broken-c++.diff21
-rw-r--r--app-pda/coldsync/files/coldsync-2.2.5-gcc3.diff10
4 files changed, 11 insertions, 38 deletions
diff --git a/app-pda/coldsync/Manifest b/app-pda/coldsync/Manifest
index b7e4011f6931..0a64b053a153 100644
--- a/app-pda/coldsync/Manifest
+++ b/app-pda/coldsync/Manifest
@@ -1,19 +1,17 @@
-----BEGIN PGP SIGNED MESSAGE-----
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 1520 RMD160 936625c967b5d2292043bc5ccb6928c1b1d89076 SHA1 850e19e940368e79461cdb677e728c3cc786ca2e SHA256 70be6d5f191e093758e12679ef8d70b9584302dd79ca5ef1a85e341e8a7787f6
+EBUILD coldsync-2.2.5-r1.ebuild 1599 RMD160 2bb186369d90044025994fbf5c9175590dc5803d SHA1 27d50456876068742b551542226ab6b2326a997b SHA256 5d96205320ac759921c88fdb082d88f03ac5a92dd9ce855ef450e13c041986c6
EBUILD coldsync-3.0_pre4.ebuild 1392 RMD160 c6e9d515e3d918a11b16d8902cacc8f6c287f3c2 SHA1 663a27c8d1ca1ee10d929b64a2969bc85838e688 SHA256 39f1c7fbe01767f674a74f8d18649ecb3128d6d0cf8de34ddfeaab16076594d5
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)
-iF4EAREIAAYFAk2UFhIACgkQXkR9YqOcLPF1SQEAkCW37t5xfrbVOi2/q2+sXINn
-6Sv2S7yJYrUkBRCJq7EA/0fXBuyorJXVXlQubEqJ3ItBEP9X/ppS18u4UXJeY0iQ
-=Aq9V
+iF4EAREIAAYFAk2UFmAACgkQXkR9YqOcLPFYJAD+MCjOg4vDWzmcg7nhM5ZyNfl2
+X2G1Y052psMmYfpYnX8A/jQkR4l4ldeput6woeWlmht5OKh8+ZRJ/x1xASTH7+G6
+=6oE5
-----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 8ea9becf97dc..d65e16e7bc4b 100644
--- a/app-pda/coldsync/coldsync-2.2.5-r1.ebuild
+++ b/app-pda/coldsync/coldsync-2.2.5-r1.ebuild
@@ -1,6 +1,6 @@
# 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.12 2011/03/31 05:49:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/coldsync-2.2.5-r1.ebuild,v 1.13 2011/03/31 05:50:44 ssuominen Exp $
EAPI=2
inherit eutils flag-o-matic perl-module toolchain-funcs
@@ -20,6 +20,12 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/${P}-toolchain.patch
+
+ if use perl; then
+ pushd perl/ColdSync
+ perl-module_src_prepare
+ popd
+ fi
}
src_configure() {
diff --git a/app-pda/coldsync/files/coldsync-2.2.5-broken-c++.diff b/app-pda/coldsync/files/coldsync-2.2.5-broken-c++.diff
deleted file mode 100644
index efbe4615ec16..000000000000
--- a/app-pda/coldsync/files/coldsync-2.2.5-broken-c++.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/symboltable.cc
-+++ src/symboltable.cc
-@@ -12,6 +12,7 @@
- #include <map>
- #include <cstdlib> // For malloc() and friends
- #include "symboltable.h"
-+using namespace std;
-
- static char *make_c_string(const string &s);
-
---- 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:
diff --git a/app-pda/coldsync/files/coldsync-2.2.5-gcc3.diff b/app-pda/coldsync/files/coldsync-2.2.5-gcc3.diff
deleted file mode 100644
index c881d7e9a64f..000000000000
--- a/app-pda/coldsync/files/coldsync-2.2.5-gcc3.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/symboltable.cc
-+++ src/symboltable.cc
-@@ -7,6 +7,7 @@
- * $Id: coldsync-2.2.5-gcc3.diff,v 1.2 2011/03/31 05:22:11 ssuominen Exp $
- */
-
-+using namespace std;
- #include "config.h"
- #include <string>
- #include <map>